Changeset 2195 for branches/fc17-dev/server/fedora/specs/httpd.spec.patch
- Timestamp:
- May 22, 2012, 10:52:35 PM (12 years ago)
- Location:
- branches/fc17-dev
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/fc17-dev
- Property svn:mergeinfo changed
/trunk (added) merged: 2082-2122,2125-2148,2150-2194
- Property svn:mergeinfo changed
-
branches/fc17-dev/server/fedora/specs/httpd.spec.patch
r2066 r2195 1 --- httpd.spec. orig 2011-09-13 09:43:36.000000000 -04002 +++ httpd.spec 201 1-11-05 20:57:13.910145847-04001 --- httpd.spec.~1~ 2012-02-13 09:46:36.000000000 -0500 2 +++ httpd.spec 2012-03-26 01:33:53.247271289 -0400 3 3 @@ -8,7 +8,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 Version: 2.2.2 16 Version: 2.2.22 7 7 -Release: 1%{?dist} 8 8 +Release: 1%{?dist}.scripts.%{scriptsversion} … … 26 26 The Apache HTTP Server is a powerful, efficient, and extensible 27 27 web server. 28 @@ -64,6 +7 3,7 @@28 @@ -64,6 +76,7 @@ 29 29 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 30 30 Requires: apr-devel, apr-util-devel, pkgconfig … … 34 34 %description devel 35 35 The httpd-devel package contains the APXS binary and other files 36 @@ -102,6 +11 2,7 @@36 @@ -102,6 +115,7 @@ 37 37 Requires(post): openssl, /bin/cat 38 38 Requires(pre): httpd … … 42 42 43 43 %description -n mod_ssl 44 @@ -110,6 +12 1,11 @@44 @@ -110,6 +124,11 @@ 45 45 Security (TLS) protocols. 46 46 … … 54 54 %patch1 -p1 -b .apctl 55 55 %patch2 -p1 -b .apxs 56 @@ -128,6 +14 4,13@@56 @@ -128,6 +147,14 @@ 57 57 # Patch in vendor/release string 58 58 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 64 64 +%patch1006 -p1 -b .cloexec 65 65 +%patch1007 -p1 -b .fixup-vhost 66 +# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec 66 67 + 67 68 # Safety check: prevent build if defined MMN does not equal upstream MMN. 68 69 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 69 70 if test "x${vmmn}" != "x%{mmn}"; then 70 @@ -175,10 + 198,12 @@71 @@ -175,10 +205,12 @@ 71 72 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 72 73 --enable-suexec --with-suexec \
Note: See TracChangeset
for help on using the changeset viewer.