| [760] | 1 | --- httpd.spec.orig     2008-02-19 02:05:36.000000000 -0500 | 
|---|
 | 2 | +++ httpd.spec  2008-05-20 19:39:59.000000000 -0400 | 
|---|
| [810] | 3 | @@ -54,6 +54,10 @@ | 
|---|
| [1] | 4 |  Conflicts: pcre < 4.0 | 
|---|
| [760] | 5 |  Requires: httpd-tools = %{version}-%{release} | 
|---|
| [1] | 6 |   | 
|---|
 | 7 | +Patch1000: httpd-suexec-scripts.patch | 
|---|
| [816] | 8 | +Patch1001: httpd-2.2.x-sni.patch | 
|---|
| [795] | 9 | +Patch1003: httpd-2.2.x-mod_status-security.patch | 
|---|
| [1] | 10 | + | 
|---|
 | 11 |  %description | 
|---|
 | 12 |  The Apache HTTP Server is a powerful, efficient, and extensible | 
|---|
 | 13 |  web server. | 
|---|
| [810] | 14 | @@ -127,6 +131,10 @@ | 
|---|
| [1] | 15 |  # Patch in vendor/release string | 
|---|
 | 16 |  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 | 
|---|
 | 17 |   | 
|---|
 | 18 | +%patch1000 -p1 -b .scripts | 
|---|
| [683] | 19 | +%patch1001 -p1 -b .sni | 
|---|
| [795] | 20 | +%patch1003 -p1 -b .permitstatus | 
|---|
| [1] | 21 | + | 
|---|
 | 22 |  # Safety check: prevent build if defined MMN does not equal upstream MMN. | 
|---|
 | 23 |  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` | 
|---|
 | 24 |  if test "x${vmmn}" != "x%{mmn}"; then | 
|---|
| [824] | 25 | @@ -175,10 +183,12 @@ | 
|---|
| [684] | 26 |          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ | 
|---|
 | 27 |         --enable-suexec --with-suexec \ | 
|---|
 | 28 |         --with-suexec-caller=%{suexec_caller} \ | 
|---|
 | 29 | -       --with-suexec-docroot=%{contentdir} \ | 
|---|
 | 30 | +       --with-suexec-docroot=/ \ | 
|---|
 | 31 | +       --with-suexec-userdir=web_scripts \ | 
|---|
| [824] | 32 | +       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ | 
|---|
| [684] | 33 |         --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ | 
|---|
 | 34 |         --with-suexec-bin=%{_sbindir}/suexec \ | 
|---|
 | 35 | -       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ | 
|---|
 | 36 | +       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ | 
|---|
 | 37 |          --enable-pie \ | 
|---|
 | 38 |          --with-pcre \ | 
|---|
 | 39 |         $* | 
|---|