Gentoo Archives: gentoo-commits

From: Mike Gilbert <floppym@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/systemd/
Date: Wed, 08 Sep 2021 19:06:17
Message-Id: 1631127968.c3b4b4b5f982639b7a411fab2f58314514b228dd.floppym@gentoo
1 commit: c3b4b4b5f982639b7a411fab2f58314514b228dd
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 8 19:05:41 2021 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 8 19:06:08 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3b4b4b5
7
8 sys-apps/systemd: add fido2 USE flag
9
10 Closes: https://bugs.gentoo.org/779763
11 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
12
13 sys-apps/systemd/metadata.xml | 1 +
14 sys-apps/systemd/{systemd-249.4-r2.ebuild => systemd-249.4-r3.ebuild} | 4 +++-
15 sys-apps/systemd/systemd-9999.ebuild | 4 +++-
16 3 files changed, 7 insertions(+), 2 deletions(-)
17
18 diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
19 index cb86e5b1d24..c458d3f1e3b 100644
20 --- a/sys-apps/systemd/metadata.xml
21 +++ b/sys-apps/systemd/metadata.xml
22 @@ -17,6 +17,7 @@
23 <flag name="dns-over-tls">Enable DNS-over-TLS support</flag>
24 <flag name="gnuefi">Enable EFI boot manager and stub loader (built using <pkg>sys-boot/gnu-efi</pkg>)</flag>
25 <flag name="elfutils">Enable coredump stacktraces in the journal</flag>
26 + <flag name="fido2">Enable FIDO2 support</flag>
27 <flag name="gcrypt">Enable sealing of journal files using gcrypt</flag>
28 <flag name="homed">Enable portable home directories</flag>
29 <flag name="http">Enable embedded HTTP server in journald</flag>
30
31 diff --git a/sys-apps/systemd/systemd-249.4-r2.ebuild b/sys-apps/systemd/systemd-249.4-r3.ebuild
32 similarity index 98%
33 rename from sys-apps/systemd/systemd-249.4-r2.ebuild
34 rename to sys-apps/systemd/systemd-249.4-r3.ebuild
35 index dd5462b694d..f7381f4632b 100644
36 --- a/sys-apps/systemd/systemd-249.4-r2.ebuild
37 +++ b/sys-apps/systemd/systemd-249.4-r3.ebuild
38 @@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
39
40 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
41 SLOT="0/2"
42 -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
43 +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
44
45 REQUIRED_USE="
46 homed? ( cryptsetup pam )
47 @@ -53,6 +53,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
48 curl? ( net-misc/curl:0= )
49 dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
50 elfutils? ( >=dev-libs/elfutils-0.158:0= )
51 + fido2? ( dev-libs/libfido2:0= )
52 gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
53 homed? ( ${OPENSSL_DEP} )
54 http? (
55 @@ -275,6 +276,7 @@ multilib_src_configure() {
56 $(meson_native_use_bool curl libcurl)
57 $(meson_native_use_bool dns-over-tls dns-over-tls)
58 $(meson_native_use_bool elfutils)
59 + $(meson_native_use_bool fido2 libfido2)
60 $(meson_use gcrypt)
61 $(meson_native_use_bool gnuefi gnu-efi)
62 -Defi-includedir="${ESYSROOT}/usr/include/efi"
63
64 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
65 index aedda0284c1..ee6cfbea7da 100644
66 --- a/sys-apps/systemd/systemd-9999.ebuild
67 +++ b/sys-apps/systemd/systemd-9999.ebuild
68 @@ -30,7 +30,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
69
70 LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
71 SLOT="0/2"
72 -IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
73 +IUSE="acl apparmor audit build cgroup-hybrid cryptsetup curl dns-over-tls elfutils fido2 +gcrypt gnuefi homed http +hwdb idn importd +kmod +lz4 lzma nat pam pcre pkcs11 policykit pwquality qrcode repart +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd"
74
75 REQUIRED_USE="
76 homed? ( cryptsetup pam )
77 @@ -53,6 +53,7 @@ COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
78 curl? ( net-misc/curl:0= )
79 dns-over-tls? ( >=net-libs/gnutls-3.6.0:0= )
80 elfutils? ( >=dev-libs/elfutils-0.158:0= )
81 + fido2? ( dev-libs/libfido2:0= )
82 gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
83 homed? ( ${OPENSSL_DEP} )
84 http? (
85 @@ -272,6 +273,7 @@ multilib_src_configure() {
86 $(meson_native_use_bool curl libcurl)
87 $(meson_native_use_bool dns-over-tls dns-over-tls)
88 $(meson_native_use_bool elfutils)
89 + $(meson_native_use_bool fido2 libfido2)
90 $(meson_use gcrypt)
91 $(meson_native_use_bool gnuefi gnu-efi)
92 -Defi-includedir="${ESYSROOT}/usr/include/efi"