[httpd/f19] update to 2.4.10
jorton
jorton at fedoraproject.org
Thu Jul 31 11:10:12 UTC 2014
commit 768904369046213fb04b35d72cf124b3c2ffde07
Author: Joe Orton <jorton at redhat.com>
Date: Mon Jul 21 22:05:49 2014 +0100
update to 2.4.10
Conflicts:
httpd.spec
.gitignore | 1 +
httpd-2.4.7-r1537535.patch | 38 --------------------------------------
httpd-2.4.9-r1573626.patch | 29 -----------------------------
httpd.spec | 9 ++++-----
sources | 1 +
5 files changed, 6 insertions(+), 72 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index dbc83cb..def012c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ x86_64
/httpd-2.4.6.tar.bz2
/httpd-2.4.7.tar.bz2
/httpd-2.4.9.tar.bz2
+/httpd-2.4.10.tar.bz2
diff --git a/httpd.spec b/httpd.spec
index 2f1ce08..cda5cbd 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -13,7 +13,7 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.9
+Version: 2.4.10
Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
@@ -61,8 +61,6 @@ Patch27: httpd-2.4.2-icons.patch
Patch29: httpd-2.4.3-mod_systemd.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch31: httpd-2.4.6-sslmultiproxy.patch
-Patch32: httpd-2.4.7-r1537535.patch
-Patch33: httpd-2.4.9-r1573626.patch
# Bug fixes
Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
@@ -187,8 +185,6 @@ interface for storing and accessing per-user session data.
%patch29 -p1 -b .systemd
%patch30 -p1 -b .cachehardmax
%patch31 -p1 -b .sslmultiproxy
-%patch32 -p1 -b .r1537535
-%patch33 -p1 -b .r1573626
%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
@@ -618,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT
%{_sysconfdir}/rpm/macros.httpd
%changelog
+* Mon Jul 21 2014 Joe Orton <jorton at redhat.com> - 2.4.10-1
+- update to 2.4.10
+
* Wed Apr 09 2014 Jan Kaluza <jkaluza at redhat.com> - 2.4.9-1
- update to 2.4.9
- add support for SetHandler + proxy (#1078970)
diff --git a/sources b/sources
index 43c32ab..eb72d86 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
2ef4e65353497606b24fa9bb3e5a3c40 httpd-2.4.9.tar.bz2
+44543dff14a4ebc1e9e2d86780507156 httpd-2.4.10.tar.bz2
More information about the scm-commits
mailing list