| [1] | 1 | --- httpd.spec.old 2006-09-08 15:04:31.000000000 -0400 |
|---|
| 2 | +++ httpd.spec 2006-09-16 21:32:05.000000000 -0400 |
|---|
| [685] | 3 | @@ -59,6 +59,10 @@ |
|---|
| [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 |
|---|
| [685] | 9 | +Patch1002: httpd-2.2.x-broken-ldap-caching.patch |
|---|
| [1] | 10 | + |
|---|
| 11 | %description |
|---|
| 12 | The Apache HTTP Server is a powerful, efficient, and extensible |
|---|
| 13 | web server. |
|---|
| [685] | 14 | @@ -127,6 +129,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 |
|---|
| [685] | 20 | +%patch1002 -p1 -b .broken-ldap |
|---|
| [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 |
|---|
| [684] | 25 | @@ -166,10 +166,11 @@ |
|---|
| 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 \ |
|---|
| 32 | --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ |
|---|
| 33 | --with-suexec-bin=%{_sbindir}/suexec \ |
|---|
| 34 | - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ |
|---|
| 35 | + --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ |
|---|
| 36 | --enable-pie \ |
|---|
| 37 | --with-pcre \ |
|---|
| 38 | $* |
|---|
