Ignore:
Timestamp:
Aug 26, 2014, 9:42:29 PM (8 years ago)
Author:
glasgall
Message:
Refresh httpd.spec patch and add allow-null-user patch to fix mod_auth_optional on F20.

File:
1 edited

Legend:

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

    r2551 r2583  
    1 --- httpd.spec.orig     2014-07-23 06:24:15.000000000 -0400
    2 +++ httpd.spec  2014-07-27 17:38:45.622914152 -0400
     1--- rpmbuild/SPECS/httpd.spec.~1~       2014-07-23 06:24:15.000000000 -0400
     2+++ httpd.spec  2014-08-26 21:10:34.994027237 -0400
    33@@ -15,7 +15,7 @@
    44 Summary: Apache HTTP Server
     
    1010 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
    1111 Source1: index.html
    12 @@ -84,6 +84,12 @@
    13  Requires(post): systemd-units
    14  Conflicts: apr < 1.5.0-1
    15  
    16 +Provides: scripts-httpd = %{version}-%{release}
     12@@ -65,6 +65,13 @@
     13 # Bug fixes
     14 Patch55: httpd-2.4.4-malformed-host.patch
     15 Patch56: httpd-2.4.4-mod_unique_id.patch
     16+
    1717+Patch1001: httpd-suexec-scripts.patch
    1818+Patch1002: httpd-mod_status-security.patch
    1919+Patch1003: httpd-304s.patch
    2020+Patch1004: httpd-fixup-vhost.patch
     21+Patch1005: httpd-allow-null-user.patch
    2122+
    22  %description
    23  The Apache HTTP Server is a powerful, efficient, and extensible
    24  web server.
    25 @@ -94,6 +100,7 @@
     23 License: ASL 2.0
     24 Group: System Environment/Daemons
     25 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
     26@@ -77,6 +84,7 @@
     27 Provides: webserver
     28 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release}
     29 Provides: httpd-mmn = %{mmn}, httpd-mmn = %{mmnisa}, httpd-mmn = %{oldmmnisa}
     30+Provides: scripts-httpd = %{version}-%{release}
     31 Requires: httpd-tools = %{version}-%{release}
     32 Requires(pre): /usr/sbin/useradd
     33 Requires(preun): systemd-units
     34@@ -94,6 +102,7 @@
    2635 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel
    2736 Requires: apr-devel, apr-util-devel, pkgconfig
     
    3140 %description devel
    3241 The httpd-devel package contains the APXS binary and other files
    33 @@ -132,6 +139,7 @@
     42@@ -132,6 +141,7 @@
    3443 Requires(post): openssl, /bin/cat
    3544 Requires(pre): httpd
     
    3948 
    4049 %description -n mod_ssl
    41 @@ -196,6 +204,11 @@
    42  # Prevent use of setcap in "install-suexec-caps" target.
    43  sed -i '/suexec/s,setcap ,echo Skipping setcap for ,' Makefile.in
     50@@ -190,6 +200,12 @@
     51 %patch55 -p1 -b .malformedhost
     52 %patch56 -p1 -b .uniqueid
    4453 
    4554+%patch1001 -p1 -b .suexec-scripts
     
    4756+%patch1003 -p1 -b .scripts-304s
    4857+%patch1004 -p1 -b .fixup-vhost
     58+%patch1005 -p1 -b .allow-null-user
    4959+
    50  # Safety check: prevent build if defined MMN does not equal upstream MMN.
    51  vmmn=`echo MODULE_MAGIC_NUMBER_MAJOR | cpp -include include/ap_mmn.h | sed -n '/^2/p'`
    52  if test "x${vmmn}" != "x%{mmn}"; then
    53 @@ -242,11 +255,13 @@
     60 # Patch in the vendor string
     61 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
     62 
     63@@ -242,11 +258,13 @@
    5464        --enable-suexec --with-suexec \
    5565         --enable-suexec-capabilities \
     
    6979         --with-pcre \
    7080         --enable-mods-shared=all \
    71 @@ -542,7 +557,8 @@
     81@@ -542,7 +560,8 @@
    7282 %{_sbindir}/fcgistarter
    7383 %{_sbindir}/apachectl
     
    7989 %dir %{_libdir}/httpd
    8090 %dir %{_libdir}/httpd/modules
     91@@ -1014,3 +1033,8 @@
     92 * Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
     93 - update to 2.2.15 (#572404, #579311)
     94 
     95+Patch1001: httpd-suexec-scripts.patch
     96+Patch1002: httpd-mod_status-security.patch
     97+Patch1003: httpd-304s.patch
     98+Patch1004: httpd-fixup-vhost.patch
     99+Patch1005: httpd-allow-null-user.patch
Note: See TracChangeset for help on using the changeset viewer.