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

Timestamp:

May 22, 2012, 10:52:35 PM (12 years ago)

Author:

ezyang

Message:

Merge changes from trunk.

Location:

branches/fc17-dev

Files:

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

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

@@ -1 @@
---- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
-+++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
+--- 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 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.21
+ Version: 2.2.22
 -Release: 1%{?dist}
 +Release: 1%{?dist}.scripts.%{scriptsversion}
@@ -26 +26 @@
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -64,6 +73,7 @@
+@@ -64,6 +76,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34 +34 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -102,6 +112,7 @@
+@@ -102,6 +115,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42 +42 @@
  
  %description -n mod_ssl
-@@ -110,6 +121,11 @@
+@@ -110,6 +124,11 @@
  Security (TLS) protocols.
  
@@ -54 +54 @@
  %patch1 -p1 -b .apctl
  %patch2 -p1 -b .apxs
-@@ -128,6 +144,13 @@
+@@ -128,6 +147,14 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -64 +64 @@
 +%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 +198,12 @@
+@@ -175,10 +205,12 @@
          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
         --enable-suexec --with-suexec \