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

Last change on this file since 1539 was 1539, checked in by mitchb, 12 years ago
Upgrade to Apache 2.2.15 Also drop the CVE-2010-0434 patch which is now incorporated upstream.
File size: 2.1 KB
  • httpd.spec

    old new  
    77Summary: Apache HTTP Server
    88Name: httpd
    99Version: 2.2.15
    10 Release: 1%{?dist}.1
     10Release: 1%{?dist}.1.scripts.%{scriptsversion}
    1111URL: http://httpd.apache.org/
    1212Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1313Source1: index.html
     
    5555Conflicts: pcre < 4.0
    5656Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    5757
     58Provides: scripts-httpd
     59Patch1000: httpd-suexec-scripts.patch
     60Patch1003: httpd-2.2.x-mod_status-security.patch
     61Patch1004: httpd-2.2.x-304.patch
     62Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
     63Patch1006: httpd-suexec-cloexec.patch
     64
    5865%description
    5966The Apache HTTP Server is a powerful, efficient, and extensible
    6067web server.
     
    102109Requires(post): openssl >= 0.9.7f-4, /bin/cat
    103110Requires(pre): httpd
    104111Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     112Provides: scripts-mod_ssl
    105113Obsoletes: stronghold-mod_ssl
    106114
    107115%description -n mod_ssl
     
    129137# Patch in vendor/release string
    130138sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    131139
     140%patch1000 -p1 -b .scripts
     141%patch1003 -p1 -b .permitstatus
     142%patch1004 -p1 -b .scripts-304
     143%patch1005 -p1 -b .ssl-sessioncache
     144%patch1006 -p1 -b .cloexec
     145
    132146# Safety check: prevent build if defined MMN does not equal upstream MMN.
    133147vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    134148if test "x${vmmn}" != "x%{mmn}"; then
     
    177191        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    178192        --enable-suexec --with-suexec \
    179193        --with-suexec-caller=%{suexec_caller} \
    180         --with-suexec-docroot=%{contentdir} \
     194        --with-suexec-docroot=/ \
     195        --with-suexec-userdir=web_scripts \
     196        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    181197        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    182198        --with-suexec-bin=%{_sbindir}/suexec \
    183         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     199        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    184200        --enable-pie \
    185201        --with-pcre \
    186202        $*
Note: See TracBrowser for help on using the repository browser.