From 1b9fe5e79276d7f5972b0f4d35606b792b29a22a Mon Sep 17 00:00:00 2001 From: Albert Schwarzkopf Date: Wed, 21 Dec 2022 23:41:31 +0100 Subject: [PATCH] musl: fix strverscmp() comparison of digit sequence --- .../patches/fix_strverscmp_comparison.patch | 40 +++++++++++++++++++ srcpkgs/musl/template | 2 +- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 srcpkgs/musl/patches/fix_strverscmp_comparison.patch diff --git a/srcpkgs/musl/patches/fix_strverscmp_comparison.patch b/srcpkgs/musl/patches/fix_strverscmp_comparison.patch new file mode 100644 index 000000000000..0b7fda952a74 --- /dev/null +++ b/srcpkgs/musl/patches/fix_strverscmp_comparison.patch @@ -0,0 +1,40 @@ +From b50eb8c36c20f967bd0ed70c0b0db38a450886ba Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Mon, 7 Nov 2022 22:17:55 -0500 +Subject: fix strverscmp comparison of digit sequence with non-digits + +the rule that longest digit sequence not beginning with a zero is +greater only applies when both sequences being compared are +non-degenerate. this is spelled out explicitly in the man page, which +may be deemed authoritative for this nonstandard function: "If one or +both of these is empty, then return what strcmp(3) would have +returned..." + +we were wrongly treating any sequence of digits not beginning with a +zero as greater than a non-digit in the other string. +--- + src/string/strverscmp.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +(limited to 'src/string/strverscmp.c') + +diff --git a/src/string/strverscmp.c b/src/string/strverscmp.c +index 4daf276d..16c1da22 100644 +--- a/src/string/strverscmp.c ++++ b/src/string/strverscmp.c +@@ -18,9 +18,9 @@ int strverscmp(const char *l0, const char *r0) + else if (c!='0') z=0; + } + +- if (l[dp]!='0' && r[dp]!='0') { +- /* If we're not looking at a digit sequence that began +- * with a zero, longest digit string is greater. */ ++ if (l[dp]-'1'<9U && r[dp]-'1'<9U) { ++ /* If we're looking at non-degenerate digit sequences starting ++ * with nonzero digits, longest digit string is greater. */ + for (j=i; isdigit(l[j]); j++) + if (!isdigit(r[j])) return 1; + if (isdigit(r[j])) return -1; +-- +cgit v1.2.1 + diff --git a/srcpkgs/musl/template b/srcpkgs/musl/template index afb33cd868b5..ebac306aef36 100644 --- a/srcpkgs/musl/template +++ b/srcpkgs/musl/template @@ -2,7 +2,7 @@ pkgname=musl reverts="1.2.0_1" version=1.1.24 -revision=12 +revision=13 archs="*-musl" bootstrap=yes build_style=gnu-configure