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

Last change on this file since 1033 was 1033, checked in by mitchb, 14 years ago
Revert r959; we're not using Fedora 10.
File size: 1.9 KB
  • httpd.spec

    old new  
    66Summary: Apache HTTP Server
    77Name: httpd
    88Version: 2.2.9
    9 Release: 1%{?dist}
     9Release: 1%{?dist}.scripts.%{scriptsversion}
    1010URL: http://httpd.apache.org/
    1111Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
    1212Source1: index.html
     
    5454Conflicts: pcre < 4.0
    5555Requires: httpd-tools = %{version}-%{release}
    5656
     57Provides: scripts-httpd
     58Patch1000: httpd-suexec-scripts.patch
     59Patch1001: httpd-2.2.x-sni.patch
     60Patch1003: httpd-2.2.x-mod_status-security.patch
     61
    5762%description
    5863The Apache HTTP Server is a powerful, efficient, and extensible
    5964web server.
     
    100105BuildRequires: openssl-devel, distcache-devel
    101106Requires(post): openssl >= 0.9.7f-4, /bin/cat
    102107Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmn}
     108Provides: scripts-mod_ssl
    103109Obsoletes: stronghold-mod_ssl
    104110
    105111%description -n mod_ssl
     
    127133# Patch in vendor/release string
    128134sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    129135
     136%patch1000 -p1 -b .scripts
     137%patch1001 -p1 -b .sni
     138%patch1003 -p1 -b .permitstatus
     139
    130140# Safety check: prevent build if defined MMN does not equal upstream MMN.
    131141vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    132142if test "x${vmmn}" != "x%{mmn}"; then
     
    175185        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    176186        --enable-suexec --with-suexec \
    177187        --with-suexec-caller=%{suexec_caller} \
    178         --with-suexec-docroot=%{contentdir} \
     188        --with-suexec-docroot=/ \
     189        --with-suexec-userdir=web_scripts \
     190        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    179191        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    180192        --with-suexec-bin=%{_sbindir}/suexec \
    181         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     193        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    182194        --enable-pie \
    183195        --with-pcre \
    184196        $*
Note: See TracBrowser for help on using the repository browser.