From 57357ffbba4dbfc16cd827c1cc4ea46dac1a57a6 Mon Sep 17 00:00:00 2001 From: Wenlong Zhang Date: Thu, 20 Jun 2024 11:13:53 +0800 Subject: [PATCH] rename mod_xforward to apache2-mod_xforward (cherry picked from commit 37f4ea8df4676912ba074926668ec4bfe598ed9b) --- ...mod_xforward-to-apache2-mod_xforward.patch | 25 +++++++++++++++++++ obs-server.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0001-rename-mod_xforward-to-apache2-mod_xforward.patch diff --git a/0001-rename-mod_xforward-to-apache2-mod_xforward.patch b/0001-rename-mod_xforward-to-apache2-mod_xforward.patch new file mode 100644 index 0000000..6192677 --- /dev/null +++ b/0001-rename-mod_xforward-to-apache2-mod_xforward.patch @@ -0,0 +1,25 @@ +From 149f7655b41d3a8d79e1ec20427bbe26e074fb0c Mon Sep 17 00:00:00 2001 +From: Wenlong Zhang +Date: Thu, 20 Jun 2024 11:06:19 +0800 +Subject: [PATCH] rename mod_xforward to apache2-mod_xforward + +--- + dist/functions.setup-appliance.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dist/functions.setup-appliance.sh b/dist/functions.setup-appliance.sh +index d294ed8..0ed16d7 100755 +--- a/dist/functions.setup-appliance.sh ++++ b/dist/functions.setup-appliance.sh +@@ -642,7 +642,7 @@ function prepare_os_settings { + UPDATE_SSL_TRUST_BIN=update-ca-trust + MOD_PASSENGER_CONF=/etc/$HTTPD_SERVICE/conf.d/passenger.conf + INST_PACKAGES_CMD="dnf -y install" +- APACHE_ADDITIONAL_PACKAGES="$HTTPD_SERVICE mod_xforward mod_passenger memcached" ++ APACHE_ADDITIONAL_PACKAGES="$HTTPD_SERVICE apache2-mod_xforward mod_passenger memcached" + CONFIGURE_APACHE=0 + OBS_SIGND=signd + SIGND_BIN="/usr/sbin/signd" +-- +2.43.0 + diff --git a/obs-server.spec b/obs-server.spec index fa8d9ca..f55c123 100644 --- a/obs-server.spec +++ b/obs-server.spec @@ -6,7 +6,7 @@ Name: obs-server Version: 2.10.15 -Release: 10 +Release: 11 Summary: The Open Build Service -- Server Component License: GPL-2.0-only OR GPL-3.0-only URL: http://www.openbuildservice.org @@ -17,6 +17,7 @@ Patch2: fix-obs_productconvert-inputfile-path.patch Patch3: obs_project_update-should-tell-the-usage-but-not-hung-still.patch Patch4: Adapt-setup-appliance.sh-for-openeuler.patch Patch5: Skip-new-signer-cert.patch +Patch6: 0001-rename-mod_xforward-to-apache2-mod_xforward.patch BuildArch: noarch @@ -497,6 +498,9 @@ usermod -a -G docker obsservicerun %{_sbindir}/obsstoragesetup %changelog +* Thu Jun 20 2024 Wenlong Zhang - 2.10.15-11 +- rename mod_xforward to apache2-mod_xforward + * Mon May 27 2024 Ge Wang - 2.10.15-10 - Clear insignificance infomation when running post script -- Gitee