summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2004-10-15 15:36:49 +0000
committerjorton <jorton@fedoraproject.org>2004-10-15 15:36:49 +0000
commita52696df5e0cabaab71247e92a0f8910fe867884 (patch)
treeac23978def8e14981d2cf6364f9c1f350278d122 /httpd.spec
parent2bc479e77012b87f27956c6c47e5b6e7ecb41f99 (diff)
downloadhttpd-a52696df5e0cabaab71247e92a0f8910fe867884.tar.gz
httpd-a52696df5e0cabaab71247e92a0f8910fe867884.tar.xz
httpd-a52696df5e0cabaab71247e92a0f8910fe867884.zip
- add dummy connection address fixes from HEAD
- mod_ssl: add security fix for CAN-2004-0885
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec5
1 files changed, 5 insertions, 0 deletions
diff --git a/httpd.spec b/httpd.spec
index e451590..335c76b 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -68,6 +68,8 @@ Patch89: httpd-2.0.49-headerssl.patch
Patch90: httpd-2.0.49-workerstack.patch
Patch91: httpd-2.0.46-testhook.patch
Patch92: httpd-2.0.46-dumpcerts.patch
+# Security fixes
+Patch120: httpd-2.0.52-CAN-2004-0885.patch
License: Apache Software License
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-root
@@ -178,6 +180,8 @@ executed by SSI pages) as a user other than the 'apache' user.
%patch91 -p1 -b .testhook
%patch92 -p1 -b .dumpcerts
+%patch120 -p1 -b .can0885
+
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH70} | patch -p1
@@ -577,6 +581,7 @@ rm -rf $RPM_BUILD_ROOT
%changelog
* Thu Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-3
- add dummy connection address fixes from HEAD
+- mod_ssl: add security fix for CAN-2004-0885
* Tue Sep 28 2004 Joe Orton <jorton@redhat.com> 2.0.52-2
- update to 2.0.52