Changeset 1356 for trunk/server/fedora/specs/httpd.spec.patch

Timestamp:

Nov 9, 2009, 11:14:34 PM (15 years ago)

Author:

andersk

Message:

suexec: Fix error logging if execv failed.

Patch from httpd trunk r821321.

File:

• trunk/server/fedora/specs/httpd.spec.patch (modified) (4 diffs)

trunk/server/fedora/specs/httpd.spec.patch

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
  Source1: index.html
-@@ -55,6 +55,12 @@
+@@ -55,6 +55,13 @@
  Conflicts: pcre < 4.0
  Requires: httpd-tools = %{version}-%{release}, apr-util-ldap
@@ -19 +19 @@
 +Patch1004: httpd-2.2.x-304.patch
 +Patch1005: httpd-2.2.x-mod_ssl-sessioncaching.patch
++Patch1006: httpd-suexec-cloexec.patch
 +
  %description
@@ -31 +32 @@
  
  %description -n mod_ssl
-@@ -128,6 +135,11 @@
+@@ -128,6 +135,12 @@
  # Patch in vendor/release string
  sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -39 +40 @@
 +%patch1004 -p1 -b .scripts-304
 +%patch1005 -p1 -b .ssl-sessioncache
++%patch1006 -p1 -b .cloexec
 +
  # Safety check: prevent build if defined MMN does not equal upstream MMN.