Received: by mail.netbsd.org (Postfix, from userid 605) id A717B84CED; Mon, 17 Aug 2020 02:38:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2C35384DA9 for ; Mon, 17 Aug 2020 02:38:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6FXvUElbJgbz for ; Mon, 17 Aug 2020 02:38:54 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9735D84CDF for ; Mon, 17 Aug 2020 02:38:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 90905FB28; Mon, 17 Aug 2020 02:38:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1597631934273650" MIME-Version: 1.0 Date: Mon, 17 Aug 2020 02:38:54 +0000 From: "Tobias Nygren" Subject: CVS commit: pkgsrc/pkgtools/lintpkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: tnn@netbsd.org X-Mailer: log_accum Message-Id: <20200817023854.90905FB28@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1597631934273650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: tnn Date: Mon Aug 17 02:38:54 UTC 2020 Modified Files: pkgsrc/pkgtools/lintpkgsrc: Makefile pkgsrc/pkgtools/lintpkgsrc/files: lintpkgsrc.pl Log Message: lintpkgsrc: update to 4.95 Use xargs when executing digest for -m. PR pkg/48335: error when using -m and too many files in DISTDIR To generate a diff of this commit: cvs rdiff -u -r1.32 -r1.33 pkgsrc/pkgtools/lintpkgsrc/Makefile cvs rdiff -u -r1.16 -r1.17 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1597631934273650 Content-Disposition: inline Content-Length: 2260 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/pkgtools/lintpkgsrc/Makefile diff -u pkgsrc/pkgtools/lintpkgsrc/Makefile:1.32 pkgsrc/pkgtools/lintpkgsrc/Makefile:1.33 --- pkgsrc/pkgtools/lintpkgsrc/Makefile:1.32 Sat Jan 18 23:33:26 2020 +++ pkgsrc/pkgtools/lintpkgsrc/Makefile Mon Aug 17 02:38:54 2020 @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2020/01/18 23:33:26 rillig Exp $ +# $NetBSD: Makefile,v 1.33 2020/08/17 02:38:54 tnn Exp $ -PKGNAME= lintpkgsrc-4.94 -PKGREVISION= 2 +PKGNAME= lintpkgsrc-4.95 CATEGORIES= pkgtools MAINTAINER= pkgsrc-users@NetBSD.org Index: pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl diff -u pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.16 pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.17 --- pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl:1.16 Thu Jul 16 10:11:39 2020 +++ pkgsrc/pkgtools/lintpkgsrc/files/lintpkgsrc.pl Mon Aug 17 02:38:54 2020 @@ -1,6 +1,6 @@ #!@PERL5@ -# $NetBSD: lintpkgsrc.pl,v 1.16 2020/07/16 10:11:39 wiz Exp $ +# $NetBSD: lintpkgsrc.pl,v 1.17 2020/08/17 02:38:54 tnn Exp $ # Written by David Brownlee . # @@ -1648,9 +1648,17 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$ next; } - open( DIGEST, "digest $sum @{$sumfiles{$sum}}|" ) - || fail("Run digest: $!"); - while () { + my $pid = open3(my $in, my $out, undef, "xargs", "digest", $sum); + defined($pid) || fail "fork"; + my $pid2 = fork(); + defined($pid2) || fail "fork"; + if ($pid2) { + close($in); + } else { + print $in "@{$sumfiles{$sum}}"; + exit 0; + } + while (<$out>) { if (m/^$sum ?\(([^\)]+)\) = (\S+)/) { if ( $distfiles{$1}{sum} ne $2 ) { print $1, " ($sum)\n"; @@ -1658,7 +1666,9 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$ } } } - close(DIGEST); + close($out); + waitpid( $pid, 0 ) || fail "xargs digest $sum"; + waitpid( $pid2, 0 ) || fail "pipe write to xargs"; } safe_chdir('/'); # Do not want to stay in $pkgdistdir } --_----------=_1597631934273650--