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

Last change on this file since 2843 was 2032, checked in by ezyang, 13 years ago
Add systemd dependencies on remote filesystems/cron to httpd.
File size: 2.7 KB
RevLine 
[2032]1--- httpd.spec.orig     2011-09-13 09:43:36.000000000 -0400
2+++ httpd.spec  2011-11-05 20:57:13.910145847 -0400
[1807]3@@ -8,7 +8,7 @@
[926]4 Summary: Apache HTTP Server
5 Name: httpd
[2012]6 Version: 2.2.21
7-Release: 1%{?dist}
8+Release: 1%{?dist}.scripts.%{scriptsversion}
[926]9 URL: http://httpd.apache.org/
[2032]10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
[926]11 Source1: index.html
[2032]12@@ -54,6 +54,15 @@
[1807]13 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
14 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
[1]15 
[1952]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
[2032]23+Patch1008: httpd-sysv-deps.patch
[1]24+
25 %description
26 The Apache HTTP Server is a powerful, efficient, and extensible
27 web server.
[2032]28@@ -64,6 +73,7 @@
[1607]29 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
30 Requires: apr-devel, apr-util-devel, pkgconfig
31 Requires: httpd = %{version}-%{release}
[1952]32+Provides: scripts-httpd-devel = %{version}-%{release}
[1607]33 
34 %description devel
35 The httpd-devel package contains the APXS binary and other files
[2032]36@@ -102,6 +112,7 @@
[1807]37 Requires(post): openssl, /bin/cat
[1499]38 Requires(pre): httpd
[1807]39 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
[925]40+Provides: scripts-mod_ssl
41 Obsoletes: stronghold-mod_ssl
42 
43 %description -n mod_ssl
[2032]44@@ -110,6 +121,11 @@
45 Security (TLS) protocols.
46 
47 %prep
48+
49+# Horrible hack to patch the httpd.init file
50+cd $RPM_SOURCE_DIR
51+%patch1008 -p1 -b .sysv-deps
52+
53 %setup -q
54 %patch1 -p1 -b .apctl
55 %patch2 -p1 -b .apxs
56@@ -128,6 +144,13 @@
[1]57 # Patch in vendor/release string
58 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
59 
60+%patch1000 -p1 -b .scripts
[795]61+%patch1003 -p1 -b .permitstatus
[1035]62+%patch1004 -p1 -b .scripts-304
[1348]63+%patch1005 -p1 -b .ssl-sessioncache
[1356]64+%patch1006 -p1 -b .cloexec
[1602]65+%patch1007 -p1 -b .fixup-vhost
[1]66+
67 # Safety check: prevent build if defined MMN does not equal upstream MMN.
68 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
69 if test "x${vmmn}" != "x%{mmn}"; then
[2032]70@@ -175,10 +198,12 @@
[684]71         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
72        --enable-suexec --with-suexec \
73        --with-suexec-caller=%{suexec_caller} \
74-       --with-suexec-docroot=%{contentdir} \
[1288]75+       --with-suexec-docroot=/ \
[684]76+       --with-suexec-userdir=web_scripts \
[824]77+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
[684]78        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
79        --with-suexec-bin=%{_sbindir}/suexec \
80-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
81+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
82         --enable-pie \
83         --with-pcre \
84        $*
Note: See TracBrowser for help on using the repository browser.