commit: 115bf7872f7c0d8946339629d0d1550e386c1dfa Author: Julien Roy <julien <AT> jroy <DOT> ca> AuthorDate: Sat Feb 4 03:40:15 2023 +0000 Commit: Julien Roy <julien <AT> jroy <DOT> ca> CommitDate: Sat Feb 4 03:40:28 2023 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=115bf787
app-crypt/clevis: drop 18 Signed-off-by: Julien Roy <julien <AT> jroy.ca> app-crypt/clevis/clevis-18.ebuild | 30 -------------------- app-crypt/clevis/files/clevis-openssl.patch | 44 ----------------------------- 2 files changed, 74 deletions(-) diff --git a/app-crypt/clevis/clevis-18.ebuild b/app-crypt/clevis/clevis-18.ebuild deleted file mode 100644 index a08573ab8..000000000 --- a/app-crypt/clevis/clevis-18.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit meson - -DESCRIPTION="Automated Encryption Framework" -HOMEPAGE="https://github.com/latchset/clevis"; -SRC_URI="https://github.com/latchset/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="~amd64" -IUSE="+luks +tpm" - -DEPEND="luks? ( app-misc/jq ) - >=dev-libs/jose-8 - luks? ( dev-libs/libpwquality ) - luks? ( dev-libs/luksmeta ) - tpm? ( app-crypt/tpm2-tools ) - sys-fs/cryptsetup" -RDEPEND="${DEPEND}" -BDEPEND="" - -PATCHES=( - "${FILESDIR}/${PN}-dracut.patch" - "${FILESDIR}/${PN}-meson.patch" - "${FILESDIR}/${PN}-openssl.patch" -) diff --git a/app-crypt/clevis/files/clevis-openssl.patch b/app-crypt/clevis/files/clevis-openssl.patch deleted file mode 100644 index 5b9090980..000000000 --- a/app-crypt/clevis/files/clevis-openssl.patch +++ /dev/null @@ -1,44 +0,0 @@ -From ee1dfedb9baca107e66a0fec76693c9d479dcfd9 Mon Sep 17 00:00:00 2001 -From: Sergio Correia <scorr...@redhat.com> -Date: Mon, 3 May 2021 22:36:36 -0300 -Subject: [PATCH] sss: use BN_set_word(x, 0) instead of BN_zero() - -Different OpenSSL versions define BN_zero() differently -- sometimes -returning an integer, sometimes as void --, so let's use instead -BN_set_word() instead, not to have issues when building with these -different versions. ---- - src/pins/sss/sss.c | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/pins/sss/sss.c b/src/pins/sss/sss.c -index a37215d7..7486d6c5 100644 ---- a/src/pins/sss/sss.c -+++ b/src/pins/sss/sss.c -@@ -214,7 +214,7 @@ sss_point(const json_t *sss, size_t *len) - if (BN_rand_range(xx, pp) <= 0) - return NULL; - -- if (BN_zero(yy) <= 0) -+ if (BN_set_word(yy, 0) <= 0) - return NULL; - - for (size_t i = 0; i < json_array_size(e); i++) { -@@ -272,7 +272,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[]) - if (!ctx || !pp || !acc || !tmp || !k) - return NULL; - -- if (BN_zero(k) <= 0) -+ if (BN_set_word(k, 0) <= 0) - return NULL; - - len = jose_b64_dec(p, NULL, 0); -@@ -303,7 +303,7 @@ sss_recover(const json_t *p, size_t npnts, const uint8_t *pnts[]) - - /* acc *= (0 - xi) / (xo - xi) */ - -- if (BN_zero(tmp) <= 0) -+ if (BN_set_word(tmp, 0) <= 0) - return NULL; - - if (BN_mod_sub(tmp, tmp, xi, pp, ctx) <= 0)
