Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

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: Mon, 04 Jul 2022 17:38:52
Message-Id: 1656956294.76303199fc06f8817c0c298ac37f8e0786b77af7.floppym@gentoo
1 commit: 76303199fc06f8817c0c298ac37f8e0786b77af7
2 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jul 4 17:34:30 2022 +0000
4 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
5 CommitDate: Mon Jul 4 17:38:14 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76303199
7
8 sys-apps/systemd: rename 'nat' USE flag to 'iptables'
9
10 Since v248, systemd has supported using nftables by default if the
11 running kernel supports it. This makes the iptables dependency
12 an optional fallback.
13
14 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
15
16 sys-apps/systemd/metadata.xml | 2 +-
17 sys-apps/systemd/systemd-250.7.ebuild | 8 ++++----
18 sys-apps/systemd/systemd-251.2.ebuild | 8 ++++----
19 sys-apps/systemd/systemd-9999.ebuild | 8 ++++----
20 4 files changed, 13 insertions(+), 13 deletions(-)
21
22 diff --git a/sys-apps/systemd/metadata.xml b/sys-apps/systemd/metadata.xml
23 index 0d8cc3d2f286..b6426bde80a1 100644
24 --- a/sys-apps/systemd/metadata.xml
25 +++ b/sys-apps/systemd/metadata.xml
26 @@ -23,9 +23,9 @@
27 <flag name="hostnamed-fallback">Enable setting hostname with networkd/hostnamed without polkit (requires running <pkg>sys-apps/dbus-broker</pkg>)</flag>
28 <flag name="http">Enable embedded HTTP server in journald</flag>
29 <flag name="importd">Enable import daemon</flag>
30 + <flag name="iptables">Use libiptc from <pkg>net-firewall/iptables</pkg> for NAT support in systemd-networkd; this is used only if the running kernel does not support nftables</flag>
31 <flag name="kmod">Enable kernel module loading via <pkg>sys-apps/kmod</pkg></flag>
32 <flag name="lz4">Enable lz4 compression for the journal</flag>
33 - <flag name="nat">Enable support for network address translation in networkd</flag>
34 <flag name="openssl">Enable use of <pkg>dev-libs/openssl</pkg> for various features</flag>
35 <flag name="pkcs11">Enable PKCS#11 support for cryptsetup and homed</flag>
36 <flag name="pwquality">Enable password quality checking in homed</flag>
37
38 diff --git a/sys-apps/systemd/systemd-250.7.ebuild b/sys-apps/systemd/systemd-250.7.ebuild
39 index 92bbec7305b4..6c099f218fd6 100644
40 --- a/sys-apps/systemd/systemd-250.7.ebuild
41 +++ b/sys-apps/systemd/systemd-250.7.ebuild
42 @@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
43 SLOT="0/2"
44 IUSE="
45 acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
46 - fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod
47 - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
48 + fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd iptables +kmod
49 + +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
50 +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
51 "
52 REQUIRED_USE="
53 @@ -72,7 +72,7 @@ COMMON_DEPEND="
54 kmod? ( >=sys-apps/kmod-15:0= )
55 lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
56 lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
57 - nat? ( net-firewall/iptables:0= )
58 + iptables? ( net-firewall/iptables:0= )
59 openssl? ( >=dev-libs/openssl-1.1.0:0= )
60 pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
61 pkcs11? ( app-crypt/p11-kit:0= )
62 @@ -328,7 +328,7 @@ multilib_src_configure() {
63 $(meson_use lz4)
64 $(meson_use lzma xz)
65 $(meson_use zstd)
66 - $(meson_native_use_bool nat libiptc)
67 + $(meson_native_use_bool iptables libiptc)
68 $(meson_native_use_bool openssl)
69 $(meson_use pam)
70 $(meson_native_use_bool pkcs11 p11kit)
71
72 diff --git a/sys-apps/systemd/systemd-251.2.ebuild b/sys-apps/systemd/systemd-251.2.ebuild
73 index 04abbae40454..15de03f9a772 100644
74 --- a/sys-apps/systemd/systemd-251.2.ebuild
75 +++ b/sys-apps/systemd/systemd-251.2.ebuild
76 @@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
77 SLOT="0/2"
78 IUSE="
79 acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
80 - fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
81 - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
82 + fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
83 + +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
84 +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
85 "
86 REQUIRED_USE="
87 @@ -71,7 +71,7 @@ COMMON_DEPEND="
88 kmod? ( >=sys-apps/kmod-15:0= )
89 lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
90 lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
91 - nat? ( net-firewall/iptables:0= )
92 + iptables? ( net-firewall/iptables:0= )
93 openssl? ( >=dev-libs/openssl-1.1.0:0= )
94 pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
95 pkcs11? ( app-crypt/p11-kit:0= )
96 @@ -326,7 +326,7 @@ multilib_src_configure() {
97 $(meson_use lz4)
98 $(meson_use lzma xz)
99 $(meson_use zstd)
100 - $(meson_native_use_bool nat libiptc)
101 + $(meson_native_use_bool iptables libiptc)
102 $(meson_native_use_bool openssl)
103 $(meson_use pam)
104 $(meson_native_use_bool pkcs11 p11kit)
105
106 diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
107 index 0b4f28e4c6b5..b3bc091078ab 100644
108 --- a/sys-apps/systemd/systemd-9999.ebuild
109 +++ b/sys-apps/systemd/systemd-9999.ebuild
110 @@ -35,8 +35,8 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
111 SLOT="0/2"
112 IUSE="
113 acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
114 - fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod
115 - +lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode
116 + fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
117 + +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
118 +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
119 "
120 REQUIRED_USE="
121 @@ -71,7 +71,7 @@ COMMON_DEPEND="
122 kmod? ( >=sys-apps/kmod-15:0= )
123 lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
124 lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
125 - nat? ( net-firewall/iptables:0= )
126 + iptables? ( net-firewall/iptables:0= )
127 openssl? ( >=dev-libs/openssl-1.1.0:0= )
128 pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
129 pkcs11? ( app-crypt/p11-kit:0= )
130 @@ -322,7 +322,7 @@ multilib_src_configure() {
131 $(meson_use lz4)
132 $(meson_use lzma xz)
133 $(meson_use zstd)
134 - $(meson_native_use_bool nat libiptc)
135 + $(meson_native_use_bool iptables libiptc)
136 $(meson_native_use_bool openssl)
137 $(meson_use pam)
138 $(meson_native_use_bool pkcs11 p11kit)
Report Message
Find on MARC Find on Google Groups