diff options
Diffstat (limited to 'pkgtools/pkglint/files/vardefs.go')
| -rw-r--r-- | pkgtools/pkglint/files/vardefs.go | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/pkgtools/pkglint/files/vardefs.go b/pkgtools/pkglint/files/vardefs.go index 9027a707521..a65343e620d 100644 --- a/pkgtools/pkglint/files/vardefs.go +++ b/pkgtools/pkglint/files/vardefs.go @@ -206,7 +206,7 @@ func (gd *GlobalData) InitVartypes() { pkglist("CONFLICTS", lkSpace, CheckvarDependency) pkglist("CONF_FILES", lkShell, CheckvarShellWord) pkg("CONF_FILES_MODE", lkNone, enum("0644 0640 0600 0400")) - pkglist("CONF_FILES_PERMS", lkShell, CheckvarShellWord) + pkglist("CONF_FILES_PERMS", lkShell, CheckvarPerms) sys("COPY", lkNone, enum("-c")) // The flag that tells ${INSTALL} to copy a file sys("CPP", lkNone, CheckvarShellCommand) pkglist("CPPFLAGS*", lkShell, CheckvarCFlag) @@ -400,7 +400,7 @@ func (gd *GlobalData) InitVartypes() { pkglist("MAKEFLAGS", lkShell, CheckvarShellWord) acl("MAKEVARS", lkShell, CheckvarVarname, "builtin.mk: append; buildlink3.mk: append; hacks.mk: append") pkglist("MAKE_DIRS", lkShell, CheckvarPathname) - pkglist("MAKE_DIRS_PERMS", lkShell, CheckvarShellWord) + pkglist("MAKE_DIRS_PERMS", lkShell, CheckvarPerms) acl("MAKE_ENV", lkShell, CheckvarShellWord, "Makefile: append, set, use; Makefile.common: append, set, use; buildlink3.mk: append; builtin.mk: append; *.mk: append, use") pkg("MAKE_FILE", lkNone, CheckvarPathname) pkglist("MAKE_FLAGS", lkShell, CheckvarShellWord) @@ -477,7 +477,7 @@ func (gd *GlobalData) InitVartypes() { pkg("OVERRIDE_GNU_CONFIG_SCRIPTS", lkNone, CheckvarYes) acl("OWNER", lkNone, CheckvarMailAddress, "Makefile: set; Makefile.common: default") pkglist("OWN_DIRS", lkShell, CheckvarPathname) - pkglist("OWN_DIRS_PERMS", lkShell, CheckvarShellWord) + pkglist("OWN_DIRS_PERMS", lkShell, CheckvarPerms) sys("PAMBASE", lkNone, CheckvarPathname) usr("PAM_DEFAULT", lkNone, enum("linux-pam openpam solaris-pam")) acl("PATCHDIR", lkNone, CheckvarRelativePkgPath, "Makefile: set; Makefile.common: default, set") @@ -564,7 +564,7 @@ func (gd *GlobalData) InitVartypes() { acl("PKG_SUGGESTED_OPTIONS", lkShell, CheckvarOption, "options.mk: set, append; Makefile: set, append; Makefile.common: set") acl("PKG_SUPPORTED_OPTIONS", lkShell, CheckvarOption, "options.mk: set, append, use; Makefile: set, append; Makefile.common: set") pkg("PKG_SYSCONFDIR*", lkNone, CheckvarPathname) - pkglist("PKG_SYSCONFDIR_PERMS", lkShell, CheckvarShellWord) + pkglist("PKG_SYSCONFDIR_PERMS", lkShell, CheckvarPerms) sys("PKG_SYSCONFBASEDIR", lkNone, CheckvarPathname) pkg("PKG_SYSCONFSUBDIR", lkNone, CheckvarPathname) acl("PKG_SYSCONFVAR", lkNone, CheckvarIdentifier, "") // FIXME: name/type mismatch. @@ -614,10 +614,10 @@ func (gd *GlobalData) InitVartypes() { pkglist("REPLACE_PYTHON", lkShell, CheckvarPathmask) pkglist("REPLACE_SH", lkShell, CheckvarPathmask) pkglist("REQD_DIRS", lkShell, CheckvarPathname) - pkglist("REQD_DIRS_PERMS", lkShell, CheckvarShellWord) + pkglist("REQD_DIRS_PERMS", lkShell, CheckvarPerms) pkglist("REQD_FILES", lkShell, CheckvarPathname) pkg("REQD_FILES_MODE", lkNone, enum("0644 0640 0600 0400")) - pkglist("REQD_FILES_PERMS", lkShell, CheckvarShellWord) + pkglist("REQD_FILES_PERMS", lkShell, CheckvarPerms) pkg("RESTRICTED", lkNone, CheckvarMessage) usr("ROOT_USER", lkNone, CheckvarUserGroupName) usr("ROOT_GROUP", lkNone, CheckvarUserGroupName) @@ -634,7 +634,7 @@ func (gd *GlobalData) InitVartypes() { acl("SHLIBTOOL", lkNone, CheckvarShellCommand, "Makefile: use") acl("SHLIBTOOL_OVERRIDE", lkShell, CheckvarPathmask, "Makefile: set, append; Makefile.common: append") acl("SITES.*", lkShell, CheckvarFetchURL, "Makefile, Makefile.common, options.mk: set, append, use") - pkglist("SPECIAL_PERMS", lkShell, CheckvarShellWord) + pkglist("SPECIAL_PERMS", lkShell, CheckvarPerms) sys("STEP_MSG", lkNone, CheckvarShellCommand) acl("SUBDIR", lkShell, CheckvarFilename, "Makefile: append; *:") acl("SUBST_CLASSES", lkShell, CheckvarIdentifier, "Makefile: set, append; *: append") @@ -672,6 +672,7 @@ func (gd *GlobalData) InitVartypes() { acl("USE_BUILTIN.*", lkNone, CheckvarYesNoIndirectly, "builtin.mk: set") pkg("USE_CMAKE", lkNone, CheckvarYes) acl("USE_CROSSBASE", lkNone, CheckvarYes, "Makefile: set") + usr("USE_DESTDIR", lkNone, CheckvarYes) pkg("USE_FEATURES", lkShell, CheckvarIdentifier) pkg("USE_GCC_RUNTIME", lkNone, CheckvarYesNo) pkg("USE_GNU_CONFIGURE_HOST", lkNone, CheckvarYesNo) |