Date: Mon, 10 Apr 2017 14:19:25 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r438168 - head/Mk/Scripts Message-ID: <201704101419.v3AEJPZu067785@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Mon Apr 10 14:19:25 2017 New Revision: 438168 URL: https://svnweb.freebsd.org/changeset/ports/438168 Log: Don't limit Q/A check for bad shebangs with just bin, sbin, libexec and www. Scripts (with possibly incorrect shebangs) may be located anywhere in ${PREFIX}, including, for instance, lib/ (multimedia/lives): Error: '/usr/bin/perl' is an invalid shebang you need USES=shebangfix for 'lib/lives/plugins/effects/rendered/colour_replace' and ${DATADIR}/ (databases/cego): Error: '/bin/bash' is an invalid shebang you need USES=shebangfix for 'share/cego/cgbackup' There may be some more false positives, but broken scripts are much more severe problem. There's also whitelist mechanism which lets you ignore shebangs for certain kinds of files (like .pm) which may be extended to fix FPs Approved by: portmgr (swills) Differential Revision: D8923 Modified: head/Mk/Scripts/qa.sh Modified: head/Mk/Scripts/qa.sh ============================================================================== --- head/Mk/Scripts/qa.sh Mon Apr 10 13:48:12 2017 (r438167) +++ head/Mk/Scripts/qa.sh Mon Apr 10 14:19:25 2017 (r438168) @@ -83,8 +83,7 @@ shebang() { shebangonefile "${f}" || rc=1 # Use heredoc to avoid losing rc from find|while subshell done <<-EOF - $(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \ - ${STAGEDIR}${PREFIX}/libexec ${STAGEDIR}${PREFIX}/www \ + $(find ${STAGEDIR}${PREFIX} \ -type f -perm +111 2>/dev/null) EOF @@ -104,8 +103,7 @@ shebang() { fi # Use heredoc to avoid losing rc from find|while subshell done <<-EOF - $(find ${STAGEDIR}${PREFIX}/bin ${STAGEDIR}${PREFIX}/sbin \ - ${STAGEDIR}${PREFIX}/libexec ${STAGEDIR}${PREFIX}/www \ + $(find ${STAGEDIR}${PREFIX} \ -type l -exec stat -f "%N${LF}%Y" {} + 2>/dev/null) EOF
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201704101419.v3AEJPZu067785>