Package: telnetd
Version: 0.17-35
Severity: important
Tags: patch

Hi,

netkit-telnet suffers from the same problem as linux-ftpd (#482912), a
change to update-inetd --remove regexp handling means inetd.conf
entries aren't removed.

The attached patch fixes the regexp, plus problems with the
code to handle switching from telnetd-ssl -> telnetd:

* telnetd-ssl no longer specifies a group name in inetd.conf
  (due to inetutils-inetd not supporting groups [patch nicked from
  telnetd 0.17-33]) which means the fgrep match in postinst fails.

* installing telnetd, then installing telnetd-ssl, then purging
  telnetd results in removing the inetd.conf entry for telnetd.
  The fix is to only remove the inetd.conf entry if it is disabled
  (which will have happened in the prerm). I've just uploaded
  a new version of netkit-telnet-ssl which solves the corresponding
  problem going in the other direction.

The patch also replaces the dependency on netbase with one on
openbsd-inetd | inet-superserver, which is needed to drag in
update-inetd. Purely cosmetically, it also removes the versioned
dependecies on base-files and dpkg, as the minimum versions specified
long predate oldstable.

cheers,

Ian.


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.24-1-686 (SMP w/1 CPU core)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages telnetd depends on:
ii  adduser                     3.108        add and remove users and groups
ii  libc6                       2.7-12       GNU C Library: Shared libraries
ii  openbsd-inetd [inet-superse 0.20080125-1 The OpenBSD Internet Superserver
ii  passwd                      1:4.1.1-1    change and administer password and

telnetd recommends no packages.
diff -Naur dist/netkit-telnet-0.17/debian/changelog 
netkit-telnet-0.17/debian/changelog
--- dist/netkit-telnet-0.17/debian/changelog    2008-05-21 16:30:55.000000000 
+0100
+++ netkit-telnet-0.17/debian/changelog 2008-06-13 15:43:34.000000000 +0100
@@ -1,3 +1,17 @@
+netkit-telnet (0.17-36) unstable; urgency=low
+
+  * telnetd.postinst:
+    + Fix update-inetd --remove regexp.
+    + Drop group from telnetd-ssl regexp.
+  * telnetd.postrm: Only remove inetd entry if it is disabled.
+  * telnetd Depends:
+    + Replace netbase Depends: with openbsd-inetd | inet-superserver
+      to pull in update-inetd (Closes: #473262).
+    + Remove versioned dependencies on versions of dpkg and base-files
+      that long predate oldstable.
+
+ -- Ian Beckwith <[EMAIL PROTECTED]>  Fri, 13 Jun 2008 14:05:45 +0100
+
 netkit-telnet (0.17-35) unstable; urgency=low
 
   * The 'this does not need to depend on update-inetd' release
diff -Naur dist/netkit-telnet-0.17/debian/control 
netkit-telnet-0.17/debian/control
--- dist/netkit-telnet-0.17/debian/control      2008-05-21 16:30:55.000000000 
+0100
+++ netkit-telnet-0.17/debian/control   2008-05-26 19:53:04.000000000 +0100
@@ -17,7 +17,7 @@
 Package: telnetd
 Architecture: any
 Priority: optional
-Depends: adduser, base-files (>= 2.1.8), dpkg (>= 1.7.0), netbase, passwd, 
${shlibs:Depends}
+Depends: adduser, openbsd-inetd | inet-superserver, passwd, ${shlibs:Depends}
 Replaces: netstd
 Provides: telnet-server
 Conflicts: suidmanager (<< 0.50)
diff -Naur dist/netkit-telnet-0.17/debian/telnetd.postinst 
netkit-telnet-0.17/debian/telnetd.postinst
--- dist/netkit-telnet-0.17/debian/telnetd.postinst     2008-05-21 
16:30:55.000000000 +0100
+++ netkit-telnet-0.17/debian/telnetd.postinst  2008-05-21 16:42:56.000000000 
+0100
@@ -3,10 +3,10 @@
 
 update_inetd_entry() {
        if [ $2 ]; then
-               update-inetd --remove ".*/usr/sbin/in.telnetd"
+               update-inetd --remove ".*telnet"
                update-inetd --group STANDARD --add "$telnetdent"
        else
-               update-inetd --remove ".*/usr/sbin/in.telnetd"
+               update-inetd --remove ".*telnet"
                update-inetd --group STANDARD --add "$rootent"
        fi
 }
@@ -41,7 +41,7 @@
 configure)
        if [ -z "$2" ] || 
        dpkg --compare-versions "$2" lt 0.17-13 ||
-       fgrep -q telnetd-ssl.telnetd-ssl /etc/inetd.conf
+       fgrep -q telnetd-ssl /etc/inetd.conf
     then
                update_inetd_entry "$2" $devpts
        else
diff -Naur dist/netkit-telnet-0.17/debian/telnetd.postrm 
netkit-telnet-0.17/debian/telnetd.postrm
--- dist/netkit-telnet-0.17/debian/telnetd.postrm       2008-05-21 
16:30:55.000000000 +0100
+++ netkit-telnet-0.17/debian/telnetd.postrm    2008-06-13 14:17:44.000000000 
+0100
@@ -38,7 +38,7 @@
 purge)
        # If netbase is not installed, then we don't need to do the remove.
        if command -v update-inetd >/dev/null 2>&1; then
-               update-inetd --remove "telnet   .*      /usr/sbin/in.telnetd"
+               update-inetd --remove "#<off># telnet"
        fi
        ;;
 *)

Reply via email to