source:
trunk/server/fedora/specs/httpd.spec.patch
@
2602
Last change on this file since 2602 was 2602, checked in by achernya, 10 years ago | |
---|---|
File size: 3.1 KB |
-
(a) rpmbuild/SPECS/httpd.spec.~1~ vs. (b) httpd.spec
a b 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 … … 65 65 # Bug fixes 66 66 Patch55: httpd-2.4.4-malformed-host.patch 67 67 Patch56: httpd-2.4.4-mod_unique_id.patch 68 69 Patch1001: httpd-suexec-scripts.patch 70 Patch1002: httpd-mod_status-security.patch 71 Patch1003: httpd-304s.patch 72 Patch1004: httpd-fixup-vhost.patch 73 Patch1005: httpd-allow-null-user.patch 74 Patch1006: httpd-suexec-journald.patch 75 68 76 License: ASL 2.0 69 77 Group: System Environment/Daemons 70 78 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root … … 77 84 Provides: webserver 78 85 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} 79 86 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa} 87 Provides: scripts-httpd = %{version}-%{release} 80 88 Requires: httpd-tools = %{version}-%{release} 81 89 Requires(pre): /usr/sbin/useradd 82 90 Requires(preun): systemd-units … … 94 102 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 95 103 Requires: apr-devel, apr-util-devel, pkgconfig 96 104 Requires: httpd = %{version}-%{release} 105 Provides: scripts-httpd-devel = %{version}-%{release} 97 106 98 107 %description devel 99 108 The httpd-devel package contains the APXS binary and other files … … 132 141 Requires(post): openssl, /bin/cat 133 142 Requires(pre): httpd 134 143 Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa} 144 Provides: scripts-mod_ssl 135 145 Obsoletes: stronghold-mod_ssl 136 146 137 147 %description -n mod_ssl … … 190 200 %patch55 -p1 -b .malformedhost 191 201 %patch56 -p1 -b .uniqueid 192 202 203 %patch1001 -p1 -b .suexec-scripts 204 %patch1002 -p1 -b .mod_status-security 205 %patch1003 -p1 -b .scripts-304s 206 %patch1004 -p1 -b .fixup-vhost 207 %patch1005 -p1 -b .allow-null-user 208 %patch1006 -p1 -b .journald 209 193 210 # Patch in the vendor string 194 211 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h 195 212 … … 242 258 --enable-suexec --with-suexec \ 243 259 --enable-suexec-capabilities \ 244 260 --with-suexec-caller=%{suexec_caller} \ 245 --with-suexec-docroot=%{docroot} \ 246 --without-suexec-logfile \ 247 --with-suexec-syslog \ 261 --with-suexec-docroot=/ \ 262 --with-suexec-userdir=web_scripts \ 263 --with-suexec-trusteddir=/usr/libexec/scripts-trusted \ 264 --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \ 265 --without-suexec-syslog \ 248 266 --with-suexec-bin=%{_sbindir}/suexec \ 249 --with-suexec-uidmin=50 0 --with-suexec-gidmin=100 \267 --with-suexec-uidmin=50 --with-suexec-gidmin=50 \ 250 268 --enable-pie \ 251 269 --with-pcre \ 252 270 --enable-mods-shared=all \ … … 542 560 %{_sbindir}/fcgistarter 543 561 %{_sbindir}/apachectl 544 562 %{_sbindir}/rotatelogs 545 %caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec 563 # cap_dac_override needed to write to /var/log/httpd 564 %caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec 546 565 547 566 %dir %{_libdir}/httpd 548 567 %dir %{_libdir}/httpd/modules
Note: See TracBrowser
for help on using the repository browser.