Changeset 2207 for branches

Timestamp:

May 25, 2012, 1:49:00 AM (12 years ago)

Author:

ezyang

Message:

Punt httpd sysv patch.

Location:

branches/fc17-dev/server

Files:

• common/patches/httpd-sysv-deps.patch (deleted)
• fedora/specs/httpd.spec.patch (modified) (4 diffs)

branches/fc17-dev/server/fedora/specs/httpd.spec.patch

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -58,6 +58,15 @@
+@@ -58,6 +58,14 @@
  Requires(postun): systemd-units
  Requires(post): systemd-units
@@ -21 +21 @@
 +Patch1006: httpd-suexec-cloexec.patch
 +Patch1007: httpd-fixup-vhost.patch
-+Patch1008: httpd-sysv-deps.patch
 +
  %description
@@ -42 +41 @@
  
  %description -n mod_ssl
-@@ -114,6 +125,11 @@
- Security (TLS) protocols.
- 
- %prep
-+
-+# Horrible hack to patch the httpd.init file
-+cd $RPM_SOURCE_DIR
-+%patch1008 -p1 -b .sysv-deps
-+
- %setup -q
- %patch1 -p1 -b .apctl
- %patch2 -p1 -b .apxs
-@@ -133,6 +149,14 @@
+@@ -133,6 +149,13 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -64 +51 @@
 +%patch1006 -p1 -b .cloexec
 +%patch1007 -p1 -b .fixup-vhost
-+# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.