Merge branch 'master' of git+ssh://git.debian.org/git/pkg-apache/apache2

5 files changed, 15 insertions, 1 deletions

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index b392e02b..e7e1ac22 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -209,6 +209,16 @@ enable_default_modules()
 		for module in authn_core authz_core filter access_compat ; do
 			a2enmod -m -q $module
 		done
+	elif dpkg --compare-versions "$2" "le" "2.4.6-1~" ; then
+		# These modules had dependencies missing in the initial 2.4 upload
+		for module in auth_basic auth_digest auth_form cache_disk include ratelimit mpm_event
+		do
+			if [ -e /etc/apache2/mods-enabled/$module.load ] ; then
+				# If module is enabled, enable again to
+				# enable new dependencies
+				a2enmod -m -q $module
+			fi
+		done
 	fi
 }
 
diff --git a/debian/changelog b/debian/changelog
index fd951f3c..39552b91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ apache2 (2.4.6-1) unstable; urgency=low
     an inconsistent state (Closes: #716921, #717343).
   * Improve error output of init script.
   * Fix broken dependency information in several *.load files.
+  * Add mod_authn_core as dependency of the mod_auth_* modules.
+    (Closes: #717448)
 
  -- Arno Töll <arno@debian.org>  Sun, 21 Jul 2013 18:44:42 +0200
 
diff --git a/debian/config-dir/mods-available/auth_basic.load b/debian/config-dir/mods-available/auth_basic.load
index 3aace443..5f3cd1c6 100644
--- a/debian/config-dir/mods-available/auth_basic.load
+++ b/debian/config-dir/mods-available/auth_basic.load
@@ -1 +1,2 @@
+# Depends: authn_core
 LoadModule auth_basic_module /usr/lib/apache2/modules/mod_auth_basic.so
diff --git a/debian/config-dir/mods-available/auth_digest.load b/debian/config-dir/mods-available/auth_digest.load
index e936bc57..4fa7a3e9 100644
--- a/debian/config-dir/mods-available/auth_digest.load
+++ b/debian/config-dir/mods-available/auth_digest.load
@@ -1 +1,2 @@
+# Depends: authn_core
 LoadModule auth_digest_module /usr/lib/apache2/modules/mod_auth_digest.so
diff --git a/debian/config-dir/mods-available/auth_form.load b/debian/config-dir/mods-available/auth_form.load
index 35fe905e..91e9507e 100644
--- a/debian/config-dir/mods-available/auth_form.load
+++ b/debian/config-dir/mods-available/auth_form.load
@@ -1,2 +1,2 @@
-# Depends: session
+# Depends: session authn_core
 LoadModule auth_form_module /usr/lib/apache2/modules/mod_auth_form.so