fixed c530636 from https://gitee.com/yue-yuankun/httpd/pulls/193
Replace openEuler with %{_vendor}
This commit is contained in:
parent
bb02d25be8
commit
81d68651bc
11
httpd.spec
11
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 <yueyuankun@kylinos.cn> - 2.4.58-3
|
||||
- Type:NA
|
||||
- ID:NA
|
||||
- SUG:NA
|
||||
- DESC: replace openEuler with _vendor
|
||||
|
||||
* Mon May 06 2024 chengyechun <chengyechun1@huaiwe.com> - 2.4.58-2
|
||||
- Type:CVE
|
||||
- ID:CVE-2024-24795,CVE-2023-38709,CVE-2024-27316
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user