diff --git a/httpd.spec b/httpd.spec index 9c047ee53392316a9605ba46037a75c1ac953f0f..61b191d449e432bd0166b435875f70f9cb77130b 100644 --- a/httpd.spec +++ b/httpd.spec @@ -8,7 +8,7 @@ Name: httpd Summary: Apache HTTP Server Version: 2.4.58 -Release: 10 +Release: 11 License: ASL 2.0 URL: https://httpd.apache.org/ Source0: https://archive.apache.org/dist/httpd/httpd-%{version}.tar.bz2 @@ -204,17 +204,17 @@ 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 . -sed < $RPM_SOURCE_DIR/httpd.conf >> instance.conf ' +cp %{_sourcedir}/instance.conf . +sed < %{_sourcedir}/httpd.conf >> instance.conf ' 0,/^ServerRoot/d; /# Supplemental configuration/,$d /^ *CustomLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_, /^ *ErrorLog .logs/s,logs/,logs/${HTTPD_INSTANCE}_, ' -touch -r $RPM_SOURCE_DIR/instance.conf instance.conf -cp -p $RPM_SOURCE_DIR/server-status.conf server-status.conf +touch -r %{_sourcedir}/instance.conf instance.conf +cp -p %{_sourcedir}/server-status.conf server-status.conf -sed 's/@MPM@/%{mpm}/' < $RPM_SOURCE_DIR/httpd.service.xml \ +sed 's/@MPM@/%{mpm}/' < %{_sourcedir}/httpd.service.xml \ > httpd.service.xml xmlto man ./httpd.service.xml @@ -259,31 +259,31 @@ rm -rf $RPM_BUILD_ROOT %make_install install -d $RPM_BUILD_ROOT%{_unitdir} -install -p -m644 $RPM_SOURCE_DIR/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service -install -p -m644 $RPM_SOURCE_DIR/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/ +install -p -m644 %{_sourcedir}/httpd.service $RPM_BUILD_ROOT%{_unitdir}/httpd.service +install -p -m644 %{_sourcedir}/{htcacheclean.service,httpd.socket,httpd@.service,httpd-init.service} $RPM_BUILD_ROOT%{_unitdir}/ -install -D -m644 $RPM_SOURCE_DIR/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README -install -D -m644 $RPM_SOURCE_DIR/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README -install -p -m644 $RPM_SOURCE_DIR/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/ +install -D -m644 %{_sourcedir}/README.confd $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/README +install -D -m644 %{_sourcedir}/README.confmod $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/README +install -p -m644 %{_sourcedir}/0*.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/ sed -i '/^#LoadModule mpm_%{mpm}_module /s/^#//' $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf -touch -r $RPM_SOURCE_DIR/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf +touch -r %{_sourcedir}/00-mpm.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.modules.d/00-mpm.conf install -d $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d -install -D -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf -install -m644 -p $RPM_SOURCE_DIR/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ +install -D -m 644 -p %{_sourcedir}/10-listen443.conf $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf +install -m644 -p %{_sourcedir}/{welcome.conf,ssl.conf,manual.conf,userdir.conf} $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/ install -m 644 docs/conf/extra/httpd-autoindex.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/autoindex.conf rm -v docs/conf/extra/httpd-{ssl,userdir}.conf rm $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/*.conf -install -m 644 -p $RPM_SOURCE_DIR/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf +install -m 644 -p %{_sourcedir}/httpd.conf $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf/httpd.conf -install -D -m 644 -p $RPM_SOURCE_DIR/htcacheclean.sysconf \ +install -D -m 644 -p %{_sourcedir}/htcacheclean.sysconf \ $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/htcacheclean -install -D -m 644 -p $RPM_SOURCE_DIR/httpd.tmpfiles \ - $RPM_BUILD_ROOT%{_prefix}/lib/tmpfiles.d/httpd.conf +install -D -m 644 -p %{_sourcedir}/httpd.tmpfiles \ + $RPM_BUILD_ROOT%{_tmpfilesdir}/httpd.conf install -d $RPM_BUILD_ROOT%{_localstatedir}/lib/{dav,httpd} \ $RPM_BUILD_ROOT/run/httpd/htcacheclean @@ -309,7 +309,7 @@ cat > $RPM_BUILD_ROOT%{_rpmconfigdir}/macros.d/macros.httpd < - 2.4.58-11 +- Type:NA +- CVE:NA +- SUG:NA +- DESC: modify spec file + $RPM_SOURCE_DIR -> %{_sourcedir} + %{_prefix}/lib/tmpfiles.d -> %{_tmpfilesdir} + * Wed Aug 13 2025 yanglu - 2.4.58-10 - Type:CVE - CVE:CVE-2025-49812,CVE-2025-23048,CVE-2024-47252,CVE-2024-43204,CVE-2024-42516