|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
|
Name: %{pkgname}
|
|
|
Summary: Apache HTTP Server
|
|
|
-Version: 2.4.46
|
|
|
+Version: 2.4.48
|
|
|
Release: 1%{_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: servers
|
|
|
Vendor: Project Vine
|
|
|
@@ -65,9 +65,9 @@ Patch3: httpd-2.4.43-deplibs.patch
|
|
|
# Needed for socket activation and mod_systemd patch
|
|
|
Patch19: httpd-2.4.43-detect-systemd.patch
|
|
|
# Features/functional changes
|
|
|
-Patch21: httpd-2.4.43-r1842929+.patch
|
|
|
+Patch21: httpd-2.4.48-r1842929+.patch
|
|
|
Patch22: httpd-2.4.43-mod_systemd.patch
|
|
|
-Patch23: httpd-2.4.43-export.patch
|
|
|
+Patch23: httpd-2.4.48-export.patch
|
|
|
Patch24: httpd-2.4.43-corelimit.patch
|
|
|
Patch25: httpd-2.4.43-selinux.patch
|
|
|
Patch26: httpd-2.4.43-gettid.patch
|
|
|
@@ -80,13 +80,12 @@ Patch39: httpd-2.4.43-sslprotdefault.patch
|
|
|
Patch40: httpd-2.4.43-r1861269.patch
|
|
|
Patch41: httpd-2.4.43-r1861793+.patch
|
|
|
Patch42: httpd-2.4.43-r1828172+.patch
|
|
|
-Patch43: httpd-2.4.43-sslcoalesce.patch
|
|
|
-Patch44: httpd-2.4.43-lua-resume.patch
|
|
|
|
|
|
# Bug fixes
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
|
|
Patch60: httpd-2.4.43-enable-sslv3.patch
|
|
|
-Patch62: httpd-2.4.43-r1870095+.patch
|
|
|
+Patch61: httpd-2.4.48-r1878890.patch
|
|
|
+Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
|
|
|
|
|
# Security fixes
|
|
|
|
|
|
@@ -162,6 +161,9 @@ server via the Secure Sockets Layer (SSL) and Transport Layer
|
|
|
Security (TLS) protocols.
|
|
|
|
|
|
|
|
|
+%debug_package
|
|
|
+
|
|
|
+
|
|
|
%prep
|
|
|
%setup -q -n httpd-%{version}
|
|
|
|
|
|
@@ -189,11 +191,10 @@ Security (TLS) protocols.
|
|
|
%patch40 -p1 -b .r1861269
|
|
|
%patch41 -p1 -b .r1861793+
|
|
|
%patch42 -p1 -b .r1828172+
|
|
|
-%patch43 -p1 -b .sslcoalesce
|
|
|
-#patch44 -p1 -b .luaresume
|
|
|
|
|
|
%patch60 -p1 -b .enable-sslv3
|
|
|
-%patch62 -p1 -b .r1870095
|
|
|
+%patch61 -p1 -b .r1878890
|
|
|
+%patch63 -p1 -b .htcacheclean-dont-break
|
|
|
|
|
|
perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
|
|
|
|
|
|
@@ -487,7 +488,6 @@ if [ "$1" -ge 1 ]; then
|
|
|
/sbin/service apache2 condrestart
|
|
|
fi
|
|
|
%endif
|
|
|
-/sbin/ldconfig
|
|
|
|
|
|
%define sslcert %{_sysconfdir}/pki/tls/certs/localhost.crt
|
|
|
%define sslkey %{_sysconfdir}/pki/tls/private/localhost.key
|
|
|
@@ -636,6 +636,13 @@ EOF
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Thu Jun 17 2021 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.48-1
|
|
|
+- new upstream release.
|
|
|
+- dropped ldconfig scriptlets.
|
|
|
+- updated Patch21 and 23.
|
|
|
+- dropped Patch43, 44 and 62.
|
|
|
+- imported Patch61 and 63 from rawhide.
|
|
|
+
|
|
|
* Wed Aug 19 2020 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.46-1
|
|
|
- new upstream release.
|
|
|
- added systemd support (disabled as default).
|
