|
|
@@ -10,7 +10,7 @@
|
|
|
|
|
|
Name: %{pkgname}
|
|
|
Summary: Apache HTTP Server
|
|
|
-Version: 2.4.52
|
|
|
+Version: 2.4.54
|
|
|
Release: 1%{_dist_release}%{?with_systemd:.systemd}
|
|
|
Group: servers
|
|
|
Vendor: Project Vine
|
|
|
@@ -63,11 +63,11 @@ Source144: httpd@.service
|
|
|
Patch2: httpd-2.4.43-apxs.patch
|
|
|
Patch3: httpd-2.4.43-deplibs.patch
|
|
|
# Needed for socket activation and mod_systemd patch
|
|
|
-Patch19: httpd-2.4.43-detect-systemd.patch
|
|
|
+Patch19: httpd-2.4.53-detect-systemd.patch
|
|
|
# Features/functional changes
|
|
|
Patch21: httpd-2.4.48-r1842929+.patch
|
|
|
Patch22: httpd-2.4.43-mod_systemd.patch
|
|
|
-Patch23: httpd-2.4.48-export.patch
|
|
|
+Patch23: httpd-2.4.53-export.patch
|
|
|
Patch24: httpd-2.4.43-corelimit.patch
|
|
|
Patch25: httpd-2.4.43-selinux.patch
|
|
|
Patch26: httpd-2.4.43-gettid.patch
|
|
|
@@ -80,12 +80,15 @@ 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
|
|
|
+Patch45: httpd-2.4.43-logjournal.patch
|
|
|
+Patch46: httpd-2.4.53-separate-systemd-fns.patch
|
|
|
|
|
|
# Bug fixes
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1397243
|
|
|
Patch60: httpd-2.4.43-enable-sslv3.patch
|
|
|
Patch61: httpd-2.4.48-r1878890.patch
|
|
|
Patch63: httpd-2.4.46-htcacheclean-dont-break.patch
|
|
|
+Patch65: httpd-2.4.51-r1894152.patch
|
|
|
|
|
|
# Security fixes
|
|
|
|
|
|
@@ -195,6 +198,11 @@ Security (TLS) protocols.
|
|
|
%patch60 -p1 -b .enable-sslv3
|
|
|
%patch61 -p1 -b .r1878890
|
|
|
%patch63 -p1 -b .htcacheclean-dont-break
|
|
|
+%patch65 -p1 -b .r1894152
|
|
|
+%if %{with systemd}
|
|
|
+#patch45 -p1 -b .logjournal
|
|
|
+%patch46 -p1 -b .separatesystemd
|
|
|
+%endif
|
|
|
|
|
|
perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
|
|
|
|
|
|
@@ -636,6 +644,11 @@ EOF
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
+* Sat Jun 18 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.54-1
|
|
|
+- new upstream release.
|
|
|
+- updated Patch19 and 22-23.
|
|
|
+- imported Patch45-46 and 61.
|
|
|
+
|
|
|
* Wed Jan 05 2022 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.52-1
|
|
|
- new upstream release.
|
|
|
|
