From 05a31ef28ef279dd48b7bce96226d1d8c2eb6816 Mon Sep 17 00:00:00 2001 From: wang_yue111 <648774160@qq.com> Date: Mon, 28 Jun 2021 19:28:21 +0800 Subject: [PATCH] Change rubygem-bundler bundled version to fix compilation error --- change-bundled-rubygem-bundler-version.patch | 22 ++++++++++++++++++++ obs-server.spec | 6 +++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 change-bundled-rubygem-bundler-version.patch diff --git a/change-bundled-rubygem-bundler-version.patch b/change-bundled-rubygem-bundler-version.patch new file mode 100644 index 0000000..5e62059 --- /dev/null +++ b/change-bundled-rubygem-bundler-version.patch @@ -0,0 +1,22 @@ +From f09770635d1dbf86085ece2a8000a909f4950f97 Mon Sep 17 00:00:00 2001 +From: wang_yue111 <648774160@qq.com> +Date: Mon, 28 Jun 2021 16:13:49 +0800 +Subject: [PATCH] change rubygem-bundler bundled version to fix compilation error + +--- + 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 e930bf4..681e653 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,7 +5,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 @@ -15,6 +15,7 @@ Source0: open-build-service-%version.tar.xz Patch1: 0001-obs_server-fix-usage-info.patch Patch2: 0002-CVE-2020-8020.patch Patch3: 0003-CVE-2020-8021.patch +Patch4: change-bundled-rubygem-bundler-version.patch BuildArch: noarch @@ -480,6 +481,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Mon Jun 28 2021 wangyue - 2.10.1-lp151.23.9 +- Change rubygem-bundler bundled version to fix compilation error + * Tue Mar 16 2021 yanglongkang - 2.10.1-lp151.23.8 - fix CVE-2020-8020 CVE-2020-8021 -- Gitee