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 | |
---|---|
File size: 2.7 KB |
-
httpd.spec
old new 8 8 Summary: Apache HTTP Server 9 9 Name: httpd 10 10 Version: 2.2.21 11 Release: 1%{?dist} 11 Release: 1%{?dist}.scripts.%{scriptsversion} 12 12 URL: http://httpd.apache.org/ 13 13 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 14 14 Source1: index.html … … 54 54 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa} 55 55 Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units 56 56 57 Provides: scripts-httpd = %{version}-%{release} 58 Patch1000: httpd-suexec-scripts.patch 59 Patch1003: httpd-2.2.x-mod_status-security.patch 60 Patch1004: httpd-2.2.x-304.patch 61 Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch 62 Patch1006: httpd-suexec-cloexec.patch 63 Patch1007: httpd-fixup-vhost.patch 64 Patch1008: httpd-sysv-deps.patch 65 57 66 %description 58 67 The Apache HTTP Server is a powerful, efficient, and extensible 59 68 web server. … … 64 73 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 65 74 Requires: apr-devel, apr-util-devel, pkgconfig 66 75 Requires: httpd = %{version}-%{release} 76 Provides: scripts-httpd-devel = %{version}-%{release} 67 77 68 78 %description devel 69 79 The httpd-devel package contains the APXS binary and other files … … 102 112 Requires(post): openssl, /bin/cat 103 113 Requires(pre): httpd 104 114 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} 115 Provides: scripts-mod_ssl 105 116 Obsoletes: stronghold-mod_ssl 106 117 107 118 %description -n mod_ssl … … 110 121 Security (TLS) protocols. 111 122 112 123 %prep 124 125 # Horrible hack to patch the httpd.init file 126 cd $RPM_SOURCE_DIR 127 %patch1008 -p1 -b .sysv-deps 128 113 129 %setup -q 114 130 %patch1 -p1 -b .apctl 115 131 %patch2 -p1 -b .apxs … … 128 144 # Patch in vendor/release string 129 145 sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1 130 146 147 %patch1000 -p1 -b .scripts 148 %patch1003 -p1 -b .permitstatus 149 %patch1004 -p1 -b .scripts-304 150 %patch1005 -p1 -b .ssl-sessioncache 151 %patch1006 -p1 -b .cloexec 152 %patch1007 -p1 -b .fixup-vhost 153 131 154 # Safety check: prevent build if defined MMN does not equal upstream MMN. 132 155 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 133 156 if test "x${vmmn}" != "x%{mmn}"; then … … 175 198 --with-apr=%{_prefix} --with-apr-util=%{_prefix} \ 176 199 --enable-suexec --with-suexec \ 177 200 --with-suexec-caller=%{suexec_caller} \ 178 --with-suexec-docroot=%{contentdir} \ 201 --with-suexec-docroot=/ \ 202 --with-suexec-userdir=web_scripts \ 203 --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ 179 204 --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ 180 205 --with-suexec-bin=%{_sbindir}/suexec \ 181 --with-suexec-uidmin=50 0 --with-suexec-gidmin=100 \206 --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ 182 207 --enable-pie \ 183 208 --with-pcre \ 184 209 $*
Note: See TracBrowser
for help on using the repository browser.