source: branches/fc17-dev/server/fedora/specs/httpd.spec.patch @ 2198

Last change on this file since 2198 was 2198, checked in by ezyang, 10 years ago
Untested version bumps for all spec files.
File size: 2.8 KB
  • httpd.spec

    old new  
    99Summary: Apache HTTP Server
    1010Name: httpd
    1111Version: 2.2.22
    12 Release: 4%{?dist}
     12Release: 4%{?dist}.scripts.%{scriptsversion}
    1313URL: http://httpd.apache.org/
    1414Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1515Source1: index.html
     
    5858Requires(postun): systemd-units
    5959Requires(post): systemd-units
    6060
     61Provides: scripts-httpd = %{version}-%{release}
     62Patch1000: httpd-suexec-scripts.patch
     63Patch1003: httpd-2.2.x-mod_status-security.patch
     64Patch1004: httpd-2.2.x-304.patch
     65Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
     66Patch1006: httpd-suexec-cloexec.patch
     67Patch1007: httpd-fixup-vhost.patch
     68Patch1008: httpd-sysv-deps.patch
     69
    6170%description
    6271The Apache HTTP Server is a powerful, efficient, and extensible
    6372web server.
     
    6877Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    6978Requires: apr-devel, apr-util-devel, pkgconfig
    7079Requires: httpd = %{version}-%{release}
     80Provides: scripts-httpd-devel = %{version}-%{release}
    7181
    7282%description devel
    7383The httpd-devel package contains the APXS binary and other files
     
    106116Requires(post): openssl, /bin/cat
    107117Requires(pre): httpd
    108118Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     119Provides: scripts-mod_ssl
    109120Obsoletes: stronghold-mod_ssl
    110121
    111122%description -n mod_ssl
     
    114125Security (TLS) protocols.
    115126
    116127%prep
     128
     129# Horrible hack to patch the httpd.init file
     130cd $RPM_SOURCE_DIR
     131%patch1008 -p1 -b .sysv-deps
     132
    117133%setup -q
    118134%patch1 -p1 -b .apctl
    119135%patch2 -p1 -b .apxs
     
    133149# Patch in vendor/release string
    134150sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
    135151
     152%patch1000 -p1 -b .scripts
     153%patch1003 -p1 -b .permitstatus
     154%patch1004 -p1 -b .scripts-304
     155%patch1005 -p1 -b .ssl-sessioncache
     156%patch1006 -p1 -b .cloexec
     157%patch1007 -p1 -b .fixup-vhost
     158# Note that patch1008 is not here, as it patches the initscript elsewhere in this .spec
     159
    136160# Safety check: prevent build if defined MMN does not equal upstream MMN.
    137161vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    138162if test "x${vmmn}" != "x%{mmn}"; then
     
    193217        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    194218        --enable-suexec --with-suexec \
    195219        --with-suexec-caller=%{suexec_caller} \
    196         --with-suexec-docroot=%{contentdir} \
     220        --with-suexec-docroot=/ \
     221        --with-suexec-userdir=web_scripts \
     222        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    197223        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    198224        --with-suexec-bin=%{_sbindir}/suexec \
    199         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     225        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    200226        --enable-pie \
    201227        --with-pcre \
    202228        $*
Note: See TracBrowser for help on using the repository browser.