source: branches/fc15-dev/server/fedora/specs/httpd.spec.patch @ 1952

Last change on this file since 1952 was 1952, checked in by achernya, 12 years ago
Make httpd.spec.patch have versioned Provides httpdmods uses a versioned Requires on scripts-httpd, but scripts-httpd was previously unversioned. RPM and friends treat this as "provides any version" (as opposed to version 0), satisfying the Requires without actually doing any useful checks.
File size: 2.5 KB
  • httpd.spec

    old new  
    88Summary: Apache HTTP Server
    99Name: httpd
    1010Version: 2.2.19
    11 Release: 2%{?dist}
     11Release: 2%{?dist}.scripts.%{scriptsversion}
    1414Source1: index.html
    5252Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}
    5353Requires: httpd-tools = %{version}-%{release}, apr-util-ldap, systemd-units
     55Provides: scripts-httpd = %{version}-%{release}
     56Patch1000: httpd-suexec-scripts.patch
     57Patch1003: httpd-2.2.x-mod_status-security.patch
     58Patch1004: httpd-2.2.x-304.patch
     59Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
     60Patch1006: httpd-suexec-cloexec.patch
     61Patch1007: httpd-fixup-vhost.patch
    5664The Apache HTTP Server is a powerful, efficient, and extensible
    5765web server.
    6270Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    6371Requires: apr-devel, apr-util-devel, pkgconfig
    6472Requires: httpd = %{version}-%{release}
     73Provides: scripts-httpd-devel = %{version}-%{release}
    6675%description devel
    6776The httpd-devel package contains the APXS binary and other files
    100109Requires(post): openssl, /bin/cat
    101110Requires(pre): httpd
    102111Requires: httpd = 0:%{version}-%{release}, httpd-mmn = %{mmnisa}
     112Provides: scripts-mod_ssl
    103113Obsoletes: stronghold-mod_ssl
    105115%description -n mod_ssl
    125135# Patch in vendor/release string
    126136sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     138%patch1000 -p1 -b .scripts
     139%patch1003 -p1 -b .permitstatus
     140%patch1004 -p1 -b .scripts-304
     141%patch1005 -p1 -b .ssl-sessioncache
     142%patch1006 -p1 -b .cloexec
     143%patch1007 -p1 -b .fixup-vhost
    128145# Safety check: prevent build if defined MMN does not equal upstream MMN.
    129146vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    130147if test "x${vmmn}" != "x%{mmn}"; then
    172189        --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
    173190        --enable-suexec --with-suexec \
    174191        --with-suexec-caller=%{suexec_caller} \
    175         --with-suexec-docroot=%{contentdir} \
     192        --with-suexec-docroot=/ \
     193        --with-suexec-userdir=web_scripts \
     194        --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    176195        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
    177196        --with-suexec-bin=%{_sbindir}/suexec \
    178         --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     197        --with-suexec-uidmin=50 --with-suexec-gidmin=50 \
    179198        --enable-pie \
    180199        --with-pcre \
    181200        $*
Note: See TracBrowser for help on using the repository browser.