Changeset 2246 for trunk/server/fedora/specs/httpd.spec.patch

Timestamp:

Jun 27, 2012, 10:29:47 PM (12 years ago)

Author:

ezyang

Message:

Reintegrate Fedora 17 development branch into trunk.

Location:

trunk

Files:

• . (modified) (1 prop)
• server/fedora/specs/httpd.spec.patch (modified) (5 diffs)

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

@@ -1 @@
---- httpd.spec.~1~      2012-02-13 09:46:36.000000000 -0500
-+++ httpd.spec  2012-03-26 01:33:53.247271289 -0400
-@@ -8,7 +8,7 @@
+--- httpd.spec.~1~      2012-04-30 05:52:31.000000000 -0400
++++ httpd.spec  2012-05-22 23:31:12.397142763 -0400
+@@ -9,7 +9,7 @@
  Summary: Apache HTTP Server
  Name: httpd
  Version: 2.2.22
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+-Release: 4%{?dist}
++Release: 4%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -54,6 +54,15 @@
- Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
- Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
+@@ -58,6 +58,14 @@
+ Requires(postun): systemd-units
+ Requires(post): systemd-units
  
 +Provides: scripts-httpd = %{version}-%{release}
@@ -21 +21 @@
 +Patch1006: httpd-suexec-cloexec.patch
 +Patch1007: httpd-fixup-vhost.patch
-+Patch1008: httpd-sysv-deps.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -64,6 +76,7 @@
+@@ -68,6 +77,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34 +33 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -102,6 +115,7 @@
+@@ -106,6 +116,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42 +41 @@
  
  %description -n mod_ssl
-@@ -110,6 +124,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
-@@ -128,6 +147,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.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -175,10 +205,12 @@
+@@ -193,10 +217,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \