CVS commit: pkgsrc/pkgtools/lintpkgsrc

["Tobias Nygren" <tnn%netbsd.org@localhost>]

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.

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@localhost

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 <abs%netbsd.org@localhost>.
 #
@@ -1648,9 +1648,17 @@ sub scan_pkgsrc_distfiles_vs_distinfo($$
                 next;
             }
 
-            open( DIGEST, "digest $sum @{$sumfiles{$sum}}|" )
-              || fail("Run digest: $!");
-            while (<DIGEST>) {
+            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
     }