[2198] | 1 | --- httpd.spec.~1~ 2012-04-30 05:52:31.000000000 -0400 |
---|
| 2 | +++ httpd.spec 2012-05-22 23:31:12.397142763 -0400 |
---|
| 3 | @@ -9,7 +9,7 @@ |
---|
[926] | 4 | Summary: Apache HTTP Server |
---|
| 5 | Name: httpd |
---|
[2195] | 6 | Version: 2.2.22 |
---|
[2198] | 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 |
---|
[2207] | 12 | @@ -58,6 +58,14 @@ |
---|
[2198] | 13 | Requires(postun): systemd-units |
---|
| 14 | Requires(post): systemd-units |
---|
[1] | 15 | |
---|
[2066] | 16 | +Provides: scripts-httpd = %{version}-%{release} |
---|
[1] | 17 | +Patch1000: httpd-suexec-scripts.patch |
---|
[795] | 18 | +Patch1003: httpd-2.2.x-mod_status-security.patch |
---|
[1035] | 19 | +Patch1004: httpd-2.2.x-304.patch |
---|
[1348] | 20 | +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch |
---|
[1356] | 21 | +Patch1006: httpd-suexec-cloexec.patch |
---|
[1602] | 22 | +Patch1007: httpd-fixup-vhost.patch |
---|
[1] | 23 | + |
---|
| 24 | %description |
---|
| 25 | The Apache HTTP Server is a powerful, efficient, and extensible |
---|
| 26 | web server. |
---|
[2198] | 27 | @@ -68,6 +77,7 @@ |
---|
[1607] | 28 | Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel |
---|
| 29 | Requires: apr-devel, apr-util-devel, pkgconfig |
---|
| 30 | Requires: httpd = %{version}-%{release} |
---|
[2066] | 31 | +Provides: scripts-httpd-devel = %{version}-%{release} |
---|
[1607] | 32 | |
---|
| 33 | %description devel |
---|
| 34 | The httpd-devel package contains the APXS binary and other files |
---|
[2198] | 35 | @@ -106,6 +116,7 @@ |
---|
[2066] | 36 | Requires(post): openssl, /bin/cat |
---|
[1499] | 37 | Requires(pre): httpd |
---|
[2066] | 38 | Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} |
---|
[925] | 39 | +Provides: scripts-mod_ssl |
---|
| 40 | Obsoletes: stronghold-mod_ssl |
---|
| 41 | |
---|
| 42 | %description -n mod_ssl |
---|
[2207] | 43 | @@ -133,6 +149,13 @@ |
---|
[1] | 44 | # Patch in vendor/release string |
---|
| 45 | sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 |
---|
| 46 | |
---|
| 47 | +%patch1000 -p1 -b .scripts |
---|
[795] | 48 | +%patch1003 -p1 -b .permitstatus |
---|
[1035] | 49 | +%patch1004 -p1 -b .scripts-304 |
---|
[1348] | 50 | +%patch1005 -p1 -b .ssl-sessioncache |
---|
[1356] | 51 | +%patch1006 -p1 -b .cloexec |
---|
[1602] | 52 | +%patch1007 -p1 -b .fixup-vhost |
---|
[1] | 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 |
---|
[2198] | 57 | @@ -193,10 +217,12 @@ |
---|
[684] | 58 | --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ |
---|
| 59 | --enable-suexec --with-suexec \ |
---|
| 60 | --with-suexec-caller=%{suexec_caller} \ |
---|
| 61 | - --with-suexec-docroot=%{contentdir} \ |
---|
[1288] | 62 | + --with-suexec-docroot=/ \ |
---|
[684] | 63 | + --with-suexec-userdir=web_scripts \ |
---|
[824] | 64 | + --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ |
---|
[684] | 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 | $* |
---|