source: server/fedora/specs/httpd.spec.patch @ 839

Last change on this file since 839 was 824, checked in by andersk, 16 years ago
Fix `make httpd` too.
File size: 1.4 KB
  • httpd.spec

    old new  
    5454Conflicts: pcre < 4.0
    5555Requires: httpd-tools = %{version}-%{release}
    5656
     57Patch1000: httpd-suexec-scripts.patch
     58Patch1001: httpd-2.2.x-sni.patch
     59Patch1003: httpd-2.2.x-mod_status-security.patch
     60
    5761%description
    5862The Apache HTTP Server is a powerful, efficient, and extensible
    5963web server.
     
    127131# Patch in vendor/release string
    128132sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    129133
     134%patch1000 -p1 -b .scripts
     135%patch1001 -p1 -b .sni
     136%patch1003 -p1 -b .permitstatus
     137
    130138# Safety check: prevent build if defined MMN does not equal upstream MMN.
    131139vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    132140if test "x${vmmn}" != "x%{mmn}"; then
     
    175183        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    176184        --enable-suexec --with-suexec \
    177185        --with-suexec-caller=%{suexec_caller} \
    178         --with-suexec-docroot=%{contentdir} \
     186        --with-suexec-docroot=/ \
     187        --with-suexec-userdir=web_scripts \
     188        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    179189        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    180190        --with-suexec-bin=%{_sbindir}/suexec \
    181         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     191        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    182192        --enable-pie \
    183193        --with-pcre \
    184194        $*
Note: See TracBrowser for help on using the repository browser.