Your message dated Thu, 5 Mar 2020 10:04:17 +0000
with message-id <[email protected]>
and subject line closed in debian-security-support 2020.02.25
has caused the Debian Bug report #951874,
regarding debian-security-support: Miscellaneous sh fixes
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
951874: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=951874
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: debian-security-support
Version: 2020.02.21
Tags: upstream patch
Good morning Holger,
Following up on #951772, here are a few more bugfixes:
[[[
>From d96f69e8ed2eef988c4b2fab24dc43cc1fc672d3 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <[email protected]>
Date: Sat, 22 Feb 2020 15:29:06 +0000
Subject: [PATCH 1/4] Clarify an error message
---
check-support-status.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/check-support-status.in b/check-support-status.in
index b9f5263..5ac4274 100755
--- a/check-support-status.in
+++ b/check-support-status.in
@@ -21,7 +21,7 @@ if [ -z "$DEBIAN_VERSION" ] ; then
fi
if [ "$DEBIAN_VERSION" -lt "$DEB_LOWEST_VER_ID" ] || [ "$DEBIAN_VERSION" -gt
"$DEB_NEXT_VER_ID" ] ; then
- eval_gettext "Unknown DEBIAN_VERSION \$DEBIAN_VERSION. Valid values from
\$DEB_LOWEST_VER_ID and \$DEB_NEXT_VER_ID"; echo
+ eval_gettext "Unknown DEBIAN_VERSION \$DEBIAN_VERSION. Valid values are
from \$DEB_LOWEST_VER_ID to \$DEB_NEXT_VER_ID, inclusive."; echo
exit 0
fi
>From c9e725c5c554e35ba03453fa56804b8c93f790eb Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <[email protected]>
Date: Sat, 22 Feb 2020 15:29:53 +0000
Subject: [PATCH 2/4] Fix --version output: used an undefined variable.
---
check-support-status.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/check-support-status.in b/check-support-status.in
index 5ac4274..5a2c500 100755
--- a/check-support-status.in
+++ b/check-support-status.in
@@ -68,7 +68,7 @@ eval set -- "$TEMP"
while true ; do
case "$1" in
-V|--version|--Version)
- eval_gettext "\$name version \$VERSION"; echo
+ eval_gettext "\$NAME version \$VERSION"; echo
exit 0
;;
-h|--help)
>From 5a5010c11a3fa3bb0f74d5c5d6ad319ef7e7badf Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <[email protected]>
Date: Sat, 22 Feb 2020 15:30:39 +0000
Subject: [PATCH 3/4] Print errors and warnings to stderr
In one case, fix the exit code.
---
check-support-status.in | 35 ++++++++++++++++++++++-------------
1 file changed, 22 insertions(+), 13 deletions(-)
diff --git a/check-support-status.in b/check-support-status.in
index 5a2c500..9aeb50c 100755
--- a/check-support-status.in
+++ b/check-support-status.in
@@ -21,8 +21,10 @@ if [ -z "$DEBIAN_VERSION" ] ; then
fi
if [ "$DEBIAN_VERSION" -lt "$DEB_LOWEST_VER_ID" ] || [ "$DEBIAN_VERSION" -gt
"$DEB_NEXT_VER_ID" ] ; then
- eval_gettext "Unknown DEBIAN_VERSION \$DEBIAN_VERSION. Valid values are
from \$DEB_LOWEST_VER_ID to \$DEB_NEXT_VER_ID, inclusive."; echo
- exit 0
+ >&2 printf "%s: " "$NAME"
+ >&2 eval_gettext "Unknown DEBIAN_VERSION \$DEBIAN_VERSION. Valid values
are from \$DEB_LOWEST_VER_ID to \$DEB_NEXT_VER_ID, inclusive."
+ >&2 echo
+ exit 1
fi
LIST=
@@ -59,7 +61,9 @@ Options:
}
if [ $? != 0 ] ; then
- gettext "Failed to parse the command line parameters"; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 gettext "Failed to parse the command line parameters"
+ >&2 echo
exit 1
fi
@@ -92,8 +96,9 @@ while true ; do
EXCEPT="$2"
case "$EXCEPT" in
*:*)
- printf "%s: " "$NAME" &&
- gettext 'E: --except=<package name> does not allow :<arch>
suffixes'; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 gettext 'E: --except=<package name> does not allow
:<arch> suffixes'
+ >&2 echo
exit 1
;;
esac
@@ -108,8 +113,9 @@ while true ; do
break
;;
*)
- printf "%s: " "$NAME" &&
- gettext 'E: Internal error'; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 gettext 'E: Internal error'
+ >&2 echo
exit 1
;;
esac
@@ -131,8 +137,9 @@ case "$TYPE" in
$0 --type earlyend --list [% ENDED %] --status-db "$STATUSDB_FILE"
--except "$EXCEPT" $NOHEADING
exit 0
fi
- printf "%s: " "$NAME" &&
- gettext 'E: Need a --type if --list is given'; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 gettext 'E: Need a --type if --list is given'
+ >&2 echo
exit 1
;;
earlyend)
@@ -145,8 +152,9 @@ limited)
[ "$LIST" ] || LIST=[% LIMITED %]
;;
*)
- printf "%s: " "$NAME" &&
- eval_gettext "E: Unknown --type '\$TYPE'"; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 eval_gettext "E: Unknown --type '\$TYPE'"
+ >&2 echo
exit 1
;;
esac
@@ -168,8 +176,9 @@ if [ "$DPKG_VERSION" ] && dpkg --compare-versions
"$DPKG_VERSION" '<<' 1.16 ; th
SHOWFORMAT='${Status}\t${Package}\t${Version}\t${Source}\n'
else
if [ -z "$DPKG_VERSION" ] ; then
- printf "%s: " "$NAME" &&
- gettext "E: Cannot detect dpkg version, assuming wheezy or newer"; echo
+ >&2 printf "%s: " "$NAME"
+ >&2 gettext "E: Cannot detect dpkg version, assuming wheezy or newer"
+ >&2 echo
fi
SHOWFORMAT='${Status}\t${binary:Package}\t${Version}\t${Source}\n'
fi
>From 6be408eb10c6b7bbf17b9be09603496d29b700d3 Mon Sep 17 00:00:00 2001
From: Daniel Shahaf <[email protected]>
Date: Sat, 22 Feb 2020 15:33:09 +0000
Subject: [PATCH 4/4] Avoid implementation-defined behaviour
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
The behaviour of «echo» with an argument that contains literal backslashes is
implementation-defined. In particular, bash and dash produce different
output.
---
check-support-status.in | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/check-support-status.in b/check-support-status.in
index 9aeb50c..0376e86 100755
--- a/check-support-status.in
+++ b/check-support-status.in
@@ -318,30 +318,30 @@ if [ -z "$NOHEADING" ] ; then
earlyend)
gettext \
"Future end of support for one or more packages"
- echo "\n"
+ echo ""
gettext \
"Unfortunately, it will be necessary to end security support for some packages
before the end of the regular security maintenance life cycle." | $FOLD
- echo "\n"
+ echo ""
gettext \
"The following packages found on this system are affected by this:" ; echo
;;
ended)
gettext \
"Ended security support for one or more packages"
- echo "\n"
+ echo ""
gettext \
"Unfortunately, it has been necessary to end security support for some
packages before the end of the regular security maintenance life cycle." | $FOLD
- echo "\n"
+ echo ""
gettext \
"The following packages found on this system are affected by this:" ; echo
;;
limited)
gettext \
"Limited security support for one or more packages"
- echo "\n"
+ echo ""
gettext \
"Unfortunately, it has been necessary to limit security support for some
packages." | $FOLD
- echo "\n"
+ echo ""
gettext \
"The following packages found on this system are affected by this:" ; echo
;;
]]]
Thanks for merging #951772, by the way.
Cheers,
Daniel
--- End Message ---
--- Begin Message ---
version: 2020.02.25
#951874 was closed in debian-security-support 2020.02.25.
--
cheers,
Holger
-------------------------------------------------------------------------------
holger@(debian|reproducible-builds|layer-acht).org
PGP fingerprint: B8BF 5413 7B09 D35C F026 FE9D 091A B856 069A AA1C
signature.asc
Description: PGP signature
--- End Message ---
