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 75D46158041 for ; Mon, 26 Feb 2024 16:43:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 124502BC01E; Mon, 26 Feb 2024 16:43:45 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 E82E62BC01E for ; Mon, 26 Feb 2024 16:43:44 +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 D352033BE93 for ; Mon, 26 Feb 2024 16:43:43 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D9F8814DE for ; Mon, 26 Feb 2024 16:43:40 +0000 (UTC) From: "Florian Schmaus" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Florian Schmaus" Message-ID: <1708965707.03a8b73964892e45e3a8054416d2e91f3ce2da3c.flow@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-vpn/eduvpn-common/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-vpn/eduvpn-common/Manifest net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild X-VCS-Directories: net-vpn/eduvpn-common/ X-VCS-Committer: flow X-VCS-Committer-Name: Florian Schmaus X-VCS-Revision: 03a8b73964892e45e3a8054416d2e91f3ce2da3c X-VCS-Branch: master Date: Mon, 26 Feb 2024 16:43:40 +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: 81feb2af-5065-41af-b620-ea81a3578cf4 X-Archives-Hash: e783d0509cc23f499020bb1d6f751aa3 commit: 03a8b73964892e45e3a8054416d2e91f3ce2da3c Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Fri Dec 8 22:40:45 2023 +0000 Commit: Florian Schmaus gentoo org> CommitDate: Mon Feb 26 16:41:47 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03a8b739 net-vpn/eduvpn-common: add verify-sig support Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Signed-off-by: Florian Schmaus gentoo.org> net-vpn/eduvpn-common/Manifest | 3 ++- net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild | 20 +++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/net-vpn/eduvpn-common/Manifest b/net-vpn/eduvpn-common/Manifest index 16f9fda92fc4..333e74870bcb 100644 --- a/net-vpn/eduvpn-common/Manifest +++ b/net-vpn/eduvpn-common/Manifest @@ -1,4 +1,5 @@ DIST eduvpn-common-1.1.2-deps.tar.xz 7517364 BLAKE2B a6bd2c11d5056170d88ca8c35d054cd6d529462af6595fe31c535640cdf59a25ae4811c04bc738832fa4c28d2d3308ca5615170547b0c93edf7c4dd3f475978b SHA512 ce167298a76df4e22b23e3cfb7640f0272ea546dc5767f66baab900029c2a4850b383521d2f74ae0d77c53f47ba6eb51d80ab122362e4a7470e69a1fc3ac423f DIST eduvpn-common-1.1.2.gh.tar.gz 208300 BLAKE2B 8cb7e96d4a6a5032a1696aa57a6322f6a861aebba8b1f653d8be98e0044eacb3f23dc400ac9a8598dd83f30ca2140394ee2aa5733a27547f2a0378ad03ab422d SHA512 dbc290e48bc045456ad83e58e63c223cef5a7e1c7178537a44ed306a423276e644fb0f5607a7d8ddc5014b48ae11b57e365068d72887062277f8ab4f6f1ae660 DIST eduvpn-common-1.2.0-deps.tar.xz 7583176 BLAKE2B af35dd134a77753448fc9e7f91bde9d52fe05c20339eea637d0d0c5e9564f19cae6e294723adf1ef6c516ae05bc0495be2f316b2560b9d1860d9ce509517e04b SHA512 83e88038a6b5cb39917f9b892ac8783ef273c9e606173aad68125702a70a70dc9c61f54f0078d92214d6e1ec3e92cbdff3d10f18caf889cd603a2d75fa70c209 -DIST eduvpn-common-1.2.0.gh.tar.gz 210499 BLAKE2B 1e584138378f2c08ca71c6954b35196db2541a77327a3a7d88fefd2f2e946fd544d8d54d39b539a558830ad60ba65e3382035f016446ef596a015db3ccf43704 SHA512 abd7c4372ef5a2b7e182b497c46235f2c10b7d7e87bcab32910a3a149a0db31a93890a8e6d5434935ca444da69ec8bbccb944762dc160a879903baccac18bb35 +DIST eduvpn-common-1.2.0.tar.xz 738836 BLAKE2B 85a10cee1a18e88a8f19bae8c8273cc2993b4dfa29106804342079739c5549e517194f2f4b52225e7f557cce45cffbc74b110f82c4cfd9d8141096d97445938d SHA512 8858e85b1422340a87ee8df2a8392bdf910fb282c6a80c171a89cd535bb119958c46576a17c57cf9a02bf9946ed749e01bacdbd9c45fa8623c7d6dfa9272aa36 +DIST eduvpn-common-1.2.0.tar.xz.asc 228 BLAKE2B 6b9de0767b9f755235556ab15447a639930447bea91c7880b9248844eac7600ad22ff2828a3e73176c65fb824a0b870604d53e68964850b5e8239dbd5ffd1fff SHA512 6d54112f22ba6272ca56cea3ad82d0de1b24365a9d61f8ac9f1708741d491ff3184b47bc86845f8ace0a5f44fb5ad7614535ce665b71dd56510445c1d4777d34 diff --git a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild index 3545e366925a..3aae9a36bd55 100644 --- a/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild +++ b/net-vpn/eduvpn-common/eduvpn-common-1.2.0.ebuild @@ -16,8 +16,11 @@ if [[ ${PV} == "9999" ]] ; then inherit git-r3 EGIT_REPO_URI="https://github.com/eduvpn/eduvpn-common.git" else + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/eduvpn.asc + inherit verify-sig SRC_URI=" - https://github.com/eduvpn/eduvpn-common/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz + https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz + verify-sig? ( https://github.com/eduvpn/eduvpn-common/releases/download/${PV}/eduvpn-common-${PV}.tar.xz.asc ) https://www-user.tu-chemnitz.de/~hamari/eduvpn/${P}-deps.tar.xz " fi @@ -31,6 +34,10 @@ RDEPEND=" openvpn? ( net-vpn/openvpn ) " +if [[ ${PV} != *9999* ]] ; then + BDEPEND="verify-sig? ( sec-keys/openpgp-keys-eduvpn )" +fi + wrap_python() { local phase=$1 shift @@ -48,6 +55,17 @@ pkg_pretend() { fi } +src_unpack() { + # go dependencies are not signed + if use verify-sig; then + pushd "${DISTDIR}" > /dev/null || die + verify-sig_verify_detached \ + ${P}.tar.xz{,.asc} + popd > /dev/null || die + fi + default_src_unpack +} + src_prepare() { default