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

Updated pkglint to 4.45.1.

Browse source 
- Added a new type ShellWord that is used for MAKE_ENV and the like to
  check for invalid FOO="${VALUE}" additions. They really should be
  FOO=${VALUE:Q}, as they may already contain embedded quotes. This is
  especially important for CPPFLAGS and CFLAGS.
This commit is contained in:
rillig 2005-11-23 05:18:46 +00:00
parent f1c7672081
commit 09ccc37a3a
3 changed files with 20 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgtools/pkglint/Makefile
View file

@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.305 2005/11/21 22:06:30 rillig Exp $ # $NetBSD: Makefile,v 1.306 2005/11/23 05:18:46 rillig Exp $
# #
DISTNAME= pkglint-4.45 DISTNAME= pkglint-4.45.1
CATEGORIES= pkgtools CATEGORIES= pkgtools
MASTER_SITES= # empty MASTER_SITES= # empty
DISTFILES= # empty DISTFILES= # empty

22
pkgtools/pkglint/files/makevars.map
View file

@ -1,4 +1,4 @@
# $NetBSD: makevars.map,v 1.36 2005/11/20 13:14:17 rillig Exp $ # $NetBSD: makevars.map,v 1.37 2005/11/23 05:18:46 rillig Exp $
# #
# This file contains the guessed type of some variables, according to # This file contains the guessed type of some variables, according to
@ -63,9 +63,9 @@ CATEGORIES List* of Category
CC_VERSION Readonly CC_VERSION Readonly
CFLAGS List CFLAGS List
COMMENT Comment COMMENT Comment
CONFIGURE_ARGS List CONFIGURE_ARGS List of ShellWord
CONFIGURE_DIRS List* of WrksrcSubdirectory CONFIGURE_DIRS List* of WrksrcSubdirectory
CONFIGURE_ENV List CONFIGURE_ENV List of ShellWord
CPPFLAGS List CPPFLAGS List
DEPENDS List of DependencyWithPath DEPENDS List of DependencyWithPath
DISTFILES List* of Filename DISTFILES List* of Filename
@ -87,7 +87,7 @@ FAMBASE Readonly
FAM_ACCEPTED List* of { fam gamin } FAM_ACCEPTED List* of { fam gamin }
FAM_DEFAULT Userdefined FAM_DEFAULT Userdefined
FAM_TYPE Readonly FAM_TYPE Readonly
FILES_SUBST List FILES_SUBST List of ShellWord
GCC_REQD List GCC_REQD List
GNU_CONFIGURE Yes GNU_CONFIGURE Yes
HOMEPAGE URL HOMEPAGE URL
@ -101,10 +101,10 @@ KRB5_TYPE Readonly
LDFLAGS List LDFLAGS List
LIBS List LIBS List
MAINTAINER Mail_Address MAINTAINER Mail_Address
MAKEFLAGS List MAKEFLAGS List of ShellWord
MAKEVARS List of Varname MAKEVARS List of Varname
MAKE_ENV List MAKE_ENV List of ShellWord
MAKE_FLAGS List MAKE_FLAGS List of ShellWord
MANZ Yes MANZ Yes
MASTER_SITES List* of URL MASTER_SITES List* of URL
MYSQL_VERSIONS_ACCEPTED List* of { 40 41 50 } MYSQL_VERSIONS_ACCEPTED List* of { 40 41 50 }
@ -140,7 +140,7 @@ PKG_APACHE_ACCEPTED List* of { apache13 apache2 }
PKG_APACHE_DEFAULT Userdefined PKG_APACHE_DEFAULT Userdefined
PKG_DEBUG_LEVEL Userdefined PKG_DEBUG_LEVEL Userdefined
PKG_DEFAULT_OPTIONS Userdefined PKG_DEFAULT_OPTIONS Userdefined
PKG_FAIL_REASON List PKG_FAIL_REASON List of ShellWord
PKG_INSTALLATION_TYPES List* of { overwrite pkgviews } PKG_INSTALLATION_TYPES List* of { overwrite pkgviews }
PKG_JAVA_HOME Readonly PKG_JAVA_HOME Readonly
PKG_JVM Readonly PKG_JVM Readonly
@ -148,7 +148,7 @@ PKG_JVMS_ACCEPTED List* of { blackdown-jdk13 jdk jdk14 kaffe sun-jdk13 sun-jdk14
PKG_JVM_DEFAULT Userdefined PKG_JVM_DEFAULT Userdefined
PKG_LEGACY_OPTIONS List* of Option PKG_LEGACY_OPTIONS List* of Option
PKG_OPTIONS Readonly PKG_OPTIONS Readonly
PKG_OPTIONS_DEPRECATED_WARNINGS List* PKG_OPTIONS_DEPRECATED_WARNINGS List* of ShellWord
PKG_OPTIONS_GROUP List* PKG_OPTIONS_GROUP List*
PKG_OPTIONS_LEGACY_OPTS List* PKG_OPTIONS_LEGACY_OPTS List*
PKG_OPTIONS_LEGACY_VARS List* PKG_OPTIONS_LEGACY_VARS List*
@ -158,12 +158,12 @@ PKG_OPTIONS_REQUIRED_GROUPS List*
PKG_OPTIONS_SET List* PKG_OPTIONS_SET List*
PKG_OPTIONS_VAR Varname PKG_OPTIONS_VAR Varname
PKG_PRESERVE Yes PKG_PRESERVE Yes
PKG_SKIP_REASON List PKG_SKIP_REASON List of ShellWord
PKG_SUFX Userdefined PKG_SUFX Userdefined
PKG_SUGGESTED_OPTIONS List* of Option PKG_SUGGESTED_OPTIONS List* of Option
PKG_SUPPORTED_OPTIONS List* of Option PKG_SUPPORTED_OPTIONS List* of Option
PLIST_SRC List* of Pathname PLIST_SRC List* of Pathname
PLIST_SUBST List PLIST_SUBST List of ShellWord
PLIST_TYPE { dynamic static } PLIST_TYPE { dynamic static }
PTHREAD_AUTO_VARS YesNo PTHREAD_AUTO_VARS YesNo
PTHREAD_OPTS List of { native optional require } PTHREAD_OPTS List of { native optional require }

8
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.376 2005/11/21 22:06:30 rillig Exp $ # $NetBSD: pkglint.pl,v 1.377 2005/11/23 05:18:46 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:
@ -1804,6 +1804,12 @@ sub checkline_basic_vartype($$$$$) {
$line->log_warning("\"${value}\" is not a valid relative package directory."); $line->log_warning("\"${value}\" is not a valid relative package directory.");
} }
} elsif ($type eq "ShellWord") {
if ($value =~ qr"^[\w_]+=\"\$\{([\w_]+)\}\"$") {
my ($vname) = ($1);
$line->log_warning("Please use \${${vname}:Q} instead of \"\${${vname}}\".");
}
} elsif ($type eq "Stage") { } elsif ($type eq "Stage") {
if ($value !~ qr"^(?:pre|do|post)-(?:extract|patch|configure|build|install)$") { if ($value !~ qr"^(?:pre|do|post)-(?:extract|patch|configure|build|install)$") {
$line->log_warning("Invalid stage name. Use one of {pre,do,post}-{extract,patch,configure,build,install}."); $line->log_warning("Invalid stage name. Use one of {pre,do,post}-{extract,patch,configure,build,install}.");