pkgsrc/pkgtools/pkglint/files/patches.go
rillig 806fe06245 Updated pkglint to 5.3
Changes since 5.2.2.2:

* Makefile variables

The warnings about missing permissions sound more natural than before
and give a hint for alternative operators (e.g. set-default instead
of append), or an alternative file where setting this variable is
allowed instead (e.g. PKGREVISION may not be set in Makefile.common,
but in Makefile it is ok).

Warnings about "unknown" allowed permissions are not shown anymore,
since they didn't provide any benefit. To see them again, pkglint must
be run with the -Dunchecked option.

User-defined variables may be used by builtin.mk. They may also be
used during load time, not only during run time, under the assumption
that in most cases the bsd.prefs.mk has already been loaded.

Some individual variables may be defined or used in places where this
was not allowed before. CHECK_BUILTIN.*, BUILDLINK_TARGETS,
TOOLS_DEPENDS.*, BUILDLINK_DEPMETHOD.*, SUBST_CLASSES.

A new parser for Makefile expressions detects and reports more
mistakes than bmake itself. Currently it is only used to check the
basic syntax; more applications are possible.

* PLIST

In PLIST files, conditionals of the form ${PLIST.*} are recognized and
are not part of the pathname. This allows pkglint to better check for
missing manual pages and correctly sorted PLIST files.

In --autofix mode, pkglint can sort PLIST files, which makes these
rather annoying warnings easy to fix.

No more warnings for man pages whose filename doesn't match exactly
the section, e.g. man/man3/exit.3c.

* Patches

The code for checking patch files has been completely rewritten, so
that it is easier understandable and well-structured. As an additional
benefit, it also became faster. Support for context diffs has been
dropped to a minimum, since they are not popular anymore.

Pkglint no longer warns about missing trailing whitespace in a line,
since all patch programs can handle these lines. It also doesn't
request empty lines between multiple diffs in a single file, since
that is simply not necessary.

Pkglint is picky when a patch file continues after the diff with some
text that still looks like a diff, since that means the patch doesn't
do what it looks like on first sight
(example: audio/faad2/patches/patch-au).

* Distinfo

When a patch file listed in distinfo cannot be found in the
filesystem, this is reported clearly instead of complaining about
missing SHA512 hashes (example: audio/libopus).

The inter-package distinfo check that verifies whether a distfile has
different hashes has been enabled. It had been disabled before, but
unintentionally so.

* Misc

- The check for COMMENT has been updated to reflect the changed
  default value from url2pkg.
- BUILDLINK_API_DEPENDS.* may be set in buildlink3.mk, even if the
  package is not the current one. (The other variables may be only set
  for the current package.)
- In shell commands, the escape sequence \. (and similar ones, which
  are often seen in sed(1) commands) no longer produces a warning,
  since the different shells handle these escape sequences
  consistently. (It is the echo(1) implementations that actually
  differ, therefore this warning was superfluous.)
- Compiler flags in backticks (typically `pkg-config --cflags`) are
  properly recognized.
- Internal pkglint errors when parsing shell commands have been fixed.
- No more warnings about PKGCONFIG_FILE.* being defined but unused.
- Dependencies of the form pkgbase>=1.0<5.0 are recognized.
- Diagnostics use quotes more often to indicate the placeholders.
- The type of GENERATE_PLIST has been changed from List of ShellWord
  to ShellCommands, since that is what the variable is really about.
- The type ShellCommand used to mean "a shell command line in a
  Makefile", which was confusing. Now it means what the name says,
  which reduces the wrong warnings for variables like CC (example:
  x11/kdebase3/options.mk).
- Improved buildlink3.mk checks to generate more helpful diagnostics.
- Fixed the parsing of dependency patterns, so that all but the most
  exotic ones are properly recognized.
- Fixed the parsing of shell variables of the form ${var%.c}.
- Updated the check for the default COMMENT from url2pkg.
- Many more small improvements.
- Performance has improved again, though only a little bit.
- Unit test coverage has increased from 64.2 % to 78.9 %.

This fixes most of the points mentioned in PR pkg/46570.
2016-01-12 01:02:48 +00:00

388 lines
11 KiB
Go
Raw Blame History

This file contains ambiguous Unicode characters

This file contains Unicode characters that might be confused with other characters. If you think that this is intentional, you can safely ignore this warning. Use the Escape button to reveal them.

package main
// Checks for patch files.
import (
"path"
"strings"
)
func ChecklinesPatch(lines []*Line) {
if G.opts.DebugTrace {
defer tracecall1(lines[0].Fname)()
}
(&PatchChecker{lines, NewExpecter(lines), false, false}).Check()
}
type PatchChecker struct {
lines []*Line
exp *Expecter
seenDocumentation bool
previousLineEmpty bool
}
const (
rePatchUniFileDel = `^---\s(\S+)(?:\s+(.*))?$`
rePatchUniFileAdd = `^\+\+\+\s(\S+)(?:\s+(.*))?$`
rePatchUniHunk = `^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@(.*)$`
)
func (ck *PatchChecker) Check() {
if G.opts.DebugTrace {
defer tracecall0()()
}
if ck.lines[0].CheckRcsid(``, "") {
ck.exp.Advance()
}
ck.previousLineEmpty = ck.exp.ExpectEmptyLine()
patchedFiles := 0
for !ck.exp.EOF() {
line := ck.exp.CurrentLine()
if ck.exp.AdvanceIfMatches(rePatchUniFileDel) {
if ck.exp.AdvanceIfMatches(rePatchUniFileAdd) {
ck.checkBeginDiff(line, patchedFiles)
ck.checkUnifiedDiff(ck.exp.m[1])
patchedFiles++
continue
}
ck.exp.StepBack()
}
if ck.exp.AdvanceIfMatches(rePatchUniFileAdd) {
patchedFile := ck.exp.m[1]
if ck.exp.AdvanceIfMatches(rePatchUniFileDel) {
ck.checkBeginDiff(line, patchedFiles)
ck.exp.PreviousLine().Warn0("Unified diff headers should be first ---, then +++.")
ck.checkUnifiedDiff(patchedFile)
patchedFiles++
continue
}
ck.exp.StepBack()
}
if ck.exp.AdvanceIfMatches(`^\*\*\*\s(\S+)(.*)$`) {
if ck.exp.AdvanceIfMatches(`^---\s(\S+)(.*)$`) {
ck.checkBeginDiff(line, patchedFiles)
line.Warn0("Please use unified diffs (diff -u) for patches.")
return
}
ck.exp.StepBack()
}
ck.exp.Advance()
ck.previousLineEmpty = line.Text == "" || hasPrefix(line.Text, "diff ") || hasPrefix(line.Text, "=============")
if !ck.previousLineEmpty {
ck.seenDocumentation = true
}
}
if patchedFiles > 1 {
Warnf(ck.lines[0].Fname, noLines, "Contains patches for %d files, should be only one.", patchedFiles)
} else if patchedFiles == 0 {
Errorf(ck.lines[0].Fname, noLines, "Contains no patch.")
}
ChecklinesTrailingEmptyLines(ck.lines)
SaveAutofixChanges(ck.lines)
}
// See http://www.gnu.org/software/diffutils/manual/html_node/Detailed-Unified.html
func (ck *PatchChecker) checkUnifiedDiff(patchedFile string) {
if G.opts.DebugTrace {
defer tracecall0()()
}
patchedFileType := guessFileType(ck.exp.CurrentLine(), patchedFile)
if G.opts.DebugMisc {
ck.exp.CurrentLine().Debugf("guessFileType(%q) = %s", patchedFile, patchedFileType)
}
hasHunks := false
for ck.exp.AdvanceIfMatches(rePatchUniHunk) {
hasHunks = true
linesToDel := toInt(ck.exp.m[2], 1)
linesToAdd := toInt(ck.exp.m[4], 1)
if G.opts.DebugMisc {
ck.exp.PreviousLine().Debugf("hunk -%d +%d", linesToDel, linesToAdd)
}
ck.checktextUniHunkCr()
for linesToDel > 0 || linesToAdd > 0 || hasPrefix(ck.exp.CurrentLine().Text, "\\") {
line := ck.exp.CurrentLine()
ck.exp.Advance()
text := line.Text
switch {
case text == "":
linesToDel--
linesToAdd--
case hasPrefix(text, " "), hasPrefix(text, "\t"):
linesToDel--
linesToAdd--
ck.checklineContext(text[1:], patchedFileType)
case hasPrefix(text, "-"):
linesToDel--
case hasPrefix(text, "+"):
linesToAdd--
ck.checklineAdded(text[1:], patchedFileType)
case hasPrefix(text, "\\"):
// \ No newline at end of file
default:
line.Error0("Invalid line in unified patch hunk")
return
}
}
}
if !hasHunks {
ck.exp.CurrentLine().Error1("No patch hunks for %q.", patchedFile)
}
if !ck.exp.EOF() {
line := ck.exp.CurrentLine()
if line.Text != "" && !matches(line.Text, rePatchUniFileDel) && !hasPrefix(line.Text, "Index:") && !hasPrefix(line.Text, "diff ") {
line.Warn0("Empty line or end of file expected.")
Explain3(
"This empty line makes the end of the patch clearly visible.",
"Otherwise the reader would have to count lines to see where",
"the patch ends.")
}
}
}
func (ck *PatchChecker) checkBeginDiff(line *Line, patchedFiles int) {
if G.opts.DebugTrace {
defer tracecall0()()
}
if !ck.seenDocumentation && patchedFiles == 0 {
line.Error0("Each patch must be documented.")
Explain(
"Pkgsrc tries to have as few patches as possible. Therefore, each",
"patch must document why it is necessary. Typical reasons are",
"portability or security.",
"",
"Patches that are related to a security issue should mention the",
"corresponding CVE identifier.",
"",
"Each patch should be sent to the upstream maintainers of the",
"package, so that they can include it in future versions. After",
"submitting a patch upstream, the corresponding bug report should",
"be mentioned in this file, to prevent duplicate work.")
}
if G.opts.WarnSpace && !ck.previousLineEmpty {
if !line.AutofixInsertBefore("") {
line.Note0("Empty line expected.")
}
}
}
func (ck *PatchChecker) checklineContext(text string, patchedFileType FileType) {
if G.opts.DebugTrace {
defer tracecall2(text, patchedFileType.String())()
}
if G.opts.WarnExtra {
ck.checklineAdded(text, patchedFileType)
} else {
ck.checktextRcsid(text)
}
}
func (ck *PatchChecker) checklineAdded(addedText string, patchedFileType FileType) {
if G.opts.DebugTrace {
defer tracecall2(addedText, patchedFileType.String())()
}
ck.checktextRcsid(addedText)
line := ck.exp.PreviousLine()
switch patchedFileType {
case ftShell:
break
case ftMakefile:
// This check is not as accurate as the similar one in MkLine.checkShelltext.
shellTokens, _ := splitIntoShellTokens(line, addedText)
for _, shellToken := range shellTokens {
if !hasPrefix(shellToken, "#") {
line.CheckAbsolutePathname(shellToken)
}
}
case ftSource:
checklineSourceAbsolutePathname(line, addedText)
case ftConfigure:
if hasSuffix(addedText, ": Avoid regenerating within pkgsrc") {
line.Error0("This code must not be included in patches.")
Explain4(
"It is generated automatically by pkgsrc after the patch phase.",
"",
"For more details, look for \"configure-scripts-override\" in",
"mk/configure/gnu-configure.mk.")
}
case ftIgnore:
break
default:
checklineOtherAbsolutePathname(line, addedText)
}
}
func (ck *PatchChecker) checktextUniHunkCr() {
if G.opts.DebugTrace {
defer tracecall0()()
}
line := ck.exp.PreviousLine()
if hasSuffix(line.Text, "\r") {
if !line.AutofixReplace("\r\n", "\n") {
line.Error0("The hunk header must not end with a CR character.")
Explain1(
"The MacOS X patch utility cannot handle these.")
}
}
}
func (ck *PatchChecker) checktextRcsid(text string) {
if strings.IndexByte(text, '$') == -1 {
return
}
if m, tagname := match1(text, `\$(Author|Date|Header|Id|Locker|Log|Name|RCSfile|Revision|Source|State|NetBSD)(?::[^\$]*)?\$`); m {
if matches(text, rePatchUniHunk) {
ck.exp.PreviousLine().Warn1("Found RCS tag \"$%s$\". Please remove it.", tagname)
} else {
ck.exp.PreviousLine().Warn1("Found RCS tag \"$%s$\". Please remove it by reducing the number of context lines using pkgdiff or \"diff -U[210]\".", tagname)
}
}
}
type FileType uint8
const (
ftSource FileType = iota
ftShell
ftMakefile
ftText
ftConfigure
ftIgnore
ftUnknown
)
func (ft FileType) String() string {
return [...]string{
"source code",
"shell code",
"Makefile",
"text file",
"configure file",
"ignored",
"unknown",
}[ft]
}
// This is used to select the proper subroutine for detecting absolute pathnames.
func guessFileType(line *Line, fname string) FileType {
basename := path.Base(fname)
basename = strings.TrimSuffix(basename, ".in") // doesnt influence the content type
ext := strings.ToLower(strings.TrimLeft(path.Ext(basename), "."))
switch {
case matches(basename, `^I?[Mm]akefile|\.ma?k$`):
return ftMakefile
case basename == "configure" || basename == "configure.ac":
return ftConfigure
}
switch ext {
case "m4", "sh":
return ftShell
case "c", "cc", "cpp", "cxx", "el", "h", "hh", "hpp", "l", "pl", "pm", "py", "s", "t", "y":
return ftSource
case "conf", "html", "info", "man", "po", "tex", "texi", "texinfo", "txt", "xml":
return ftText
case "":
return ftUnknown
}
if G.opts.DebugMisc {
line.Debug1("Unknown file type for %q", fname)
}
return ftUnknown
}
func checkwordAbsolutePathname(line *Line, word string) {
if G.opts.DebugTrace {
defer tracecall1(word)()
}
switch {
case matches(word, `^/dev/(?:null|tty|zero)$`):
// These are defined by POSIX.
case word == "/bin/sh":
// This is usually correct, although on Solaris, it's pretty feature-crippled.
case matches(word, `^/s\W`):
// Probably a sed(1) command
case matches(word, `^/(?:[a-z]|\$[({])`):
// Absolute paths probably start with a lowercase letter.
line.Warn1("Found absolute pathname: %s", word)
Explain(
"Absolute pathnames are often an indicator for unportable code. As",
"pkgsrc aims to be a portable system, absolute pathnames should be",
"avoided whenever possible.",
"",
"A special variable in this context is ${DESTDIR}, which is used in",
"GNU projects to specify a different directory for installation than",
"what the programs see later when they are executed. Usually it is",
"empty, so if anything after that variable starts with a slash, it is",
"considered an absolute pathname.")
}
}
// Looks for strings like "/dev/cd0" appearing in source code
func checklineSourceAbsolutePathname(line *Line, text string) {
if !strings.ContainsAny(text, "\"'") {
return
}
if matched, before, _, str := match3(text, `^(.*)(["'])(/\w[^"']*)["']`); matched {
if G.opts.DebugMisc {
line.Debug2("checklineSourceAbsolutePathname: before=%q, str=%q", before, str)
}
switch {
case matches(before, `[A-Z_]\s*$`):
// ok; C example: const char *echo_cmd = PREFIX "/bin/echo";
case matches(before, `\+\s*$`):
// ok; Python example: libdir = prefix + '/lib'
default:
checkwordAbsolutePathname(line, str)
}
}
}
func checklineOtherAbsolutePathname(line *Line, text string) {
if G.opts.DebugTrace {
defer tracecall1(text)()
}
if hasPrefix(text, "#") && !hasPrefix(text, "#!") {
// Don't warn for absolute pathnames in comments, except for shell interpreters.
} else if m, before, path, _ := match3(text, `^(.*?)((?:/[\w.]+)*/(?:bin|dev|etc|home|lib|mnt|opt|proc|sbin|tmp|usr|var)\b[\w./\-]*)(.*)$`); m {
switch {
case hasSuffix(before, "@"): // Example: @PREFIX@/bin
case matches(before, `[)}]$`): // Example: ${prefix}/bin
case matches(before, `\+\s*["']$`): // Example: prefix + '/lib'
case matches(before, `\w$`): // Example: libdir=$prefix/lib
case hasSuffix(before, "."): // Example: ../dir
// XXX new: case matches(before, `s.$`): // Example: sed -e s,/usr,@PREFIX@,
default:
if G.opts.DebugMisc {
line.Debug1("before=%q", before)
}
checkwordAbsolutePathname(line, path)
}
}
}