source: trunk/server/fedora/specs/httpd.spec.patch @ 2617

Last change on this file since 2617 was 2602, checked in by achernya, 10 years ago
Behold the glorious, working logview
File size: 3.1 KB
RevLine 
[2591]1--- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
2+++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
3@@ -15,7 +15,7 @@
[926]4 Summary: Apache HTTP Server
5 Name: httpd
[2591]6 Version: 2.4.10
[2377]7-Release: 1%{?dist}
8+Release: 1%{?dist}.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
[2602]12@@ -65,6 +65,14 @@
[2591]13 # Bug fixes
14 Patch55: httpd-2.4.4-malformed-host.patch
15 Patch56: httpd-2.4.4-mod_unique_id.patch
16+
17+Patch1001: httpd-suexec-scripts.patch
18+Patch1002: httpd-mod_status-security.patch
19+Patch1003: httpd-304s.patch
20+Patch1004: httpd-fixup-vhost.patch
21+Patch1005: httpd-allow-null-user.patch
[2602]22+Patch1006: httpd-suexec-journald.patch
[2591]23+
24 License: ASL 2.0
25 Group: System Environment/Daemons
26 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
27@@ -77,6 +84,7 @@
28 Provides: webserver
29 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
30 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
[2066]31+Provides: scripts-httpd = %{version}-%{release}
[2591]32 Requires: httpd-tools = %{version}-%{release}
33 Requires(pre): /usr/sbin/useradd
34 Requires(preun): systemd-units
35@@ -94,6 +102,7 @@
[1607]36 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
37 Requires: apr-devel, apr-util-devel, pkgconfig
38 Requires: httpd = %{version}-%{release}
[2066]39+Provides: scripts-httpd-devel = %{version}-%{release}
[1607]40 
41 %description devel
42 The httpd-devel package contains the APXS binary and other files
[2591]43@@ -132,6 +141,7 @@
[2066]44 Requires(post): openssl, /bin/cat
[1499]45 Requires(pre): httpd
[2066]46 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
[925]47+Provides: scripts-mod_ssl
48 Obsoletes: stronghold-mod_ssl
49 
50 %description -n mod_ssl
[2602]51@@ -190,6 +200,13 @@
[2591]52 %patch55 -p1 -b .malformedhost
53 %patch56 -p1 -b .uniqueid
[1]54 
[2591]55+%patch1001 -p1 -b .suexec-scripts
56+%patch1002 -p1 -b .mod_status-security
57+%patch1003 -p1 -b .scripts-304s
58+%patch1004 -p1 -b .fixup-vhost
59+%patch1005 -p1 -b .allow-null-user
[2602]60+%patch1006 -p1 -b .journald
[1]61+
[2591]62 # Patch in the vendor string
63 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
64 
65@@ -242,11 +258,13 @@
[684]66        --enable-suexec --with-suexec \
[2591]67         --enable-suexec-capabilities \
[684]68        --with-suexec-caller=%{suexec_caller} \
[2591]69-       --with-suexec-docroot=%{docroot} \
70-       --without-suexec-logfile \
71-        --with-suexec-syslog \
[1288]72+       --with-suexec-docroot=/ \
[684]73+       --with-suexec-userdir=web_scripts \
[824]74+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
[2591]75+       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
76+        --without-suexec-syslog \
[684]77        --with-suexec-bin=%{_sbindir}/suexec \
78-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
79+       --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
80         --enable-pie \
81         --with-pcre \
[2591]82         --enable-mods-shared=all \
83@@ -542,7 +560,8 @@
84 %{_sbindir}/fcgistarter
85 %{_sbindir}/apachectl
86 %{_sbindir}/rotatelogs
87-%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
88+# cap_dac_override needed to write to /var/log/httpd
89+%caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
90 
91 %dir %{_libdir}/httpd
92 %dir %{_libdir}/httpd/modules
Note: See TracBrowser for help on using the repository browser.