[SCM] proftpd-dfsg branch, master, updated. upstream/1.3.5_rc1-91-gdeb8e1a

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 2959854be0bb1e5ad3ef54e53c56f7f98501b2e8
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Thu Jan 10 11:57:09 2013 +0100

    Now update-inetd is used only if available.

diff --git a/debian/changelog b/debian/changelog
index 761afe1..d64623d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,11 @@ proftpd-dfsg (1.3.5~rc1-2) UNRELEASED; urgency=low
     simple fixed delay. This should be safe in every situations when the init
     script is called.
     (closes: #675081)
+  * Removed dependency on update-inetd. Now it is under responsability of the
+    admin to ensure installing *inetd _before_ reconfiguring proftpd in 
+    non standalone mode. Also in that case one could use xinetd which renders
+    the update-inetd tool superfluous.
+    (closes: #626527)
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Thu, 10 Jan 2013 10:57:37 +0100
 
diff --git a/debian/control.in b/debian/control.in
index 85e6288..c3c4b93 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -35,7 +35,6 @@ Depends: adduser,
          netbase (>= 4.13),
          sed (>= 4.1.5),
          ucf (>= 0.30),
-         update-inetd,
          ${misc:Depends},
          ${shlibs:Depends}
 Conflicts: ftp-server
diff --git a/debian/proftpd-basic.postinst b/debian/proftpd-basic.postinst
index 37c464c..af36eb2 100644
--- a/debian/proftpd-basic.postinst
+++ b/debian/proftpd-basic.postinst
@@ -132,6 +132,13 @@ DONTSTART=0
 
 . /usr/share/debconf/confmodule
 
+# update-ined is used if found, else you are on your own
+if [ -x /usr/sbin/update-inetd ]; then
+    UPDATE_INETD=/usr/sbin/update-inetd
+else
+    UPDATE_INETD=/bin/true
+fi
+
 if [ "$1" = "configure" ]; then
     
     # mv eventual old configuration in the new location
@@ -151,16 +158,16 @@ if [ "$1" = "configure" ]; then
     
     # update-inetd does not manage hostlist prefix to service, at least avoid to add a duplicated line
     if [ -f /etc/inetd.conf -a $(grep -qs '^([[:alnum:],.]+)?:?ftp[[:space:]]+' /etc/inetd.conf|wc -l) -eq 0 ]; then
-    	update-inetd --group STANDARD --add 'ftp	stream	tcp	nowait	root	/usr/sbin/tcpd /usr/sbin/proftpd' 
+    	$UPDATE_INETD --group STANDARD --add 'ftp	stream	tcp	nowait	root /usr/sbin/tcpd /usr/sbin/proftpd' 
     fi
 
     db_get shared/proftpd/inetd_or_standalone
     if [ "$RET" = "from inetd" ] ; then
-	    update-inetd --enable ftp
-	    switch_off
+	    $UPDATE_INETD --enable ftp 
+        switch_off
     else
-	    update-inetd --disable ftp
-	    switch_on
+	    $UPDATE_INETD --disable ftp 
+        switch_on
     fi
 
     add_sysuser
diff --git a/debian/proftpd-basic.postrm b/debian/proftpd-basic.postrm
index 168adaf..bc54bed 100644
--- a/debian/proftpd-basic.postrm
+++ b/debian/proftpd-basic.postrm
@@ -4,7 +4,10 @@ set -e
 
 if [ "$1" = "disappear" -o "$1" = "remove" ]
 then
-    update-inetd --disable ftp
+    if [ -x /usr/sbin/update-inetd ]
+    then
+        update-inetd --disable ftp
+    fi
 fi
 
 if [ "$1" = "purge" ]

-- 
ProFTPD core package