source:
branches/fc20-dev/server/fedora/specs/httpd.spec.patch
@
2576
Last change on this file since 2576 was 2551, checked in by andersk, 10 years ago | |
---|---|
File size: 2.8 KB |
-
httpd.spec
old new 15 15 Summary: Apache HTTP Server 16 16 Name: httpd 17 17 Version: 2.4.10 18 Release: 1%{?dist} 18 Release: 1%{?dist}.scripts.%{scriptsversion} 19 19 URL: http://httpd.apache.org/ 20 20 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 21 21 Source1: index.html … … 84 84 Requires(post): systemd-units 85 85 Conflicts: apr < 1.5.0-1 86 86 87 Provides: scripts-httpd = %{version}-%{release} 88 Patch1001: httpd-suexec-scripts.patch 89 Patch1002: httpd-mod_status-security.patch 90 Patch1003: httpd-304s.patch 91 Patch1004: httpd-fixup-vhost.patch 92 87 93 %description 88 94 The Apache HTTP Server is a powerful, efficient, and extensible 89 95 web server. … … 94 100 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 95 101 Requires: apr-devel, apr-util-devel, pkgconfig 96 102 Requires: httpd = %{version}-%{release} 103 Provides: scripts-httpd-devel = %{version}-%{release} 97 104 98 105 %description devel 99 106 The httpd-devel package contains the APXS binary and other files … … 132 139 Requires(post): openssl, /bin/cat 133 140 Requires(pre): httpd 134 141 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} 142 Provides: scripts-mod_ssl 135 143 Obsoletes: stronghold-mod_ssl 136 144 137 145 %description -n mod_ssl … … 196 204 # Prevent use of setcap in "install-suexec-caps" target. 197 205 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in 198 206 207 %patch1001 -p1 -b .suexec-scripts 208 %patch1002 -p1 -b .mod_status-security 209 %patch1003 -p1 -b .scripts-304s 210 %patch1004 -p1 -b .fixup-vhost 211 199 212 # Safety check: prevent build if defined MMN does not equal upstream MMN. 200 213 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'` 201 214 if test "x${vmmn}" != "x%{mmn}"; then … … 242 255 --enable-suexec --with-suexec \ 243 256 --enable-suexec-capabilities \ 244 257 --with-suexec-caller=%{suexec_caller} \ 245 --with-suexec-docroot=%{docroot} \ 246 --without-suexec-logfile \ 247 --with-suexec-syslog \ 258 --with-suexec-docroot=/ \ 259 --with-suexec-userdir=web_scripts \ 260 --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ 261 --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ 262 --without-suexec-syslog \ 248 263 --with-suexec-bin=%{_sbindir}/suexec \ 249 --with-suexec-uidmin=50 0 --with-suexec-gidmin=100 \264 --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ 250 265 --enable-pie \ 251 266 --with-pcre \ 252 267 --enable-mods-shared=all \ … … 542 557 %{_sbindir}/fcgistarter 543 558 %{_sbindir}/apachectl 544 559 %{_sbindir}/rotatelogs 545 %caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec 560 # cap_dac_override needed to write to /var/log/httpd 561 %caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec 546 562 547 563 %dir %{_libdir}/httpd 548 564 %dir %{_libdir}/httpd/modules
Note: See TracBrowser
for help on using the repository browser.