| 1 |
commit: 3120aad0e95fe0963199bd1a57526cdacc5ad3ec |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 22:59:09 2022 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 6 18:33:55 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3120aad0 |
| 7 |
|
| 8 |
sys-apps/systemd: remove hostnamed-fallback from live ebuild |
| 9 |
|
| 10 |
this was added before we had policykit working with duktape |
| 11 |
now duktape support in polkit landed, and is the default in gentoo |
| 12 |
systemd-hostnamed should function without this workaround, and without |
| 13 |
pulling llvm+rust+spidermonkey via polkit. |
| 14 |
|
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/25312 |
| 16 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 17 |
|
| 18 |
sys-apps/systemd/systemd-9999.ebuild | 25 +------------------------ |
| 19 |
1 file changed, 1 insertion(+), 24 deletions(-) |
| 20 |
|
| 21 |
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild |
| 22 |
index 3069cafa856d..044df638afe4 100644 |
| 23 |
--- a/sys-apps/systemd/systemd-9999.ebuild |
| 24 |
+++ b/sys-apps/systemd/systemd-9999.ebuild |
| 25 |
@@ -32,7 +32,7 @@ LICENSE="GPL-2 LGPL-2.1 MIT public-domain" |
| 26 |
SLOT="0/2" |
| 27 |
IUSE=" |
| 28 |
acl apparmor audit build cgroup-hybrid cryptsetup curl +dns-over-tls elfutils |
| 29 |
- fido2 +gcrypt gnuefi gnutls homed hostnamed-fallback http idn importd +kmod |
| 30 |
+ fido2 +gcrypt gnuefi gnutls homed http idn importd +kmod |
| 31 |
+lz4 lzma nat +openssl pam pcre pkcs11 policykit pwquality qrcode |
| 32 |
+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd |
| 33 |
" |
| 34 |
@@ -40,7 +40,6 @@ REQUIRED_USE=" |
| 35 |
dns-over-tls? ( || ( gnutls openssl ) ) |
| 36 |
homed? ( cryptsetup pam openssl ) |
| 37 |
importd? ( curl lzma || ( gcrypt openssl ) ) |
| 38 |
- policykit? ( !hostnamed-fallback ) |
| 39 |
pwquality? ( homed ) |
| 40 |
" |
| 41 |
RESTRICT="!test? ( test )" |
| 42 |
@@ -118,10 +117,6 @@ RDEPEND="${COMMON_DEPEND} |
| 43 |
>=acct-user/systemd-resolve-0-r1 |
| 44 |
>=acct-user/systemd-timesync-0-r1 |
| 45 |
>=sys-apps/baselayout-2.2 |
| 46 |
- hostnamed-fallback? ( |
| 47 |
- acct-group/systemd-hostname |
| 48 |
- sys-apps/dbus-broker |
| 49 |
- ) |
| 50 |
selinux? ( sec-policy/selinux-base-policy[systemd] ) |
| 51 |
sysv-utils? ( |
| 52 |
!sys-apps/openrc[sysv-utils(-)] |
| 53 |
@@ -407,16 +402,6 @@ multilib_src_install_all() { |
| 54 |
dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown |
| 55 |
fi |
| 56 |
|
| 57 |
- # workaround for https://github.com/systemd/systemd/issues/13501 |
| 58 |
- if use hostnamed-fallback; then |
| 59 |
- # this file requires dbus-broker |
| 60 |
- insinto /usr/share/dbus-1/system.d/ |
| 61 |
- doins "${FILESDIR}/org.freedesktop.hostname1_no_polkit.conf" |
| 62 |
- |
| 63 |
- insinto "${rootprefix}/lib/systemd/system/systemd-hostnamed.service.d/" |
| 64 |
- doins "${FILESDIR}/00-hostnamed-network-user.conf" |
| 65 |
- fi |
| 66 |
- |
| 67 |
gen_usr_ldscript -a systemd udev |
| 68 |
} |
| 69 |
|
| 70 |
@@ -513,14 +498,6 @@ pkg_postinst() { |
| 71 |
eerror "systemd again." |
| 72 |
eerror |
| 73 |
fi |
| 74 |
- |
| 75 |
- if use hostnamed-fallback; then |
| 76 |
- if ! systemctl --root="${ROOT:-/}" is-enabled --quiet dbus-broker.service 2>/dev/null; then |
| 77 |
- ewarn "dbus-broker.service is not enabled, systemd-hostnamed will fail to run." |
| 78 |
- ewarn "To enable dbus-broker.service run the next command as root:" |
| 79 |
- ewarn "systemctl enable dbus-broker.service" |
| 80 |
- fi |
| 81 |
- fi |
| 82 |
} |
| 83 |
|
| 84 |
pkg_prerm() { |
Archives