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

Last change on this file since 1288 was 1288, checked in by mitchb, 15 years ago
Revert r1287 - we're not convinced the change is beneficial
File size: 2.0 KB
  • httpd.spec

    old new  
    77Summary: Apache HTTP Server
    88Name: httpd
    99Version: 2.2.11
    10 Release: 8
     10Release: 8.scripts.%{scriptsversion}
    1111URL: http://httpd.apache.org/
    1212Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1313Source1: index.html
     
    5656Conflicts: pcre < 4.0
    5757Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
    5858
     59Provides: scripts-httpd
     60Patch1000: httpd-suexec-scripts.patch
     61Patch1001: httpd-2.2.x-sni.patch
     62Patch1003: httpd-2.2.x-mod_status-security.patch
     63Patch1004: httpd-2.2.x-304.patch
     64
    5965%description
    6066The Apache HTTP Server is a powerful, efficient, and extensible
    6167web server.
     
    102108BuildRequires: openssl-devel, distcache-devel
    103109Requires(post): openssl >= 0.9.7f-4, /bin/cat
    104110Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     111Provides: scripts-mod_ssl
    105112Obsoletes: stronghold-mod_ssl
    106113
    107114%description -n mod_ssl
     
    130137# Patch in vendor/release string
    131138sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    132139
     140%patch1000 -p1 -b .scripts
     141%patch1001 -p1 -b .sni
     142%patch1003 -p1 -b .permitstatus
     143%patch1004 -p1 -b .scripts-304
     144
    133145# Safety check: prevent build if defined MMN does not equal upstream MMN.
    134146vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    135147if test "x${vmmn}" != "x%{mmn}"; then
     
    178190        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    179191        --enable-suexec --with-suexec \
    180192        --with-suexec-caller=%{suexec_caller} \
    181         --with-suexec-docroot=%{contentdir} \
     193        --with-suexec-docroot=/ \
     194        --with-suexec-userdir=web_scripts \
     195        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    182196        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    183197        --with-suexec-bin=%{_sbindir}/suexec \
    184         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     198        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    185199        --enable-pie \
    186200        --with-pcre \
    187201        $*
Note: See TracBrowser for help on using the repository browser.