Received: by mail.netbsd.org (Postfix, from userid 605) id F143984D66; Wed, 3 Aug 2022 20:50:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3872E84D59 for ; Wed, 3 Aug 2022 20:50:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id KhpCC2fECyYP for ; Wed, 3 Aug 2022 20:50:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id A509884CE2 for ; Wed, 3 Aug 2022 20:50:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 98EAFFB1A; Wed, 3 Aug 2022 20:50:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1659559843130620" MIME-Version: 1.0 Date: Wed, 3 Aug 2022 20:50:43 +0000 From: "Roland Illig" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc/files To: pkgsrc-changes@NetBSD.org Reply-To: rillig@netbsd.org X-Mailer: log_accum Message-Id: <20220803205043.98EAFFB1A@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1659559843130620 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: rillig Date: Wed Aug 3 20:50:43 UTC 2022 Modified Files: pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl pkgsrc/pkgtools/lintpkgsrc/files/t: pkgversion.t Log Message: lintpkgsrc: fix off-by-9 bug in version comparison (since today) To generate a diff of this commit: cvs rdiff -u -r1.49 -r1.50 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl cvs rdiff -u -r1.6 -r1.7 pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1659559843130620 Content-Disposition: inline Content-Length: 1966 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.49 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.50 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.49 Wed Aug 3 20:39:27 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Wed Aug 3 20:50:43 2022 @@ -1,6 +1,6 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.49 2022/08/03 20:39:27 rillig Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.50 2022/08/03 20:50:43 rillig Exp $ # Written by David Brownlee . # @@ -305,7 +305,7 @@ sub split_pkgversion($) { my $nb = ($pkgversion =~ s/^(.*)nb(\d+)$/$1/) ? +$2 : 0; foreach my $elem (split(/(\D+)/, lc($pkgversion))) { if ($elem =~ /\d/) { - push(@temp, $elem); + push(@temp, +$elem); } elsif ($elem eq "pl" || $elem eq "." || $elem eq "_") { push(@temp, 0); } elsif ($elem eq "pre" || $elem eq "rc") { @@ -318,7 +318,7 @@ sub split_pkgversion($) { foreach my $ch (split(//, $elem)) { if ('a' le $ch && $ch le 'z') { push(@temp, 0); - push(@temp, ord($ch) - ord('a') + 10); + push(@temp, ord($ch) - ord('a') + 1); } } } Index: pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t diff -u pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t:1.6 pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t:1.7 --- pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t:1.6 Wed Aug 3 20:39:27 2022 +++ pkgsrc/pkgtools/lintpkgsrc/files/t/pkgversion.t Wed Aug 3 20:50:43 2022 @@ -1,4 +1,4 @@ -# $NetBSD: pkgversion.t,v 1.6 2022/08/03 20:39:27 rillig Exp $ +# $NetBSD: pkgversion.t,v 1.7 2022/08/03 20:50:43 rillig Exp $ use strict; use warnings; @@ -15,3 +15,5 @@ ok(pkgversioncmp('3.4nb13', '>=', '3.4') ok(pkgversioncmp('3.4nb13', '<', '3.4'), ''); ok(pkgversioncmp('3.4nb13', '>', '3.4nb5'), 1); ok(pkgversioncmp('1.1ab', '>', '1.1aa'), 1); +ok(pkgversioncmp('1.1ab', '<=', '1.1.1.2'), 1); +ok(pkgversioncmp('1.1ab', '>=', '1.1.1.2'), 1); --_----------=_1659559843130620--