[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, next, updated. d45a03625ca7399ba492081c586fc31ee49a76dd

[Arno Töll]

The following commit has been merged in the next branch:
commit d45a03625ca7399ba492081c586fc31ee49a76dd
Author: Arno Töll <debian at toell.net>
Date:   Thu Feb 2 23:55:57 2012 +0100

    * Merge Stefan's changelog from 2.2.22-1
    * Add a transition chain which allows upgrades to the new packages when
      upgrading from Squeeze. Many thanks to brlink to assist me
      A real upgrade is still broken, but it's a start

diff --git a/debian/changelog b/debian/changelog
index bb1e466..bb1b53c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
+apache2 (2.3.16-beta-1) experimental; urgency=low
 
   * Package the coming up 2.4 branch of Apache by packaging the current
     development release 2.3.16.
@@ -61,19 +61,25 @@ apache2 (2.3.16-beta-1) UNRELEASED; urgency=low
     + Parse "Conflicts: " header to denote conflicts between modules which
       cannot be loaded into the same Apache server.
 
- -- Arno Töll <debian at toell.net>  Wed, 01 Feb 2012 22:49:14 +0100
+ -- Arno Töll <debian at toell.net>  Thu, 02 Feb 2012 23:51:16 +0100
 
-apache2 (2.2.21-6) UNRELEASED; urgency=low
 
-  [ Arno Töll ]
-  * Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)
-
-  [ Stefan Fritsch ]
-  * Adjust debian/control to point to new git repository.
+   [ Stefan Fritsch ]
+   * New upstream release, urgency medium due to security fixes:
+     - Fix CVE-2012-0021: mod_log_config: DoS with '%{cookiename}C' log format
+     - Fix CVE-2012-0031: Unprivileged child process could cause the parent to
+       crash at shutdown
+     - Fix CVE-2012-0053: Exposure of "httpOnly" cookies in code 400 error
+       message.
+   * Move httxt2dbm to apache2-utils
+   * Adjust debian/control to point to new git repository.
+ 
+   [ Arno Töll ]
+   * Fix "typo in /etc/apache2/apache2.conf" (Closes: #653801)
 
- -- Arno Töll <debian at toell.net>  Sat, 31 Dec 2011 09:45:14 +0100
+ -- Stefan Fritsch <sf at debian.org>  Wed, 01 Feb 2012 21:49:04 +0100 
 
-apache2 (2.2.21-5) unstable; urgency=low
+pache2 (2.2.21-5) unstable; urgency=low
 
   [ Arno Töll ]
   * Fix build failures introduced as regregression by the previous build. Debian
diff --git a/debian/control b/debian/control
index 37411ea..e950ef9 100644
--- a/debian/control
+++ b/debian/control
@@ -18,6 +18,9 @@ Architecture: any
 Depends: ${misc:Depends}, lsb-base, procps [!hurd-i386],
  perl, mime-support, apache2-bin (= ${binary:Version}),
  apache2-data (= ${source:Version})
+Replaces: apache2.2-common (<< 2.3.16-beta-1~)
+Breaks: apache2.2-common (<< 2.3.16-beta-1~)
+Provides: apache2.2-common
 Recommends: ssl-cert
 Description: Apache HTTP Server
  The Apache Software Foundation's goal is to build a secure, efficient and
@@ -32,6 +35,7 @@ Architecture: all
 #Depends: ${misc:Depends}, apache2-bin (= ${binary:Version}), apache2-utils, mime-support, lsb-base, procps [!hurd-i386], perl
 Depends: ${misc:Depends}
 Recommends: ssl-cert
+Replaces: apache2.2-common
 Description: Apache HTTP Server common files
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
@@ -44,8 +48,12 @@ Package: apache2-bin
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 # MODULE_MAGIC_NUMBER_MAJOR from apache2/include/ap_mmn.h
-Provides: apache2-bin-mmv-20111203-0
+Provides: apache2-api-20111203-0
 Suggests: www-browser, apache2-doc, apache2-suexec | apache2-suexec-custom
+Replaces: apache2.2-bin (<< 2.3.16-beta-1~), apache2.2-common (<< 2.3.16-beta-1~),
+ apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event
+Breaks: apache2.2-bin (<< 2.3.16-beta-1~), apache2.2-common (<< 2.3.16-beta-1~),
+ apache2-mpm-worker, apache2-mpm-prefork, apache2-mpm-event, apache2-mpm-itk
 Description: Apache HTTP Server common binary files
  The Apache Software Foundation's goal is to build a secure, efficient and
  extensible HTTP server as standards-compliant open source software. The
@@ -56,6 +64,24 @@ Description: Apache HTTP Server common binary files
  instance. Do not install this package unless you want to set-up the Apache
  HTTP server entirely on your own.
 
+Package: apache2.2-common
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2 (>= 2.3.16-beta-1~)
+Description: Transitional package for apache2
+ This is a transitional package for apache2, and can be safely removed
+ after the installation is complete.
+
+Package: apache2.2-bin
+Architecture: any
+Section: oldlibs
+Priority: extra
+Depends: ${shlibs:Depends}, ${misc:Depends}, apache2-bin (>= 2.3.16-beta-1~)
+Description: Transitional package for apache2-bin
+ This is a transitional package for apache2-bin, and can be safely removed
+ after the installation is complete.
+
 Package: apache2-utils
 Architecture: any
 #Replaces: apache2-common, apache-utils (<< 1.3.33-4)

-- 
Debian packaging for apache2 (Apache HTTPD 2.x)