From nobody Wed Dec 06 12:36:05 2023 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 4SlcMV09phz53NsM; Wed, 6 Dec 2023 12:36:06 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SlcMT6fKSz3bgW; Wed, 6 Dec 2023 12:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701866165; 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=7SuCdH5JnMyAZc9sfNxZJsyCDslTl+Iz4+NqOyY78CE=; b=Kdn9Jl6h/FyCus9lSneLcc7RAWhl+QnSCp/E/oZe0VP5ZruDfx/iRbo1VKImO8tH+k0ocs jKlSXha/liY0XVLjV+xuOViN1rlqFZAC91oL5UYY0PlX2tlQKc2BoVzdPr3ibRPihltovy dw0+cEvQeajwCg03MAT6sjtAwXSWZCwR44zd/dW4wAvgo/3z/3DVj1p0yNXtaED0Qtd4kt ovcTcoXgYFQJaXayK5OXisk7nCQ3djZeDyXd+eiMew+dwW22KrXjpzioNCBBjGMMfNjLe7 JAxHCbP5+vNBVFPaaUDV7XNjr6pzOR+X3K37/Hchpj6yWZYrBA1V6DxNVQaTtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701866165; a=rsa-sha256; cv=none; b=BQLkujlurD9BIKxwfm7gpUoL2EiA63hzhE6yIMSisdxL2JDlMZjvbRjvgviEQtKeYPiVN3 GefeogtyB5Nc+Ed3KrHhMvJnD5ymHCVx8RJ6SDUZhJmcMagIO3/tQgH8vNcBAU0+PjCKZv tYhiIKWZGLyMZqg9HeXDPshnYmsjleyU7Wfu3gg1fB2jD6U9XEjFoom4U1ka6qVzpvx42Q eSKnolTsFn9SKjvtEG9e9d+M8y/C2stSl0YsVip7mhlaapW7FPaWT0tOFPRnsg3mWNWTXk E5mNSyU8cvPKfzWyh6Y291PBOxu+pcOjmwbMYGzrziNfjusCl1mZJnNA7CAUxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701866165; 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=7SuCdH5JnMyAZc9sfNxZJsyCDslTl+Iz4+NqOyY78CE=; b=Wn9zrCh7P0m9gbSeh6x+17iDQK6ONRoZqleXAOjjNlZ9iMBPThQm4I8x5y3xJJPKB/vQCg w6vkqm0AdyCrgymGo4KAP/I1K4zBjrOiu+a/bYfGlVTGw9ImZR8y/4T+uA7F0Yp1XE6rkT OFIzcmckgP4MKr2Y0eaCmV1lin/6eTjLnAAiAKHj5nD9JLhXLAVCphmWON6Q7JI7fPYGOe px/6VqNMrdY96phHdzVtGthuZjfPLbS6QFaXl8pCfyPwnQ4XcQqGUFMoyTbHImXv3Qc609 kiJb8eB5nWRHwxZJHLJV0CRgfOQBzyi7O/yUh2+sh6aGZIK6PrTKlBvxGXAT9g== 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 4SlcMT5lTPzt4p; Wed, 6 Dec 2023 12:36:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B6Ca5Qj033117; Wed, 6 Dec 2023 12:36:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B6Ca5TA033114; Wed, 6 Dec 2023 12:36:05 GMT (envelope-from git) Date: Wed, 6 Dec 2023 12:36:05 GMT Message-Id: <202312061236.3B6Ca5TA033114@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 285b19417fff - main - security/py-pass-audit: Honor PREFIX 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 285b19417fff7a4cccebf9769b6a339631ccd5e5 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=285b19417fff7a4cccebf9769b6a339631ccd5e5 commit 285b19417fff7a4cccebf9769b6a339631ccd5e5 Author: Tobias Rehbein AuthorDate: 2023-12-06 11:43:27 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2023-12-06 12:35:50 +0000 security/py-pass-audit: Honor PREFIX Since the update to release 1.2, the port has no longer taken PREFIX into account. This oversight is corrected with this commit. PR: 275561 Approved by: submitter is maintainer --- security/py-pass-audit/Makefile | 2 ++ security/py-pass-audit/files/patch-setup.py | 8 +++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/security/py-pass-audit/Makefile b/security/py-pass-audit/Makefile index dd965877f59d..1a4f7d7423ea 100644 --- a/security/py-pass-audit/Makefile +++ b/security/py-pass-audit/Makefile @@ -1,5 +1,6 @@ PORTNAME= pass-audit PORTVERSION= 1.2 +PORTREVISION= 1 CATEGORIES= security MASTER_SITES= https://github.com/roddhjav/${PORTNAME}/releases/download/v${PORTVERSION}/ PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -26,6 +27,7 @@ NO_BUILD= yes SHEBANG_FILES= ${WRKSRC}/pass_audit/__main__.py post-patch: + @${REINPLACE_CMD} -e 's:%%PREFIX%%:${PREFIX}:g' ${WRKSRC}/setup.py @${REINPLACE_CMD} -e 's:\:${PYTHON_CMD}:g' ${WRKSRC}/audit.bash .include diff --git a/security/py-pass-audit/files/patch-setup.py b/security/py-pass-audit/files/patch-setup.py index fa83e997b80e..cc10eff9ef5b 100644 --- a/security/py-pass-audit/files/patch-setup.py +++ b/security/py-pass-audit/files/patch-setup.py @@ -1,16 +1,18 @@ ---- setup.py.orig 2023-12-04 19:45:19 UTC +--- setup.py.orig 2022-01-30 14:55:34 UTC +++ setup.py -@@ -10,9 +10,12 @@ base = '/usr' +@@ -10,9 +10,13 @@ base = '/usr' share = Path(sys.prefix, 'share') base = '/usr' -if os.uname().sysname == 'Darwin': +- base = '/usr/local' +if os.uname().sysname == 'Darwin' or os.uname().sysname == 'FreeBSD': - base = '/usr/local' ++ base = '%%PREFIX%%' + lib = Path(base, 'lib', 'password-store', 'extensions') +if os.uname().sysname == 'FreeBSD': + lib = Path(base, 'libexec', 'password-store', 'extensions') ++ share = Path(base, 'share') if '--user' in sys.argv: if 'PASSWORD_STORE_EXTENSIONS_DIR' in os.environ: