# HG changeset patch
# User godisch
# Date 1056089122 -3600
# Node ID e5bd838e0c2747e053df92b8f0fbadad8ce4c5bf
# Parent  cb18c7d41cc599d1de8d45f568d7bcb00e5cb08e
[svn] fixed update-inetd

diff -r cb18c7d41cc5 -r e5bd838e0c27 debian/postinst
--- a/debian/postinst	Fri Jun 20 06:59:52 2003 +0100
+++ b/debian/postinst	Fri Jun 20 07:05:22 2003 +0100
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: postinst 561 2003-06-20 05:59:52Z godisch $
+# $Id: postinst 562 2003-06-20 06:05:22Z godisch $
 
 set -e
 
@@ -108,7 +108,7 @@
 		# update-inetd will silently fail if nntp is already occupied
 		update-inetd --group MAIL --add "nntp\tstream\ttcp\tnowait\tnews\t/usr/sbin/tcpd /usr/bin/noffle -r"
 		if grep -q "^nntp.*/usr/bin/noffle -r"; then
-			update-inetd --disable "$port"
+			update-inetd --disable nntp
 		fi
 	fi
 fi
diff -r cb18c7d41cc5 -r e5bd838e0c27 debian/prerm
--- a/debian/prerm	Fri Jun 20 06:59:52 2003 +0100
+++ b/debian/prerm	Fri Jun 20 07:05:22 2003 +0100
@@ -1,20 +1,10 @@
 #!/bin/sh
-# $Id: prerm 558 2003-06-20 05:46:35Z godisch $
+# $Id: prerm 562 2003-06-20 06:05:22Z godisch $
 
 set -e
 
-if [ -e /usr/share/debconf/confmodule ]; then
-	. /usr/share/debconf/confmodule
-	db_get noffle/debconf
-	if [ "$RET" = true ]; then
-		db_get noffle/port
-		port="$RET"
-		if [ -z "$port" -o "$port" = 119 ]; then
-			port=nntp
-		fi
-		update-inetd --disable "$port"
-	fi
-	db_stop
+if port="`grep "/usr/bin/noffle -r" /etc/inetd.conf | sed 's/[[:space:]].*$//'`"; then
+	update-inetd --disable "$port"
 fi
 
 exit 0