[apache2] 01/02: dh_apache2 add a versioned dependency on apache2-bin

[Stefan Fritsch]

This is an automated email from the git hooks/post-receive script.

sf pushed a commit to branch master
in repository apache2.

commit c892db21f08aa1411fcea50a7b37535cb1e5c0d5
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Fri Aug 7 23:42:49 2015 +0200

    dh_apache2 add a versioned dependency on apache2-bin
    
    This is not nice, yet. But urgent :-|
---
 debian/changelog               | 7 +++++++
 debian/debhelper/dh_apache2.in | 7 ++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 319c7a2..e06f02e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apache2 (2.4.16-2) UNRELEASED; urgency=medium
+
+  * Make dh_apache2 add a versioned dependency on apache2-bin, for the
+    new symbols required for the CVE-2015-3185 fix.
+
+ -- Stefan Fritsch <sf at debian.org>  Fri, 07 Aug 2015 23:40:56 +0200
+
 apache2 (2.4.16-1) unstable; urgency=medium
 
   [ Stefan Fritsch ]
diff --git a/debian/debhelper/dh_apache2.in b/debian/debhelper/dh_apache2.in
index 8b0fcda..75a00da 100755
--- a/debian/debhelper/dh_apache2.in
+++ b/debian/debhelper/dh_apache2.in
@@ -58,6 +58,11 @@ sub apache_api_version
 	return "apache2-api-$API";
 }
 
+sub apache_depends
+{
+	# TODO XXX this should be determined from ap_mmn.h, too.
+	return apache_api_version() . ", apache2-bin ( >= 2.4.16 )";
+}
 
 sub apache_version
 {
@@ -457,7 +462,7 @@ foreach my $package ((@{$dh{DOPACKAGES}}))
 		{
 			warning("Package $package appears to be an Apache module. It should comply to the package naming scheme libapache2-mod-<modulename>\n");
 		}
-		addsubstvar($package, "misc:Depends", apache_api_version());
+		addsubstvar($package, "misc:Depends", apache_depends());
 
 		my $modules = "";
 		foreach my $module (@{$PACKAGE_TYPE{'has_a_module'}})

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-apache/apache2.git