Changeset 2625 for trunk/server/fedora/specs/httpd.spec.patch
- Timestamp:
- Oct 9, 2014, 3:41:05 AM (10 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/server/fedora/specs/httpd.spec.patch
r2602 r2625 1 --- rpmbuild/SPECS/httpd.spec.~1~ 2014-07-23 06:24:15.000000000 -04002 +++ httpd.spec 2014- 08-26 21:10:34.994027237-04001 --- httpd.spec.~1~ 2014-07-23 06:24:15.000000000 -0400 2 +++ httpd.spec 2014-10-09 03:26:23.922059553 -0400 3 3 @@ -15,7 +15,7 @@ 4 4 Summary: Apache HTTP Server … … 10 10 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2 11 11 Source1: index.html 12 @@ -65,6 +65,1 4@@12 @@ -65,6 +65,15 @@ 13 13 # Bug fixes 14 14 Patch55: httpd-2.4.4-malformed-host.patch … … 21 21 +Patch1005: httpd-allow-null-user.patch 22 22 +Patch1006: httpd-suexec-journald.patch 23 +Patch1007: httpd-bug57070.patch 23 24 + 24 25 License: ASL 2.0 25 26 Group: System Environment/Daemons 26 27 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root 27 @@ -77,6 +8 4,7 @@28 @@ -77,6 +86,7 @@ 28 29 Provides: webserver 29 30 Provides: mod_dav = %{version}-%{release}, httpd-suexec = %{version}-%{release} … … 33 34 Requires(pre): /usr/sbin/useradd 34 35 Requires(preun): systemd-units 35 @@ -94,6 +10 2,7 @@36 @@ -94,6 +104,7 @@ 36 37 Obsoletes: secureweb-devel, apache-devel, stronghold-apache-devel 37 38 Requires: apr-devel, apr-util-devel, pkgconfig … … 41 42 %description devel 42 43 The httpd-devel package contains the APXS binary and other files 43 @@ -132,6 +14 1,7 @@44 @@ -132,6 +143,7 @@ 44 45 Requires(post): openssl, /bin/cat 45 46 Requires(pre): httpd … … 49 50 50 51 %description -n mod_ssl 51 @@ -190,6 +20 0,13@@52 @@ -190,6 +202,14 @@ 52 53 %patch55 -p1 -b .malformedhost 53 54 %patch56 -p1 -b .uniqueid … … 59 60 +%patch1005 -p1 -b .allow-null-user 60 61 +%patch1006 -p1 -b .journald 62 +%patch1007 -p0 -b .bug57070 61 63 + 62 64 # Patch in the vendor string 63 65 sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h 64 66 65 @@ -242,11 +2 58,13 @@67 @@ -242,11 +262,13 @@ 66 68 --enable-suexec --with-suexec \ 67 69 --enable-suexec-capabilities \ … … 81 83 --with-pcre \ 82 84 --enable-mods-shared=all \ 83 @@ -542,7 +56 0,8 @@85 @@ -542,7 +564,8 @@ 84 86 %{_sbindir}/fcgistarter 85 87 %{_sbindir}/apachectl
Note: See TracChangeset
for help on using the changeset viewer.