Changeset 1306 for trunk/server/fedora
- Timestamp:
- Aug 25, 2009, 8:18:12 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/specs/httpd.spec.patch
r1288 r1306 1 --- httpd.spec.orig 2009-0 3-17 09:12:22.000000000 -04002 +++ httpd.spec 2009-0 6-03 05:05:30.000000000 -04001 --- httpd.spec.orig 2009-08-25 07:12:16.000000000 -0400 2 +++ httpd.spec 2009-08-25 07:15:12.000000000 -0400 3 3 @@ -7,7 +7,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 Version: 2.2.1 17 -Release: 88 +Release: 8.scripts.%{scriptsversion}6 Version: 2.2.13 7 -Release: 1%{?dist} 8 +Release: 1.scripts.%{scriptsversion}%{?dist} 9 9 URL: http://httpd.apache.org/ 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz 11 11 Source1: index.html 12 @@ -5 6,6 +56,12@@12 @@ -55,6 +55,11 @@ 13 13 Conflicts: pcre < 4.0 14 14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap … … 16 16 +Provides: scripts-httpd 17 17 +Patch1000: httpd-suexec-scripts.patch 18 +Patch1001: httpd-2.2.x-sni.patch19 18 +Patch1003: httpd-2.2.x-mod_status-security.patch 20 19 +Patch1004: httpd-2.2.x-304.patch … … 23 22 The Apache HTTP Server is a powerful, efficient, and extensible 24 23 web server. 25 @@ -10 2,6 +108,7 @@24 @@ -101,6 +106,7 @@ 26 25 BuildRequires: openssl-devel, distcache-devel 27 26 Requires(post): openssl >= 0.9.7f-4, /bin/cat … … 31 30 32 31 %description -n mod_ssl 33 @@ -1 30,6 +137,11@@32 @@ -128,6 +134,10 @@ 34 33 # Patch in vendor/release string 35 34 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 36 35 37 36 +%patch1000 -p1 -b .scripts 38 +%patch1001 -p1 -b .sni39 37 +%patch1003 -p1 -b .permitstatus 40 38 +%patch1004 -p1 -b .scripts-304 … … 43 41 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 44 42 if test "x${vmmn}" != "x%{mmn}"; then 45 @@ -17 8,10 +190,12 @@43 @@ -176,10 +186,12 @@ 46 44 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 47 45 --enable-suexec --with-suexec \
Note: See TracChangeset
for help on using the changeset viewer.