commit:     1f004c7561e21090938ff20e9ed6e1aaf185fea9
Author:     orbea <orbea <AT> riseup <DOT> net>
AuthorDate: Mon May 16 20:00:07 2022 +0000
Commit:     Quentin Retornaz <gentoo <AT> retornaz <DOT> com>
CommitDate: Tue May 17 21:17:17 2022 +0000
URL:        https://gitweb.gentoo.org/repo/proj/libressl.git/commit/?id=1f004c75

dev-libs/libressl: Added verify-sig integration

Signed-off-by: orbea <orbea <AT> riseup.net>
Closes: https://github.com/gentoo/libressl/pull/410
Signed-off-by: Quentin Retornaz <gentoo <AT> retornaz.com>

 dev-libs/libressl/Manifest                         |  1 +
 dev-libs/libressl/libressl-3.5.2.ebuild            | 10 ++++++++--
 sec-keys/openpgp-keys-libressl/Manifest            |  1 +
 sec-keys/openpgp-keys-libressl/metadata.xml        |  8 ++++++++
 .../openpgp-keys-libressl-20201209.ebuild          | 22 ++++++++++++++++++++++
 5 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/dev-libs/libressl/Manifest b/dev-libs/libressl/Manifest
index 7f80fc7..5f49b7f 100644
--- a/dev-libs/libressl/Manifest
+++ b/dev-libs/libressl/Manifest
@@ -2,3 +2,4 @@ DIST libressl-3.3.6.tar.gz 3844198 BLAKE2B 
049fe23340e7dcbbc6a9d4210e257b1de0fb2
 DIST libressl-3.4.3.tar.gz 3913963 BLAKE2B 
95adbdd30f5cd573d51ab3657afd4d17263c9faae9455a88985689fbacbb711289a87027891244922250fb3ccc131f858d536df4cdadb608375ef8f0c4ea9b39
 SHA512 
0562d9c1fc227bacb9c6a51f50a5f29e73a960758c2ee9b0e702352cc55808f93533c9e0d2e85fb841846b9fdf6a50e6048205ebb67b8a8b7d9fdf5856fbfb91
 DIST libressl-3.5.1.tar.gz 4030718 BLAKE2B 
5894d1a3ca1b8e1db8d7582798efd3a35d0c1a331171c672ca4b2c3530c822fe13b4fa0078ac2c8b80d672ef9e4c81b963977179ac8e84bd515f2cb725a792f8
 SHA512 
6f31b86427144c3b6336ceb074fbe7dadd2662e598e05334999072e0d7dfa30d7fae2ab409541ae9e3359fef569849a37e2fee47b8800225a2cab7f067d60655
 DIST libressl-3.5.2.tar.gz 4039407 BLAKE2B 
7ed995ee73516d72d00cab90a78bdd1897d57ac79912c3d6ed28b010484b2e6fae511f11b2cf247f66a54ada14d4de9e1c534e8d20aae3462074bdb5f42e3c96
 SHA512 
07ebd1529934d472b621b31ba458a185c9fa1a4588d0bc34b669952ff0846e227094019b322cbb808def42967510abbb0928be3f6784920451b3e0c96c8f4cad
+DIST libressl-3.5.2.tar.gz.asc 833 BLAKE2B 
30b372eb862b6a39ba9e1bac427d919898edbbdd61f2bfacdd564e456bde02de41afff0926f324211753d660b5499fc65a07359d87472d4876a3d53a373e8b52
 SHA512 
9986b206821889de48b8e89de791aad8ac6907b2b894a2419758903f0ef8b4c66156a4984c05c7a4f00e267206208287c37c21f4aa332d50967e0dd4a4cb3f01

diff --git a/dev-libs/libressl/libressl-3.5.2.ebuild 
b/dev-libs/libressl/libressl-3.5.2.ebuild
index 2cb7044..5d8a35b 100644
--- a/dev-libs/libressl/libressl-3.5.2.ebuild
+++ b/dev-libs/libressl/libressl-3.5.2.ebuild
@@ -3,11 +3,14 @@
 
 EAPI=8
 
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal verify-sig
 
 DESCRIPTION="Free version of the SSL/TLS protocol forked from OpenSSL"
 HOMEPAGE="https://www.libressl.org/";
-SRC_URI="https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz";
+SRC_URI="
+       https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz
+       verify-sig? ( 
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/${P}.tar.gz.asc )
+"
 
 LICENSE="ISC openssl"
 # Reflects ABI of libcrypto.so and libssl.so. Since these can differ,
@@ -20,6 +23,9 @@ RESTRICT="!test? ( test )"
 REQUIRED_USE="test? ( static-libs )"
 
 PDEPEND="app-misc/ca-certificates"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-libressl )"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libressl.asc
 
 PATCHES=(
        "${FILESDIR}"/${PN}-2.8.3-solaris10.patch

diff --git a/sec-keys/openpgp-keys-libressl/Manifest 
b/sec-keys/openpgp-keys-libressl/Manifest
new file mode 100644
index 0000000..0638fca
--- /dev/null
+++ b/sec-keys/openpgp-keys-libressl/Manifest
@@ -0,0 +1 @@
+DIST libressl-A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5.asc 14172 BLAKE2B 
ce4377d26d763a8bcde698ee2562c6cce416321c9e6882eaa061fec2a169222a95d00f5478b58a478cb3ca704740122eeee7481293e3afa8e22a66ccb888ae73
 SHA512 
2a21d9f2447e13580bff088366480ba895c016fa7548fcc8b642f270486ca28ba2eca9bb5f3a7ae63490256829acc78642799618c3d7ef1021729dab852e8e42

diff --git a/sec-keys/openpgp-keys-libressl/metadata.xml 
b/sec-keys/openpgp-keys-libressl/metadata.xml
new file mode 100644
index 0000000..b690a67
--- /dev/null
+++ b/sec-keys/openpgp-keys-libressl/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd";>
+<pkgmetadata>
+       <maintainer type="person">
+               <email>or...@riseup.net</email>
+       </maintainer>
+       <stabilize-allarches/>
+</pkgmetadata>

diff --git 
a/sec-keys/openpgp-keys-libressl/openpgp-keys-libressl-20201209.ebuild 
b/sec-keys/openpgp-keys-libressl/openpgp-keys-libressl-20201209.ebuild
new file mode 100644
index 0000000..f8abc82
--- /dev/null
+++ b/sec-keys/openpgp-keys-libressl/openpgp-keys-libressl-20201209.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by the libressl project"
+HOMEPAGE="https://www.libressl.org/";
+SRC_URI="
+       https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/key.asc
+               -> libressl-A1EB079B8D3EB92B4EBD3139663AF51BD5E4D8D5.asc
+"
+S=${WORKDIR}
+
+LICENSE="public-domain"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 
sparc x86"
+
+src_install() {
+       local files=( ${A} )
+       insinto /usr/share/openpgp-keys
+       newins - libressl.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}

Reply via email to