From: "Matthias Maier" <tamiko@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: app-crypt/swtpm/
Date: Sat, 16 Sep 2023 15:54:40 +0000 (UTC) [thread overview]
Message-ID: <1694879642.385cf751b98496cf4e297b0f1cbf3e1ba9e26d80.tamiko@gentoo> (raw)
commit: 385cf751b98496cf4e297b0f1cbf3e1ba9e26d80
Author: Christopher Byrne <salah.coronya <AT> gmail <DOT> com>
AuthorDate: Sat Sep 16 15:51:13 2023 +0000
Commit: Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Sat Sep 16 15:54:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=385cf751
app-crypt/swtpm: Add gnutls dependency back for swtpm_cert
RDEPEND=net-libs/gnutls[tools,pkcs11] is essentiallly required for
app-crypt/swtpm. New vTPMs cannot be provisioned without it, and upstream
expects gnutls to have PKCS11 support:
https://github.com/stefanberger/swtpm/issues/477 .
Closes: https://github.com/gentoo/gentoo/pull/32704
Closes: https://bugs.gentoo.org/913586
Bug: https://bugs.gentoo.org/909754
Signed-off-by: Christopher Byrne <salah.coronya <AT> gmail.com>
Signed-off-by: Matthias Maier <tamiko <AT> gentoo.org>
app-crypt/swtpm/metadata.xml | 1 -
...swtpm-0.8.0-r1.ebuild => swtpm-0.8.0-r2.ebuild} | 22 ++++++++++++----------
...swtpm-0.8.1-r1.ebuild => swtpm-0.8.1-r2.ebuild} | 22 ++++++++++++----------
3 files changed, 24 insertions(+), 21 deletions(-)
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
similarity index 79%
rename from app-crypt/swtpm/swtpm-0.8.0-r1.ebuild
rename to 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
similarity index 79%
rename from app-crypt/swtpm/swtpm-0.8.1-r1.ebuild
rename to 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)
}
next reply other threads:[~2023-09-16 15:54 UTC|newest]
Thread overview: 82+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-16 15:54 Matthias Maier [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-12-11 1:53 [gentoo-commits] repo/gentoo:master commit in: app-crypt/swtpm/ Sam James
2024-12-11 1:53 Sam James
2024-11-17 21:03 Michał Górny
2024-11-17 15:48 Michał Górny
2024-11-17 3:49 Sam James
2024-11-17 3:10 Sam James
2024-11-17 3:06 Sam James
2024-07-18 7:41 Joonas Niilola
2024-07-18 7:41 Joonas Niilola
2024-06-21 18:22 Sam James
2024-06-21 18:22 Sam James
2024-06-21 18:22 Sam James
2024-06-21 18:22 Sam James
2024-06-21 18:22 Sam James
2024-04-26 6:55 Joonas Niilola
2024-04-26 6:55 Joonas Niilola
2023-12-17 7:22 Joonas Niilola
2023-12-17 7:22 Joonas Niilola
2023-12-17 0:05 Sam James
2023-12-16 16:17 Arthur Zamarin
2023-12-16 16:17 Arthur Zamarin
2023-09-14 16:09 Mike Gilbert
2023-09-14 15:10 Matthias Maier
2023-09-09 13:17 David Seifert
2023-09-09 13:17 David Seifert
2023-08-19 22:32 Conrad Kostecki
2023-07-29 4:43 Sam James
2023-07-29 3:46 Matthias Maier
2023-07-06 17:28 Matthias Maier
2023-03-30 17:17 Arthur Zamarin
2023-02-20 14:47 Arthur Zamarin
2023-02-20 13:50 Sam James
2023-02-20 13:50 Sam James
2023-02-20 9:39 Joonas Niilola
2022-12-24 2:59 Sam James
2022-12-04 15:59 WANG Xuerui
2022-11-22 9:10 Matthias Maier
2022-10-26 4:04 John Helmert III
2022-05-20 9:17 Agostino Sarubbo
2022-05-19 9:27 Agostino Sarubbo
2022-05-17 12:38 Agostino Sarubbo
2022-05-17 12:37 Agostino Sarubbo
2022-05-17 9:58 Agostino Sarubbo
2022-05-11 21:31 Matt Turner
2022-05-11 21:31 Matt Turner
2022-03-11 0:04 Ionen Wolkens
2022-03-11 0:04 Ionen Wolkens
2022-03-10 6:48 Yixun Lan
2022-02-19 5:17 Sam James
2022-02-19 5:17 Sam James
2021-11-10 10:59 Ionen Wolkens
2021-09-24 7:22 Joonas Niilola
2021-09-24 7:22 Joonas Niilola
2021-09-24 7:22 Joonas Niilola
2021-09-13 6:33 Joonas Niilola
2021-09-08 1:25 Sam James
2021-07-24 15:22 Sam James
2021-07-12 21:59 Sam James
2021-07-06 17:59 Sam James
2021-06-29 4:40 Sam James
2021-06-29 4:40 Sam James
2021-06-26 3:56 Matthias Maier
2021-05-02 17:22 Mikle Kolyada
2021-04-25 8:00 Michał Górny
2021-01-31 13:09 Joonas Niilola
2021-01-31 13:09 Joonas Niilola
2020-11-24 13:26 Joonas Niilola
2020-11-24 13:26 Joonas Niilola
2020-11-20 15:10 Sam James
2020-11-20 15:10 Sam James
2020-11-20 15:10 Sam James
2020-10-12 9:06 Joonas Niilola
2020-08-05 12:19 Joonas Niilola
2020-06-20 9:56 Conrad Kostecki
2020-06-20 9:56 Conrad Kostecki
2020-04-23 7:41 Joonas Niilola
2020-04-23 7:41 Joonas Niilola
2020-03-03 14:54 Joonas Niilola
2020-03-03 14:54 Joonas Niilola
2020-02-19 13:32 Joonas Niilola
2020-02-19 13:32 Joonas Niilola
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1694879642.385cf751b98496cf4e297b0f1cbf3e1ba9e26d80.tamiko@gentoo \
--to=tamiko@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox