- updated to 2.0.58, removed CVE patches (already in sources)

- builds, not tested

Changed files:
    apache.spec -> 1.419.2.6

diff --git a/apache.spec b/apache.spec
index 276d15474a212f3f3a311b6cfa830693365c5533..d7e09e155a3ac638c08dfcea8fe48e2a49babfa2 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -33,12 +33,12 @@ Summary(pt_BR):     Servidor HTTPD para prover servi
 Summary(ru):   óÁÍÙÊ ÐÏÐÕÌÑÒÎÙÊ ×ÅÂ-ÓÅÒ×ÅÒ
 Summary(tr):   Lider WWW tarayýcý
 Name:          apache
-Version:       2.0.55
-Release:       5
+Version:       2.0.58
+Release:       1
 License:       Apache Group License
 Group:         Networking/Daemons
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: b45f16a9878e709497820565d42b00b9
+# Source0-md5: a03eeefee78c01ec24c8671380763860
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}-icons.tar.gz
@@ -88,8 +88,6 @@ Patch22:      %{name}-apr1.patch
 Patch23:       %{name}-normalize-path.patch
 # http://issues.apache.org/bugzilla/attachment.cgi?id=13377 external pcre
 Patch24:       %{name}2-pcre-patch.diff
-Patch25:       %{name}-CVE-2005-3352.patch
-Patch26:       %{name}-CVE-2005-3357.patch
 URL:           http://httpd.apache.org/
 BuildRequires: apr-devel >= 1:1.0.0
 BuildRequires: apr-util-devel >= 1:1.0.0
@@ -792,8 +790,6 @@ Dwa programy testowe/przyk
 %patch22 -p1
 %patch23 -p1
 %{?with_external_pcre:%patch24 -p2}
-%patch25 -p0
-%patch26 -p0
 
 %{__perl} -pi -e "s@/usr/local/bin/perl@%{__perl}@" $(grep -rl "/usr/local/bin/perl" *)
 %{__perl} -pi -e "s@BUILD_SUBDIRS.*@BUILD_SUBDIRS =@g" srclib/Makefile.in