Changeset 2157 for trunk/server/fedora

Timestamp:

Mar 26, 2012, 2:54:24 AM (13 years ago)

Author:

ezyang

Message:

Latest httpd fixes CVEs we were patching.

File:

• trunk/server/fedora/specs/httpd.spec.patch (modified) (4 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -54,6 +54,18 @@
+@@ -54,6 +54,15 @@
  Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
@@ -22 +22 @@
 +Patch1007: httpd-fixup-vhost.patch
 +Patch1008: httpd-sysv-deps.patch
-+Patch1009: httpd-2.2.x-CVE-2011-3607.patch
-+Patch1010: httpd-2.2.x-CVE-2012-0053.patch
-+Patch1011: httpd-2.2.x-CVE-2012-0031.patch
 +
  %description
@@ -57 +54 @@
  %patch1 -p1 -b .apctl
  %patch2 -p1 -b .apxs
-@@ -128,6 +147,17 @@
+@@ -128,6 +147,14 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -68 +65 @@
 +%patch1007 -p1 -b .fixup-vhost
 +# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
-+%patch1009 -p4 -b .cve-2011-3607
-+%patch1010 -p4 -b .cve-2012-0053
-+%patch1011 -p4 -b .cve-2012-0031
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.