Ignore:
Timestamp:
May 29, 2013, 1:13:40 AM (9 years ago)
Author:
tboning
Message:
Rebase Scripts httpd patches for httpd 2.4:
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/fc19-dev/server/fedora/specs/httpd.spec.patch

    r2377 r2422  
    1 --- /tmp/httpd/httpd.spec.orig  2013-02-14 17:53:29.967176396 -0500
    2 +++ /tmp/httpd/httpd.spec       2013-02-14 17:54:57.172521444 -0500
    3 @@ -9,7 +9,7 @@
     1--- httpd.spec.orig     2013-05-29 00:46:07.522169507 -0400
     2+++ httpd.spec  2013-05-29 00:46:37.905169507 -0400
     3@@ -14,7 +14,7 @@
    44 Summary: Apache HTTP Server
    55 Name: httpd
    6  Version: 2.2.23
    7 -Release: 1%{?dist}
    8 +Release: 1%{?dist}.scripts.%{scriptsversion}
     6 Version: 2.4.4
     7-Release: 4%{?dist}
     8+Release: 4%{?dist}.scripts.%{scriptsversion}
    99 URL: http://httpd.apache.org/
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -57,6 +57,15 @@
     12@@ -79,6 +79,12 @@
    1313 Requires(postun): systemd-units
    1414 Requires(post): systemd-units
    1515 
    1616+Provides: scripts-httpd = %{version}-%{release}
    17 +Patch1000: httpd-suexec-scripts.patch
    18 +Patch1003: httpd-2.2.x-mod_status-security.patch
    19 +Patch1004: httpd-2.2.x-304.patch
    20 +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
    21 +Patch1006: httpd-suexec-cloexec.patch
    22 +Patch1007: httpd-fixup-vhost.patch
    23 +Patch1008: httpd-SSLCompression.patch
     17+Patch1001: httpd-suexec-scripts.patch
     18+Patch1002: httpd-mod_status-security.patch
     19+Patch1003: httpd-304s.patch
     20+Patch1004: httpd-fixup-vhost.patch
    2421+
    2522 %description
    2623 The Apache HTTP Server is a powerful, efficient, and extensible
    2724 web server.
    28 @@ -67,6 +76,7 @@
     25@@ -89,6 +95,7 @@
    2926 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    3027 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3431 %description devel
    3532 The httpd-devel package contains the APXS binary and other files
    36 @@ -105,6 +115,7 @@
     33@@ -127,6 +134,7 @@
    3734 Requires(post): openssl, /bin/cat
    3835 Requires(pre): httpd
     
    4239 
    4340 %description -n mod_ssl
    44 @@ -131,6 +142,14 @@
    45  # Patch in vendor/release string
    46  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
     41@@ -189,6 +197,11 @@
     42 # Prevent use of setcap in "install-suexec-caps" target.
     43 sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
    4744 
    48 +%patch1000 -p1 -b .scripts
    49 +%patch1003 -p1 -b .permitstatus
    50 +%patch1004 -p1 -b .scripts-304
    51 +%patch1005 -p1 -b .ssl-sessioncache
    52 +%patch1006 -p1 -b .cloexec
    53 +%patch1007 -p1 -b .fixup-vhost
    54 +%patch1008 -p1 -b .sslcompression
     45+%patch1001 -p1 -b .suexec-scripts
     46+%patch1002 -p1 -b .mod_status-security
     47+%patch1003 -p1 -b .scripts-304s
     48+%patch1004 -p1 -b .fixup-vhost
    5549+
    5650 # Safety check: prevent build if defined MMN does not equal upstream MMN.
    5751 vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    5852 if test "x${vmmn}" != "x%{mmn}"; then
    59 @@ -191,10 +210,12 @@
    60          --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
     53@@ -235,11 +248,13 @@
    6154        --enable-suexec --with-suexec \
     55         --enable-suexec-capabilities \
    6256        --with-suexec-caller=%{suexec_caller} \
    63 -       --with-suexec-docroot=%{contentdir} \
     57-       --with-suexec-docroot=%{docroot} \
     58-       --without-suexec-logfile \
     59-        --with-suexec-syslog \
    6460+       --with-suexec-docroot=/ \
    6561+       --with-suexec-userdir=web_scripts \
    6662+       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
    67         --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     63+       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
     64+        --without-suexec-syslog \
    6865        --with-suexec-bin=%{_sbindir}/suexec \
    6966-       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
     
    7168         --enable-pie \
    7269         --with-pcre \
    73         $*
     70         --enable-mods-shared=all \
Note: See TracChangeset for help on using the changeset viewer.