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

Last change on this file was 2462, checked in by tboning, 9 years ago
Updated httpd.spec.patch for upstream changes
File size: 2.4 KB
  • httpd.spec

    old new  
    1414Summary: Apache HTTP Server
    1515Name: httpd
    1616Version: 2.4.6
    17 Release: 2%{?dist}
     17Release: 2%{?dist}.scripts.%{scriptsversion}
    1818URL: http://httpd.apache.org/
    1919Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    2020Source1: index.html
     
    8383Requires(postun): systemd-units
    8484Requires(post): systemd-units
    8585
     86Provides: scripts-httpd = %{version}-%{release}
     87Patch1001: httpd-suexec-scripts.patch
     88Patch1002: httpd-mod_status-security.patch
     89Patch1003: httpd-304s.patch
     90Patch1004: httpd-fixup-vhost.patch
     91
    8692%description
    8793The Apache HTTP Server is a powerful, efficient, and extensible
    8894web server.
     
    9399Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    94100Requires: apr-devel, apr-util-devel, pkgconfig
    95101Requires: httpd = %{version}-%{release}
     102Provides: scripts-httpd-devel = %{version}-%{release}
    96103
    97104%description devel
    98105The httpd-devel package contains the APXS binary and other files
     
    131138Requires(post): openssl, /bin/cat
    132139Requires(pre): httpd
    133140Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     141Provides: scripts-mod_ssl
    134142Obsoletes: stronghold-mod_ssl
    135143
    136144%description -n mod_ssl
     
    197205# Prevent use of setcap in "install-suexec-caps" target.
    198206sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    199207
     208%patch1001 -p1 -b .suexec-scripts
     209%patch1002 -p1 -b .mod_status-security
     210%patch1003 -p1 -b .scripts-304s
     211%patch1004 -p1 -b .fixup-vhost
     212
    200213# Safety check: prevent build if defined MMN does not equal upstream MMN.
    201214vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    202215if test "x${vmmn}" != "x%{mmn}"; then
     
    243256        --enable-suexec --with-suexec \
    244257        --enable-suexec-capabilities \
    245258        --with-suexec-caller=%{suexec_caller} \
    246         --with-suexec-docroot=%{docroot} \
    247         --without-suexec-logfile \
    248         --with-suexec-syslog \
     259        --with-suexec-docroot=/ \
     260        --with-suexec-userdir=web_scripts \
     261        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
     262        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     263        --without-suexec-syslog \
    249264        --with-suexec-bin=%{_sbindir}/suexec \
    250         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     265        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    251266        --enable-pie \
    252267        --with-pcre \
    253268        --enable-mods-shared=all \
Note: See TracBrowser for help on using the repository browser.