- up to 2.2.26

diff --git a/apache-bug-50002.patch b/apache-bug-50002.patch
index b9363af7f631ffb63e5ce03966404aaf9adcfe1a..89d5da302151da52893691c13c4802fb45200ca5 100644 (file)
--- a/apache-bug-50002.patch
+++ b/apache-bug-50002.patch
@@ -11,19 +11,6 @@ Date:   Sat Oct 2 14:44:20 2010 +0000
     
     git-svn-id: http://svn.apache.org/repos/asf/httpd/httpd/trunk@1003808 13f79535-47bb-0310-9956-ffa450edef68
 
-diff --git a/include/ap_mmn.h b/include/ap_mmn.h
-index f44a22b..5207637 100644
---- a/include/ap_mmn.h
-+++ b/include/ap_mmn.h
-@@ -156,7 +156,7 @@
- #ifndef MODULE_MAGIC_NUMBER_MAJOR
- #define MODULE_MAGIC_NUMBER_MAJOR 20051115
- #endif
--#define MODULE_MAGIC_NUMBER_MINOR 31                    /* 0...n */
-+#define MODULE_MAGIC_NUMBER_MINOR 32                    /* 0...n */
- 
- /**
-  * Determine if the server's current MODULE_MAGIC_NUMBER is at least a
 diff --git a/include/util_cfgtree.h b/include/util_cfgtree.h
 index 4da4c7d..791a5cc 100644
 --- a/include/util_cfgtree.h

diff --git a/apache.spec b/apache.spec
index 9fcbec8ab9df69f6c2fddb60e899e37a9f916c05..43346d9cb17d69bde528ccc4481367004a2b9837 100644 (file)
--- a/apache.spec
+++ b/apache.spec
@@ -43,12 +43,12 @@ Summary(pt_BR.UTF-8):       Servidor HTTPD para prover serviços WWW
 Summary(ru.UTF-8):     Самый популярный веб-сервер
 Summary(tr.UTF-8):     Lider WWW tarayıcı
 Name:          apache
-Version:       2.2.24
-Release:       9
+Version:       2.2.26
+Release:       1
 License:       Apache v2.0
 Group:         Networking/Daemons/HTTP
 Source0:       http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
-# Source0-md5: 64a3392018ad60583209a16d728180d3
+# Source0-md5: 8f580ea4f8476d5fb131b772beca33b2
 Source1:       %{name}.init
 Source2:       %{name}.logrotate
 Source3:       %{name}.sysconfig