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

Last change on this file since 2431 was 2431, checked in by tboning, 9 years ago
Fixed httpd.spec.patch from messing with suexec options.
File size: 2.4 KB
  • httpd.spec

    old new  
    1414Summary: Apache HTTP Server
    1515Name: httpd
    1616Version: 2.4.4
    17 Release: 6%{?dist}
     17Release: 6%{?dist}.scripts.%{scriptsversion}
    1818URL: http://httpd.apache.org/
    1919Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    2020Source1: index.html
     
    8585Requires(postun): systemd-units
    8686Requires(post): systemd-units
    8787
     88Provides: scripts-httpd = %{version}-%{release}
     89Patch1001: httpd-suexec-scripts.patch
     90Patch1002: httpd-mod_status-security.patch
     91Patch1003: httpd-304s.patch
     92Patch1004: httpd-fixup-vhost.patch
     93
    8894%description
    8995The Apache HTTP Server is a powerful, efficient, and extensible
    9096web server.
     
    95101Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    96102Requires: apr-devel, apr-util-devel, pkgconfig
    97103Requires: httpd = %{version}-%{release}
     104Provides: scripts-httpd-devel = %{version}-%{release}
    98105
    99106%description devel
    100107The httpd-devel package contains the APXS binary and other files
     
    133140Requires(post): openssl, /bin/cat
    134141Requires(pre): httpd
    135142Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     143Provides: scripts-mod_ssl
    136144Obsoletes: stronghold-mod_ssl
    137145
    138146%description -n mod_ssl
     
    201209# Prevent use of setcap in "install-suexec-caps" target.
    202210sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    203211
     212%patch1001 -p1 -b .suexec-scripts
     213%patch1002 -p1 -b .mod_status-security
     214%patch1003 -p1 -b .scripts-304s
     215%patch1004 -p1 -b .fixup-vhost
     216
    204217# Safety check: prevent build if defined MMN does not equal upstream MMN.
    205218vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    206219if test "x${vmmn}" != "x%{mmn}"; then
     
    247260        --enable-suexec --with-suexec \
    248261        --enable-suexec-capabilities \
    249262        --with-suexec-caller=%{suexec_caller} \
    250         --with-suexec-docroot=%{docroot} \
    251         --without-suexec-logfile \
    252         --with-suexec-syslog \
     263        --with-suexec-docroot=/ \
     264        --with-suexec-userdir=web_scripts \
     265        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
     266        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     267        --without-suexec-syslog \
    253268        --with-suexec-bin=%{_sbindir}/suexec \
    254         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     269        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    255270        --enable-pie \
    256271        --with-pcre \
    257272        --enable-mods-shared=all \
Note: See TracBrowser for help on using the repository browser.