From 81d68651bc55493b30315cf36bd9377d0623bf5d Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Wed, 8 May 2024 13:40:15 +0800 Subject: [PATCH 1/2] fixed c530636 from https://gitee.com/yue-yuankun/httpd/pulls/193 Replace openEuler with %{_vendor} --- httpd.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/httpd.spec b/httpd.spec index 61ed127..beba61d 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.58 -Release: 2 +Release: 3 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -174,6 +174,7 @@ Ths module provides session support for per-user. %autosetup -p1 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in +sed -i 's/openEuler/%{_vendor}/g' config.layout # Example conf for instances cp $RPM_SOURCE_DIR/instance.conf . @@ -211,7 +212,7 @@ export LYNX_PATH=/usr/bin/links --sbindir=%{_sbindir} --mandir=%{_mandir} --libdir=%{_libdir} \ --sysconfdir=%{_sysconfdir}/httpd/conf --includedir=%{_includedir}/httpd \ --libexecdir=%{_libdir}/httpd/modules --datadir=%{contentdir} \ - --with-installbuilddir=%{_libdir}/httpd/build --enable-layout=openEuler \ + --with-installbuilddir=%{_libdir}/httpd/build --enable-layout=%{_vendor} \ --enable-mpms-shared=all --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ --enable-suexec --with-suexec --enable-suexec-capabilities \ --with-suexec-caller=%{suexec_caller} --with-suexec-docroot=%{docroot} \ @@ -512,6 +513,12 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog +* Wed May 08 2024 yueyuankun - 2.4.58-3 +- Type:NA +- ID:NA +- SUG:NA +- DESC: replace openEuler with _vendor + * Mon May 06 2024 chengyechun - 2.4.58-2 - Type:CVE - ID:CVE-2024-24795,CVE-2023-38709,CVE-2024-27316 -- Gitee From 2e4f0eb39fac17cc55fc66c920bf0b979a7881c8 Mon Sep 17 00:00:00 2001 From: yueyuankun Date: Sat, 8 Jun 2024 09:30:15 +0000 Subject: [PATCH 2/2] update httpd.spec. Signed-off-by: yueyuankun --- httpd.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/httpd.spec b/httpd.spec index d445377..8e8ecf6 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.58 -Release: 3 +Release: 4 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 -- Gitee