From owner-svn-ports-head@freebsd.org Sat May 12 22:14:32 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E7FC1FD4325; Sat, 12 May 2018 22:14:31 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 91F457F402; Sat, 12 May 2018 22:14:31 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 70A93244A8; Sat, 12 May 2018 22:14:31 +0000 (UTC) (envelope-from marcus@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w4CMEVFp035044; Sat, 12 May 2018 22:14:31 GMT (envelope-from marcus@FreeBSD.org) Received: (from marcus@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w4CMEVFW035042; Sat, 12 May 2018 22:14:31 GMT (envelope-from marcus@FreeBSD.org) Message-Id: <201805122214.w4CMEVFW035042@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: marcus set sender to marcus@FreeBSD.org using -f From: Joe Marcus Clarke Date: Sat, 12 May 2018 22:14:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r469758 - in head/ports-mgmt/portlint: . src X-SVN-Group: ports-head X-SVN-Commit-Author: marcus X-SVN-Commit-Paths: in head/ports-mgmt/portlint: . src X-SVN-Commit-Revision: 469758 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 May 2018 22:14:32 -0000 Author: marcus Date: Sat May 12 22:14:30 2018 New Revision: 469758 URL: https://svnweb.freebsd.org/changeset/ports/469758 Log: Bump version to 2.18.2. Fix a regression in the mae makepatch check. Make sure only the patch header is checked, but make sure to read in the entire patch file. This regression was introduced in 2.18.0. PR: 228203 Modified: head/ports-mgmt/portlint/Makefile head/ports-mgmt/portlint/src/portlint.pl Modified: head/ports-mgmt/portlint/Makefile ============================================================================== --- head/ports-mgmt/portlint/Makefile Sat May 12 21:27:22 2018 (r469757) +++ head/ports-mgmt/portlint/Makefile Sat May 12 22:14:30 2018 (r469758) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= portlint -PORTVERSION= 2.18.1 +PORTVERSION= 2.18.2 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none Modified: head/ports-mgmt/portlint/src/portlint.pl ============================================================================== --- head/ports-mgmt/portlint/src/portlint.pl Sat May 12 21:27:22 2018 (r469757) +++ head/ports-mgmt/portlint/src/portlint.pl Sat May 12 22:14:30 2018 (r469758) @@ -15,7 +15,7 @@ # was removed. # # $FreeBSD$ -# $MCom: portlint/portlint.pl,v 1.461 2018/05/12 18:55:45 jclarke Exp $ +# $MCom: portlint/portlint.pl,v 1.463 2018/05/12 22:12:18 jclarke Exp $ # use strict; @@ -50,7 +50,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 18; -my $micro = 1; +my $micro = 2; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -1037,16 +1037,17 @@ sub checkpatch { open(IN, "< $file") || return 0; $whole = ''; + my $checked_header = 0; while () { $whole .= $_; - if (/^--- /) { + if (/^--- / && !$checked_header) { + $checked_header = 1; if ($_ !~ /UTC\s*$/) { &perror("WARN", $file, -1, "patch was not generated using ". "``make makepatch''. It is recommended to use ". "``make makepatch'' when you need to [re-]generate a ". "patch to ensure proper patch format."); } - # last; } }