From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4B51815817D for ; Fri, 14 Jun 2024 08:03:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E451AE2BB6; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CA5D1E2BB6 for ; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1BAC333C84E for ; Fri, 14 Jun 2024 08:03:30 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6E4721CF1 for ; Fri, 14 Jun 2024 08:03:27 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1718352145.d86bc0181c2ae3ed0391fab1c66d27a43faaa709.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/ntpsec/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild net-misc/ntpsec/ntpsec-1.2.3.ebuild net-misc/ntpsec/ntpsec-9999.ebuild X-VCS-Directories: net-misc/ntpsec/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: d86bc0181c2ae3ed0391fab1c66d27a43faaa709 X-VCS-Branch: master Date: Fri, 14 Jun 2024 08:03:27 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2eefcfc0-d4b7-4260-a2e3-12d938049fab X-Archives-Hash: da340bcbdded64e2005bf3c290087aaa commit: d86bc0181c2ae3ed0391fab1c66d27a43faaa709 Author: Sam James gentoo org> AuthorDate: Fri Jun 14 07:47:12 2024 +0000 Commit: Sam James gentoo org> CommitDate: Fri Jun 14 08:02:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d86bc018 net-misc/ntpsec: fix verify-sig w/ downloaded waf Signed-off-by: Sam James gentoo.org> net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild | 13 ++++++++++++- net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild | 13 ++++++++++++- net-misc/ntpsec/ntpsec-1.2.3.ebuild | 2 +- net-misc/ntpsec/ntpsec-9999.ebuild | 13 ++++++++++++- 4 files changed, 37 insertions(+), 4 deletions(-) diff --git a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild index aae9eef1da0d..a14653efe462 100644 --- a/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.2a-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else @@ -77,6 +77,17 @@ PATCHES=( WAF_BINARY="${S}/waf" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + src_prepare() { cp -v "${DISTDIR}/waf-2.0.27" "${WAF_BINARY}" || die chmod -v ugo+x "${WAF_BINARY}" || die diff --git a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild index ae86968c45db..7bf78aa18efb 100644 --- a/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3-r1.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else @@ -76,6 +76,17 @@ PATCHES=( WAF_BINARY="${S}/waf" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + src_prepare() { default diff --git a/net-misc/ntpsec/ntpsec-1.2.3.ebuild b/net-misc/ntpsec/ntpsec-1.2.3.ebuild index 29d8829e72d7..2fd6e5cad45b 100644 --- a/net-misc/ntpsec/ntpsec-1.2.3.ebuild +++ b/net-misc/ntpsec/ntpsec-1.2.3.ebuild @@ -10,7 +10,7 @@ DISTUTILS_USE_SETUPTOOLS=no inherit distutils-r1 flag-o-matic waf-utils systemd -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else diff --git a/net-misc/ntpsec/ntpsec-9999.ebuild b/net-misc/ntpsec/ntpsec-9999.ebuild index ae86968c45db..7bf78aa18efb 100644 --- a/net-misc/ntpsec/ntpsec-9999.ebuild +++ b/net-misc/ntpsec/ntpsec-9999.ebuild @@ -9,7 +9,7 @@ PYTHON_REQ_USE='threads(+)' inherit distutils-r1 flag-o-matic multiprocessing waf-utils systemd -if [[ ${PV} == *9999* ]]; then +if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://gitlab.com/NTPsec/ntpsec.git" else @@ -76,6 +76,17 @@ PATCHES=( WAF_BINARY="${S}/waf" +src_unpack() { + if [[ ${PV} == 9999 ]] ; then + git-r3_src_unpack + elif use verify-sig ; then + # Needed for downloaded waf which is unsigned + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.gz{,.asc} + fi + + default +} + src_prepare() { default