Changeset 1539 for trunk/server/fedora
- Timestamp:
- Apr 16, 2010, 5:21:37 AM (15 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/specs/httpd.spec.patch
r1505 r1539 1 --- httpd.spec.orig 2010-0 2-28 05:01:55.000000000 -05002 +++ httpd.spec 2010-0 3-11 05:30:54.000000000 -05001 --- httpd.spec.orig 2010-04-06 18:26:08.000000000 -0400 2 +++ httpd.spec 2010-04-14 04:14:13.000000000 -0400 3 3 @@ -7,7 +7,7 @@ 4 4 Summary: Apache HTTP Server 5 5 Name: httpd 6 Version: 2.2.1 47 -Release: 1%{?dist} 8 +Release: 1 .scripts.%{scriptsversion}%{?dist}6 Version: 2.2.15 7 -Release: 1%{?dist}.1 8 +Release: 1%{?dist}.1.scripts.%{scriptsversion} 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 7,6 +57,14@@12 @@ -55,6 +55,13 @@ 13 13 Conflicts: pcre < 4.0 14 14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap … … 20 20 +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch 21 21 +Patch1006: httpd-suexec-cloexec.patch 22 +Patch1007: httpd-2.2.x-CVE-2010-0434.patch23 22 + 24 23 %description 25 24 The Apache HTTP Server is a powerful, efficient, and extensible 26 25 web server. 27 @@ -10 4,6 +112,7 @@26 @@ -102,6 +109,7 @@ 28 27 Requires(post): openssl >= 0.9.7f-4, /bin/cat 29 28 Requires(pre): httpd … … 33 32 34 33 %description -n mod_ssl 35 @@ -1 33,6 +142,13@@34 @@ -129,6 +137,12 @@ 36 35 # Patch in vendor/release string 37 36 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 … … 42 41 +%patch1005 -p1 -b .ssl-sessioncache 43 42 +%patch1006 -p1 -b .cloexec 44 +%patch1007 -p1 -b .cve-2010-043445 43 + 46 44 # Safety check: prevent build if defined MMN does not equal upstream MMN. 47 45 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 48 46 if test "x${vmmn}" != "x%{mmn}"; then 49 @@ -1 81,10 +197,12 @@47 @@ -177,10 +191,12 @@ 50 48 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 51 49 --enable-suexec --with-suexec \
Note: See TracChangeset
for help on using the changeset viewer.