summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-02-01 09:08:01 +0000
committerwiz <wiz@pkgsrc.org>2011-02-01 09:08:01 +0000
commit46a84723542e40edb406fa4440855195e6f7d50f (patch)
tree29ae0537947f1a2b24caf0793313710487c3c735 /pkgtools
parentf72e2eb13115fbed30c449b5eb1dacf5c6784b69 (diff)
downloadpkgsrc-46a84723542e40edb406fa4440855195e6f7d50f.tar.gz
Make a missing LICENSE an error.
Be more permissive wrt what characters are allowed in patch file names. Bump version to 4.97.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkglint/Makefile4
-rw-r--r--pkgtools/pkglint/files/pkglint.pl14
2 files changed, 9 insertions, 9 deletions
diff --git a/pkgtools/pkglint/Makefile b/pkgtools/pkglint/Makefile
index b86c07f10b5..ed0f8d6bb54 100644
--- a/pkgtools/pkglint/Makefile
+++ b/pkgtools/pkglint/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.387 2011/01/23 08:30:05 obache Exp $
+# $NetBSD: Makefile,v 1.388 2011/02/01 09:08:01 wiz Exp $
#
# Note: if you update the version number, please have a look at the
# changes between the CVS tag "pkglint_current" and HEAD.
# After updating, please re-set the CVS tag to HEAD.
-DISTNAME= pkglint-4.96
+DISTNAME= pkglint-4.97
CATEGORIES= pkgtools
MASTER_SITES= # none
DISTFILES= # none
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index ba56492b054..314a88321d8 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
#! @PERL@
-# $NetBSD: pkglint.pl,v 1.824 2010/10/26 22:32:40 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.825 2011/02/01 09:08:01 wiz Exp $
#
# pkglint - static analyzer and checker for pkgsrc packages
@@ -6868,7 +6868,7 @@ sub checkfile_distinfo($) {
next;
}
my ($alg, $chksum_fname, $sum) = ($1, $2, $3);
- my $is_patch = (($chksum_fname =~ m"^patch-[A-Za-z0-9]+$") ? true : false);
+ my $is_patch = (($chksum_fname =~ m"^patch-.+$") ? true : false);
if ($chksum_fname !~ m"^\w") {
$line->log_error("All file names should start with a letter.");
@@ -7096,8 +7096,8 @@ sub checkfile_package_Makefile($$) {
$pkgctx_vardef->{"NO_CONFIGURE"}->log_warning("... NO_CONFIGURE is set.");
}
- if (exists($pkgctx_vardef->{"RESTRICTED"}) && !exists($pkgctx_vardef->{"LICENSE"})) {
- $pkgctx_vardef->{"RESTRICTED"}->log_error("Restricted packages must have a LICENSE.");
+ if (!exists($pkgctx_vardef->{"LICENSE"})) {
+ log_error($fname, NO_LINE_NUMBER, "All packages must define their LICENSE.");
}
if (exists($pkgctx_vardef->{"GNU_CONFIGURE"}) && exists($pkgctx_vardef->{"USE_LANGUAGES"})) {
@@ -7991,14 +7991,14 @@ sub checkfile($) {
} elsif ($basename =~ m"^MESSAGE") {
$opt_check_MESSAGE and checkfile_MESSAGE($fname);
- } elsif ($basename =~ m"^patch-[A-Za-z0-9]*$") {
+ } elsif ($basename =~ m"^patch-[-A-Za-z0-9_\.]*$") {
$opt_check_patches and checkfile_patch($fname);
} elsif ($fname =~ m"(?:^|/)patches/manual-[^/]*$") {
$opt_debug_unchecked and log_debug($fname, NO_LINE_NUMBER, "Unchecked file \"${fname}\".");
} elsif ($fname =~ m"(?:^|/)patches/[^/]*$") {
- log_warning($fname, NO_LINE_NUMBER, "Patch files should be named \"patch-\", followed by letters and digits only.");
+ log_warning($fname, NO_LINE_NUMBER, "Patch files should be named \"patch-\", followed by letters, '-', '_', '.', and digits only.");
} elsif ($basename =~ m"^PLIST") {
$opt_check_PLIST and checkfile_PLIST($fname);
@@ -8339,7 +8339,7 @@ sub checkdir_package() {
} else {
checkfile($fname);
}
- if ($fname =~ m"/patches/patch-[A-Za-z0-9]*$") {
+ if ($fname =~ m"/patches/patch-*$") {
$have_patches = true;
} elsif ($fname =~ m"/distinfo$") {
$have_distinfo = true;