Use the symbolic name for the remctl port in inetd.conf

* On new installations of remctl-server, add the inetd.conf line with
  the symbolic protocol name rather than the port number.  Depend on a
  new enough version of netbase.  Remove that line in prerm.

4 files changed, 6 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index 43b8ab8..cf37052 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ remctl (2.13-1) unstable; urgency=low
     - When processing the include of a directory for configuration or ACL
       files, limit the files included to characters in [a-zA-Z0-9_-] to
       avoid editor temporary files.  (Closes: #479481)
+  * On new installations of remctl-server, add the inetd.conf line with
+    the symbolic protocol name rather than the port number.  Depend on a
+    new enough version of netbase.  Remove that line in prerm.
 
  -- Russ Allbery <rra@debian.org>  Mon, 22 Sep 2008 01:33:55 -0700
 
diff --git a/debian/control b/debian/control
index 7071ea8..b667b64 100644
--- a/debian/control
+++ b/debian/control
@@ -54,7 +54,7 @@ Description: Client for Kerberos-authenticated command execution
 
 Package: remctl-server
 Architecture: any
-Depends: ${shlibs:Depends}, update-inetd | inet-superserver
+Depends: ${shlibs:Depends}, update-inetd | inet-superserver, netbase (>= 4.31)
 Recommends: openbsd-inetd | inet-superserver, tcpd
 Conflicts: remctl (<< 1.10-1)
 Replaces: remctl (<< 1.10-1)
diff --git a/debian/remctl-server.postinst b/debian/remctl-server.postinst
index a0cc824..79b0dff 100755
--- a/debian/remctl-server.postinst
+++ b/debian/remctl-server.postinst
@@ -7,7 +7,7 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ] ; then
     # Only try to add the inetd line on an initial installation.
     if [ -z "$2" ] || [ x"$2" = x"<unknown>" ] ; then
         update-inetd --add \
-        '4373\t\tstream\ttcp\tnowait\troot\t/usr/sbin/tcpd /usr/sbin/remctld'
+        'remctl\t\tstream\ttcp\tnowait\troot\t/usr/sbin/tcpd /usr/sbin/remctld'
     fi
 fi
 
diff --git a/debian/remctl-server.prerm b/debian/remctl-server.prerm
index 8db4de8..4d0da6f 100755
--- a/debian/remctl-server.prerm
+++ b/debian/remctl-server.prerm
@@ -6,6 +6,7 @@ set -e
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ] ; then
     update-inetd --remove '4444.*/usr/sbin/remctld'
     update-inetd --remove '4373.*/usr/sbin/remctld'
+    update-inetd --remove 'remctl.*/usr/sbin/remctld'
 fi
 
 #DEBHELPER#