source: branches/fc15-dev/server/fedora/specs/httpd.spec.patch @ 1947

Last change on this file since 1947 was 1807, checked in by achernya, 13 years ago
Necessary changes to build the Scripts RPMs on Fedora 15: * Stop scriptsifying 389-ds-base, as it appears to have Mitch's patch * Update krb5.spec.patch for krb5-1.9 * Update the krb5-kuserok-scripts.patch to work with krb5-1.9 (code review requested) * Update httpd.spec.patch to apply properly to Fedora's newly cleaned-up httpd.spec * Bump zephyr to version 3.0.1
File size: 2.5 KB
RevLine 
[1738]1--- httpd.spec.orig     2010-10-27 08:26:15.000000000 -0400
2+++ httpd.spec  2010-11-18 18:20:43.000000000 -0500
[1807]3@@ -8,7 +8,7 @@
[926]4 Summary: Apache HTTP Server
5 Name: httpd
[1738]6 Version: 2.2.17
[1807]7-Release: 10%{?dist}.1
8+Release: 10%{?dist}.1.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
[1807]12@@ -54,6 +54,14 @@
13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
[1]15 
[925]16+Provides: scripts-httpd
[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.
[1807]27@@ -64,6 +72,7 @@
[1607]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
32 
33 %description devel
34 The httpd-devel package contains the APXS binary and other files
[1807]35@@ -102,6 +102,7 @@
36 Requires(post): openssl, /bin/cat
[1499]37 Requires(pre): httpd
[1807]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
[1807]43@@ -129,6 +139,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
[1807]57@@ -176,10 +193,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        $*
Note: See TracBrowser for help on using the repository browser.