diff -Nru update-inetd-4.47/debian/changelog update-inetd-4.49/debian/changelog --- update-inetd-4.47/debian/changelog 2018-08-20 18:21:09.000000000 +0000 +++ update-inetd-4.49/debian/changelog 2018-09-29 08:46:39.000000000 +0000 @@ -1,3 +1,22 @@ +update-inetd (4.49) unstable; urgency=medium + + * Preserve the original @ARGV, to pass it to the Debconf module so that + when that tries to reexecute us we get the correct arguments. + Fixes regression introduced in 4.46. + + -- Guillem Jover Sat, 29 Sep 2018 10:46:39 +0200 + +update-inetd (4.48) unstable; urgency=medium + + * Add debconf translations: + - Catalan (Guillem Jover). + * Bump Standards-Version to 4.2.0 (no changes needed). + * Turn the --group and --pattern usage with --add into a warning. While + it is invalid usage, it does not deserve (yet) the unexpected breakage + it is causing. Let's postpone erroring out for later. Closes: #909758 + + -- Guillem Jover Fri, 28 Sep 2018 10:12:53 +0200 + update-inetd (4.47) unstable; urgency=medium * Print “error: ” after program name when emitting error messages from @@ -29,7 +48,7 @@ (Closes: #374542) * Improve --help output and man page documentation on commands, options, their arguments, and the order they are listed. (Closes: #311111) - * Bump Standards-Version to 4.2.0 (no changes needed). + * Bump Standards-Version to 4.1.5 (no changes needed). * Code cleanup: - Declare all variables with our or my. - Use a typeglob instead of redefining fallback functions. diff -Nru update-inetd-4.47/debian/control update-inetd-4.49/debian/control --- update-inetd-4.47/debian/control 2018-08-04 14:38:05.000000000 +0000 +++ update-inetd-4.49/debian/control 2018-09-29 01:51:59.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Guillem Jover Vcs-Browser: https://git.hadrons.org/cgit/debian/update-inetd.git Vcs-Git: https://git.hadrons.org/git/debian/update-inetd.git -Standards-Version: 4.1.5 +Standards-Version: 4.2.0 Rules-Requires-Root: no Build-Depends: debhelper (>= 11), diff -Nru update-inetd-4.47/debian/po/ca.po update-inetd-4.49/debian/po/ca.po --- update-inetd-4.47/debian/po/ca.po 1970-01-01 00:00:00.000000000 +0000 +++ update-inetd-4.49/debian/po/ca.po 2018-09-29 01:51:59.000000000 +0000 @@ -0,0 +1,86 @@ +# Catalan translation of update-inetd debconf template +# This file is distributed under the same license as the update-inetd package. +# Guillem Jover \n" +"Language-Team: Catalan \n" +"Language: ca\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n!=1;\n" + +#. Type: title +#. Description +#: ../update-inetd.templates:2001 +msgid "Configuring service: ${service}" +msgstr "S'està configurant el servei: ${service}" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:3001 +msgid "Ignore multiple entries and continue without changes?" +msgstr "Voleu ignorar multiples entrades i contonuar sense fer canvis?" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../update-inetd.templates:3001 ../update-inetd.templates:5001 +#: ../update-inetd.templates:6001 +msgid "There are multiple entries in ${inetdcf} for the '${service}' service." +msgstr "S'han trobat multiples entrades pel servei '${service}' a ${inetdcf}." + +#. Type: boolean +#. Description +#: ../update-inetd.templates:4001 +msgid "Leave existing entry and continue without changes?" +msgstr "Voleu deixar l'entrada existent i continuar sense fer canvis?" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:4001 +msgid "" +"An unrecognized entry for ${sservice} was found in ${inetdcf} while trying " +"to add the following entry:" +msgstr "" +"S'ha trobar una entrada desconeguda per ${sservice} a ${inetdcf}, durant " +"l'addició de l'entrada següent:" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:4001 +msgid "The unrecognized entry is:" +msgstr "L'entrada no reconeguda és:" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:5001 +msgid "Remove inetd entries?" +msgstr "Voleu eliminar les entrades d'inetd?" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:5001 +msgid "Please confirm that you agree to remove these entries." +msgstr "Confirmeu que voleu eliminar aquestes entrades." + +#. Type: boolean +#. Description +#: ../update-inetd.templates:6001 +msgid "Disable inetd entries?" +msgstr "Voleu deshabilitar les entrades d'inetd?" + +#. Type: boolean +#. Description +#: ../update-inetd.templates:6001 +msgid "Please confirm that you agree to disable these entries." +msgstr "Confirmeu que voleu deshabilitar aquestes entrades." diff -Nru update-inetd-4.47/lib/DebianNet.pm update-inetd-4.49/lib/DebianNet.pm --- update-inetd-4.47/lib/DebianNet.pm 2018-08-20 18:21:04.000000000 +0000 +++ update-inetd-4.49/lib/DebianNet.pm 2018-09-29 08:38:34.000000000 +0000 @@ -148,6 +148,7 @@ =cut our $INETD_WAKEUP_CALLED = 0; +our @DEBCONF_ARGV = (); # Backwards compatibility aliases. ## no critic (Variables::ProhibitPackageVars) @@ -173,6 +174,7 @@ sub _debconf_init { + local @ARGV = @DEBCONF_ARGV; Debconf::Client::ConfModule->import(':all'); } diff -Nru update-inetd-4.47/update-inetd update-inetd-4.49/update-inetd --- update-inetd-4.47/update-inetd 2018-08-04 14:38:05.000000000 +0000 +++ update-inetd-4.49/update-inetd 2018-09-29 08:39:41.000000000 +0000 @@ -25,6 +25,11 @@ use DebianNet (); +# We need to preserve the original @ARGV, otherwise when the Debconf module +# tries to reexecute us after it has started the backend it would miss +# arguments. +@DebianNet::DEBCONF_ARGV = @ARGV; + $| = 1; $0 =~ s{.*/}{}; @@ -83,12 +88,12 @@ usage() unless $mode; if (defined $group and $mode ne 'add') { - error('--group is only relevant with --add'); + warning('--group is only relevant with --add'); } $group //= 'OTHER'; if (defined $pattern and $mode eq 'add') { - error('--pattern is not relevant with --add'); + warning('--pattern is not relevant with --add'); } $pattern //= '';