Changeset 2583 for branches/fc20-dev/server

Timestamp:

Aug 26, 2014, 9:42:29 PM (10 years ago)

Author:

glasgall

Message:

Refresh httpd.spec patch and add allow-null-user patch to fix mod_auth_optional on F20.

File:

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

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

@@ -1 @@
---- httpd.spec.orig     2014-07-23 06:24:15.000000000 -0400
-+++ httpd.spec  2014-07-27 17:38:45.622914152 -0400
+--- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
++++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
 @@ -15,7 +15,7 @@
  Summary: Apache HTTP Server
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -84,6 +84,12 @@
- Requires(post): systemd-units
- Conflicts: apr < 1.5.0-1
- 
-+Provides: scripts-httpd = %{version}-%{release}
+@@ -65,6 +65,13 @@
+ # Bug fixes
+ Patch55: httpd-2.4.4-malformed-host.patch
+ Patch56: httpd-2.4.4-mod_unique_id.patch
++
 +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
 +
- %description
- The Apache HTTP Server is a powerful, efficient, and extensible
- web server.
-@@ -94,6 +100,7 @@
+ License: ASL 2.0
+ Group: System Environment/Daemons
+ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+@@ -77,6 +84,7 @@
+ Provides: webserver
+ Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
+ Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
++Provides: scripts-httpd = %{version}-%{release}
+ Requires: httpd-tools = %{version}-%{release}
+ Requires(pre): /usr/sbin/useradd
+ Requires(preun): systemd-units
+@@ -94,6 +102,7 @@
  Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
  Requires: apr-devel, apr-util-devel, pkgconfig
@@ -31 +40 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -132,6 +139,7 @@
+@@ -132,6 +141,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -39 +48 @@
  
  %description -n mod_ssl
-@@ -196,6 +204,11 @@
- # Prevent use of setcap in "install-suexec-caps" target.
- sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
+@@ -190,6 +200,12 @@
+ %patch55 -p1 -b .malformedhost
+ %patch56 -p1 -b .uniqueid
  
 +%patch1001 -p1 -b .suexec-scripts
@@ -47 +56 @@
 +%patch1003 -p1 -b .scripts-304s
 +%patch1004 -p1 -b .fixup-vhost
++%patch1005 -p1 -b .allow-null-user
 +
- # 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
-@@ -242,11 +255,13 @@
+ # Patch in the vendor string
+ sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
+ 
+@@ -242,11 +258,13 @@
         --enable-suexec --with-suexec \
          --enable-suexec-capabilities \
@@ -69 +79 @@
          --with-pcre \
          --enable-mods-shared=all \
-@@ -542,7 +557,8 @@
+@@ -542,7 +560,8 @@
  %{_sbindir}/fcgistarter
  %{_sbindir}/apachectl
@@ -79 +89 @@
  %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