Changeset 2422 for branches/fc19-dev/server/fedora

Timestamp:

May 29, 2013, 1:13:40 AM (11 years ago)

Author:

tboning

Message:

Rebase Scripts httpd patches for httpd 2.4:

File:

• branches/fc19-dev/server/fedora/specs/httpd.spec.patch (modified) (4 diffs)

branches/fc19-dev/server/fedora/specs/httpd.spec.patch

@@ -1 @@
---- /tmp/httpd/httpd.spec.orig  2013-02-14 17:53:29.967176396 -0500
-+++ /tmp/httpd/httpd.spec       2013-02-14 17:54:57.172521444 -0500
-@@ -9,7 +9,7 @@
+--- httpd.spec.orig     2013-05-29 00:46:07.522169507 -0400
++++ httpd.spec  2013-05-29 00:46:37.905169507 -0400
+@@ -14,7 +14,7 @@
  Summary: Apache HTTP Server
  Name: httpd
- Version: 2.2.23
--Release: 1%{?dist}
-+Release: 1%{?dist}.scripts.%{scriptsversion}
+ Version: 2.4.4
+-Release: 4%{?dist}
++Release: 4%{?dist}.scripts.%{scriptsversion}
  URL: http://httpd.apache.org/
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -57,6 +57,15 @@
+@@ -79,6 +79,12 @@
  Requires(postun): systemd-units
  Requires(post): systemd-units
  
 +Provides: scripts-httpd = %{version}-%{release}
-+Patch1000: httpd-suexec-scripts.patch
-+Patch1003: httpd-2.2.x-mod_status-security.patch
-+Patch1004: httpd-2.2.x-304.patch
-+Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
-+Patch1006: httpd-suexec-cloexec.patch
-+Patch1007: httpd-fixup-vhost.patch
-+Patch1008: httpd-SSLCompression.patch
++Patch1001: httpd-suexec-scripts.patch
++Patch1002: httpd-mod_status-security.patch
++Patch1003: httpd-304s.patch
++Patch1004: httpd-fixup-vhost.patch
 +
  %description
  The Apache HTTP Server is a powerful, efficient, and extensible
  web server.
-@@ -67,6 +76,7 @@
+@@ -89,6 +95,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -34 +31 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -105,6 +115,7 @@
+@@ -127,6 +134,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42 +39 @@
  
  %description -n mod_ssl
-@@ -131,6 +142,14 @@
- # Patch in vendor/release string
- sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
+@@ -189,6 +197,11 @@
+ # Prevent use of setcap in "install-suexec-caps" target.
+ sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
  
-+%patch1000 -p1 -b .scripts
-+%patch1003 -p1 -b .permitstatus
-+%patch1004 -p1 -b .scripts-304
-+%patch1005 -p1 -b .ssl-sessioncache
-+%patch1006 -p1 -b .cloexec
-+%patch1007 -p1 -b .fixup-vhost
-+%patch1008 -p1 -b .sslcompression
++%patch1001 -p1 -b .suexec-scripts
++%patch1002 -p1 -b .mod_status-security
++%patch1003 -p1 -b .scripts-304s
++%patch1004 -p1 -b .fixup-vhost
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.
  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
  if test "x${vmmn}" != "x%{mmn}"; then
-@@ -191,10 +210,12 @@
-         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
+@@ -235,11 +248,13 @@
         --enable-suexec --with-suexec \
+         --enable-suexec-capabilities \
         --with-suexec-caller=%{suexec_caller} \
--       --with-suexec-docroot=%{contentdir} \
+-       --with-suexec-docroot=%{docroot} \
+-       --without-suexec-logfile \
+-        --with-suexec-syslog \
 +       --with-suexec-docroot=/ \
 +       --with-suexec-userdir=web_scripts \
 +       --with-suexec-trusteddir=/usr/libexec/scripts-trusted \
-        --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
++       --with-suexec-logfile=%{_localstatedir}/log/httpd/suexec.log \
++        --without-suexec-syslog \
         --with-suexec-bin=%{_sbindir}/suexec \
 -       --with-suexec-uidmin=500 --with-suexec-gidmin=100 \
@@ -71 +68 @@
          --enable-pie \
          --with-pcre \
-        $*
+         --enable-mods-shared=all \