From bd54318046bfee055b140705a5cfd4148e78da07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Sat, 11 Jun 2022 11:54:23 +0200 Subject: vendor/bc: import of version 5.3.1 This update does not contain any functional change, but fixes two minor build issues: - Temporary files were created in the source directory, causing build failures if the sources were not writable at build time. - A message catalogue contained extra characters that were ignored but made gencat print warning messages. --- NEWS.md | 6 ++++++ gen/strgen.sh | 12 +++++++----- include/version.h | 2 +- locales/en_US.msg | 4 ++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/NEWS.md b/NEWS.md index c526239a6987..6fa0cbdd1bb8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,11 @@ # News +## 5.3.1 + +This is a production release that fixes a build problem in the FreeBSD base +system, as well as a problem in the `en_US` locale. If you don't have problems +with either, you do not need to upgrade. + ## 5.3.0 This is a production release that adds features and has a few bug fixes. diff --git a/gen/strgen.sh b/gen/strgen.sh index 2b41da4a4a48..ca67fda3ae71 100755 --- a/gen/strgen.sh +++ b/gen/strgen.sh @@ -52,17 +52,19 @@ label="$5" define="$6" remove_tabs="$7" +tmpinput=$(mktemp -t "${input##*/}") + if [ "$exclude" -ne 0 ]; then - filter_text "$input" "$input.tmp" "E" + filter_text "$input" "$tmpinput" "E" else - filter_text "$input" "$input.tmp" "A" + filter_text "$input" "$tmpinput" "A" fi -input="$input.tmp" - -exec < "$input" +exec < "$tmpinput" exec > "$output" +rm -f "$tmpinput" + if [ -n "$label" ]; then nameline="const char *${label} = \"${input}\";" labelexternline="extern const char *${label};" diff --git a/include/version.h b/include/version.h index 7dc3c053447f..d460ebfa2d10 100644 --- a/include/version.h +++ b/include/version.h @@ -37,6 +37,6 @@ #define BC_VERSION_H /// The current version. -#define VERSION 5.3.0 +#define VERSION 5.3.1 #endif // BC_VERSION_H diff --git a/locales/en_US.msg b/locales/en_US.msg index adc1cc4537b9..c6bfe6dc3f6a 100644 --- a/locales/en_US.msg +++ b/locales/en_US.msg @@ -77,10 +77,10 @@ $set 4 22 "POSIX does not allow comparison operators outside if statements or loops" 23 "POSIX requires 0 or 1 comparison operators per condition" 24 "POSIX requires all 3 parts of a for loop to be non-empty" -25 "POSIX requires a newline between a semicolon and a function definition", +25 "POSIX requires a newline between a semicolon and a function definition" 26 "POSIX does not allow exponential notation" 27 "POSIX does not allow array references as function parameters" -28 "POSIX does not allow void functions", +28 "POSIX does not allow void functions" 29 "POSIX requires the left brace be on the same line as the function header" 30 "POSIX does not allow strings to be assigned to variables or arrays" -- cgit v1.2.3