diff options
| author | knu <knu@FreeBSD.org> | 2003-01-11 16:18:48 +0800 |
|---|---|---|
| committer | knu <knu@FreeBSD.org> | 2003-01-11 16:18:48 +0800 |
| commit | 0d3c4d96b118b87b5bebc8c2fb738b6a3f0cdb79 (patch) | |
| tree | 066b2659dc8954f6f5dc3e2dc2083e65189bf8fa | |
| parent | a8969324b180ee8083ef95e5bdfe3e67a243e56e (diff) | |
| download | freebsd-ports-gnome-0d3c4d96b118b87b5bebc8c2fb738b6a3f0cdb79.tar.gz freebsd-ports-gnome-0d3c4d96b118b87b5bebc8c2fb738b6a3f0cdb79.tar.zst freebsd-ports-gnome-0d3c4d96b118b87b5bebc8c2fb738b6a3f0cdb79.zip | |
Add a simple check for MAINTAINER not to include multiple addresses or
comments.
Approved by: portmgr
| -rw-r--r-- | devel/portlint/Makefile | 2 | ||||
| -rw-r--r-- | devel/portlint/src/portlint.pl | 8 | ||||
| -rw-r--r-- | ports-mgmt/portlint/Makefile | 2 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 8 |
4 files changed, 16 insertions, 4 deletions
diff --git a/devel/portlint/Makefile b/devel/portlint/Makefile index 5ea72aca047a..151e11c06857 100644 --- a/devel/portlint/Makefile +++ b/devel/portlint/Makefile @@ -9,7 +9,7 @@ PORTNAME= portlint PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl index 16521143c593..08b13be587c8 100644 --- a/devel/portlint/src/portlint.pl +++ b/devel/portlint/src/portlint.pl @@ -1199,7 +1199,13 @@ PATCH_SITES PATCHFILES PATCH_DIST_STRIP &checkearlier($file, $tmp, @varnames); $tmp = "\n" . $tmp; - if ($tmp =~ /\nMAINTAINER\??=[^\n]+/) { + if ($tmp =~ /\nMAINTAINER\??=([^\n]+)/) { + my $addr = $1; + $addr =~ s/^\s*//; + $addr =~ s/\s*$//; + if ($addr =~ /[\s,<>()]/) { + &perror("FATAL: MAINTAINER should be a single address without comment."); + } $tmp =~ s/\nMAINTAINER\??=[^\n]+//; } elsif ($whole !~ /\nMAINTAINER[?]?=/) { &perror("FATAL: no MAINTAINER listed in $file.") unless ($slaveport && $makevar{MAINTAINER} ne ''); diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 5ea72aca047a..151e11c06857 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -9,7 +9,7 @@ PORTNAME= portlint PORTVERSION= 2.3.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 16521143c593..08b13be587c8 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -1199,7 +1199,13 @@ PATCH_SITES PATCHFILES PATCH_DIST_STRIP &checkearlier($file, $tmp, @varnames); $tmp = "\n" . $tmp; - if ($tmp =~ /\nMAINTAINER\??=[^\n]+/) { + if ($tmp =~ /\nMAINTAINER\??=([^\n]+)/) { + my $addr = $1; + $addr =~ s/^\s*//; + $addr =~ s/\s*$//; + if ($addr =~ /[\s,<>()]/) { + &perror("FATAL: MAINTAINER should be a single address without comment."); + } $tmp =~ s/\nMAINTAINER\??=[^\n]+//; } elsif ($whole !~ /\nMAINTAINER[?]?=/) { &perror("FATAL: no MAINTAINER listed in $file.") unless ($slaveport && $makevar{MAINTAINER} ne ''); |