source: server/fedora/specs/httpd.spec.patch @ 933

Last change on this file since 933 was 926, checked in by quentin, 14 years ago
Use an RPM macro instead of sed to specify package versions
File size: 1.9 KB
RevLine 
[925]1--- httpd.spec.orig     2009-01-01 21:06:31.000000000 -0500
[926]2+++ httpd.spec  2009-01-01 22:52:19.000000000 -0500
3@@ -6,7 +6,7 @@
4 Summary: Apache HTTP Server
5 Name: httpd
6 Version: 2.2.9
7-Release: 1%{?dist}
8+Release: 1%{?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
[925]12@@ -54,6 +54,11 @@
[1]13 Conflicts: pcre < 4.0
[760]14 Requires: httpd-tools = %{version}-%{release}
[1]15 
[925]16+Provides: scripts-httpd
[1]17+Patch1000: httpd-suexec-scripts.patch
[816]18+Patch1001: httpd-2.2.x-sni.patch
[795]19+Patch1003: httpd-2.2.x-mod_status-security.patch
[1]20+
21 %description
22 The Apache HTTP Server is a powerful, efficient, and extensible
23 web server.
[925]24@@ -100,6 +105,7 @@
25 BuildRequires: openssl-devel, distcache-devel
26 Requires(post): openssl >= 0.9.7f-4, /bin/cat
27 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
28+Provides: scripts-mod_ssl
29 Obsoletes: stronghold-mod_ssl
30 
31 %description -n mod_ssl
32@@ -127,6 +133,10 @@
[1]33 # Patch in vendor/release string
34 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
35 
36+%patch1000 -p1 -b .scripts
[683]37+%patch1001 -p1 -b .sni
[795]38+%patch1003 -p1 -b .permitstatus
[1]39+
40 # Safety check: prevent build if defined MMN does not equal upstream MMN.
41 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
42 if test "x${vmmn}" != "x%{mmn}"; then
[925]43@@ -175,10 +185,12 @@
[684]44         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
45        --enable-suexec --with-suexec \
46        --with-suexec-caller=%{suexec_caller} \
47-       --with-suexec-docroot=%{contentdir} \
48+       --with-suexec-docroot=/ \
49+       --with-suexec-userdir=web_scripts \
[824]50+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
[684]51        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
52        --with-suexec-bin=%{_sbindir}/suexec \
53-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
54+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
55         --enable-pie \
56         --with-pcre \
57        $*
Note: See TracBrowser for help on using the repository browser.