| |
@@ -24,7 +24,7 @@
|
| |
Summary: Apache HTTP Server
|
| |
Name: httpd
|
| |
Version: 2.4.57
|
| |
- Release: 1%{?dist}
|
| |
+ Release: 2%{?dist}
|
| |
URL: https://httpd.apache.org/
|
| |
Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
|
| |
Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
|
| |
@@ -432,8 +432,9 @@
|
| |
# 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
|
| |
@@ -602,7 +603,7 @@
|
| |
$RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk
|
| |
|
| |
# Sanitize CFLAGS & LIBTOOL in standard config_vars.mk
|
| |
- sed -e '/^CFLAGS/s,=.*$,= -O2 -g -Wall,' \
|
| |
+ sed -e '/^[A-Z]*FLAGS = /s,-specs[^ ]*,,g' \
|
| |
-e '/^LIBTOOL/s,/.*/libtool,%{_bindir}/libtool,' \
|
| |
-i $RPM_BUILD_ROOT%{_libdir}/httpd/build/config_vars.mk
|
| |
diff -u $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor_config_vars.mk \
|
| |
@@ -797,6 +798,7 @@
|
| |
%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,6 +852,10 @@
|
| |
%{_rpmconfigdir}/macros.d/macros.httpd
|
| |
|
| |
%changelog
|
| |
+ * Wed Jul 5 2023 Joe Orton <jorton@redhat.com> - 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 <luhliari@redhat.com> - 2.4.57-1
|
| |
- new version 2.4.57
|
| |
|
| |
