source: trunk/server/fedora/specs/httpd.spec.patch @ 1499

Last change on this file since 1499 was 1499, checked in by mitchb, 13 years ago
Upgrade Apache from 2.2.13-1 to 2.2.14-1
File size: 2.1 KB
  • httpd.spec

    old new  
    77Summary: Apache HTTP Server
    88Name: httpd
    99Version: 2.2.14
    10 Release: 1%{?dist}
     10Release: 1.scripts.%{scriptsversion}%{?dist}
    1111URL: http://httpd.apache.org/
    1212Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1313Source1: index.html
     
    5757Conflicts: pcre < 4.0
    5858Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    5959
     60Provides: scripts-httpd
     61Patch1000: httpd-suexec-scripts.patch
     62Patch1003: httpd-2.2.x-mod_status-security.patch
     63Patch1004: httpd-2.2.x-304.patch
     64Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
     65Patch1006: httpd-suexec-cloexec.patch
     66
    6067%description
    6168The Apache HTTP Server is a powerful, efficient, and extensible
    6269web server.
     
    104111Requires(post): openssl >= 0.9.7f-4, /bin/cat
    105112Requires(pre): httpd
    106113Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     114Provides: scripts-mod_ssl
    107115Obsoletes: stronghold-mod_ssl
    108116
    109117%description -n mod_ssl
     
    133141# Patch in vendor/release string
    134142sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    135143
     144%patch1000 -p1 -b .scripts
     145%patch1003 -p1 -b .permitstatus
     146%patch1004 -p1 -b .scripts-304
     147%patch1005 -p1 -b .ssl-sessioncache
     148%patch1006 -p1 -b .cloexec
     149
    136150# Safety check: prevent build if defined MMN does not equal upstream MMN.
    137151vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    138152if test "x${vmmn}" != "x%{mmn}"; then
     
    181195        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    182196        --enable-suexec --with-suexec \
    183197        --with-suexec-caller=%{suexec_caller} \
    184         --with-suexec-docroot=%{contentdir} \
     198        --with-suexec-docroot=/ \
     199        --with-suexec-userdir=web_scripts \
     200        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    185201        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    186202        --with-suexec-bin=%{_sbindir}/suexec \
    187         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     203        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    188204        --enable-pie \
    189205        --with-pcre \
    190206        $*
Note: See TracBrowser for help on using the repository browser.