[Forensics-changes] [SCM] debian-forensics/unhide branch, debian, updated. debian/20110113-3-9-g39f17d3

[Julien Valroff]

The following commit has been merged in the debian branch:
commit fac9fbe9df3b53c2efb6f6cbd58864a158046a97
Author: Julien Valroff <julien at kirya.net>
Date:   Fri Mar 9 21:59:38 2012 +0100

    Use unhide-2.6 features unconditionally since Debian doesn't support pre-2.6 Linux kernels. As a consequence, drop us of alternatives, and ships unhide-2.6 as unhide (Closes: #662588)

diff --git a/debian/changelog b/debian/changelog
index 4c6cb72..592997c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 unhide (20110113-4) unstable; urgency=low
 
   * Update DEP-5 URI to the final location 
+  * Use unhide-2.6 features unconditionally since Debian doesn't support
+    pre-2.6 Linux kernels. As a consequence, drop us of alternatives, and
+    ships unhide-2.6 as unhide (Closes: #662588)
 
- -- Julien Valroff <julien at debian.org>  Tue, 28 Feb 2012 18:51:37 +0100
+ -- Julien Valroff <julien at debian.org>  Fri, 09 Mar 2012 21:59:12 +0100
 
 unhide (20110113-3) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index bf550f6..ab381e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,5 @@ override_dh_auto_configure:
 	ln man/es/unhide.8 man/unhide.es.8
 
 override_dh_auto_build:
-	gcc --static unhide-linux26.c -o unhide-linux26 -lpthread
-	gcc --static unhide.c -o unhide-posix
+	gcc --static unhide-linux26.c -o unhide -lpthread
 	gcc --static unhide-tcp.c -o unhide-tcp
diff --git a/debian/unhide.README.Debian b/debian/unhide.README.Debian
index 370c411..1dfcc46 100644
--- a/debian/unhide.README.Debian
+++ b/debian/unhide.README.Debian
@@ -14,12 +14,5 @@ Some applications can start listening on a port between the time that unhide
 gets the list of open ports in /bin/netstat and the time when it brute-forces
 ports. Run it a few times to make sure that it's not a permanent port.
 
-Non-Linux 2.6 kernels
----------------------
-
-If you want to run unhide on a kernel other than Linux 2.6, make the
-unhide-posix program the default:
-
-	# update-alternatives --config unhide
-
  -- Francois Marier <francois at debian.org>  Thu, 06 Dec 2007 16:59:30 +1300
+ -- Julien Valroff <julien at debian.org>  Fri, 09 Mar 2012 21:53:56 +0100
diff --git a/debian/unhide.postinst b/debian/unhide.postinst
deleted file mode 100644
index 8124135..0000000
--- a/debian/unhide.postinst
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-case "${1}" in
-	configure|abort-remove|abort-deconfigure)
-		_MAJOR="$(uname -r | cut -d. -f1)"
-		_MINOR="$(uname -r | cut -d. -f2)"
-
-		update-alternatives --quiet \
-			--install /usr/sbin/unhide unhide \
-			/usr/sbin/unhide-posix 10
-		update-alternatives --quiet \
-			--install /usr/sbin/unhide unhide \
-			/usr/sbin/unhide-linux26 20
-
-		# Setting defaults alternative
-		if [ ${_MAJOR} -lt 2 ] || \
-		 ( [ ${_MAJOR} -eq 2 ] && [ ${_MINOR} -lt 6 ] )
-		then
-			update-alternatives --quiet \
-				--set unhide /usr/sbin/unhide-posix
-		else
-			update-alternatives --quiet \
-				--set unhide /usr/sbin/unhide-linux26
-		fi
-		;;
-
-	abort-upgrade)
-
-		;;
-
-	*)
-		echo "postinst called with unknown argument \`${1}'" >&2
-		exit 1
-		;;
-esac
-
-#DEBHELPER#
-
-exit 0
diff --git a/debian/unhide.prerm b/debian/unhide.prerm
index 4718b6c..fad0bf2 100644
--- a/debian/unhide.prerm
+++ b/debian/unhide.prerm
@@ -3,15 +3,8 @@
 set -e
 
 case "${1}" in
-	upgrade|failed-upgrade)
-
-		;;
-
-	remove|deconfigure)
-		update-alternatives --quiet \
-			--remove unhide /usr/sbin/unhide-posix
-		update-alternatives --quiet \
-			--remove unhide /usr/sbin/unhide-linux26
+	upgrade|failed-upgrade|remove|deconfigure)
+		update-alternatives --quiet --remove-all unhide
 		;;
 
 	*)

-- 
debian-forensics/unhide