Branch '2.3-stable' - 2 commits - apache/apache.spec apache/ChangeLog

[Christoph Wickert]

 apache/ChangeLog   |   12 ------------
 apache/apache.spec |    7 +++++--
 2 files changed, 5 insertions(+), 14 deletions(-)

New commits:
commit 4066b337abde1d573bed6d1f96e39742303de89b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sat Sep 17 12:46:08 2011 +0200

    apache: Update to 2.2.21 (includes another fix for CVE-2011-3192)

diff --git a/apache/apache.spec b/apache/apache.spec
index 3d5a310..45baabb 100644
--- a/apache/apache.spec
+++ b/apache/apache.spec
@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Web
 License:      ASF
-Version:      2.2.20
-Release:      20110912
+Version:      2.2.21
+Release:      20110917
 
 #   package options
 %option       with_mpm_prefork          yes
@@ -347,6 +347,9 @@ AutoReqProv:  no
     exit 0
 
 %changelog
+* Sat Sep 17 2011 Christoph Wickert <wickert at kolabsys.com> - 2.2.21-20110917
+- Update to 2.2.21 (includes another fix for CVE-2011-3192)
+
 * Mon Sep 12 2011 Christoph Wickert <wickert at kolabsys.com> - 2.2.20-20110912
 - Update to 2.2.20 (fixes CVE-2011-3192)
 


commit 029dda9695afbe2ac844a5ef5c6eb7ab50b3687b
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Sat Sep 17 12:44:24 2011 +0200

    apache: Remove ChangeLog, all info is supposed to be in the %changelog section of apache.spec

diff --git a/apache/ChangeLog b/apache/ChangeLog
deleted file mode 100644
index bae53f9..0000000
--- a/apache/ChangeLog
+++ /dev/null
@@ -1,12 +0,0 @@
-2011-09-12  Christoph Wickert  <wickert at kolabsys.com>
-
-	* apache.spec (Version): Update to 2.2.20.
-
-2010-12-01  Christoph Wickert  <wickert at kolabsys.com>
-
-	* apache.spec (Version): Update to 2.2.17.
-
-2010-10-12  Gunnar Wrobel  <p at rdus.de>
-
-	* apache.spec (Version): Update to 2.2.16.
-