diff --git a/fix-obs_productconvert-inputfile-path.patch b/fix-obs_productconvert-inputfile-path.patch new file mode 100644 index 0000000..740fb21 --- /dev/null +++ b/fix-obs_productconvert-inputfile-path.patch @@ -0,0 +1,20 @@ +From 000f42efd6d3817cbded659de101af2e4a5bcc18 Mon Sep 17 00:00:00 2001 +From: baizg1107 +Date: Thu, 17 Jun 2021 17:05:38 +0800 +Subject: [PATCH] fix obs productconvert inputfile path + +--- + dist/obs_productconvert | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dist/obs_productconvert b/dist/obs_productconvert +index 8a7f4cc..6005d90 100755 +--- a/dist/obs_productconvert ++++ b/dist/obs_productconvert +@@ -1,2 +1,2 @@ + #!/bin/bash +-exec /usr/lib/obs/server/bs_productconvert "$@" ++exec /usr/lib/obs/server/bs_productconvert ${PWD}"/$@" +-- +2.27.0 + diff --git a/obs-server.spec b/obs-server.spec index 755d5e4..1e41316 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -5,7 +5,7 @@ Name: obs-server Version: 2.10.1 -Release: lp151.23.10 +Release: lp151.23.11 Summary: The Open Build Service -- Server Component License: GPL-2.0-only or GPL-3.0-only URL: http://www.openbuildservice.org @@ -18,6 +18,9 @@ Patch3: 0003-CVE-2020-8021.patch Patch4: 0004-remove-systemV-method.patch Patch5: 0005-obsscheduler-stop.patch Patch6: change-bundled-rubygem-bundler-version.patch +Patch7: fix-obs_productconvert-inputfile-path.patch +Patch8: obs_project_update-should-tell-the-usage-but-not-hung-still.patch + BuildArch: noarch BuildRequires: python-devel, /usr/bin/xmllint, openssl, perl-BSSolv, perl-Compress-Zlib, xz @@ -487,6 +490,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/rcobsstoragesetup %changelog +* Thu Oct 14 2021 herengui - 2.10.1-lp151.23.11 +- sync two patch from openEuler-20.03-LTS-SP2 + * Mon Jun 28 2021 wangyue - 2.10.1-lp151.23.10 - Change rubygem-bundler bundled version to fix compilation error diff --git a/obs_project_update-should-tell-the-usage-but-not-hung-still.patch b/obs_project_update-should-tell-the-usage-but-not-hung-still.patch new file mode 100644 index 0000000..b3716d0 --- /dev/null +++ b/obs_project_update-should-tell-the-usage-but-not-hung-still.patch @@ -0,0 +1,27 @@ +From 29a123a92e31dbdc137e94428323c75d7a0c215b Mon Sep 17 00:00:00 2001 +From: si-gui +Date: Thu, 17 Jun 2021 16:34:05 +0800 +Subject: [PATCH] obs_project_update should tell the usage but not hung still + +--- + dist/obs_project_update | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/dist/obs_project_update b/dist/obs_project_update +index 07c8233..1da43ce 100755 +--- a/dist/obs_project_update ++++ b/dist/obs_project_update +@@ -17,6 +17,10 @@ + # $ echo "kiwi deb" | obs_project_update -u https://api.opensuse.org OBS:Server:2.4 https://api.yourdomain.ext OBS:Server:2.4 + # + usage="usage: $0 {-e | -u} [listfile]" ++if [ $# -lt 5 ];then ++ echo $usage ++ exit 1 ++fi + + srcexpand='-e' + dstexpand='-u' +-- +2.30.0 +