From: Pierre Habouzit Date: Wed, 28 Nov 2007 10:54:27 +0000 (+0100) Subject: Don't force inetd_compat for upgrades. X-Git-Tag: debian-sid/2.3.14-4~2 X-Git-Url: http://git.madism.org/?p=packages%2Fxinetd.git;a=commitdiff_plain;h=fce21f089b06d628dab975a14b876ebefc424b3b Don't force inetd_compat for upgrades. Signed-off-by: Pierre Habouzit --- diff --git a/debian/NEWS b/debian/NEWS index 374498e..8d24fd1 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -2,9 +2,10 @@ xinetd (1:2.3.14-3) unstable; urgency=low This version enables inetd_compat mode by default, so that we can pretend to be a real inet-superserver. This way, packages that use update-inetd will - work with xinetd properly. + work with xinetd properly. The inetd_compat mode is forced for new + installations only, and can be tweaked in /etc/default/xinetd. Note that if the same service is configured in /etc/xinetd.d/ and in - /etc/inetd.conf, the former takes precedence. + /etc/inetd.conf, the former takes precedence, based on the service id. -- Pierre Habouzit Tue, 27 Nov 2007 01:55:29 +0100 diff --git a/debian/changelog b/debian/changelog index 6bf0962..0f43d68 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ xinetd (1:2.3.14-4) UNRELEASED; urgency=low debian/xinetd.defaults -> debian/xinetd.default. * debian/xinetd.postrm: don't purge configuration that isn't ours on purge anymore. + * Don't force inetd_compat for upgrades. -- Pierre Habouzit Wed, 28 Nov 2007 10:14:47 +0100 diff --git a/debian/xinetd.postinst b/debian/xinetd.postinst index 5281388..ac9fa57 100644 --- a/debian/xinetd.postinst +++ b/debian/xinetd.postinst @@ -1,5 +1,11 @@ #!/bin/sh -e +if test "$1" = "configure"; then + if dpkg --compare-versions "$2" lt-nl 1:2.3.14-3; then + sed -e -i "s/INETD_COMPAT=Yes/INETD_COMPAT=No/" /etc/default/xinetd + fi +fi + if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then invoke-rc.d xinetd stop elif [ -x /etc/init.d/xinetd ]; then