From fd06e529c2de123a89111dde2b26b713b464f017 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Wed, 5 Jul 2023 12:13:09 +0100 Subject: [PATCH] - package /etc/systemd/httpd/httpd.service.d --- httpd.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/httpd.spec b/httpd.spec index 06173ae..bb9f422 100644 --- a/httpd.spec +++ b/httpd.spec @@ -432,8 +432,9 @@ touch -r $RPM_SOURCE_DIR/00-mpm.conf \ # install systemd override drop directory # Web application packages can drop snippets into this location if # they need ExecStart[pre|post]. -mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d -mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d +mkdir $RPM_BUILD_ROOT%{_unitdir}/httpd.service.d \ + $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d \ + $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/httpd.service.d install -m 644 -p $RPM_SOURCE_DIR/10-listen443.conf \ $RPM_BUILD_ROOT%{_unitdir}/httpd.socket.d/10-listen443.conf @@ -797,6 +798,7 @@ exit $rv %dir %{contentdir}/icons %attr(755,root,root) %dir %{_unitdir}/httpd.service.d %attr(755,root,root) %dir %{_unitdir}/httpd.socket.d +%attr(755,root,root) %dir %{_sysconfdir}/systemd/system/httpd.service.d %{_sysusersdir}/httpd.conf %files tools @@ -850,7 +852,8 @@ exit $rv %{_rpmconfigdir}/macros.d/macros.httpd %changelog -* Fri Jun 23 2023 Joe Orton - 2.4.57-2 +* Wed Jul 5 2023 Joe Orton - 2.4.57-2 +- package /etc/systemd/httpd/httpd.service.d - also sanitize LDFLAGS/CXXFLAGS in non-vendor config_vars.mk * Tue Apr 11 2023 Luboš Uhliarik - 2.4.57-1