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

Last change on this file since 959 was 959, checked in by geofft, 14 years ago
Update httpd.spec.patch for Fedora 10
File size: 1.9 KB
  • httpd.spec

    old new  
    99Summary: Apache HTTP Server
    1010Name: httpd
    1111Version: 2.2.10
    12 Release: 2
     12Release: 2.scripts.%{scriptsversion}
    1313URL: http://httpd.apache.org/
    1414Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1515Source1: index.html
     
    5858Conflicts: pcre < 4.0
    5959Requires: httpd-tools = %{version}-%{release}
    6060
     61Provides: scripts-httpd
     62Patch1000: httpd-suexec-scripts.patch
     63Patch1001: httpd-2.2.x-sni.patch
     64Patch1003: httpd-2.2.x-mod_status-security.patch
     65
    6166%description
    6267The Apache HTTP Server is a powerful, efficient, and extensible
    6368web server.
     
    104109BuildRequires: openssl-devel, distcache-devel
    105110Requires(post): openssl >= 0.9.7f-4, /bin/cat
    106111Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     112Provides: scripts-mod_ssl
    107113Obsoletes: stronghold-mod_ssl
    108114
    109115%description -n mod_ssl
     
    132138# Patch in vendor/release string
    133139sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    134140
     141%patch1000 -p1 -b .scripts
     142%patch1001 -p1 -b .sni
     143%patch1003 -p1 -b .permitstatus
     144
    135145# Safety check: prevent build if defined MMN does not equal upstream MMN.
    136146vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    137147if test "x${vmmn}" != "x%{mmn}"; then
     
    180190        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    181191        --enable-suexec --with-suexec \
    182192        --with-suexec-caller=%{suexec_caller} \
    183         --with-suexec-docroot=%{contentdir} \
     193        --with-suexec-docroot=/ \
     194        --with-suexec-userdir=web_scripts \
     195        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    184196        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    185197        --with-suexec-bin=%{_sbindir}/suexec \
    186         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     198        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    187199        --enable-pie \
    188200        --with-pcre \
    189201        $*
Note: See TracBrowser for help on using the repository browser.