[Pkg-apache-commits] [SCM] Debian packaging for apache2 (Apache HTTPD 2.x) branch, master, updated. debian/2.2.22-3-15-g50179ea

[Stefan Fritsch]

The following commit has been merged in the master branch:
commit e6aad6b92043d161c78c7c045fce14009ee51958
Author: Stefan Fritsch <sf at sfritsch.de>
Date:   Mon May 28 21:54:48 2012 +0200

    Compile mod_version statically

diff --git a/debian/apache2.2-common.postinst b/debian/apache2.2-common.postinst
index 76e920f..65a565c 100644
--- a/debian/apache2.2-common.postinst
+++ b/debian/apache2.2-common.postinst
@@ -89,7 +89,9 @@ if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.22-6~ ; then
 			mv /etc/apache2/httpd.conf /etc/apache2/conf.d/httpd.conf
 		fi
 	fi
+	rm -f /etc/apache2/mods-enabled/version.load
 fi
+dpkg-maintscript-helper rm_conffile /etc/apache2/mods-available/version.load 2.2.22-6~ -- "$@"
 
 # The definition of other_vhost_access.log has been moved.
 # Disable the new definition if the admin has changed the old
diff --git a/debian/apache2.2-common.postrm b/debian/apache2.2-common.postrm
index ef65e77..bbe9f74 100644
--- a/debian/apache2.2-common.postrm
+++ b/debian/apache2.2-common.postrm
@@ -24,6 +24,7 @@ if [ -x /etc/apache2/upgrade-to-2.4-in-progress ] ; then
 	esac
 fi
 
+dpkg-maintscript-helper rm_conffile /etc/apache2/mods-available/version.load 2.2.22-6~ -- "$@"
 
 if [ "$1" = purge -a "$DONT_PURGE" != 1 ] ; then
 	rm -f 	/etc/apache2/httpd.conf \
@@ -65,6 +66,7 @@ if [ "$1" = abort-upgrade ] ; then
 	restore_conffile /etc/default/apache2
 	restore_conffile /etc/apache2/ports.conf
 	restore_conffile /etc/apache2/conf.d/charset
+	a2enmod -q version
 fi
 
 if [ "$1" = remove ] ; then
diff --git a/debian/apache2.2-common.preinst b/debian/apache2.2-common.preinst
index 03daca9..4bcd5e9 100644
--- a/debian/apache2.2-common.preinst
+++ b/debian/apache2.2-common.preinst
@@ -25,4 +25,6 @@ if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.2.15-4~ ; then
 	fi
 fi
 
+dpkg-maintscript-helper rm_conffile /etc/apache2/mods-available/version.load 2.2.22-6~ -- "$@"
+
 #DEBHELPER#
diff --git a/debian/changelog b/debian/changelog
index f8c79e3..d7e47a0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ apache2 (2.2.22-6) UNRELEASED; urgency=low
     Closes: #649020
   * Add "AddCharset" for .brf files in default mod_mime config.
     Closes: #402567
+  * Compile mod_version statically, drop associated module load file.
   * Don't create httpd.conf anymore and don't include it in apache2.conf. If
     it contains local modifications, move it to /etc/apache2/conf.d/httpd.conf
   * Note in README.Debian that future versions of the package will have the
diff --git a/debian/config-dir/mods-available/version.load b/debian/config-dir/mods-available/version.load
deleted file mode 100644
index 3eada46..0000000
--- a/debian/config-dir/mods-available/version.load
+++ /dev/null
@@ -1 +0,0 @@
-LoadModule version_module /usr/lib/apache2/modules/mod_version.so
diff --git a/debian/rules b/debian/rules
index daf2693..4cb688d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -49,6 +49,7 @@ AP2_COMMON_CONFARGS = --enable-layout=Debian --enable-so \
                       --with-suexec-uidmin=100 \
                       --enable-suexec=shared \
                       --enable-log-config=static --enable-logio=static \
+                      --enable-version=static \
                       --with-apr=/usr/bin/apr-1-config \
                       --with-apr-util=/usr/bin/apu-1-config \
                       --with-pcre=yes \
@@ -78,7 +79,7 @@ AP2_worker_CONFARGS = --enable-authn-alias=shared --enable-authnz-ldap=shared  \
                       --enable-expires=shared --enable-headers=shared \
                       --enable-ident=shared --enable-usertrack=shared \
                       --enable-unique-id=shared --enable-setenvif=shared \
-                      --enable-version=shared --enable-status=shared \
+                      --enable-status=shared \
                       --enable-autoindex=shared --enable-asis=shared \
                       --enable-info=shared --enable-cgid=shared \
                       --enable-dav=shared --enable-dav-fs=shared \

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