Changeset 1035 for server/fedora/specs/httpd.spec.patch
- Timestamp:
- Mar 28, 2009, 4:19:19 PM (16 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
server/fedora/specs/httpd.spec.patch
r1034 r1035 1 1 --- httpd.spec.orig 2009-03-28 13:32:47.000000000 -0400 2 +++ httpd.spec 2009-03-28 1 3:48:25.000000000 -04002 +++ httpd.spec 2009-03-28 14:20:15.000000000 -0400 3 3 @@ -6,7 +6,7 @@ 4 4 Summary: Apache HTTP Server … … 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz 11 11 Source1: index.html 12 @@ -54,6 +54,1 1@@12 @@ -54,6 +54,12 @@ 13 13 Conflicts: pcre < 4.0 14 14 Requires: httpd-tools = %{version}-%{release} … … 18 18 +Patch1001: httpd-2.2.x-sni.patch 19 19 +Patch1003: httpd-2.2.x-mod_status-security.patch 20 +Patch1004: httpd-2.2.x-304.patch 20 21 + 21 22 %description 22 23 The Apache HTTP Server is a powerful, efficient, and extensible 23 24 web server. 24 @@ -100,6 +10 5,7 @@25 @@ -100,6 +106,7 @@ 25 26 BuildRequires: openssl-devel, distcache-devel 26 27 Requires(post): openssl >= 0.9.7f-4, /bin/cat … … 30 31 31 32 %description -n mod_ssl 32 @@ -127,6 +13 3,10@@33 @@ -127,6 +134,11 @@ 33 34 # Patch in vendor/release string 34 35 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 37 38 +%patch1001 -p1 -b .sni 38 39 +%patch1003 -p1 -b .permitstatus 40 +%patch1004 -p1 -b .scripts-304 39 41 + 40 42 # Safety check: prevent build if defined MMN does not equal upstream MMN. 41 43 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 42 44 if test "x${vmmn}" != "x%{mmn}"; then 43 @@ -175,10 +18 5,12 @@45 @@ -175,10 +187,12 @@ 44 46 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 45 47 --enable-suexec --with-suexec \
Note: See TracChangeset
for help on using the changeset viewer.