summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorRobert Scheck <robert@fedoraproject.org>2010-04-04 17:10:41 +0000
committerRobert Scheck <robert@fedoraproject.org>2010-04-04 17:10:41 +0000
commit672cc2659388f968d14e1b88e809a6b3a2b811f4 (patch)
treeb9563b4e80f3b1923780a09cbaee7a83757815e0 /httpd.spec
parentc12c47b6c4f38c0d99ac43eefce0700383411699 (diff)
downloadhttpd-672cc2659388f968d14e1b88e809a6b3a2b811f4.tar.gz
httpd-672cc2659388f968d14e1b88e809a6b3a2b811f4.tar.xz
httpd-672cc2659388f968d14e1b88e809a6b3a2b811f4.zip
update to 2.2.15 (#572404, #579311)httpd-2_2_15-1_fc12
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec9
1 files changed, 4 insertions, 5 deletions
diff --git a/httpd.spec b/httpd.spec
index d99c487..258040d 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,7 +6,7 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.2.14
+Version: 2.2.15
Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
@@ -37,8 +37,6 @@ Patch25: httpd-2.2.11-selinux.patch
Patch26: httpd-2.2.9-suenable.patch
# Bug fixes
Patch54: httpd-2.2.0-authnoprov.patch
-# Security fixes
-Patch90: httpd-2.2.14-CVE-2009-3555.patch
License: ASL 2.0
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
@@ -129,8 +127,6 @@ Security (TLS) protocols.
%patch54 -p1 -b .authnoprov
-%patch90 -p1 -b .cve3555
-
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -489,6 +485,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Sun Apr 04 2010 Robert Scheck <robert@fedoraproject.org> - 2.2.15-1
+- update to 2.2.15 (#572404, #579311)
+
* Thu Dec 3 2009 Joe Orton <jorton@redhat.com> - 2.2.14-1
- update to 2.2.14
- relax permissions on /var/run/httpd (#495780)