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

Timestamp:

Aug 27, 2014, 10:06:17 PM (9 years ago)

Author:

achernya

Message:

Reintegrate fc20-dev into trunk

Location:

trunk

Files:

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

trunk/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 @@
+--- 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
  Name: httpd
- Version: 2.2.23
+ Version: 2.4.10
 -Release: 1%{?dist}
 +Release: 1%{?dist}.scripts.%{scriptsversion}
@@ -10 +10 @@
  Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
  Source1: index.html
-@@ -57,6 +57,15 @@
- Requires(postun): systemd-units
- Requires(post): systemd-units
- 
+@@ -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
++
+ 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}
-+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
-+
- %description
- The Apache HTTP Server is a powerful, efficient, and extensible
- web server.
-@@ -67,6 +76,7 @@
+ 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
@@ -34 +40 @@
  %description devel
  The httpd-devel package contains the APXS binary and other files
-@@ -105,6 +115,7 @@
+@@ -132,6 +141,7 @@
  Requires(post): openssl, /bin/cat
  Requires(pre): httpd
@@ -42 +48 @@
  
  %description -n mod_ssl
-@@ -131,6 +142,14 @@
- # Patch in vendor/release string
- sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
+@@ -190,6 +200,12 @@
+ %patch55 -p1 -b .malformedhost
+ %patch56 -p1 -b .uniqueid
  
-+%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
++%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
-@@ -191,10 +210,12 @@
-         --with-apr=%{_prefix} --with-apr-util=%{_prefix} \
+ # 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 \
         --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 +78 @@
          --enable-pie \
          --with-pcre \
-        $*
+         --enable-mods-shared=all \
+@@ -542,7 +560,8 @@
+ %{_sbindir}/fcgistarter
+ %{_sbindir}/apachectl
+ %{_sbindir}/rotatelogs
+-%caps(cap_setuid,cap_setgid+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
++# cap_dac_override needed to write to /var/log/httpd
++%caps(cap_setuid,cap_setgid,cap_dac_override+pe) %attr(510,root,%{suexec_caller}) %{_sbindir}/suexec
+ 
+ %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