summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJan Kaluza <jkaluza@redhat.com>2015-03-27 09:33:08 +0100
committerJan Kaluza <jkaluza@redhat.com>2015-03-27 09:33:08 +0100
commit16a9524e2662d986755b000dd55ee867b4468f79 (patch)
treebbfdd19acec5b6337da2a8de46c0cc85519285be /httpd.spec
parentb4adeb746b71e5ff2f8d7d06dbbb0955c6063a9b (diff)
downloadhttpd-16a9524e2662d986755b000dd55ee867b4468f79.tar.gz
httpd-16a9524e2662d986755b000dd55ee867b4468f79.tar.xz
httpd-16a9524e2662d986755b000dd55ee867b4468f79.zip
update to 2.4.12
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec16
1 files changed, 5 insertions, 11 deletions
diff --git a/httpd.spec b/httpd.spec
index 9787cbf..c9c3349 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,8 +7,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.10
-Release: 17%{?dist}
+Version: 2.4.12
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -68,10 +68,6 @@ Patch55: httpd-2.4.4-malformed-host.patch
Patch56: httpd-2.4.4-mod_unique_id.patch
Patch57: httpd-2.4.10-sigint.patch
# Security fixes
-Patch100: httpd-2.4.6-CVE-2013-5704.patch
-Patch101: httpd-2.4.6-CVE-2014-3581.patch
-Patch102: httpd-2.4.10-CVE-2014-3583.patch
-Patch103: httpd-2.4.10-CVE-2014-8109.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -217,11 +213,6 @@ interface for storing and accessing per-user session data.
%patch56 -p1 -b .uniqueid
%patch57 -p1 -b .sigint
-%patch100 -p1 -b cve20135704
-%patch101 -p1 -b cve20143581
-%patch102 -p1 -b cve20143583
-%patch103 -p1 -b cve20148109
-
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -675,6 +666,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Fri Mar 27 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.12-1
+- update to 2.4.12
+
* Tue Mar 24 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.10-17
- fix compilation with lua-5.3