Received: by mail.netbsd.org (Postfix, from userid 605) id 088DA84DF0; Fri, 25 May 2018 10:57:30 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7D8ED84DE4 for ; Fri, 25 May 2018 10:57:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id rqpaBoYQrcPt for ; Fri, 25 May 2018 10:57:29 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D53F384DB0 for ; Fri, 25 May 2018 10:57:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id D0A7EFBEC; Fri, 25 May 2018 10:57:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1527245848296010" MIME-Version: 1.0 Date: Fri, 25 May 2018 10:57:28 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk/check To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20180525105728.D0A7EFBEC@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1527245848296010 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri May 25 10:57:28 UTC 2018 Modified Files: pkgsrc/mk/check: check-shlibs-macho.awk Log Message: check-shlibs-macho.awk: Implement revision 1.3 correctly. Skip any lines of otool output that do not start with a tab, ensuring we only check valid files and ignore e.g. shell scripts. Older versions of otool would simply print no output on such files, whereas newer releases print "is not an object file". To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/check/check-shlibs-macho.awk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1527245848296010 Content-Disposition: inline Content-Length: 775 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/check/check-shlibs-macho.awk diff -u pkgsrc/mk/check/check-shlibs-macho.awk:1.4 pkgsrc/mk/check/check-shlibs-macho.awk:1.5 --- pkgsrc/mk/check/check-shlibs-macho.awk:1.4 Fri May 25 09:26:49 2018 +++ pkgsrc/mk/check/check-shlibs-macho.awk Fri May 25 10:57:28 2018 @@ -1,4 +1,4 @@ -# $NetBSD: check-shlibs-macho.awk,v 1.4 2018/05/25 09:26:49 jperkin Exp $ +# $NetBSD: check-shlibs-macho.awk,v 1.5 2018/05/25 10:57:28 jperkin Exp $ # # Read a list of potential Mach-O binaries from stdin. @@ -71,6 +71,8 @@ function check_pkg(DSO, pkg, found) { function checkshlib(DSO, needed, found) { cmd = "otool -XL " shquote(DSO) " 2>/dev/null" while ((cmd | getline) > 0) { + if ($0 !~ /^\t/) + continue needed[$1] = "" } close(cmd) --_----------=_1527245848296010--