* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/
@ 2025-02-21 10:05 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2025-02-21 10:05 UTC (permalink / raw
To: gentoo-commits
commit: 843c9bb0145e253962785f1f74c73bf83cfb9a43
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Jan 25 22:51:00 2025 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Fri Feb 21 10:05:45 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=843c9bb0
app-crypt/tpm2-openssl: drop 1.2.0
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/40306
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-crypt/tpm2-openssl/Manifest | 1 -
app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild | 49 ------------------------
2 files changed, 50 deletions(-)
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index c8ed9053e321..c9b7b8551562 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,2 +1 @@
-DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d
DIST tpm2-openssl-1.3.0.tar.gz 432730 BLAKE2B 458cf61324f28b6c9c7d970afa7a4fe4b22f556db986e6ae4db823e876e680e338145b5519b1e351006e43adaf6b7ee7639f42cd7d1ef0b9d96f833b6016c1e4 SHA512 7f226a7a3040fb33863e24d2c3712b2cc816d872c907ac4e05f38502bf52a979a522cad5a27f1984d3ce6cc75b6d4c5098ba025cce9eedac1b7f605300210650
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
deleted file mode 100644
index 03767401d089..000000000000
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-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"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- >=app-crypt/tpm2-tss-3.2.0:=
- >=dev-libs/openssl-3:="
-DEPEND="${RDEPEND}
- test? (
- app-crypt/swtpm[gnutls(+)]
- app-crypt/tpm2-abrmd
- app-crypt/tpm2-tools
- )"
-BDEPEND="
- dev-build/autoconf-archive
- virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.2.0-tests-run-with-simulator-in-container.patch"
- "${FILESDIR}/${PN}-1.2.0-Makefile-add-run-with-simulator-to-extra-dists.patch"
- "${FILESDIR}/${PN}-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch"
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_test() {
- "${S}/test/run-with-simulator" swtpm skip-build || die
-}
-
-src_install() {
- default
- find "${ED}" -iname '*.la' -delete || die
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/
@ 2024-01-11 16:08 Viorel Munteanu
0 siblings, 0 replies; 4+ messages in thread
From: Viorel Munteanu @ 2024-01-11 16:08 UTC (permalink / raw
To: gentoo-commits
commit: fe56154bce7c965cbd1f5c1a07e7be994b0b82e4
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Oct 14 20:38:41 2023 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 16:07:59 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe56154b
app-crypt/tpm2-openssl: add 1.2.0
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-crypt/tpm2-openssl/Manifest | 1 +
app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild | 108 +++++++++++++++++++++++
2 files changed, 109 insertions(+)
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index 06860f330281..22745e950b20 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1 +1,2 @@
DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812
+DIST tpm2-openssl-1.2.0.tar.gz 424967 BLAKE2B 9bcdc47b2eb94329caace24f10e8c234cdd92250ee7fdd4f6156c278328c0103a2285234e64f48f951f5e1b77e72341eb129ee996e628641a4032849fe5a62ce SHA512 4a12c83a0687768cd972a8d7e544f4bba2debcd24d7da2d2ee9adb097d1565bb1d69d1c448edff05f040b95700847293a8e33bfe92f43e536d13bc734ded1e1d
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
new file mode 100644
index 000000000000..bc06e73f4411
--- /dev/null
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.2.0.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+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"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ >=app-crypt/tpm2-tss-3.2.0:=
+ >=dev-libs/openssl-3:="
+DEPEND="${RDEPEND}
+ test? (
+ app-crypt/swtpm[gnutls(+)]
+ app-crypt/tpm2-abrmd
+ app-crypt/tpm2-tools
+ )"
+BDEPEND="
+ sys-devel/autoconf-archive
+ virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch"
+)
+
+src_prepare() {
+ eautoreconf
+ default
+}
+
+src_test() {
+ dbus_run() {
+ (
+ # start isolated dbus session bus
+ local dbus_data=$(dbus-launch --sh-syntax) || exit
+ eval "${dbus_data}"
+
+ $@
+ ret=${?}
+
+ kill "${DBUS_SESSION_BUS_PID}"
+ exit "${ret}"
+ ) || die
+ }
+
+ tpm2_run_with_emulator() {
+ local -x XDG_CONFIG_HOME="${T}"/.config/swtpm
+ "${BROOT}"/usr/share/swtpm/swtpm-create-user-config-files || die
+
+ mkdir -p "${XDG_CONFIG_HOME}"/mytpm1 || die
+ local 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
+
+ local swtpm_socket_args=(
+ --tpm2
+ --tpmstate dir="${XDG_CONFIG_HOME}"/mytpm1
+ --flags startup-clear
+ --ctrl type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket.ctrl
+ --server type=unixio,path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
+ --pid file="${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid
+ --daemon
+ )
+ swtpm socket "${swtpm_socket_args[@]}" || die
+
+ local tpm2_abrmd_args=(
+ --logger=stdout
+ --tcti=swtpm:path="${XDG_CONFIG_HOME}"/mytpm1/swtpm.socket
+ --session
+ --flush-all
+ )
+ tpm2-abrmd "${tpm2_abrmd_args[@]}" &
+
+ local -x TPM2OPENSSL_TCTI="tabrmd:bus_type=session"
+ local -x TPM2TOOLS_TCTI="tabrmd:bus_type=session"
+
+ $@ || die
+
+ # When swtpm dies, tmp2-abrmd will exit
+ kill $(< "${XDG_CONFIG_HOME}"/mytpm1/swtpm.pid) || die
+ }
+
+ dbus_run tpm2_run_with_emulator make check
+}
+
+src_install() {
+ default
+ find "${ED}" -iname '*.la' -delete || die
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/
@ 2023-09-16 17:13 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2023-09-16 17:13 UTC (permalink / raw
To: gentoo-commits
commit: 9087009cbc96d9e66ba4395bd701d5159c4772d3
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 17:12:39 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 17:12:39 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9087009c
app-crypt/tpm2-openssl: add missing build dependency
The "eautoreconf" call requires sys-devel/autoconf-archive to be
present, otherwise configure fails due to missing autoconf archive
features.
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
index a7e97911f696..a420baf98c3a 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
@@ -24,7 +24,9 @@ DEPEND="${RDEPEND}
app-crypt/tpm2-abrmd
app-crypt/tpm2-tools
)"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+ sys-devel/autoconf-archive
+ virtual/pkgconfig"
PATCHES=(
"${FILESDIR}/${P}-tests-include-base-provider-required-to-load-ecparam.patch"
^ permalink raw reply related [flat|nested] 4+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/
@ 2023-09-16 16:20 Matthias Maier
0 siblings, 0 replies; 4+ messages in thread
From: Matthias Maier @ 2023-09-16 16:20 UTC (permalink / raw
To: gentoo-commits
commit: 8a1203bde98779e86ad2b0d1e6031ad319dc4525
Author: Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 16:19:29 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 16:20:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8a1203bd
app-crypt/tpm2-openssl: update dependency on app-crypt/swtpm[gnutls(+)]
This change is necessary for the recent change of dropping USE=gnutls
from app-crypt/swtpm.
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
.../{tpm2-openssl-1.1.1.ebuild => tpm2-openssl-1.1.1-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
similarity index 98%
rename from app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
rename to app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
index 54fda1a513cb..9149a1e93139 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
@@ -18,7 +18,7 @@ RDEPEND="
>=dev-libs/openssl-3:="
DEPEND="${RDEPEND}
test? (
- app-crypt/swtpm[gnutls]
+ app-crypt/swtpm[gnutls(+)]
app-crypt/tpm2-abrmd
app-crypt/tpm2-tools
)"
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-21 10:05 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-02-21 10:05 [gentoo-commits] repo/gentoo:master commit in: app-crypt/tpm2-openssl/ Viorel Munteanu
-- strict thread matches above, loose matches on Subject: below --
2024-01-11 16:08 Viorel Munteanu
2023-09-16 17:13 Matthias Maier
2023-09-16 16:20 Matthias Maier
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox