summaryrefslogtreecommitdiff
path: root/app-crypt
diff options
context:
space:
mode:
Diffstat (limited to 'app-crypt')
-rw-r--r--app-crypt/Manifest.gzbin24795 -> 24792 bytes
-rw-r--r--app-crypt/swtpm/Manifest6
-rw-r--r--app-crypt/swtpm/metadata.xml1
-rw-r--r--app-crypt/swtpm/swtpm-0.8.0-r2.ebuild (renamed from app-crypt/swtpm/swtpm-0.8.0-r1.ebuild)22
-rw-r--r--app-crypt/swtpm/swtpm-0.8.1-r2.ebuild (renamed from app-crypt/swtpm/swtpm-0.8.1-r1.ebuild)22
-rw-r--r--app-crypt/tpm2-openssl/Manifest3
-rw-r--r--app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch26
-rw-r--r--app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild (renamed from app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild)18
8 files changed, 70 insertions, 28 deletions
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index df48b908892b..bab0167e971d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
Binary files differ
diff --git a/app-crypt/swtpm/Manifest b/app-crypt/swtpm/Manifest
index 29020ad251a8..22efa56c0b5c 100644
--- a/app-crypt/swtpm/Manifest
+++ b/app-crypt/swtpm/Manifest
@@ -3,6 +3,6 @@ AUX swtpm-0.6.0-fix-localca-path.patch 1321 BLAKE2B 06d9e7409dda7554bd819a822e2e
AUX swtpm-0.7.2-Conditionalize-test-dependencies.patch 1065 BLAKE2B 359cf6e692691317255d8c456abee7fe59a5370bf94f0bdd37ee6bb16ceb80340939f3f0a348398c6c93177690f4e2dc141d2b6c9f12319586c5a850dec2cd5c SHA512 8a2731b9d9c49fa2a8ea2732b20dbbd7264b1c93b00848e67f83e5d54f8ed150e97ff940422ccf46de21ae8d81fbf951314b3908ef0377d8548adebc4872474f
DIST swtpm-0.8.0.tar.gz 363951 BLAKE2B 8ec91961c5ac145dc5d1c3c4a609d18bc425caef0efb4d2b18c08c76acacefa619617b6e7b6e8e4e707117a29e3ff3c0198b63d81d24fc747435c6e06e48e8e9 SHA512 7f70c19f732404061be6168c96c0dd3ec91ed8b50dddcafcb50d810062ce0e83ad85360191f97db5db9dc034e01d91cebe3912449d896d2cde68fe060a0adb09
DIST swtpm-0.8.1.tar.gz 364169 BLAKE2B 4b364ed581ea97d78c5c6248870503b1612d7d164b05b76c1f02644aade6fd09f204396f0a2d0db4e0ecec2792dc512f7c4393c44bf7ce447a3a7fbb8754594f SHA512 07276519b0e20c9c4167ce78e789d2072eb90172ed9bcba2a11eef46ee03a77860f7a2218f4dc013a2ddb8471079e3cbe43f8ab02174bd704a78aea8eee3d2fc
-EBUILD swtpm-0.8.0-r1.ebuild 1443 BLAKE2B 928289a394af381ff6fad6db31d985f31eb8644512aa35c26c8a30eb8fe721088c8e2b28572ffcddbe687b323457164838df3ef4077c6c7864068cb44919557f SHA512 f1bdc4a0d0f1cafb9a55f2428169f10c2dd1edbea3454469a676e77b666ca9787002b246671e1aeb106162f542f51455643c27015b6d7d1f324e0fff72cc0ebb
-EBUILD swtpm-0.8.1-r1.ebuild 1448 BLAKE2B 9ce4ee50718d422f0760ef78567016e478d8423c1f1df15591e745e7e8ad11ee973f5d73d8524882cd650ade80e32c98ce360e43665ac2f3a4e367d595bf434b SHA512 adc1245a18253f34ef063491fece9a3431615ebda0016976c930204253db51c21f4c3cb3bc2613f3b2126854960bbc6f4705d0da13c7934140c1fcc6f74eaea2
-MISC metadata.xml 818 BLAKE2B a76597f339726e233429c815bbf9a4dce2fb4805c76e870c9e3f71671e158bc0d3fac817f9dd48c524f9a0fd804496a19c697253bb28291fa22ba879aa26ff64 SHA512 aa14715b755387e9d0616cba12550778e60c27d25463211a785b28c9a955447b3a707b6230be94a1160c9e7515d75afa472aff825cdee74d53cb049b2645e955
+EBUILD swtpm-0.8.0-r2.ebuild 1602 BLAKE2B b51ae100307f16be7042c8215121b12a2724c0d370b4261ca9cb2fa3ee1533901b40f7839916fca557f91c0c048154184b9012bd59b2d3997d1c288ce5b0986c SHA512 6c1ee351c2d46a7dcfc368efead75ead25471aa1fdd214827df0fa156259d1b12b348846aee6e87ec1f0c8015eb279967760eedb10f27b7ad1cf43c341043d64
+EBUILD swtpm-0.8.1-r2.ebuild 1607 BLAKE2B d2df7f189dfc87f46c3830619fc20b08ebb500536413310cf6af21053f2c90f827a69a86793bb57327612777b259371bd315dbc10cf990eb0a24a640dab4cc89 SHA512 65e418e311269c5d41e4914436f22e2cba64dff40434e5baa1f8db504dac534f640484e23a74f9f8567a05219db1a657d65836d36f0a251781cf3136fc4f96ce
+MISC metadata.xml 717 BLAKE2B 70de08f9ed69084e7ed07c72ae96ab76cdb8bf489c3d3664edab24d2a904f44a6483bb9685f0e97f4520420dab1b6796e58cff00ba82190459af12398aa4b6d1 SHA512 a4f2977c84e03e215f6455def44ead6f767d6a4803061942b799b38bedaada373b51bbd47bd87c4339df32138a339b5f595a5ea19c5706b5e424329cc8aec0a5
diff --git a/app-crypt/swtpm/metadata.xml b/app-crypt/swtpm/metadata.xml
index 0cef26f8515d..3187cf4dce7f 100644
--- a/app-crypt/swtpm/metadata.xml
+++ b/app-crypt/swtpm/metadata.xml
@@ -15,7 +15,6 @@
</maintainer>
<use>
<flag name="fuse">Support <pkg>sys-fs/fuse</pkg> based /dev/tpm interface</flag>
- <flag name="gnutls">Build the swtpm_cert binary which depends on <pkg>net-libs/gnutls</pkg></flag>
</use>
<upstream>
<remote-id type="github">stefanberger/swtpm</remote-id>
diff --git a/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild b/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
index fa93580b5b34..650e54402d13 100644
--- a/app-crypt/swtpm/swtpm-0.8.0-r1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.0-r2.ebuild
@@ -14,30 +14,32 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv x86"
-IUSE="fuse +gnutls seccomp test"
+IUSE="fuse seccomp test"
RESTRICT="!test? ( test )"
+# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
+# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
+# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
+
RDEPEND="fuse? (
dev-libs/glib:2
sys-fs/fuse:0
)
- gnutls? (
- dev-libs/libtasn1:=
- >=net-libs/gnutls-3.4.0:=[tools,pkcs11]
- )
seccomp? ( sys-libs/libseccomp )
- dev-libs/libtasn1:=
acct-group/tss
acct-user/tss
dev-libs/openssl:0=
dev-libs/json-glib
- dev-libs/libtpms"
+ dev-libs/libtpms
+ dev-libs/libtasn1:=
+ net-libs/gnutls[pkcs11,tools]
+"
DEPEND="${RDEPEND}
- test? (
+ test? (
net-misc/socat
dev-tcltk/expect
- )"
+ )"
BDEPEND="${PYTHON_DEPS}"
@@ -55,9 +57,9 @@ src_prepare() {
src_configure() {
econf \
--with-openssl \
+ --with-gnutls \
--without-selinux \
$(use_with fuse cuse) \
- $(use_with gnutls) \
$(use_with seccomp) \
$(use_enable test)
}
diff --git a/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild b/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
index 96cec582841b..43e4f293c488 100644
--- a/app-crypt/swtpm/swtpm-0.8.1-r1.ebuild
+++ b/app-crypt/swtpm/swtpm-0.8.1-r2.ebuild
@@ -14,30 +14,32 @@ SRC_URI="https://github.com/stefanberger/swtpm/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-IUSE="fuse +gnutls seccomp test"
+IUSE="fuse seccomp test"
RESTRICT="!test? ( test )"
+# net-libs/gnutls[pkcs11,tools] is required otherwsie it not possible to
+# provision new vTPMs. swtpm_cert spawns certttool, and upstream expects
+# pkcs11 in gnutls: https://github.com/stefanberger/swtpm/issues/477.
+
RDEPEND="fuse? (
dev-libs/glib:2
sys-fs/fuse:0
)
- gnutls? (
- dev-libs/libtasn1:=
- >=net-libs/gnutls-3.4.0:=[tools,pkcs11]
- )
seccomp? ( sys-libs/libseccomp )
- dev-libs/libtasn1:=
acct-group/tss
acct-user/tss
dev-libs/openssl:0=
dev-libs/json-glib
- dev-libs/libtpms"
+ dev-libs/libtpms
+ dev-libs/libtasn1:=
+ net-libs/gnutls[pkcs11,tools]
+"
DEPEND="${RDEPEND}
- test? (
+ test? (
net-misc/socat
dev-tcltk/expect
- )"
+ )"
BDEPEND="${PYTHON_DEPS}"
@@ -55,9 +57,9 @@ src_prepare() {
src_configure() {
econf \
--with-openssl \
+ --with-gnutls \
--without-selinux \
$(use_with fuse cuse) \
- $(use_with gnutls) \
$(use_with seccomp) \
$(use_enable test)
}
diff --git a/app-crypt/tpm2-openssl/Manifest b/app-crypt/tpm2-openssl/Manifest
index c3e8f9b3cf70..c87b57f78b1b 100644
--- a/app-crypt/tpm2-openssl/Manifest
+++ b/app-crypt/tpm2-openssl/Manifest
@@ -1,4 +1,5 @@
+AUX tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch 975 BLAKE2B 6a7b744513e026cbcc916543d3aa17300a63185eb112c3f1afb1eb4ffb0a02554c18759106c0c7d82efab9bc7b8c9e9f8809f06959edf763d6b38458416d160e SHA512 a4bc43d08f4cd70ba39a3396351894454edbb4ef284344a3184c8538685b15d85a8554619077d03d694e1355dcac5ab57976531f47158f5d2575c5bf7207e966
AUX tpm2-openssl-1.1.1-tests-include-base-provider-required-to-load-ecparam.patch 892 BLAKE2B 25314711ddf35721fb3b8c3c0b077d29f4a097df226dd986f48411bbb79f9e6a30c7bab9a2d19daad85498d5c648833c918c41060fae3f5e22d91d45e7f546ef SHA512 ad5ad95f3fa91a876032472dcaad55384421daf6d9f7b80381dcf0284471006b58a4c0b1bcad2f0ed3df132e6e8da3eec44e9a20413d3685fe1f69b7de150c5b
DIST tpm2-openssl-1.1.1.tar.gz 415093 BLAKE2B 4f05b04ad059b9e5232bde2426102628927c71360cda5c3a1df02f951a8ecd6e1e036a6373ac5d7fc8209415874c52544eca3195e2361a165bc2c91f99ad85b1 SHA512 be4f114b21d15e6baeb7e756a787619d01f20171e86ebc42ea098c98d59ffd2ba648885b345b9d1a9dc3339199eaa6db8335f039587be338c1126e23349b8812
-EBUILD tpm2-openssl-1.1.1.ebuild 2269 BLAKE2B 2b3cadf7e1a5452ca39a7a720e0ebc7ebfe6ad70b8de366c1f2fed0d7bc0b638f6b9e5f359d16aafe2791adca74b39510dc0aadc292e1dd5ee727dcfbddd8c6a SHA512 6c419a5394d6d8cace118b8362c2ce7e8bfd7dcda3d417a72e7bbe96681c13cf1cef0f99d5ba4332bb1bf54d4678e74ca188966bff72c6035e061117ff6c1bb3
+EBUILD tpm2-openssl-1.1.1-r1.ebuild 2440 BLAKE2B 10dc70497ebb0779508eda684d14ae21819a1116827159bcf7976825d7dee3ac961b90cf15d3b12c6d23ad61f8e160bf8605d1d63f7ea99d8104f04931689da9 SHA512 70d67ce9bb432a32e3fbf6968e974cc5841696cf5d79d65073fefb5c3ab20adf469cdb8e8e48030d60b63ab4ce59cf4721fbfd5ccefe95779630bd145f0bfd04
MISC metadata.xml 495 BLAKE2B 2859f35839200edede18d42a8c1e04c3eb2a8983e35a6aa73352d20f5f1a9b8e2685091ab6c121442bbc23ef232ab701cfe1e5eb2f1e2fbd8c3fa1cafd51b749 SHA512 cf93a17e4ef6cf8e9294fadd0b7a33ccf21196bf648f1239a99cb0d8675c130e7e5ab7990b9a292f0814072ee3d234085d92e250f72b86ad854d81a68a642879
diff --git a/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch
new file mode 100644
index 000000000000..4045a940756f
--- /dev/null
+++ b/app-crypt/tpm2-openssl/files/tpm2-openssl-1.1.1-build-Fix-undefined-references-when-using-slibtool.patch
@@ -0,0 +1,26 @@
+From 8c87d708a168ab090f8e5fc01f2bf1db5103427d Mon Sep 17 00:00:00 2001
+From: Christopher Byrne <salah.coronya@gmail.com>
+Date: Fri, 15 Sep 2023 11:26:55 -0500
+Subject: [PATCH] build: Fix undefined references when using slibtool
+
+Signed-off-by: Christopher Byrne <salah.coronya@gmail.com>
+---
+ Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index a0ad0d5..34a751c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -50,7 +50,7 @@ tpm2_la_LIBADD = $(TSS2_ESYS_LIBS) $(TSS2_TCTILDR_LIBS) $(LIBS) $(CODE_COVERAGE_
+ if TSS2_RC
+ tpm2_la_LIBADD += $(TSS2_RC_LIBS)
+ endif
+-tpm2_la_LDFLAGS = -module -avoid-version -no-undefined -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
++tpm2_la_LDFLAGS = -module -avoid-version -export-symbols-regex 'OSSL_provider_init' $(COMMON_LDFLAGS) $(CODE_COVERAGE_LDFLAGS)
+
+ check_PROGRAMS = test/selftest
+ test_selftest_SOURCES = test/selftest.c
+--
+2.41.0
+
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
index 54fda1a513cb..a420baf98c3a 100644
--- a/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1.ebuild
+++ b/app-crypt/tpm2-openssl/tpm2-openssl-1.1.1-r1.ebuild
@@ -3,6 +3,8 @@
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"
@@ -18,13 +20,23 @@ RDEPEND="
>=dev-libs/openssl-3:="
DEPEND="${RDEPEND}
test? (
- app-crypt/swtpm[gnutls]
+ app-crypt/swtpm[gnutls(+)]
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"
+ "${FILESDIR}/${P}-build-Fix-undefined-references-when-using-slibtool.patch"
+)
-PATCHES=( "${FILESDIR}"/${P}-tests-include-base-provider-required-to-load-ecparam.patch )
+src_prepare() {
+ eautoreconf
+ default
+}
src_test() {
dbus_run() {
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 17:35:32 +0000