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

Timestamp:

Aug 28, 2014, 11:31:15 PM (10 years ago)

Author:

achernya

Message:

Behold the glorious, working logview

File:

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

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

@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -65,6 +65,13 @@
+@@ -65,6 +65,14 @@
  # Bug fixes
  Patch55: httpd-2.4.4-malformed-host.patch
@@ -20 +20 @@
 +Patch1004: httpd-fixup-vhost.patch
 +Patch1005: httpd-allow-null-user.patch
++Patch1006: httpd-suexec-journald.patch
 +
  License: ASL 2.0
@@ -48 +49 @@
  
  %description -n mod_ssl
-@@ -190,6 +200,12 @@
+@@ -190,6 +200,13 @@
  %patch55 -p1 -b .malformedhost
  %patch56 -p1 -b .uniqueid
@@ -57 +58 @@
 +%patch1004 -p1 -b .fixup-vhost
 +%patch1005 -p1 -b .allow-null-user
++%patch1006 -p1 -b .journald
 +
  # Patch in the vendor string
@@ -89 +91 @@
  %dir %{_libdir}/httpd
  %dir %{_libdir}/httpd/modules
-@@ -1014,3 +1033,8 @@
- * Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
- - update to 2.2.15 (#572404, #579311)
- 
-+Patch1001: httpd-suexec-scripts.patch
-+Patch1002: httpd-mod_status-security.patch
-+Patch1003: httpd-304s.patch
-+Patch1004: httpd-fixup-vhost.patch
-+Patch1005: httpd-allow-null-user.patch