[apache2] 01/01: re-add mod_ident

[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 50b97eba01d1f88f17bdf2d7273ceb4f8751de20
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Sun Sep 21 21:31:50 2014 +0200

    re-add mod_ident
---
 debian/apache2.postinst                     | 1 -
 debian/apache2.postrm                       | 1 -
 debian/changelog                            | 1 +
 debian/config-dir/mods-available/ident.load | 1 +
 debian/rules                                | 2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/apache2.postinst b/debian/apache2.postinst
index acbe652..6c156d0 100644
--- a/debian/apache2.postinst
+++ b/debian/apache2.postinst
@@ -29,7 +29,6 @@ OBSOLETE_CONFFILES="/etc/apache2/mods-available/authz_default.load
 /etc/apache2/mods-available/cern_meta.load
 /etc/apache2/mods-available/disk_cache.load
 /etc/apache2/mods-available/disk_cache.conf
-/etc/apache2/mods-available/ident.load
 /etc/apache2/mods-available/imagemap.load
 /etc/apache2/mods-available/version.load"
 
diff --git a/debian/apache2.postrm b/debian/apache2.postrm
index 72de74c..8a13a65 100644
--- a/debian/apache2.postrm
+++ b/debian/apache2.postrm
@@ -27,7 +27,6 @@ OBSOLETE_CONFFILES="/etc/apache2/mods-available/authz_default.load
 /etc/apache2/mods-available/cern_meta.load
 /etc/apache2/mods-available/disk_cache.load
 /etc/apache2/mods-available/disk_cache.conf
-/etc/apache2/mods-available/ident.load
 /etc/apache2/mods-available/imagemap.load
 /etc/apache2/mods-available/version.load"
 
diff --git a/debian/changelog b/debian/changelog
index cac35da..b14ab48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ apache2 (2.4.10-2) UNRELEASED; urgency=medium
   * Clarify description of apache2 package. Closes: #755976
   * In the maintainer script helper, print out Apache's error message if
     the config check fails.
+  * Re-add mod_ident. It has still at least one user. LP: #1333388
 
  -- Stefan Fritsch <sf at debian.org>  Wed, 27 Aug 2014 07:22:55 +0200
 
diff --git a/debian/config-dir/mods-available/ident.load b/debian/config-dir/mods-available/ident.load
new file mode 100644
index 0000000..f7c4c3c
--- /dev/null
+++ b/debian/config-dir/mods-available/ident.load
@@ -0,0 +1 @@
+LoadModule ident_module /usr/lib/apache2/modules/mod_ident.so
diff --git a/debian/rules b/debian/rules
index b15ef25..d5c49aa 100755
--- a/debian/rules
+++ b/debian/rules
@@ -86,7 +86,7 @@ override_dh_auto_configure: generate-maintainer-scripts prebuild-checks support/
 		--with-pcre=yes \
 		--enable-pie \
 		--enable-mpms-shared=all \
-		--enable-mods-shared="all cgi" \
+		--enable-mods-shared="all cgi ident" \
 		--enable-mods-static="unixd logio watchdog version" \
 		CFLAGS="$(AP2_CFLAGS)" CPPFLAGS="$(AP2_CPPFLAGS)" LDFLAGS="$(AP2_LDFLAGS)" \
 		LTFLAGS="$(AP2_LTFLAGS)"

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