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

[Arno Töll]

The following commit has been merged in the next branch:
commit 3f9e1bc28abded2aa5ca67c109de0afd9b103f50
Author: Arno Töll <debian at toell.net>
Date:   Thu Mar 22 12:41:16 2012 +0100

    Remove suexec alternatives properly. Fixes #665002

diff --git a/debian/apache2-suexec.postinst.in b/debian/apache2-suexec.postinst.in
index 69a1191..fd3f0af 100755
--- a/debian/apache2-suexec.postinst.in
+++ b/debian/apache2-suexec.postinst.in
@@ -7,7 +7,7 @@ case "$1" in
 
 configure)
 	update-alternatives --install /usr/lib/apache2/suexec suexec /usr/lib/apache2/suexec-__TYPE__ 10 \
-		--slave /usr/share/man/man1/suexec.8.gz suexec.8.gz /usr/share/man/man8/suexec-__TYPE__.8.gz
+		--slave /usr/share/man/man8/suexec.8.gz suexec.8.gz /usr/share/man/man8/suexec-__TYPE__.8.gz
 	;;
 abort-upgrade|abort-remove|abort-deconfigure)
 	;;
diff --git a/debian/apache2-suexec.postrm.in b/debian/apache2-suexec.postrm.in
new file mode 100755
index 0000000..50b552e
--- /dev/null
+++ b/debian/apache2-suexec.postrm.in
@@ -0,0 +1,38 @@
+#!/bin/sh
+# postrm script for apache2-suexec-__TYPE__
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|disappear)
+
+        update-alternatives --remove suexec /usr/lib/apache2/suexec-__TYPE__ || true
+    ;;
+    purge|upgrade|failed-upgrade|abort-install|abort-upgrade)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/apache2-suexec.prerm.in b/debian/apache2-suexec.prerm.in
index 2c958e6..b1e329e 100755
--- a/debian/apache2-suexec.prerm.in
+++ b/debian/apache2-suexec.prerm.in
@@ -4,11 +4,11 @@
 set -e
 
 case "$1" in
-    remove|upgrade|deconfigure)
-	update-alternatives --remove /usr/lib/apache2/suexec-__TYPE__ suexec
+    remove)
+	update-alternatives --remove suexec /usr/lib/apache2/suexec-__TYPE__
     ;;
 
-    failed-upgrade)
+    upgrade|deconfigure|failed-upgrade)
     ;;
 
     *)
diff --git a/debian/changelog b/debian/changelog
index 37c1208..ddb3a03 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+apache2 (2.4.1-3) experimental; urgency=low
+
+  * apache2-suexec-{custom,pristine}: Fix argument order when removing
+    alternatives, do not remove alternatives on upgrades. Thanks Andreas
+    Beckmann for spotting the issue (Closes: #665002)
+  * Install suexec(8) link to /usr/share/man/man8/...
+
+ -- Arno Töll <debian at toell.net>  Thu, 22 Mar 2012 12:37:39 +0100
+
 apache2 (2.4.1-2) experimental; urgency=low
 
   [ Arno Töll ]
diff --git a/debian/clean b/debian/clean
index 650d647..dd77bcc 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,12 +1,14 @@
 debian/apache2-suexec-custom.postinst
 debian/apache2-suexec-custom.preinst
 debian/apache2-suexec-custom.prerm
+debian/apache2-suexec-custom.postrm
 debian/apache2-suexec-custom.links
 debian/apache2-suexec-custom.dirs
 debian/apache2-suexec-custom.lintian-overrides
 debian/apache2-suexec-pristine.postinst
 debian/apache2-suexec-pristine.preinst
 debian/apache2-suexec-pristine.prerm
+debian/apache2-suexec-pristine.postrm
 debian/apache2-suexec-pristine.links
 debian/apache2-suexec-pristine.dirs
 debian/apache2-suexec-pristine.lintian-overrides
diff --git a/debian/rules b/debian/rules
index 49a4802..b1fe409 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ prepare-scripts: debian/a2query debian/debhelper/dh_apache2
 generate-maintainer-scripts:
 	set -e ; \
 	for type in custom pristine ; do \
-		for f in postinst preinst prerm links dirs lintian-overrides; do \
+		for f in postinst preinst prerm links dirs lintian-overrides postrm; do \
 			if [ -e debian/apache2-suexec.$$f.in ] ; then \
 				perl -pe "s{__TYPE__}{$$type}g" < debian/apache2-suexec.$$f.in > debian/apache2-suexec-$$type.$$f ;\
 				chmod `/usr/bin/stat -c '%a' "debian/apache2-suexec.$$f.in"` debian/apache2-suexec-$$type.$$f ;\

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