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

Last change on this file since 684 was 684, checked in by andersk, 14 years ago
Make the packaged suexec work.
File size: 1.2 KB
RevLine 
[1]1--- httpd.spec.old      2006-09-08 15:04:31.000000000 -0400
2+++ httpd.spec  2006-09-16 21:32:05.000000000 -0400
[683]3@@ -59,6 +59,9 @@
[1]4 Obsoletes: mod_put, mod_roaming, mod_jk
5 Conflicts: pcre < 4.0
6 
7+Patch1000: httpd-suexec-scripts.patch
[683]8+Patch1001: httpd-2.2.8-sni.patch
[1]9+
10 %description
11 The Apache HTTP Server is a powerful, efficient, and extensible
12 web server.
[683]13@@ -127,6 +129,9 @@
[1]14 # Patch in vendor/release string
15 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
16 
17+%patch1000 -p1 -b .scripts
[683]18+%patch1001 -p1 -b .sni
[1]19+
20 # Safety check: prevent build if defined MMN does not equal upstream MMN.
21 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
22 if test "x${vmmn}" != "x%{mmn}"; then
[684]23@@ -166,10 +166,11 @@
24         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
25        --enable-suexec --with-suexec \
26        --with-suexec-caller=%{suexec_caller} \
27-       --with-suexec-docroot=%{contentdir} \
28+       --with-suexec-docroot=/ \
29+       --with-suexec-userdir=web_scripts \
30        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
31        --with-suexec-bin=%{_sbindir}/suexec \
32-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
33+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
34         --enable-pie \
35         --with-pcre \
36        $*
Note: See TracBrowser for help on using the repository browser.