source: server/fedora/specs/httpd.spec.patch @ 925

Last change on this file since 925 was 925, checked in by quentin, 15 years ago
Update specfile patches to provide scripts-specific virtual packages that we can depend on
File size: 1.7 KB
RevLine 
[925]1--- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
2+++ httpd.spec  2009-01-01 21:08:14.000000000 -0500
3@@ -54,6 +54,11 @@
[1]4 Conflicts: pcre < 4.0
[760]5 Requires: httpd-tools = %{version}-%{release}
[1]6 
[925]7+Provides: scripts-httpd
[1]8+Patch1000: httpd-suexec-scripts.patch
[816]9+Patch1001: httpd-2.2.x-sni.patch
[795]10+Patch1003: httpd-2.2.x-mod_status-security.patch
[1]11+
12 %description
13 The Apache HTTP Server is a powerful, efficient, and extensible
14 web server.
[925]15@@ -100,6 +105,7 @@
16 BuildRequires: openssl-devel, distcache-devel
17 Requires(post): openssl >= 0.9.7f-4, /bin/cat
18 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
19+Provides: scripts-mod_ssl
20 Obsoletes: stronghold-mod_ssl
21 
22 %description -n mod_ssl
23@@ -127,6 +133,10 @@
[1]24 # Patch in vendor/release string
25 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
26 
27+%patch1000 -p1 -b .scripts
[683]28+%patch1001 -p1 -b .sni
[795]29+%patch1003 -p1 -b .permitstatus
[1]30+
31 # Safety check: prevent build if defined MMN does not equal upstream MMN.
32 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
33 if test "x${vmmn}" != "x%{mmn}"; then
[925]34@@ -175,10 +185,12 @@
[684]35         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
36        --enable-suexec --with-suexec \
37        --with-suexec-caller=%{suexec_caller} \
38-       --with-suexec-docroot=%{contentdir} \
39+       --with-suexec-docroot=/ \
40+       --with-suexec-userdir=web_scripts \
[824]41+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
[684]42        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
43        --with-suexec-bin=%{_sbindir}/suexec \
44-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
45+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
46         --enable-pie \
47         --with-pcre \
48        $*
Note: See TracBrowser for help on using the repository browser.