[2422] | 1 | --- httpd.spec.orig 2013-05-29 00:46:07.522169507 -0400 |
---|
| 2 | +++ httpd.spec 2013-05-29 00:46:37.905169507 -0400 |
---|
| 3 | @@ -14,7 +14,7 @@ |
---|
[926] | 4 | Summary: Apache HTTP Server |
---|
| 5 | Name: httpd |
---|
[2422] | 6 | Version: 2.4.4 |
---|
| 7 | -Release: 4%{?dist} |
---|
| 8 | +Release: 4%{?dist}.scripts.%{scriptsversion} |
---|
[926] | 9 | URL: http://httpd.apache.org/ |
---|
[1738] | 10 | Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 |
---|
[926] | 11 | Source1: index.html |
---|
[2422] | 12 | @@ -79,6 +79,12 @@ |
---|
[2246] | 13 | Requires(postun): systemd-units |
---|
| 14 | Requires(post): systemd-units |
---|
[1] | 15 | |
---|
[2066] | 16 | +Provides: scripts-httpd = %{version}-%{release} |
---|
[2422] | 17 | +Patch1001: httpd-suexec-scripts.patch |
---|
| 18 | +Patch1002: httpd-mod_status-security.patch |
---|
| 19 | +Patch1003: httpd-304s.patch |
---|
| 20 | +Patch1004: httpd-fixup-vhost.patch |
---|
[1] | 21 | + |
---|
| 22 | %description |
---|
| 23 | The Apache HTTP Server is a powerful, efficient, and extensible |
---|
| 24 | web server. |
---|
[2422] | 25 | @@ -89,6 +95,7 @@ |
---|
[1607] | 26 | Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel |
---|
| 27 | Requires: apr-devel, apr-util-devel, pkgconfig |
---|
| 28 | Requires: httpd = %{version}-%{release} |
---|
[2066] | 29 | +Provides: scripts-httpd-devel = %{version}-%{release} |
---|
[1607] | 30 | |
---|
| 31 | %description devel |
---|
| 32 | The httpd-devel package contains the APXS binary and other files |
---|
[2422] | 33 | @@ -127,6 +134,7 @@ |
---|
[2066] | 34 | Requires(post): openssl, /bin/cat |
---|
[1499] | 35 | Requires(pre): httpd |
---|
[2066] | 36 | Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} |
---|
[925] | 37 | +Provides: scripts-mod_ssl |
---|
| 38 | Obsoletes: stronghold-mod_ssl |
---|
| 39 | |
---|
| 40 | %description -n mod_ssl |
---|
[2422] | 41 | @@ -189,6 +197,11 @@ |
---|
| 42 | # Prevent use of setcap in "install-suexec-caps" target. |
---|
| 43 | sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in |
---|
[1] | 44 | |
---|
[2422] | 45 | +%patch1001 -p1 -b .suexec-scripts |
---|
| 46 | +%patch1002 -p1 -b .mod_status-security |
---|
| 47 | +%patch1003 -p1 -b .scripts-304s |
---|
| 48 | +%patch1004 -p1 -b .fixup-vhost |
---|
[1] | 49 | + |
---|
| 50 | # Safety check: prevent build if defined MMN does not equal upstream MMN. |
---|
| 51 | vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` |
---|
| 52 | if test "x${vmmn}" != "x%{mmn}"; then |
---|
[2422] | 53 | @@ -235,11 +248,13 @@ |
---|
[684] | 54 | --enable-suexec --with-suexec \ |
---|
[2422] | 55 | --enable-suexec-capabilities \ |
---|
[684] | 56 | --with-suexec-caller=%{suexec_caller} \ |
---|
[2422] | 57 | - --with-suexec-docroot=%{docroot} \ |
---|
| 58 | - --without-suexec-logfile \ |
---|
| 59 | - --with-suexec-syslog \ |
---|
[1288] | 60 | + --with-suexec-docroot=/ \ |
---|
[684] | 61 | + --with-suexec-userdir=web_scripts \ |
---|
[824] | 62 | + --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ |
---|
[2422] | 63 | + --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ |
---|
| 64 | + --without-suexec-syslog \ |
---|
[684] | 65 | --with-suexec-bin=%{_sbindir}/suexec \ |
---|
| 66 | - --with-suexec-uidmin=500 --with-suexec-gidmin=100 \ |
---|
| 67 | + --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ |
---|
| 68 | --enable-pie \ |
---|
| 69 | --with-pcre \ |
---|
[2422] | 70 | --enable-mods-shared=all \ |
---|