Browse Source

apache2-2.4.33-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11614 ec354946-7b23-47d6-9f5a-488ba84defc7
tomop 6 years ago
parent
commit
c7be0fddb6
1 changed files with 12 additions and 5 deletions
  1. 12 5
      a/apache2/apache2-vl.spec

+ 12 - 5
a/apache2/apache2-vl.spec

@@ -8,7 +8,7 @@
 
 Summary: Apache HTTP Server
 Name: %{pkgname}
-Version: 2.4.29
+Version: 2.4.33
 Release: 1%{_dist_release}
 URL: http://httpd.apache.org/
 
@@ -53,7 +53,7 @@ Patch5: httpd-2.4.3-layout.patch
 # Needed for socket activation and mod_systemd patch
 #Patch19: httpd-2.4.25-detect-systemd.patch
 # Features/functional changes
-Patch23: httpd-2.4.4-export.patch
+Patch23: httpd-2.4.33-export.patch
 Patch24: httpd-2.4.1-corelimit.patch
 #Patch25: httpd-2.4.25-selinux.patch
 Patch26: httpd-2.4.4-r1337344+.patch
@@ -62,11 +62,11 @@ Patch29: httpd-2.4.27-systemd.patch
 Patch30: httpd-2.4.4-cachehardmax.patch
 Patch31: httpd-2.4.18-sslmultiproxy.patch
 Patch34: httpd-2.4.17-socket-activation.patch
-Patch35: httpd-2.4.17-sslciphdefault.patch
+Patch35: httpd-2.4.33-sslciphdefault.patch
 
 # Bug fixes
 # https://bugzilla.redhat.com/show_bug.cgi?id=1397243
-Patch58: httpd-2.4.25-r1738878.patch
+Patch58: httpd-2.4.33-r1738878.patch
 
 # Security fixes
 
@@ -152,7 +152,7 @@ Security (TLS) protocols.
 %patch27 -p1 -b .icons
 %patch29 -p1 -b .systemd
 %patch30 -p1 -b .cachehardmax
-%patch31 -p1 -b .sslmultiproxy
+#%patch31 -p1 -b .sslmultiproxy
 %patch34 -p1 -b .socketactivation
 %patch35 -p1 -b .sslciphdefault
 
@@ -536,6 +536,13 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Apr 01 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.33-1
+- new upstream release.
+- updated Patch35 and 58.
+- disabled Patch31.
+- dropped Patch23: fixed in upstream.
+- imported Patch23 from rawhide.
+
 * Mon Dec 18 2017 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2.4.29-1
 - new upstream release.
 - fixed apxs.