summaryrefslogtreecommitdiffstats
path: root/httpd.spec
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2007-09-18 13:34:14 +0000
committerjorton <jorton@fedoraproject.org>2007-09-18 13:34:14 +0000
commit3d1f4a9625341c987e20ccd35802ad366fda8c5c (patch)
treeee95c76ac7e64ca73b6dcecc54af815e9a002d0e /httpd.spec
parent08c99dd2996dcba9fc7d0887783be83db5d7bdea (diff)
- update to 2.2.6httpd-2_2_6-1_fc7
- require /etc/mime.types (#249223)
Diffstat (limited to 'httpd.spec')
-rw-r--r--httpd.spec24
1 files changed, 11 insertions, 13 deletions
diff --git a/httpd.spec b/httpd.spec
index 0fdb365..3fe053e 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -5,8 +5,8 @@
Summary: Apache HTTP Server
Name: httpd
-Version: 2.2.4
-Release: 4.1%{?dist}
+Version: 2.2.6
+Release: 1%{?dist}
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -36,18 +36,15 @@ Patch24: httpd-2.0.48-corelimit.patch
Patch25: httpd-2.0.54-selinux.patch
# Bug fixes
Patch54: httpd-2.2.0-authnoprov.patch
-# Security fixes
-Patch70: httpd-2.2.3-CVE-2006-5752.patch
-Patch71: httpd-2.2.3-CVE-2007-1863.patch
-Patch72: httpd-2.2.3-CVE-2007-3304.patch
-Patch73: httpd-2.2.4-CVE-2007-1862.patch
+Patch55: httpd-2.2.4-oldflush.patch
+Patch56: httpd-2.2.6-ssllibver.patch
License: Apache Software License
Group: System Environment/Daemons
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
BuildRequires: autoconf, perl, pkgconfig, findutils, ed
BuildRequires: db4-devel, expat-devel, zlib-devel, libselinux-devel
BuildRequires: apr-devel >= 1.2.0, apr-util-devel >= 1.2.0, pcre-devel >= 5.0
-Requires: initscripts >= 8.36
+Requires: initscripts >= 8.36, /etc/mime.types
Obsoletes: httpd-suexec
Requires(pre): /usr/sbin/useradd
Requires(post): chkconfig
@@ -117,11 +114,8 @@ Security (TLS) protocols.
%patch25 -p1 -b .selinux
%patch54 -p1 -b .authnoprov
-
-%patch70 -p1 -b .cve5752
-%patch71 -p1 -b .cve1863
-%patch72 -p1 -b .cve3304
-%patch73 -p1 -b .cve1862
+%patch55 -p1 -b .oldflush
+%patch56 -p1 -b .ssllibver
# Patch in vendor/release string
sed "s/@RELEASE@/%{vstring}/" < %{PATCH20} | patch -p1
@@ -471,6 +465,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Tue Sep 18 2007 Joe Orton <jorton@redhat.com> 2.2.6-1.fc7
+- update to 2.2.6
+- require /etc/mime.types (#249223)
+
* Tue Jun 26 2007 Joe Orton <jorton@redhat.com> 2.2.4-4.1.fc7
- add security fixes for CVE-2007-1863, CVE-2007-3304,
and CVE-2006-5752 (#244665)