From 41d5a331b08b8668e41c78249a74f1e97485713af8d9b325f4f4f4b04b7babd9 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 27 Nov 2023 11:32:57 +0000 Subject: [PATCH 1/4] - Update to release 4.18 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=122 --- libHX-4.17.tar.asc | 7 ------- libHX-4.17.tar.xz | 3 --- libHX-4.18.tar.asc | 7 +++++++ libHX-4.18.tar.xz | 3 +++ libHX.changes | 12 ++++++++++++ libHX.spec | 2 +- 6 files changed, 23 insertions(+), 11 deletions(-) delete mode 100644 libHX-4.17.tar.asc delete mode 100644 libHX-4.17.tar.xz create mode 100644 libHX-4.18.tar.asc create mode 100644 libHX-4.18.tar.xz diff --git a/libHX-4.17.tar.asc b/libHX-4.17.tar.asc deleted file mode 100644 index 06abcc4..0000000 --- a/libHX-4.17.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZVCzEwAKCRD3bv5dDCI6 -j59CAP4jLfXxVBXM8biPO6KN6wmTFk/8w/j/3IFZG4VbVBUjkwEA8Ey6tSCiUPGf -gpXzRav3+Bbg58v8SCjDhXwSLY0tJAw= -=9ItE ------END PGP SIGNATURE----- diff --git a/libHX-4.17.tar.xz b/libHX-4.17.tar.xz deleted file mode 100644 index d33ba41..0000000 --- a/libHX-4.17.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:388ef9c441ffe58583de3800a7cc68c052de19a41c9174d97af758754b779d20 -size 357724 diff --git a/libHX-4.18.tar.asc b/libHX-4.18.tar.asc new file mode 100644 index 0000000..bb7b8e1 --- /dev/null +++ b/libHX-4.18.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZWR82AAKCRD3bv5dDCI6 +j1m/APwLy01bA/g2ElzN9bLlQIB1gBiF6cH3FkWoTu50W8wwagEA4ROaAr5ZZZ8X +G37Mp+j3svhrTPiQadg0+yJmp5rGYwQ= +=iZth +-----END PGP SIGNATURE----- diff --git a/libHX-4.18.tar.xz b/libHX-4.18.tar.xz new file mode 100644 index 0000000..22be97c --- /dev/null +++ b/libHX-4.18.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7b7513010d8d7196f6d2733a8669eb12390bed12ea74449e42af485e1bd7cc75 +size 356368 diff --git a/libHX.changes b/libHX.changes index a4832e9..ef531e9 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Nov 27 11:25:47 UTC 2023 - Jan Engelhardt + +- Update to release 4.18 + * opt: new HX_getopt5 API for the parser with untangled in and + out variables + * string: HX_strtoull_units handles negative values now (like + strtoull) + * string: HX_strtoull_units & HX_strtoull_(n)sec now set + errno=ERANGE for nonrepresentable results + * string: HX_strtoull_sec rejects unitless numbers now + ------------------------------------------------------------------- Sun Nov 12 11:09:23 UTC 2023 - Jan Engelhardt diff --git a/libHX.spec b/libHX.spec index b886b72..ff0e527 100644 --- a/libHX.spec +++ b/libHX.spec @@ -18,7 +18,7 @@ Name: libHX %define lname libHX32 -Version: 4.17 +Version: 4.18 Release: 0 Summary: Collection of routines for C and C++ programming License: LGPL-2.1-or-later From b6f859f54289bd8cf4471af9020183bce3782b388112c2f3f326833dead9a979 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Nov 2023 01:09:09 +0000 Subject: [PATCH 2/4] - Add 0001-string-resolve-testsuite-failure-with-aarch64.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=123 --- ...solve-testsuite-failure-with-aarch64.patch | 38 +++++++++++++++++++ libHX.changes | 1 + 2 files changed, 39 insertions(+) create mode 100644 0001-string-resolve-testsuite-failure-with-aarch64.patch diff --git a/0001-string-resolve-testsuite-failure-with-aarch64.patch b/0001-string-resolve-testsuite-failure-with-aarch64.patch new file mode 100644 index 0000000..9c94c99 --- /dev/null +++ b/0001-string-resolve-testsuite-failure-with-aarch64.patch @@ -0,0 +1,38 @@ +From 763c993419a6d59e6d2e1d7d60bc8d23981b5a94 Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Tue, 28 Nov 2023 23:22:58 +0100 +Subject: [PATCH] string: resolve testsuite failure with aarch64 + +Fixes: v4.17-9-g323210d +--- + src/string.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/string.c b/src/string.c +index 11f3c9f..8e12b4a 100644 +--- a/src/string.c ++++ b/src/string.c +@@ -1030,8 +1030,19 @@ EXPORT_SYMBOL unsigned long long HX_strtoull_unit(const char *s, + errno = ERANGE; + return ULLONG_MAX; + } ++ /* ++ * https://eel.is/c++draft/conv.double#2: values ++ * unrepresentable in the target type (such as forcing -5.2f ++ * into a uint) is UB. Thus check for range and apply the ++ * negation after the conversion to ULL. ++ */ ++ if (q > ULLONG_MAX) { ++ errno = ERANGE; ++ return ULLONG_MAX; ++ } ++ unsigned long long r = q; + errno = 0; +- return neg ? -q : q; ++ return neg ? -r : r; + } + if (exponent == 0) + exponent = 1000; +-- +2.43.0 + diff --git a/libHX.changes b/libHX.changes index ef531e9..c8680b3 100644 --- a/libHX.changes +++ b/libHX.changes @@ -9,6 +9,7 @@ Mon Nov 27 11:25:47 UTC 2023 - Jan Engelhardt * string: HX_strtoull_units & HX_strtoull_(n)sec now set errno=ERANGE for nonrepresentable results * string: HX_strtoull_sec rejects unitless numbers now +- Add 0001-string-resolve-testsuite-failure-with-aarch64.patch ------------------------------------------------------------------- Sun Nov 12 11:09:23 UTC 2023 - Jan Engelhardt From f6ff6b2850af06e4141f66b76245ce43df7a4871a59a981e6831b3948d11fc3a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 29 Nov 2023 01:09:19 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=124 --- libHX.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libHX.spec b/libHX.spec index ff0e527..879c32f 100644 --- a/libHX.spec +++ b/libHX.spec @@ -28,6 +28,7 @@ URL: https://inai.de/projects/libhx/ Source: https://inai.de/files/libhx/libHX-%version.tar.xz Source2: https://inai.de/files/libhx/libHX-%version.tar.asc Source4: %name.keyring +Patch1: 0001-string-resolve-testsuite-failure-with-aarch64.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: xz From afd74979d807c8e23cfbd7243a81921e9879c6c49f109f01fc9d9bfbb1834cf8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Nov 2023 23:21:37 +0000 Subject: [PATCH 4/4] - Update to release 4.19 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libHX?expand=0&rev=125 --- ...solve-testsuite-failure-with-aarch64.patch | 38 ------------------- libHX-4.18.tar.asc | 7 ---- libHX-4.18.tar.xz | 3 -- libHX-4.19.tar.asc | 7 ++++ libHX-4.19.tar.xz | 3 ++ libHX.changes | 10 +++++ libHX.spec | 3 +- 7 files changed, 21 insertions(+), 50 deletions(-) delete mode 100644 0001-string-resolve-testsuite-failure-with-aarch64.patch delete mode 100644 libHX-4.18.tar.asc delete mode 100644 libHX-4.18.tar.xz create mode 100644 libHX-4.19.tar.asc create mode 100644 libHX-4.19.tar.xz diff --git a/0001-string-resolve-testsuite-failure-with-aarch64.patch b/0001-string-resolve-testsuite-failure-with-aarch64.patch deleted file mode 100644 index 9c94c99..0000000 --- a/0001-string-resolve-testsuite-failure-with-aarch64.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 763c993419a6d59e6d2e1d7d60bc8d23981b5a94 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Tue, 28 Nov 2023 23:22:58 +0100 -Subject: [PATCH] string: resolve testsuite failure with aarch64 - -Fixes: v4.17-9-g323210d ---- - src/string.c | 13 ++++++++++++- - 1 file changed, 12 insertions(+), 1 deletion(-) - -diff --git a/src/string.c b/src/string.c -index 11f3c9f..8e12b4a 100644 ---- a/src/string.c -+++ b/src/string.c -@@ -1030,8 +1030,19 @@ EXPORT_SYMBOL unsigned long long HX_strtoull_unit(const char *s, - errno = ERANGE; - return ULLONG_MAX; - } -+ /* -+ * https://eel.is/c++draft/conv.double#2: values -+ * unrepresentable in the target type (such as forcing -5.2f -+ * into a uint) is UB. Thus check for range and apply the -+ * negation after the conversion to ULL. -+ */ -+ if (q > ULLONG_MAX) { -+ errno = ERANGE; -+ return ULLONG_MAX; -+ } -+ unsigned long long r = q; - errno = 0; -- return neg ? -q : q; -+ return neg ? -r : r; - } - if (exponent == 0) - exponent = 1000; --- -2.43.0 - diff --git a/libHX-4.18.tar.asc b/libHX-4.18.tar.asc deleted file mode 100644 index bb7b8e1..0000000 --- a/libHX-4.18.tar.asc +++ /dev/null @@ -1,7 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZWR82AAKCRD3bv5dDCI6 -j1m/APwLy01bA/g2ElzN9bLlQIB1gBiF6cH3FkWoTu50W8wwagEA4ROaAr5ZZZ8X -G37Mp+j3svhrTPiQadg0+yJmp5rGYwQ= -=iZth ------END PGP SIGNATURE----- diff --git a/libHX-4.18.tar.xz b/libHX-4.18.tar.xz deleted file mode 100644 index 22be97c..0000000 --- a/libHX-4.18.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7b7513010d8d7196f6d2733a8669eb12390bed12ea74449e42af485e1bd7cc75 -size 356368 diff --git a/libHX-4.19.tar.asc b/libHX-4.19.tar.asc new file mode 100644 index 0000000..e181134 --- /dev/null +++ b/libHX-4.19.tar.asc @@ -0,0 +1,7 @@ +-----BEGIN PGP SIGNATURE----- + +iHUEABYKAB0WIQS8oMXDCcrFaedKkhz3bv5dDCI6jwUCZWkWHgAKCRD3bv5dDCI6 +j1MgAP9m/go0vrdXuyg9nNfm/OD/twP17Odc2iA1ImSg6JK3hwD/W/Jz+birwugP +Nj3nJfs3FH/SLt60Yus6Ukg8r9aPPw4= +=3Hey +-----END PGP SIGNATURE----- diff --git a/libHX-4.19.tar.xz b/libHX-4.19.tar.xz new file mode 100644 index 0000000..6082de1 --- /dev/null +++ b/libHX-4.19.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0384a1bd832a2688528b31af3dfecca36e94c8194a0207d871bf4e1a57e69b0a +size 359672 diff --git a/libHX.changes b/libHX.changes index c8680b3..02fb2e8 100644 --- a/libHX.changes +++ b/libHX.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Thu Nov 30 23:09:57 UTC 2023 - Jan Engelhardt + +- Update to release 4.19 + * string: fixed HX_strtoull_unit with negative fractions + producing 0 sometimes + * opt: fix HX_getopt losing argv on HXOPT_KEEP_ARGV +- Delete 0001-string-resolve-testsuite-failure-with-aarch64.patch + (merged) + ------------------------------------------------------------------- Mon Nov 27 11:25:47 UTC 2023 - Jan Engelhardt diff --git a/libHX.spec b/libHX.spec index 879c32f..74557ee 100644 --- a/libHX.spec +++ b/libHX.spec @@ -18,7 +18,7 @@ Name: libHX %define lname libHX32 -Version: 4.18 +Version: 4.19 Release: 0 Summary: Collection of routines for C and C++ programming License: LGPL-2.1-or-later @@ -28,7 +28,6 @@ URL: https://inai.de/projects/libhx/ Source: https://inai.de/files/libhx/libHX-%version.tar.xz Source2: https://inai.de/files/libhx/libHX-%version.tar.asc Source4: %name.keyring -Patch1: 0001-string-resolve-testsuite-failure-with-aarch64.patch BuildRequires: gcc-c++ BuildRequires: pkg-config BuildRequires: xz