diff options
Diffstat (limited to 'app-crypt/swtpm')
| -rw-r--r-- | app-crypt/swtpm/Manifest | 6 | ||||
| -rw-r--r-- | app-crypt/swtpm/metadata.xml | 1 | ||||
| -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 |
4 files changed, 27 insertions, 24 deletions
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) } |