[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/

2023-09-15 Thread David Roman
commit: 855fd6909c8be9cb1c7ef50551c070e64f1871a1
Author: David Roman  gmail  com>
AuthorDate: Fri Sep 15 15:27:31 2023 +
Commit: David Roman  gmail  com>
CommitDate: Fri Sep 15 15:27:37 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=855fd690

app-crypt/tpm2-openssl: treeclean, moved to ::gentoo

Signed-off-by: David Roman  gmail.com>

 app-crypt/tpm2-openssl/Manifest|   1 -
 ...de-base-provider-required-to-load-ecparam.patch |  25 -
 app-crypt/tpm2-openssl/metadata.xml|  12 ---
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild   | 101 -
 4 files changed, 139 deletions(-)

diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
deleted file mode 100644
index 06860f3302..00
--- a/app-crypt/tpm2-openssl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 
4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1
 SHA512 
be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812

diff --git 
a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
 
b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
deleted file mode 100644
index 5a55546286..00
--- 
a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001
-From: Petr Gotthard 
-Date: Fri, 23 Dec 2022 10:46:40 +0100
-Subject: [PATCH] tests: include base provider required to load ecparam
-

- test/ec_genpkey_parameters.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh
-index 406b558..a4f68d7 100755
 a/test/ec_genpkey_parameters.sh
-+++ b/test/ec_genpkey_parameters.sh
-@@ -6,7 +6,7 @@ set -eufx
- openssl ecparam -name prime256v1 -out testparam.pem
- 
- # generate private key as PEM
--openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem
-+openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out 
testkey.pem
- 
- # display private key info
- openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout
--- 
-2.39.2
-

diff --git a/app-crypt/tpm2-openssl/metadata.xml 
b/app-crypt/tpm2-openssl/metadata.xml
deleted file mode 100644
index aa195a46b8..00
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-https://www.gentoo.org/dtd/metadata.dtd;>
-
-   
-   salah.coro...@gmail.com
-   Christopher Byrne
-   
-   
-   tpm2-software/tpm2-openssl
-   
-
-

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
deleted file mode 100644
index 1033293fb5..00
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="OpenSSL Provider for TPM2 integration"
-
-HOMEPAGE="https://github.com/tpm2-software/tpm2-openssl;
-SRC_URI="https://github.com/tpm2-software/tpm2-openssl/releases/download/${PV}/${P}.tar.gz;
-LICENSE="BSD"
-
-SLOT="0/${PV}"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND=">=app-crypt/tpm2-tss-3.2.0:=
-   =dev-libs/openssl-3.0*:0="
-
-DEPEND="${RDEPEND}
-   test? ( app-crypt/swtpm
-   app-crypt/tpm2-abrmd
-   app-crypt/tpm2-tools )"
-
-BDEPEND="sys-devel/autoconf-archive
-virtual/pkgconfig"
-
-RESTRICT="!test? ( test )"
-
-PATCHES=(
-   
"${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch"
-   )
-
-dbus_run() {
-   (
-   # start isolated dbus session bus
-   dbus_data=$(dbus-launch --sh-syntax) || exit
-   eval "${dbus_data}"
-
-   $@
-   ret=${?}
-
-   kill "${DBUS_SESSION_BUS_PID}"
-   exit "${ret}"
-   ) || die
-}
-
-tpm2_run_with_emulator() {
-   export XDG_CONFIG_HOME="${T}/.config/swtpm"
-   "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
-
-   mkdir -p "${XDG_CONFIG_HOME}/mytpm1" || die
-   swtpm_setup_args=(
-   --tpm2
-   --tpmstate "${XDG_CONFIG_HOME}/mytpm1"
-   --createek
-   --allow-signing
-   --decryption
-   --create-ek-cert
-   --create-platform-cert
-   --lock-nvram
-   --overwrite
-   --display
-   )
-   swtpm_setup "${swtpm_setup_args[@]}" || die
-
-   swtpm_socket_args=(
-   --tpm2

[gentoo-commits] repo/proj/guru:dev commit in: app-crypt/tpm2-openssl/files/, app-crypt/tpm2-openssl/

2023-03-14 Thread Christopher Byrne
commit: 111cabeae34e03a8d729ef287adc27ecb3d3b87f
Author: Christopher Byrne  gmail  com>
AuthorDate: Tue Mar 14 23:28:52 2023 +
Commit: Christopher Byrne  gmail  com>
CommitDate: Tue Mar 14 23:28:52 2023 +
URL:https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=111cabea

app-crypt/tpm2-openssl: Fix failing test

Closes: https://bugs.gentoo.org/901005
Signed-off-by: Christopher Byrne  gmail.com>

 ...de-base-provider-required-to-load-ecparam.patch | 25 ++
 app-crypt/tpm2-openssl/metadata.xml|  4 
 app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild   |  4 
 3 files changed, 33 insertions(+)

diff --git 
a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
 
b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
new file mode 100644
index 0..5a5554628
--- /dev/null
+++ 
b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch
@@ -0,0 +1,25 @@
+From 483030d85563e26a62e4baeac3b0fdca0e314199 Mon Sep 17 00:00:00 2001
+From: Petr Gotthard 
+Date: Fri, 23 Dec 2022 10:46:40 +0100
+Subject: [PATCH] tests: include base provider required to load ecparam
+
+---
+ test/ec_genpkey_parameters.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/ec_genpkey_parameters.sh b/test/ec_genpkey_parameters.sh
+index 406b558..a4f68d7 100755
+--- a/test/ec_genpkey_parameters.sh
 b/test/ec_genpkey_parameters.sh
+@@ -6,7 +6,7 @@ set -eufx
+ openssl ecparam -name prime256v1 -out testparam.pem
+ 
+ # generate private key as PEM
+-openssl genpkey -provider tpm2 -paramfile testparam.pem -out testkey.pem
++openssl genpkey -provider tpm2 -provider base -paramfile testparam.pem -out 
testkey.pem
+ 
+ # display private key info
+ openssl ec -provider tpm2 -provider base -in testkey.pem -check -text -noout
+-- 
+2.39.2
+

diff --git a/app-crypt/tpm2-openssl/metadata.xml 
b/app-crypt/tpm2-openssl/metadata.xml
index cd1ce1c8a..aa195a46b 100644
--- a/app-crypt/tpm2-openssl/metadata.xml
+++ b/app-crypt/tpm2-openssl/metadata.xml
@@ -5,4 +5,8 @@
salah.coro...@gmail.com
Christopher Byrne

+   
+   tpm2-software/tpm2-openssl
+   
 
+

diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild 
b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
index fff830dd8..1033293fb 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
@@ -26,6 +26,10 @@ BDEPEND="sys-devel/autoconf-archive
 
 RESTRICT="!test? ( test )"
 
+PATCHES=(
+   
"${FILESDIR}/${PN}-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch"
+   )
+
 dbus_run() {
(
# start isolated dbus session bus