Ignore:
Timestamp:
May 22, 2012, 10:52:35 PM (10 years ago)
Author:
ezyang
Message:
Merge changes from trunk.
Location:
branches/fc17-dev
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/fc17-dev

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

    r2066 r2195  
    1 --- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
    2 +++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
     1--- httpd.spec.~1~      2012-02-13 09:46:36.000000000 -0500
     2+++ httpd.spec  2012-03-26 01:33:53.247271289 -0400
    33@@ -8,7 +8,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.21
     6 Version: 2.2.22
    77-Release: 1%{?dist}
    88+Release: 1%{?dist}.scripts.%{scriptsversion}
     
    2626 The Apache HTTP Server is a powerful, efficient, and extensible
    2727 web server.
    28 @@ -64,6 +73,7 @@
     28@@ -64,6 +76,7 @@
    2929 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    3030 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3434 %description devel
    3535 The httpd-devel package contains the APXS binary and other files
    36 @@ -102,6 +112,7 @@
     36@@ -102,6 +115,7 @@
    3737 Requires(post): openssl, /bin/cat
    3838 Requires(pre): httpd
     
    4242 
    4343 %description -n mod_ssl
    44 @@ -110,6 +121,11 @@
     44@@ -110,6 +124,11 @@
    4545 Security (TLS) protocols.
    4646 
     
    5454 %patch1 -p1 -b .apctl
    5555 %patch2 -p1 -b .apxs
    56 @@ -128,6 +144,13 @@
     56@@ -128,6 +147,14 @@
    5757 # Patch in vendor/release string
    5858 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     
    6464+%patch1006 -p1 -b .cloexec
    6565+%patch1007 -p1 -b .fixup-vhost
     66+# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
    6667+
    6768 # Safety check: prevent build if defined MMN does not equal upstream MMN.
    6869 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    6970 if test "x${vmmn}" != "x%{mmn}"; then
    70 @@ -175,10 +198,12 @@
     71@@ -175,10 +205,12 @@
    7172         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    7273        --enable-suexec --with-suexec \
Note: See TracChangeset for help on using the changeset viewer.