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

Last change on this file since 2543 was 2543, checked in by andersk, 8 years ago
Bump httpd.spec.patch for new httpd release 2.4.10-1
File size: 2.4 KB
  • httpd.spec

    old new  
    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
     
    8686Requires(post): systemd-units
    8787Conflicts: apr < 1.5.0-1
    8888
     89Provides: scripts-httpd = %{version}-%{release}
     90Patch1001: httpd-suexec-scripts.patch
     91Patch1002: httpd-mod_status-security.patch
     92Patch1003: httpd-304s.patch
     93Patch1004: httpd-fixup-vhost.patch
     94
    8995%description
    9096The Apache HTTP Server is a powerful, efficient, and extensible
    9197web server.
     
    96102Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    97103Requires: apr-devel, apr-util-devel, pkgconfig
    98104Requires: httpd = %{version}-%{release}
     105Provides: scripts-httpd-devel = %{version}-%{release}
    99106
    100107%description devel
    101108The httpd-devel package contains the APXS binary and other files
     
    134141Requires(post): openssl, /bin/cat
    135142Requires(pre): httpd
    136143Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     144Provides: scripts-mod_ssl
    137145Obsoletes: stronghold-mod_ssl
    138146
    139147%description -n mod_ssl
     
    200208# Prevent use of setcap in "install-suexec-caps" target.
    201209sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    202210
     211%patch1001 -p1 -b .suexec-scripts
     212%patch1002 -p1 -b .mod_status-security
     213%patch1003 -p1 -b .scripts-304s
     214%patch1004 -p1 -b .fixup-vhost
     215
    203216# Safety check: prevent build if defined MMN does not equal upstream MMN.
    204217vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    205218if test "x${vmmn}" != "x%{mmn}"; then
     
    246259        --enable-suexec --with-suexec \
    247260        --enable-suexec-capabilities \
    248261        --with-suexec-caller=%{suexec_caller} \
    249         --with-suexec-docroot=%{docroot} \
    250         --without-suexec-logfile \
    251         --with-suexec-syslog \
     262        --with-suexec-docroot=/ \
     263        --with-suexec-userdir=web_scripts \
     264        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
     265        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     266        --without-suexec-syslog \
    252267        --with-suexec-bin=%{_sbindir}/suexec \
    253         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     268        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    254269        --enable-pie \
    255270        --with-pcre \
    256271        --enable-mods-shared=all \
Note: See TracBrowser for help on using the repository browser.