Changeset 2157 for trunk/server


Ignore:
Timestamp:
Mar 26, 2012, 2:54:24 AM (10 years ago)
Author:
ezyang
Message:
Latest httpd fixes CVEs we were patching.
Location:
trunk/server
Files:
3 deleted
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/server/fedora/specs/httpd.spec.patch

    r2153 r2157  
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -54,6 +54,18 @@
     12@@ -54,6 +54,15 @@
    1313 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
    1414 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
     
    2222+Patch1007: httpd-fixup-vhost.patch
    2323+Patch1008: httpd-sysv-deps.patch
    24 +Patch1009: httpd-2.2.x-CVE-2011-3607.patch
    25 +Patch1010: httpd-2.2.x-CVE-2012-0053.patch
    26 +Patch1011: httpd-2.2.x-CVE-2012-0031.patch
    2724+
    2825 %description
     
    5754 %patch1 -p1 -b .apctl
    5855 %patch2 -p1 -b .apxs
    59 @@ -128,6 +147,17 @@
     56@@ -128,6 +147,14 @@
    6057 # Patch in vendor/release string
    6158 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    6865+%patch1007 -p1 -b .fixup-vhost
    6966+# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
    70 +%patch1009 -p4 -b .cve-2011-3607
    71 +%patch1010 -p4 -b .cve-2012-0053
    72 +%patch1011 -p4 -b .cve-2012-0031
    7367+
    7468 # Safety check: prevent build if defined MMN does not equal upstream MMN.
Note: See TracChangeset for help on using the changeset viewer.