Ignore:
Timestamp:
May 25, 2012, 1:49:00 AM (10 years ago)
Author:
ezyang
Message:
Punt httpd sysv patch.
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev/server/fedora/specs/httpd.spec.patch

    r2198 r2207  
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -58,6 +58,15 @@
     12@@ -58,6 +58,14 @@
    1313 Requires(postun): systemd-units
    1414 Requires(post): systemd-units
     
    2121+Patch1006: httpd-suexec-cloexec.patch
    2222+Patch1007: httpd-fixup-vhost.patch
    23 +Patch1008: httpd-sysv-deps.patch
    2423+
    2524 %description
     
    4241 
    4342 %description -n mod_ssl
    44 @@ -114,6 +125,11 @@
    45  Security (TLS) protocols.
    46  
    47  %prep
    48 +
    49 +# Horrible hack to patch the httpd.init file
    50 +cd $RPM_SOURCE_DIR
    51 +%patch1008 -p1 -b .sysv-deps
    52 +
    53  %setup -q
    54  %patch1 -p1 -b .apctl
    55  %patch2 -p1 -b .apxs
    56 @@ -133,6 +149,14 @@
     43@@ -133,6 +149,13 @@
    5744 # Patch in vendor/release string
    5845 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    6451+%patch1006 -p1 -b .cloexec
    6552+%patch1007 -p1 -b .fixup-vhost
    66 +# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
    6753+
    6854 # Safety check: prevent build if defined MMN does not equal upstream MMN.
Note: See TracChangeset for help on using the changeset viewer.