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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 0FBFD15808B for ; Fri, 25 Mar 2022 18:49:13 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E4FCCE07EF; Fri, 25 Mar 2022 18:49:11 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 62383E0801 for ; Fri, 25 Mar 2022 18:49:11 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E9408343366 for ; Fri, 25 Mar 2022 18:49:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 65FFC33F for ; Fri, 25 Mar 2022 18:49:08 +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: <1648234138.133c8592bd805972ab3ff8296144fa465605296d.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-admin/sudo/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-admin/sudo/sudo-9999.ebuild X-VCS-Directories: app-admin/sudo/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 133c8592bd805972ab3ff8296144fa465605296d X-VCS-Branch: master Date: Fri, 25 Mar 2022 18:49:08 +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: 82686531-219f-4b7c-ac8a-0d6925295ea0 X-Archives-Hash: 1ce6032d9b6160b251d17520624dddcf commit: 133c8592bd805972ab3ff8296144fa465605296d Author: Jonathan Davies protonmail com> AuthorDate: Tue Mar 22 00:25:11 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Mar 25 18:48:58 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=133c8592 app-admin/sudo: Sync live ebuild. Signed-off-by: Jonathan Davies protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/24701 Signed-off-by: Sam James gentoo.org> app-admin/sudo/sudo-9999.ebuild | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild index 5bf3fbade179..5c23d70b6741 100644 --- a/app-admin/sudo/sudo-9999.ebuild +++ b/app-admin/sudo/sudo-9999.ebuild @@ -14,13 +14,21 @@ if [[ ${PV} == "9999" ]] ; then inherit mercurial EHG_REPO_URI="https://www.sudo.ws/repos/sudo" else + inherit verify-sig + VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc + BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )" + uri_prefix= case ${P} in *_beta*|*_rc*) uri_prefix=beta/ ;; esac SRC_URI="https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz - ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz" + ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz + verify-sig? ( + https://www.sudo.ws/sudo/dist/${uri_prefix}${MY_P}.tar.gz.sig + ftp://ftp.sudo.ws/pub/sudo/${uri_prefix}${MY_P}.tar.gz.sig + )" if [[ ${PV} != *_beta* ]] && [[ ${PV} != *_rc* ]] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~sparc-solaris" fi @@ -58,7 +66,7 @@ RDEPEND=" selinux? ( sec-policy/selinux-sudo ) sendmail? ( virtual/mta ) " -BDEPEND=" +BDEPEND+=" sys-devel/bison virtual/pkgconfig " @@ -187,7 +195,7 @@ src_install() { fperms 0440 /etc/ldap.conf.sudo insinto /etc/openldap/schema - newins doc/schema.OpenLDAP sudo.schema + newins docs/schema.OpenLDAP sudo.schema fi if use pam; then