apache2-2.4.41-1

a/apache2/apache2-vl.spec

@@ -8,7 +8,7 @@
 
 Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.4.37
+Version: 2.4.41
 Release: 1%{_dist_release}
 URL: http://httpd.apache.org/
 
@@ -45,15 +45,13 @@ Source31: README.confmod
 Source100: vine-config.layout
 
 # build/scripts patches
-Patch1: httpd-2.4.1-apctl.patch
 Patch2: httpd-2.4.9-apxs.patch
 Patch3: httpd-2.4.1-deplibs.patch
-Patch5: httpd-2.4.3-layout.patch
-#Patch6: httpd-2.4.3-apctl-systemd.patch
 # Needed for socket activation and mod_systemd patch
 #Patch19: httpd-2.4.25-detect-systemd.patch
 # Features/functional changes
-Patch23: httpd-2.4.33-export.patch
+Patch21: httpd-2.4.39-r1842929+.patch
+Patch23: httpd-2.4.41-export.patch
 Patch24: httpd-2.4.1-corelimit.patch
 #Patch25: httpd-2.4.25-selinux.patch
 #Patch26: httpd-2.4.4-r1337344+.patch
@@ -62,15 +60,17 @@ Patch27: httpd-2.4.2-icons.patch
 Patch30: httpd-2.4.4-cachehardmax.patch
 Patch31: httpd-2.4.33-sslmultiproxy.patch
 Patch34: httpd-2.4.17-socket-activation.patch
-Patch36: httpd-2.4.33-r1830819+.patch
+Patch36: httpd-2.4.38-r1830819+.patch
 #Patch37: httpd-2.4.34-r1827912+.patch
 Patch38: httpd-2.4.34-sslciphdefault.patch
-Patch39: httpd-2.4.34-sslprotdefault.patch
+Patch39: httpd-2.4.37-sslprotdefault.patch
+Patch40: httpd-2.4.39-r1861269.patch
+Patch41: httpd-2.4.37-r1861793+.patch
+Patch42: httpd-2.4.37-r1828172+.patch
 
 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
 Patch58: httpd-2.4.34-r1738878.patch
-#Patch59: httpd-2.4.34-r1555631.patch
 Patch60: httpd-2.4.34-enable-sslv3.patch
 
 # Security fixes
@@ -142,14 +142,13 @@ Security (TLS) protocols.
 %prep
 %setup -q -n httpd-%{version}
 
-%patch1 -p1 -b .apctl
 %patch2 -p1 -b .apxs
 %patch3 -p1 -b .deplibs
-%patch5 -p1 -b .layout
 #%patch6 -p1 -b .apctlsystemd
 
 #%patch19 -p1 -b .detectsystemd
 
+%patch21 -p1 -b .r1842929+
 %patch23 -p1 -b .export
 %patch24 -p1 -b .corelimit
 #%patch25 -p1 -b .selinux
@@ -163,9 +162,11 @@ Security (TLS) protocols.
 #%patch37 -p1 -b .r1827912+
 %patch38 -p1 -b .sslciphdefault
 %patch39 -p1 -b .sslprotdefault
+%patch40 -p1 -b .r1861269
+%patch41 -p1 -b .r1861793+
+%patch42 -p1 -b .r1828172+
 
 %patch58 -p1 -b .r1738878
-#%patch59 -p1 -b .r1555631
 %patch60 -p1 -b .enable-sslv3
 
 perl -pi -e 's|/httpd/build|/apache2/build|' support/apxs.in
@@ -546,6 +547,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Aug 29 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.41-1
+- new upstream release.
+- dropped Patch1 and 5.
+- updated Patch23, 36 and 39.
+- imported Patch21 and 40-42 from rawhide.
+
 * Tue Nov 06 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.37-1
 - new upstream release.
 - updated patches.