| 1 | --- httpd.spec.orig 2011-08-19 08:36:24.000000000 -0400 |
|---|
| 2 | +++ httpd.spec 2011-08-19 08:37:34.000000000 -0400 |
|---|
| 3 | @@ -8,7 +8,7 @@ |
|---|
| 4 | Summary: Apache HTTP Server |
|---|
| 5 | Name: httpd |
|---|
| 6 | Version: 2.2.19 |
|---|
| 7 | -Release: 2%{?dist} |
|---|
| 8 | +Release: 2%{?dist}.scripts.%{scriptsversion} |
|---|
| 9 | URL: http://httpd.apache.org/ |
|---|
| 10 | Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz |
|---|
| 11 | Source1: index.html |
|---|
| 12 | @@ -52,6 +52,14 @@ |
|---|
| 13 | Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} |
|---|
| 14 | Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units |
|---|
| 15 | |
|---|
| 16 | +Provides: scripts-httpd = %{version}-%{release} |
|---|
| 17 | +Patch1000: httpd-suexec-scripts.patch |
|---|
| 18 | +Patch1003: httpd-2.2.x-mod_status-security.patch |
|---|
| 19 | +Patch1004: httpd-2.2.x-304.patch |
|---|
| 20 | +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch |
|---|
| 21 | +Patch1006: httpd-suexec-cloexec.patch |
|---|
| 22 | +Patch1007: httpd-fixup-vhost.patch |
|---|
| 23 | + |
|---|
| 24 | %description |
|---|
| 25 | The Apache HTTP Server is a powerful, efficient, and extensible |
|---|
| 26 | web server. |
|---|
| 27 | @@ -62,6 +70,7 @@ |
|---|
| 28 | Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel |
|---|
| 29 | Requires: apr-devel, apr-util-devel, pkgconfig |
|---|
| 30 | Requires: httpd = %{version}-%{release} |
|---|
| 31 | +Provides: scripts-httpd-devel = %{version}-%{release} |
|---|
| 32 | |
|---|
| 33 | %description devel |
|---|
| 34 | The httpd-devel package contains the APXS binary and other files |
|---|
| 35 | @@ -100,6 +109,7 @@ |
|---|
| 36 | Requires(post): openssl, /bin/cat |
|---|
| 37 | Requires(pre): httpd |
|---|
| 38 | Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} |
|---|
| 39 | +Provides: scripts-mod_ssl |
|---|
| 40 | Obsoletes: stronghold-mod_ssl |
|---|
| 41 | |
|---|
| 42 | %description -n mod_ssl |
|---|
| 43 | @@ -125,6 +135,13 @@ |
|---|
| 44 | # Patch in vendor/release string |
|---|
| 45 | sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 |
|---|
| 46 | |
|---|
| 47 | +%patch1000 -p1 -b .scripts |
|---|
| 48 | +%patch1003 -p1 -b .permitstatus |
|---|
| 49 | +%patch1004 -p1 -b .scripts-304 |
|---|
| 50 | +%patch1005 -p1 -b .ssl-sessioncache |
|---|
| 51 | +%patch1006 -p1 -b .cloexec |
|---|
| 52 | +%patch1007 -p1 -b .fixup-vhost |
|---|
| 53 | + |
|---|
| 54 | # Safety check: prevent build if defined MMN does not equal upstream MMN. |
|---|
| 55 | vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` |
|---|
| 56 | if test "x${vmmn}" != "x%{mmn}"; then |
|---|
| 57 | @@ -172,10 +189,12 @@ |
|---|
| 58 | --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ |
|---|
| 59 | --enable-suexec --with-suexec \ |
|---|
| 60 | --with-suexec-caller=%{suexec_caller} \ |
|---|
| 61 | - --with-suexec-docroot=%{contentdir} \ |
|---|
| 62 | + --with-suexec-docroot=/ \ |
|---|
| 63 | + --with-suexec-userdir=web_scripts \ |
|---|
| 64 | + --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ |
|---|
| 65 | --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ |
|---|
| 66 | --with-suexec-bin=%{_sbindir}/suexec \ |
|---|
| 67 | - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ |
|---|
| 68 | + --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ |
|---|
| 69 | --enable-pie \ |
|---|
| 70 | --with-pcre \ |
|---|
| 71 | $* |
|---|
