summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorJan Kaluza <jkaluza@redhat.com>2015-10-14 10:52:58 +0200
committerJan Kaluza <jkaluza@redhat.com>2015-10-14 10:52:58 +0200
commitc2c03777d60b6b589605bc46d9937e69f5a1de72 (patch)
tree8cec27344e2ea39a4b2751ecfc25e6f5e4d85a72 /httpd.spec
parent91a2788bcecc45df329bd121a15ea7ec86285d82 (diff)
downloadhttpd-c2c03777d60b6b589605bc46d9937e69f5a1de72.tar.gz
httpd-c2c03777d60b6b589605bc46d9937e69f5a1de72.tar.xz
httpd-c2c03777d60b6b589605bc46d9937e69f5a1de72.zip
rebase socket activation patch to 2.4.17
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec9
1 files changed, 6 insertions, 3 deletions
diff --git a/httpd.spec b/httpd.spec
index 8f10cd4..1e9570b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -8,7 +8,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.4.17
-Release: 1%{?dist}
+Release: 2%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
Source1: index.html
@@ -60,7 +60,7 @@ Patch27: httpd-2.4.2-icons.patch
Patch29: httpd-2.4.10-mod_systemd.patch
Patch30: httpd-2.4.4-cachehardmax.patch
Patch31: httpd-2.4.6-sslmultiproxy.patch
-Patch34: httpd-2.4.9-socket-activation.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
@@ -204,7 +204,7 @@ interface for storing and accessing per-user session data.
%patch29 -p1 -b .systemd
%patch30 -p1 -b .cachehardmax
%patch31 -p1 -b .sslmultiproxy
-#patch34 -p1 -b .socketactivation
+%patch34 -p1 -b .socketactivation
%patch35 -p1 -b .sslciphdefault
%patch55 -p1 -b .malformedhost
@@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT
%{_rpmconfigdir}/macros.d/macros.httpd
%changelog
+* Wed Oct 14 2015 Jan Kaluza <jkaluza@redhat.com> - 2.4.17-2
+- rebase socket activation patch to 2.4.17
+
* Tue Oct 13 2015 Joe Orton <jorton@redhat.com> - 2.4.17-1
- update to 2.4.17 (#1271224)
- build, load mod_http2