kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Updated pkglint to 4.21.2.

Browse source 
Changed the file name pattern for patch files to avoid false positives
for DISTFILES that start with "patch-" (requested by salo). Added a
warning for invalid patch file names.
This commit is contained in:
rillig 2005-09-22 11:56:37 +00:00
parent dd6e480708
commit 5ed3de4dcc
3 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
doc/CHANGES
View file

@ -1,4 +1,4 @@
$NetBSD: CHANGES,v 1.11167 2005/09/22 11:55:54 adrianp Exp $ $NetBSD: CHANGES,v 1.11168 2005/09/22 11:57:38 rillig Exp $
Changes to the packages collection and infrastructure in 2005: Changes to the packages collection and infrastructure in 2005:
@ -4074,3 +4074,4 @@ Changes to the packages collection and infrastructure in 2005:
Updated audio/ifp-line to 0.2.4.4nb1 [minskim 2005-09-22] Updated audio/ifp-line to 0.2.4.4nb1 [minskim 2005-09-22]
Updated audio/xhippo to 3.3nb5 [minskim 2005-09-22] Updated audio/xhippo to 3.3nb5 [minskim 2005-09-22]
Updated devel/mantis to 1.0.0rc2nb1 [adrianp 2005-09-22] Updated devel/mantis to 1.0.0rc2nb1 [adrianp 2005-09-22]
Updated pkgtools/pkglint to 4.21.2 [rillig 2005-09-22]

4
pkgtools/pkglint/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.250 2005/09/22 01:46:46 rillig Exp $ # $NetBSD: Makefile,v 1.251 2005/09/22 11:56:37 rillig Exp $
# #
DISTNAME= pkglint-4.21.1 DISTNAME= pkglint-4.21.2
CATEGORIES= pkgtools devel CATEGORIES= pkgtools devel
MASTER_SITES= # empty MASTER_SITES= # empty
DISTFILES= # empty DISTFILES= # empty

11
pkgtools/pkglint/files/pkglint.pl
View file

@ -11,7 +11,7 @@
# Freely redistributable. Absolutely no warranty. # Freely redistributable. Absolutely no warranty.
# #
# From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
# $NetBSD: pkglint.pl,v 1.284 2005/09/22 01:46:46 rillig Exp $ # $NetBSD: pkglint.pl,v 1.285 2005/09/22 11:56:37 rillig Exp $
# #
# This version contains lots of changes necessary for NetBSD packages # This version contains lots of changes necessary for NetBSD packages
# done by: # done by:
@ -832,7 +832,7 @@ sub checkfile_distinfo($$) {
next unless $line->text =~ /^(MD5|SHA1|RMD160) \(([^)]+)\) = (.*)$/; next unless $line->text =~ /^(MD5|SHA1|RMD160) \(([^)]+)\) = (.*)$/;
my ($alg, $patch, $sum) = ($1, $2, $3); my ($alg, $patch, $sum) = ($1, $2, $3);
if ($patch =~ /^patch-[-A-Za-z0-9_.]+$/) { if ($patch =~ /^patch-[A-Za-z0-9]+$/) {
if (-f "${dir}/$patchdir/$patch") { if (-f "${dir}/$patchdir/$patch") {
my $chksum = `sed -e '/\$NetBSD.*/d' $dir/$patchdir/$patch | digest $alg`; my $chksum = `sed -e '/\$NetBSD.*/d' $dir/$patchdir/$patch | digest $alg`;
$chksum =~ s/\r*\n*\z//; $chksum =~ s/\r*\n*\z//;
@ -842,8 +842,8 @@ sub checkfile_distinfo($$) {
} else { } else {
$line->log_error("$patch does not exist."); $line->log_error("$patch does not exist.");
} }
$in_distinfo{$patch} = true;
} }
$in_distinfo{$patch} = true;
} }
checklines_trailing_empty_lines($distinfo); checklines_trailing_empty_lines($distinfo);
@ -2491,10 +2491,13 @@ sub checkdir_package($) {
} elsif ($f =~ qr"/PLIST[^/]*$") { } elsif ($f =~ qr"/PLIST[^/]*$") {
$opt_check_PLIST and checkfile_PLIST($dir, $f); $opt_check_PLIST and checkfile_PLIST($dir, $f);
} elsif ($f =~ qr"/patches/patch-[-A-Za-z0-9]*$") { } elsif ($f =~ qr"/patches/patch-[A-Za-z0-9]*$") {
$have_patches = true; $have_patches = true;
$opt_check_patches and checkfile_patches_patch($dir, $f); $opt_check_patches and checkfile_patches_patch($dir, $f);
} elsif ($f =~ qr"/patches/[^/]*$") {
log_warning($f, NO_LINE_NUMBER, "Patch files should be named \"patch-\", followed by letters and digits only.");
} elsif (-T $f) { } elsif (-T $f) {
$opt_check_extra and checkfile_extra($dir, $f); $opt_check_extra and checkfile_extra($dir, $f);