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

Last change on this file since 1327 was 1306, checked in by mitchb, 13 years ago
Upgrade Apache to 2.2.13; don't patch in SNI support anymore And we thought the day would never come!
File size: 1.9 KB
  • httpd.spec

    old new  
    77Summary: Apache HTTP Server
    88Name: httpd
    99Version: 2.2.13
    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
     
    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
     62
    5863%description
    5964The Apache HTTP Server is a powerful, efficient, and extensible
    6065web server.
     
    101106BuildRequires: openssl-devel, distcache-devel
    102107Requires(post): openssl >= 0.9.7f-4, /bin/cat
    103108Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     109Provides: scripts-mod_ssl
    104110Obsoletes: stronghold-mod_ssl
    105111
    106112%description -n mod_ssl
     
    128134# Patch in vendor/release string
    129135sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    130136
     137%patch1000 -p1 -b .scripts
     138%patch1003 -p1 -b .permitstatus
     139%patch1004 -p1 -b .scripts-304
     140
    131141# Safety check: prevent build if defined MMN does not equal upstream MMN.
    132142vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    133143if test "x${vmmn}" != "x%{mmn}"; then
     
    176186        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    177187        --enable-suexec --with-suexec \
    178188        --with-suexec-caller=%{suexec_caller} \
    179         --with-suexec-docroot=%{contentdir} \
     189        --with-suexec-docroot=/ \
     190        --with-suexec-userdir=web_scripts \
     191        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    180192        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    181193        --with-suexec-bin=%{_sbindir}/suexec \
    182         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     194        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    183195        --enable-pie \
    184196        --with-pcre \
    185197        $*
Note: See TracBrowser for help on using the repository browser.