From nobody Mon Sep 30 12:43:16 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4XHLMn0sl0z5YF9s; Mon, 30 Sep 2024 12:43:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4XHLMm6vNZz4SLf; Mon, 30 Sep 2024 12:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727700197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN3hafOLXZvkFvU+UHzrN8fTxFOTlKoI20xPTnd91OQ=; b=hjD72oGTnHRXSoMjIbRJoxWZ0HXFoKwpPumwt5Xsek9M9LzHCcn+JiqiW62x9ePcshYeVm OJlm3doHRyXPS8EGXsJMFss5tECe8whp2NghbNIxgcsZ/MBlITE88Isq50lMIXpaO9zAPg 5E2EE3V/hEGGDk8IPEFxxfgSsA0PwnRKNT5jq5Fyv0cY6LYCGS3CZ0/lBw0no1aioZX9KH OoVshvFyOtCcJw7B/FBljxZNVJV5B5OQEM0hTdSWE2n84JQ1bsI8GyiuBTNcWUeQ9rFGqO Csju84yn/7TEV+4I8vVSKSXkWgT4cctIGmGDaFtEOZbIMdorc7Et6SS6MkXdYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1727700197; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZN3hafOLXZvkFvU+UHzrN8fTxFOTlKoI20xPTnd91OQ=; b=fZuJmgPQzDObgD3B+gwHy0rmD1xaih/O181Dc+SN1hXU5udZYzHcmLfYVL6Z0graQC6Wcz IvhpZFZbYGeweyr2FgTZIx5n821UnQnUaHakfvkqCcvwjob3VnMBUQ0CyZe7yyeTaWWJWF FCDQTsvIRMVX4o4tYXu7bJbIueZzzW+wEABQ+WKTiUpvhIJUNVe2N8ZVnMqYVXcFTdBSHZ xlcso737ZWNgJCKHfh9bET2RCFJXfd08frTEImOAQtCWRM7SgzS99opmA29CRVVMLwcTUE rLdfJvJKjehkUYxhTd435iy70e+nF2luHS3I/XDyspywBIoGY4kN8DmWuf8Czw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1727700197; a=rsa-sha256; cv=none; b=u685ll8//U5WTLVy/hBOa+0DE1NnO5PzsdbGoGOPRAXrDEXq282BCeeFA9a3sjeER7roOr 2HRy99DyG+XJFAx2e9h5yrxs1GlBp99xZrSHtOHDA1oQr5noCKtFkVbpGv+UN/afsMj6c2 1118XOyguz05NXsoJ334skY4D1QtQRWXixBQAlDl2ml/ZzdQWFAqDAxZq39RKsRpmisprU kLuHZFWNkXmdaqK8jRX0AlbFPWW0xuGRT/azTi3ZU8zgkTchiWUHOdnRMgtnTLPsWMsA9U 9dOryxwFUdYcwSjL0OkR0CP9OFA3wt18cJQviyPekkvB4rubapAGE60I8mWpgg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4XHLMm6QVxzswN; Mon, 30 Sep 2024 12:43:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48UChGka006094; Mon, 30 Sep 2024 12:43:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48UChGNW006091; Mon, 30 Sep 2024 12:43:16 GMT (envelope-from git) Date: Mon, 30 Sep 2024 12:43:16 GMT Message-Id: <202409301243.48UChGNW006091@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joe Marcus Clarke Subject: git: 0a0c3ea9f5be - main - ports-mgmt/portlint: Update to 2.22.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marcus X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0a0c3ea9f5be43f4a16b3a02d5b77d3d98525895 Auto-Submitted: auto-generated The branch main has been updated by marcus: URL: https://cgit.FreeBSD.org/ports/commit/?id=0a0c3ea9f5be43f4a16b3a02d5b77d3d98525895 commit 0a0c3ea9f5be43f4a16b3a02d5b77d3d98525895 Author: Joe Marcus Clarke AuthorDate: 2024-09-30 12:39:28 +0000 Commit: Joe Marcus Clarke CommitDate: 2024-09-30 12:42:42 +0000 ports-mgmt/portlint: Update to 2.22.2 * Check for executable files [1] * Check that shared objects were installed in ${PREFIX}/lib [2] * Allow MASTERDIR to contain :H[:H] [3] PR: 278404 [1] 278773 [2] Submitted by: Piotr Smyrak [3] --- ports-mgmt/portlint/Makefile | 2 +- ports-mgmt/portlint/src/portlint.pl | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile index 7e3df9f319fd..df48ea0825d6 100644 --- a/ports-mgmt/portlint/Makefile +++ b/ports-mgmt/portlint/Makefile @@ -1,5 +1,5 @@ PORTNAME= portlint -PORTVERSION= 2.22.1 +PORTVERSION= 2.22.2 CATEGORIES= ports-mgmt MASTER_SITES= # none DISTFILES= # none diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 53d80a8847c0..ac205b93ba29 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -52,7 +52,7 @@ $portdir = '.'; # version variables my $major = 2; my $minor = 22; -my $micro = 1; +my $micro = 2; # default setting - for FreeBSD my $portsdir = '/usr/ports'; @@ -171,7 +171,7 @@ my @varlist = qw( ALLFILES CHECKSUM_ALGORITHMS INSTALLS_ICONS GNU_CONFIGURE CONFIGURE_ARGS MASTER_SITE_SUBDIR LICENSE LICENSE_COMB NO_STAGE DEVELOPER SUB_FILES SHEBANG_LANG MASTER_SITES_SUBDIRS FLAVORS - USE_PYTHON LICENSE_PERMS USE_PYQT USE_GITHUB USE_GITLAB + USE_PYTHON LICENSE_PERMS USE_PYQT USE_GITHUB USE_GITLAB PREFIX ); my %makevar; @@ -364,6 +364,9 @@ if ($committer) { "git files before committing the port."); $File::Find::prune = 1; + } elsif (-f && -x) { + &perror("WARN", $fullname, -1, "this file is executable and likely ". + "does not need to be."); } elsif (-f) { my $fullpath = $makevar{'.CURDIR'}.'/'.$fullname; my $result = `type git >/dev/null 2>&1 && git status --porcelain $fullpath`; @@ -559,6 +562,7 @@ sub checkplist { my $owner_seen = 0; my $group_seen = 0; my $found_so = 0; + my $found_prefix_so = 0; # Variables that are allowed to be out-of-sync in the XXXDIR check. # E.g., %%PORTDOCS%%%%RUBY_MODDOCDIR%% will be OK because there is @@ -774,6 +778,8 @@ sub checkplist { $makevar{USE_LDCONFIG} eq '') { &perror("WARN", $file, $., "installing shared libraries, ". "please define USE_LDCONFIG as appropriate"); + } elsif ($_ =~ m|^lib/lib[^\/]+\.so[.\d]*$|) { + $found_prefix_so++; } elsif ($_ =~ m|lib[^\/]+\.so[.\d]*$|) { $found_so++; } @@ -908,9 +914,12 @@ sub checkplist { &perror("WARN", $file, -1, "There are only $item_count items in the plist. Consider using PLIST_FILES instead of pkg-plist when installing less than $numpitems items."); } - if ($makevar{USE_LDCONFIG} ne '' && !$found_so) { + if ($makevar{USE_LDCONFIG} ne "$makevar{PREFIX}/lib" && !$found_so) { &perror("WARN", $file, -1, "You have defined USE_LDCONFIG, but this ". "port does not install any shared objects."); + } elsif ($makevar{USE_LDCONFIG} eq "$makevar{PREFIX}/lib" && !$found_prefix_so) { + &perror("WARN", $file, -1, "You have defined USE_LDCONFIG, but this ". + "port does not install any shared objects into \${PREFIX}/lib."); } close(IN); @@ -2603,7 +2612,8 @@ xargs xmkmf if (! -e "$masterdir/Makefile") { &perror("WARN", "", -1, "unable to locate master port in $masterdir"); } - if ($whole !~ /^MASTERDIR=\s*\$\{\.CURDIR\}(?:\/\.\.){1,2}(?:\/[\w\@.+-]+){1,2}\s*$/m) { + if ($whole !~ /^MASTERDIR=\s*\$\{\.CURDIR\}(?:\/\.\.){1,2}(?:\/[\w\@.+-]+){1,2}\s*$/m && + $whole !~ /^MASTERDIR=\s*\$\{\.CURDIR(:H){1,2}\}(?:\/[\w\@.+-]+){1,2}\s*$/m) { &perror("WARN", $file, -1, "slave ports must define MASTERDIR=". '${.CURDIR}/..(/../)/'); }