From: Pierre Habouzit <madcoder@debian.org>
Date: Mon, 24 Mar 2008 11:54:04 +0000 (+0100)
Subject: use the new flag by default
X-Git-Tag: debian-sid/2.3.14-6~1
X-Git-Url: http://git.madism.org/?p=packages%2Fxinetd.git;a=commitdiff_plain;h=d20b1d60cc64c371865a761b9a8b659ee6e43959

use the new flag by default

Signed-off-by: Pierre Habouzit <madcoder@debian.org>
---

diff --git a/debian/NEWS b/debian/NEWS
index 8d24fd1..457bfad 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+xinetd (1:2.3.14-6) unstable; urgency=low
+
+  Thanks to David Madore, xinetd now is able to listen on IPv6 addresses for
+  inetd.conf compatibility layer. This is now the new default mode for xinetd
+  in Debian.
+
+ -- Pierre Habouzit <madcoder@debian.org>  Mon, 24 Mar 2008 12:50:42 +0100
+
 xinetd (1:2.3.14-3) unstable; urgency=low
 
   This version enables inetd_compat mode by default, so that we can pretend to
diff --git a/debian/README.update-inetd b/debian/README.update-inetd
index d881ce4..fe2ff54 100644
--- a/debian/README.update-inetd
+++ b/debian/README.update-inetd
@@ -13,7 +13,7 @@ service becomes available through xinetd, without an xinetd.conf
 modification.
 
 To enable the inetd.conf compatibility mode, you can edit
-/etc/default/xinetd and add -inetd_compat to XINETD_OPTS
+/etc/default/xinetd and add -inetd_compat or -inetd_ipv6 to XINETD_OPTS
 
 However, you will want to put some services' configurations in xinetd.conf to
 customize them.
diff --git a/debian/xinetd.init b/debian/xinetd.init
index 1c59e02..6fc0db6 100644
--- a/debian/xinetd.init
+++ b/debian/xinetd.init
@@ -20,7 +20,7 @@ PIDFILE=/var/run/$NAME.pid
 test -x "$DAEMON" || exit 0
 
 test -e /etc/default/$NAME && . /etc/default/$NAME
-case "$INETD_COMPAT" in [Yy]*) XINETD_OPTS="$XINETD_OPTS -inetd_compat";; esac
+case "$INETD_COMPAT" in [Yy]*) XINETD_OPTS="$XINETD_OPTS -inetd_compat -inetd_ipv6";; esac
 
 . /lib/lsb/init-functions