source: trunk/server/fedora/specs/httpd.spec.patch @ 1602

Last change on this file since 1602 was 1602, checked in by gdb, 12 years ago
httpd: Add method to merge virtual host with a main server_rec
File size: 2.1 KB
RevLine 
[1539]1--- httpd.spec.orig     2010-04-06 18:26:08.000000000 -0400
2+++ httpd.spec  2010-04-14 04:14:13.000000000 -0400
[1259]3@@ -7,7 +7,7 @@
[926]4 Summary: Apache HTTP Server
5 Name: httpd
[1539]6 Version: 2.2.15
7-Release: 1%{?dist}.1
8+Release: 1%{?dist}.1.scripts.%{scriptsversion}
[926]9 URL: http://httpd.apache.org/
10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
11 Source1: index.html
[1602]12@@ -55,6 +55,14 @@
[1]13 Conflicts: pcre < 4.0
[1259]14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
[1]15 
[925]16+Provides: scripts-httpd
[1]17+Patch1000: httpd-suexec-scripts.patch
[795]18+Patch1003: httpd-2.2.x-mod_status-security.patch
[1035]19+Patch1004: httpd-2.2.x-304.patch
[1348]20+Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
[1356]21+Patch1006: httpd-suexec-cloexec.patch
[1602]22+Patch1007: httpd-fixup-vhost.patch
[1]23+
24 %description
25 The Apache HTTP Server is a powerful, efficient, and extensible
26 web server.
[1539]27@@ -102,6 +109,7 @@
[925]28 Requires(post): openssl >= 0.9.7f-4, /bin/cat
[1499]29 Requires(pre): httpd
[925]30 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
31+Provides: scripts-mod_ssl
32 Obsoletes: stronghold-mod_ssl
33 
34 %description -n mod_ssl
[1602]35@@ -129,6 +137,13 @@
[1]36 # Patch in vendor/release string
37 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
38 
39+%patch1000 -p1 -b .scripts
[795]40+%patch1003 -p1 -b .permitstatus
[1035]41+%patch1004 -p1 -b .scripts-304
[1348]42+%patch1005 -p1 -b .ssl-sessioncache
[1356]43+%patch1006 -p1 -b .cloexec
[1602]44+%patch1007 -p1 -b .fixup-vhost
[1]45+
46 # Safety check: prevent build if defined MMN does not equal upstream MMN.
47 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
48 if test "x${vmmn}" != "x%{mmn}"; then
[1539]49@@ -177,10 +191,12 @@
[684]50         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
51        --enable-suexec --with-suexec \
52        --with-suexec-caller=%{suexec_caller} \
53-       --with-suexec-docroot=%{contentdir} \
[1288]54+       --with-suexec-docroot=/ \
[684]55+       --with-suexec-userdir=web_scripts \
[824]56+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
[684]57        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
58        --with-suexec-bin=%{_sbindir}/suexec \
59-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
60+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
61         --enable-pie \
62         --with-pcre \
63        $*
Note: See TracBrowser for help on using the repository browser.