source: branches/fc19-dev/server/fedora/specs/httpd.spec.patch @ 2422

Last change on this file since 2422 was 2422, checked in by tboning, 9 years ago
Rebase Scripts httpd patches for httpd 2.4:
File size: 2.4 KB
  • httpd.spec

    old new  
    1414Summary: Apache HTTP Server
    1515Name: httpd
    1616Version: 2.4.4
    17 Release: 4%{?dist}
     17Release: 4%{?dist}.scripts.%{scriptsversion}
    1818URL: http://httpd.apache.org/
    1919Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    2020Source1: index.html
     
    7979Requires(postun): systemd-units
    8080Requires(post): systemd-units
    8181
     82Provides: scripts-httpd = %{version}-%{release}
     83Patch1001: httpd-suexec-scripts.patch
     84Patch1002: httpd-mod_status-security.patch
     85Patch1003: httpd-304s.patch
     86Patch1004: httpd-fixup-vhost.patch
     87
    8288%description
    8389The Apache HTTP Server is a powerful, efficient, and extensible
    8490web server.
     
    8995Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    9096Requires: apr-devel, apr-util-devel, pkgconfig
    9197Requires: httpd = %{version}-%{release}
     98Provides: scripts-httpd-devel = %{version}-%{release}
    9299
    93100%description devel
    94101The httpd-devel package contains the APXS binary and other files
     
    127134Requires(post): openssl, /bin/cat
    128135Requires(pre): httpd
    129136Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     137Provides: scripts-mod_ssl
    130138Obsoletes: stronghold-mod_ssl
    131139
    132140%description -n mod_ssl
     
    189197# Prevent use of setcap in "install-suexec-caps" target.
    190198sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    191199
     200%patch1001 -p1 -b .suexec-scripts
     201%patch1002 -p1 -b .mod_status-security
     202%patch1003 -p1 -b .scripts-304s
     203%patch1004 -p1 -b .fixup-vhost
     204
    192205# Safety check: prevent build if defined MMN does not equal upstream MMN.
    193206vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    194207if test "x${vmmn}" != "x%{mmn}"; then
     
    235248        --enable-suexec --with-suexec \
    236249        --enable-suexec-capabilities \
    237250        --with-suexec-caller=%{suexec_caller} \
    238         --with-suexec-docroot=%{docroot} \
    239         --without-suexec-logfile \
    240         --with-suexec-syslog \
     251        --with-suexec-docroot=/ \
     252        --with-suexec-userdir=web_scripts \
     253        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
     254        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     255        --without-suexec-syslog \
    241256        --with-suexec-bin=%{_sbindir}/suexec \
    242         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     257        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    243258        --enable-pie \
    244259        --with-pcre \
    245260        --enable-mods-shared=all \
Note: See TracBrowser for help on using the repository browser.