[760] | 1 | --- httpd.spec.orig 2008-02-19 02:05:36.000000000 -0500 |
---|
| 2 | +++ httpd.spec 2008-05-20 19:39:59.000000000 -0400 |
---|
[795] | 3 | @@ -54,6 +54,11 @@ |
---|
[1] | 4 | Conflicts: pcre < 4.0 |
---|
[760] | 5 | Requires: httpd-tools = %{version}-%{release} |
---|
[1] | 6 | |
---|
| 7 | +Patch1000: httpd-suexec-scripts.patch |
---|
[683] | 8 | +Patch1001: httpd-2.2.8-sni.patch |
---|
[685] | 9 | +Patch1002: httpd-2.2.x-broken-ldap-caching.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. |
---|
[809] | 15 | @@ -127,6 +131,11 @@ |
---|
[1] | 16 | # Patch in vendor/release string |
---|
| 17 | sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 |
---|
| 18 | |
---|
| 19 | +%patch1000 -p1 -b .scripts |
---|
[683] | 20 | +%patch1001 -p1 -b .sni |
---|
[685] | 21 | +%patch1002 -p1 -b .broken-ldap |
---|
[795] | 22 | +%patch1003 -p1 -b .permitstatus |
---|
[1] | 23 | + |
---|
| 24 | # Safety check: prevent build if defined MMN does not equal upstream MMN. |
---|
| 25 | vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` |
---|
| 26 | if test "x${vmmn}" != "x%{mmn}"; then |
---|
[809] | 27 | @@ -175,10 +183,11 @@ |
---|
[684] | 28 | --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ |
---|
| 29 | --enable-suexec --with-suexec \ |
---|
| 30 | --with-suexec-caller=%{suexec_caller} \ |
---|
| 31 | - --with-suexec-docroot=%{contentdir} \ |
---|
| 32 | + --with-suexec-docroot=/ \ |
---|
| 33 | + --with-suexec-userdir=web_scripts \ |
---|
| 34 | --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ |
---|
| 35 | --with-suexec-bin=%{_sbindir}/suexec \ |
---|
| 36 | - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ |
---|
| 37 | + --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ |
---|
| 38 | --enable-pie \ |
---|
| 39 | --with-pcre \ |
---|
| 40 | $* |
---|