source: branches/fc20-dev/server/fedora/specs/httpd.spec.patch

Last change on this file was 2583, checked in by glasgall, 8 years ago
Refresh httpd.spec patch and add allow-null-user patch to fix mod_auth_optional on F20.
File size: 3.4 KB
  • (a) rpmbuild/SPECS/httpd.spec.~1~ vs. (b) httpd.spec

    a b  
    1515Summary: Apache HTTP Server
    1616Name: httpd
    1717Version: 2.4.10
    18 Release: 1%{?dist}
     18Release: 1%{?dist}.scripts.%{scriptsversion}
    1919URL: http://httpd.apache.org/
    2020Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    2121Source1: index.html
     
    6565# Bug fixes
    6666Patch55: httpd-2.4.4-malformed-host.patch
    6767Patch56: httpd-2.4.4-mod_unique_id.patch
     68
     69Patch1001: httpd-suexec-scripts.patch
     70Patch1002: httpd-mod_status-security.patch
     71Patch1003: httpd-304s.patch
     72Patch1004: httpd-fixup-vhost.patch
     73Patch1005: httpd-allow-null-user.patch
     74
    6875License: ASL 2.0
    6976Group: System Environment/Daemons
    7077BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
     
    7784Provides: webserver
    7885Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
    7986Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
     87Provides: scripts-httpd = %{version}-%{release}
    8088Requires: httpd-tools = %{version}-%{release}
    8189Requires(pre): /usr/sbin/useradd
    8290Requires(preun): systemd-units
     
    94102Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    95103Requires: apr-devel, apr-util-devel, pkgconfig
    96104Requires: httpd = %{version}-%{release}
     105Provides: scripts-httpd-devel = %{version}-%{release}
    97106
    98107%description devel
    99108The httpd-devel package contains the APXS binary and other files
     
    132141Requires(post): openssl, /bin/cat
    133142Requires(pre): httpd
    134143Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     144Provides: scripts-mod_ssl
    135145Obsoletes: stronghold-mod_ssl
    136146
    137147%description -n mod_ssl
     
    190200%patch55 -p1 -b .malformedhost
    191201%patch56 -p1 -b .uniqueid
    192202
     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
    193209# Patch in the vendor string
    194210sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
    195211
     
    242258        --enable-suexec --with-suexec \
    243259        --enable-suexec-capabilities \
    244260        --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 \
    248266        --with-suexec-bin=%{_sbindir}/suexec \
    249         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     267        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    250268        --enable-pie \
    251269        --with-pcre \
    252270        --enable-mods-shared=all \
     
    542560%{_sbindir}/fcgistarter
    543561%{_sbindir}/apachectl
    544562%{_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
    546565
    547566%dir %{_libdir}/httpd
    548567%dir %{_libdir}/httpd/modules
     
    10141033* Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
    10151034- update to 2.2.15 (#572404, #579311)
    10161035
     1036Patch1001: httpd-suexec-scripts.patch
     1037Patch1002: httpd-mod_status-security.patch
     1038Patch1003: httpd-304s.patch
     1039Patch1004: httpd-fixup-vhost.patch
     1040Patch1005: httpd-allow-null-user.patch
Note: See TracBrowser for help on using the repository browser.