summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorLuboš Uhliarik <luhliari@redhat.com>2016-12-22 15:40:14 +0100
committerLuboš Uhliarik <luhliari@redhat.com>2016-12-22 16:05:36 +0100
commitad0d0a1ae06862b6dafa940135e7e628e74ab325 (patch)
tree8c422f46c2e03b131e4b17f7d0fcfbdc161a000a /httpd.spec
parent92e639b8c0ca510ec634fab0e483234e49315c80 (diff)
downloadhttpd-ad0d0a1ae06862b6dafa940135e7e628e74ab325.tar.gz
httpd-ad0d0a1ae06862b6dafa940135e7e628e74ab325.tar.xz
httpd-ad0d0a1ae06862b6dafa940135e7e628e74ab325.zip
new version 2.4.25
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec15
1 files changed, 6 insertions, 9 deletions
diff --git a/httpd.spec b/httpd.spec
index d9d0eca..b73c1d2 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,8 +7,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.4.23
-Release: 7%{?dist}
+Version: 2.4.25
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -63,12 +63,10 @@ Patch31: httpd-2.4.18-sslmultiproxy.patch
Patch34: httpd-2.4.17-socket-activation.patch
Patch35: httpd-2.4.17-sslciphdefault.patch
# Bug fixes
-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.18-CVE-2016-5387.patch
-Patch101: httpd-2.4.23-CVE-2016-8740.patch
+
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -210,13 +208,9 @@ interface for storing and accessing per-user session data.
%patch34 -p1 -b .socketactivation
%patch35 -p1 -b .sslciphdefault
-%patch55 -p1 -b .malformedhost
%patch56 -p1 -b .uniqueid
%patch57 -p1 -b .sigint
-%patch100 -p1 -b .cve5387
-%patch101 -p1 -b .cve8740
-
# Patch in the vendor string
sed -i '/^#define PLATFORM/s/Unix/%{vstring}/' os/unix/os.h
@@ -686,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Thu Dec 22 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.25-1
+- new version 2.4.25
+
* Mon Dec 05 2016 Luboš Uhliarik <luhliari@redhat.com> - 2.4.23-7
- Resolves: #1401530 - CVE-2016-8740 httpd: Incomplete handling of
LimitRequestFields directive in mod_http2