From a73acfa3713f4e62258f89c99328c34e5ecc3578 Mon Sep 17 00:00:00 2001 From: houyingchao <1348375921@qq.com> Date: Tue, 26 Oct 2021 20:25:44 +0800 Subject: [PATCH] fix obs-server compilation failed --- fix-obs-server-compilation-failed.patch | 22 ++++++++++++++++++++++ obs-server.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 fix-obs-server-compilation-failed.patch diff --git a/fix-obs-server-compilation-failed.patch b/fix-obs-server-compilation-failed.patch new file mode 100644 index 0000000..4abad8c --- /dev/null +++ b/fix-obs-server-compilation-failed.patch @@ -0,0 +1,22 @@ +From 40a2caabd6b0d88d266b41eff4e105916b3d97c6 Mon Sep 17 00:00:00 2001 +From: houyingchao <1348375921@qq.com> +Date: Tue, 26 Oct 2021 19:48:25 +0800 +Subject: [PATCH] fix + +--- + src/api/Gemfile.lock | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/api/Gemfile.lock b/src/api/Gemfile.lock +index c8cce14..427b747 100644 +--- a/src/api/Gemfile.lock ++++ b/src/api/Gemfile.lock +@@ -579,4 +579,4 @@ DEPENDENCIES + yajl-ruby + + BUNDLED WITH +- 1.17.1 ++ 2.2.19 +-- +2.23.0 + diff --git a/obs-server.spec b/obs-server.spec index 7983567..895d8fc 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.1 -Release: lp151.23.8 +Release: lp151.23.9 Summary: The Open Build Service -- Server Component License: GPL-2.0-only or GPL-3.0-only URL: http://www.openbuildservice.org @@ -16,6 +16,7 @@ BuildArch: noarch Patch1: 0001-CVE-2020-8020.patch Patch2: 0002-CVE-2020-8021.patch +Patch3: fix-obs-server-compilation-failed.patch BuildRequires: python-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Compress-Zlib, xz BuildRequires: perl-File-Sync >= 0.10, perl-JSON-XS, perl-Net-SSLeay, perl-Socket-MsgHdr, nodejs @@ -479,6 +480,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Tue Oct 26 2021 houyingchao - 2.10.1-lp151.23.9 +- fix obs-server compilation failed + * Tue Mar 16 2021 yanglongkang - 2.10.1-lp151.23.8 - fix CVE-2020-8020 CVE-2020-8021 -- Gitee