commit: 596f8425a23433b2c99e669d9dc2838062eb2589
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 24 10:27:34 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Nov 24 10:27:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=596f8425
sys-auth/elogind: drop 246.10-r4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
sys-auth/elogind/Manifest | 1 -
sys-auth/elogind/elogind-246.10-r4.ebuild | 150 ---------------------
.../elogind/files/elogind-241.4-broken-test.patch | 15 ---
sys-auth/elogind/files/elogind-243.7-nodocs.patch | 29 ----
.../elogind-246.10-clang-undefined-symbol.patch | 20 ---
sys-auth/elogind/files/elogind-246.10-loong.patch | 40 ------
.../files/elogind-246.10-musl-selinux.patch | 99 --------------
.../elogind-246.10-revert-polkit-automagic.patch | 38 ------
sys-auth/elogind/files/elogind.init | 25 ----
9 files changed, 417 deletions(-)
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index abf5d5d7e98b..640dcae155aa 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,3 +1,2 @@
-DIST elogind-246.10.tar.gz 1559256 BLAKE2B
17a8146ee08c8ccf167f25d89b1d4525050ed0b0baaad0d36924ad3c40ffc820ef1528b33557cf285ad06c9ac9c440137428c5a235a2acf563e56f2f8f07e208
SHA512
9db0f068ed94ec07bab4d764ccb38840af3d05a4b7c9c539721906f5381b509cb9a3cbfb0453a978210d306136368de6162578c600d522416ef2a7ac1b9f348b
DIST elogind-252.9.tar.gz 1922777 BLAKE2B
dd566125e407b3479a44b007890f97c9c87a325b3fed2d3505499d2163f113affd998e14b1c1fc50b9b86b0d155b51dae344dcc1cddafb6a48c631d0a0f00c9a
SHA512
eed620cbc2f03bfeae6a80c9a421c21d3293fa40adffb96c7e4d86508c06712041f6623fb2bac15ecbb85faca4b5674ea6423b3067840809fb27d023fd9e5ffd
DIST elogind-255.5.tar.gz 2127126 BLAKE2B
395352fc24bc815d1e39c2d5722eb09c2e3378873e2ea4173d8c209cd66c28a9b94ebe62ab3efbd5dccd822d99b86a6c1a871620adefb1215cb6d4ceee78a9f9
SHA512
dd9494062ef18c3c4cddbaf70b394bf90f6da3ce49f85312e99eabde54b2fcdb5cfdde1bcbaa661031afc72853e9b138dae336e1caed72e927bfd61c8cb22895
diff --git a/sys-auth/elogind/elogind-246.10-r4.ebuild
b/sys-auth/elogind/elogind-246.10-r4.ebuild
deleted file mode 100644
index 93a9379c3c74..000000000000
--- a/sys-auth/elogind/elogind-246.10-r4.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = *9999* ]]; then
- EGIT_BRANCH="v241-stable"
- EGIT_REPO_URI="https://github.com/elogind/elogind.git";
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv
~s390 sparc x86"
-fi
-
-inherit linux-info meson pam udev xdg-utils
-
-DESCRIPTION="The systemd project's logind, extracted to a standalone package"
-HOMEPAGE="https://github.com/elogind/elogind";
-
-LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
-SLOT="0"
-IUSE="+acl audit +cgroup-hybrid debug doc +pam +policykit selinux test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
- app-text/docbook-xml-dtd:4.2
- app-text/docbook-xml-dtd:4.5
- app-text/docbook-xsl-stylesheets
- dev-util/gperf
- virtual/pkgconfig
-"
-DEPEND="
- audit? ( sys-process/audit )
- sys-apps/util-linux
- sys-libs/libcap
- virtual/libudev:=
- acl? ( sys-apps/acl )
- pam? ( sys-libs/pam )
- selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
- !sys-apps/systemd
-"
-PDEPEND="
- sys-apps/dbus
- policykit? ( sys-auth/polkit )
-"
-
-DOCS=( README.md src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
-PATCHES=(
- "${FILESDIR}/${PN}-243.7-nodocs.patch"
- "${FILESDIR}/${PN}-241.4-broken-test.patch" # bug 699116
- "${FILESDIR}/${P}-revert-polkit-automagic.patch"
- "${FILESDIR}/${P}-clang-undefined-symbol.patch"
- "${FILESDIR}/${P}-loong.patch"
- "${FILESDIR}/${P}-musl-selinux.patch"
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
-
- use kernel_linux && linux-info_pkg_setup
-}
-
-src_prepare() {
- default
- xdg_environment_reset
-}
-
-src_configure() {
- if use cgroup-hybrid; then
- cgroupmode="hybrid"
- else
- cgroupmode="unified"
- fi
-
- local emesonargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -Dhtmldir="${EPREFIX}/usr/share/doc/${PF}/html"
- -Dpamlibdir=$(getpam_mod_dir)
- -Dudevrulesdir="${EPREFIX}$(get_udevdir)"/rules.d
- --libdir="${EPREFIX}"/usr/$(get_libdir)
- -Drootlibdir="${EPREFIX}"/$(get_libdir)
- -Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind
- -Drootprefix="${EPREFIX}/"
-
-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions"
- -Dman=auto
- -Dsmack=true
- -Dcgroup-controller=openrc
- -Ddefault-hierarchy=${cgroupmode}
- -Ddefault-kill-user-processes=false
- -Dacl=$(usex acl true false)
- -Daudit=$(usex audit true false)
- -Dbuildtype=$(usex debug debug release)
- -Dhtml=$(usex doc auto false)
- -Dpam=$(usex pam true false)
- -Dselinux=$(usex selinux true false)
- -Dtests=$(usex test true false)
- -Dutmp=$(usex elibc_musl false true)
- )
-
- meson_src_configure
-}
-
-src_install() {
- DOCS+=( src/libelogind/sd-bus/GVARIANT-SERIALIZATION )
-
- meson_src_install
-
- newinitd "${FILESDIR}"/${PN}.init-r1 ${PN}
-
- sed -e "s|@libdir@|$(get_libdir)|" "${FILESDIR}"/${PN}.conf.in >
${PN}.conf || die
- newconfd ${PN}.conf ${PN}
-}
-
-pkg_postinst() {
- if ! use pam; then
- ewarn "${PN} will not be managing user logins/seats without
USE=\"pam\"!"
- ewarn "In other words, it will be useless for most
applications."
- ewarn
- fi
- if ! use policykit; then
- ewarn "loginctl will not be able to perform privileged
operations without"
- ewarn "USE=\"policykit\"! That means e.g. no suspend or
hibernate."
- ewarn
- fi
- if [[ "$(rc-config list boot | grep elogind)" != "" ]]; then
- elog "elogind is currently started from boot runlevel."
- elif [[ "$(rc-config list default | grep elogind)" != "" ]]; then
- ewarn "elogind is currently started from default runlevel."
- ewarn "Please remove elogind from the default runlevel and"
- ewarn "add it to the boot runlevel by:"
- ewarn "# rc-update del elogind default"
- ewarn "# rc-update add elogind boot"
- else
- elog "elogind is currently not started from any runlevel."
- elog "You may add it to the boot runlevel by:"
- elog "# rc-update add elogind boot"
- elog
- elog "Alternatively, you can leave elogind out of any"
- elog "runlevel. It will then be started automatically"
- if use pam; then
- elog "when the first service calls it via dbus, or"
- elog "the first user logs into the system."
- else
- elog "when the first service calls it via dbus."
- fi
- fi
-}
diff --git a/sys-auth/elogind/files/elogind-241.4-broken-test.patch
b/sys-auth/elogind/files/elogind-241.4-broken-test.patch
deleted file mode 100644
index d2735825900e..000000000000
--- a/sys-auth/elogind/files/elogind-241.4-broken-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/test/meson.build 2019-11-15 08:59:47.000000000 +0100
-+++ b/src/test/meson.build 2019-11-30 13:04:45.051316140 +0100
-@@ -1014,9 +1014,9 @@
- # '', 'timeout=120'],
- #endif // 0
-
-- [['src/libelogind/sd-login/test-login.c'],
-- [],
-- []],
-+# [['src/libelogind/sd-login/test-login.c'],
-+# [],
-+# []],
-
- [['src/libelogind/sd-device/test-sd-device.c'],
- [],
diff --git a/sys-auth/elogind/files/elogind-243.7-nodocs.patch
b/sys-auth/elogind/files/elogind-243.7-nodocs.patch
deleted file mode 100644
index 0ec0aa37308a..000000000000
--- a/sys-auth/elogind/files/elogind-243.7-nodocs.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-We don't want the build system to install to docdir for us.
-
---- a/meson.build 2020-03-12 20:33:40.000000000 +0100
-+++ b/meson.build 2020-03-12 22:46:08.020716935 +0100
-@@ -3352,15 +3352,11 @@
- # install_data('modprobe.d/systemd.conf',
- # install_dir : modprobedir)
- #endif // 0
--install_data('LICENSE.GPL2',
-- 'LICENSE.LGPL2.1',
- #if 0 /// elogind has upgraded to markdown, and the NEWS file is useless
- # 'NEWS',
- # 'README',
- #else // 0
-- 'README.md',
- #endif // 0
-- 'docs/CODING_STYLE.md',
- #if 0 /// irrelevant for elogind
- # 'docs/DISTRO_PORTING.md',
- # 'docs/ENVIRONMENT.md',
-@@ -3369,8 +3365,6 @@
- # 'docs/TRANSLATORS.md',
- # 'docs/UIDS-GIDS.md',
- #endif // 0
-- 'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
-- install_dir : docdir)
-
- #if 0 /// UNNEEDED by elogind
- # meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
b/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
deleted file mode 100644
index 3a157615884e..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-clang-undefined-symbol.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/src/libelogind/sd-bus/bus-error.h
-+++ b/src/libelogind/sd-bus/bus-error.h
-@@ -28,11 +28,17 @@ int bus_error_set_errnofv(sd_bus_error *e, int error,
const char *format, va_lis
- * the bus error table, and BUS_ERROR_MAP_ELF_USE has to be used at
- * least once per compilation unit (i.e. per library), to ensure that
- * the error map is really added to the final binary.
-+ *
-+ * In addition, set the retain attribute so that the section cannot be
-+ * discarded by ld --gc-sections -z start-stop-gc. Older compilers would
-+ * warn for the unknown attribute, so just disable -Wattributes.
- */
-
- #define BUS_ERROR_MAP_ELF_REGISTER \
-+ _Pragma("GCC diagnostic ignored \"-Wattributes\"") \
- _section_("SYSTEMD_BUS_ERROR_MAP") \
- _used_ \
-+ __attribute__((retain)) \
- _alignptr_ \
- _variable_no_sanitize_address_
-
diff --git a/sys-auth/elogind/files/elogind-246.10-loong.patch
b/sys-auth/elogind/files/elogind-246.10-loong.patch
deleted file mode 100644
index f2b418f1384a..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-loong.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-https://github.com/elogind/elogind/pull/231, but made minimal.
-From: Wu Xiaotian <[email protected]>
-Date: Tue, 1 Sep 2020 12:13:18 +0800
-Subject: [PATCH] architecture: Add support for the LoongArch architecture
-
-(cherry picked from commit 5c0968a2d14d5e1afb40a36c55d3f89805712904)
-[resolved merge conflict for minimal diff, also use __loongarch_lp64
-instead of __loongarch64 -- xen0n]
-
-basic: update the Arch tuples for LoongArch
-
-(cherry picked from commit 017228934833d8618774353dcccbc5ec9f78ce98)
---- a/src/basic/architecture.h
-+++ b/src/basic/architecture.h
-@@ -44,6 +44,7 @@ enum {
- ARCHITECTURE_RISCV64,
- ARCHITECTURE_ARC,
- ARCHITECTURE_ARC_BE,
-+ ARCHITECTURE_LOONGARCH64,
- _ARCHITECTURE_MAX,
- _ARCHITECTURE_INVALID = -1
- };
-@@ -200,6 +201,17 @@ int uname_architecture(void);
- # elif defined(__SH4A__)
- # define LIB_ARCH_TUPLE "sh4a-linux-gnu"
- # endif
-+#elif defined(__loongarch_lp64)
-+# define native_architecture() ARCHITECTURE_LOONGARCH64
-+# if defined(__loongarch_double_float)
-+# define LIB_ARCH_TUPLE "loongarch64-linux-gnuf64"
-+# elif defined(__loongarch_single_float)
-+# define LIB_ARCH_TUPLE "loongarch64-linux-gnuf32"
-+# elif defined(__loongarch_soft_float)
-+# define LIB_ARCH_TUPLE "loongarch64-linux-gnusf"
-+# else
-+# error "Unrecognized loongarch architecture variant"
-+# endif
- #elif defined(__m68k__)
- # define native_architecture() ARCHITECTURE_M68K
- # define LIB_ARCH_TUPLE "m68k-linux-gnu"
diff --git a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
b/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
deleted file mode 100644
index c36861b983e2..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-musl-selinux.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-https://bugs.gentoo.org/888912
-https://github.com/elogind/elogind/commit/ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc
-
-Rebased version to apply to 246.10 by concord@.
-
-From ab72a46f3104f44a32ef7bec7439aa9d3b5f0fdc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <[email protected]>
-Date: Fri, 9 Oct 2020 16:48:03 +0200
-Subject: [PATCH] basic/selinux: work around mallinfo deprecation
-
-Latest glibc has deprecated mallinfo(), so it might become unavailable at some
point
-in the future. There is malloc_info(), but it returns XML, ffs. I think the
information
-that we get from mallinfo() is quite useful, so let's use mallinfo() if
available, and
-not otherwise.
---- a/meson.build
-+++ b/meson.build
-@@ -617,6 +617,7 @@ foreach ident : [
- #include <unistd.h>
- #include <signal.h>
- #include <sys/wait.h>'''],
-+ ['mallinfo', '''#include <malloc.h>'''],
- ]
-
- have = cc.has_function(ident[0], prefix : ident[1], args :
'-D_GNU_SOURCE')
---- a/src/basic/macro.h
-+++ b/src/basic/macro.h
-@@ -93,6 +93,10 @@
- #endif
-
- /* Temporarily disable some warnings */
-+#define DISABLE_WARNING_DEPRECATED_DECLARATIONS \
-+ _Pragma("GCC diagnostic push"); \
-+ _Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
-+
- #define DISABLE_WARNING_FORMAT_NONLITERAL \
- _Pragma("GCC diagnostic push"); \
- _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"")
---- a/src/basic/selinux-util.c
-+++ b/src/basic/selinux-util.c
-@@ -72,12 +72,21 @@ void mac_selinux_retest(void) {
- #endif
- }
-
-+#if HAVE_MALLINFO
-+static struct mallinfo mallinfo_nowarn(void) {
-+ /* glibc has deprecated mallinfo(), but the replacement malloc_info()
returns an XML blob ;=[ */
-+DISABLE_WARNING_DEPRECATED_DECLARATIONS
-+ return mallinfo();
-+REENABLE_WARNING
-+}
-+#else
-+# warning "mallinfo() is missing, add mallinfo2() support instead."
-+#endif
-+
- int mac_selinux_init(void) {
- #if HAVE_SELINUX
- usec_t before_timestamp, after_timestamp;
-- struct mallinfo before_mallinfo, after_mallinfo;
- char timespan[FORMAT_TIMESPAN_MAX];
-- int l;
-
- selinux_set_callback(SELINUX_CB_POLICYLOAD, (union selinux_callback)
mac_selinux_reload);
-
-@@ -87,7 +96,9 @@ int mac_selinux_init(void) {
- if (!mac_selinux_use())
- return 0;
-
-- before_mallinfo = mallinfo();
-+#if HAVE_MALLINFO
-+ struct mallinfo before_mallinfo = mallinfo_nowarn();
-+#endif
- before_timestamp = now(CLOCK_MONOTONIC);
-
- label_hnd = selabel_open(SELABEL_CTX_FILE, NULL, 0);
-@@ -95,14 +107,17 @@ int mac_selinux_init(void) {
- return log_enforcing_errno(errno, "Failed to initialize
SELinux labeling handle: %m");
-
- after_timestamp = now(CLOCK_MONOTONIC);
-- after_mallinfo = mallinfo();
--
-- l = after_mallinfo.uordblks > before_mallinfo.uordblks ?
after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
-+#if HAVE_MALLINFO
-+ struct mallinfo after_mallinfo = mallinfo_nowarn();
-+ int l = after_mallinfo.uordblks > before_mallinfo.uordblks ?
after_mallinfo.uordblks - before_mallinfo.uordblks : 0;
-
- log_debug("Successfully loaded SELinux database in %s, size on heap
is %iK.",
- format_timespan(timespan, sizeof(timespan), after_timestamp
- before_timestamp, 0),
-- (l+1023)/1024);
--
-+ DIV_ROUND_UP(l, 1024));
-+#else
-+ log_debug("Successfully loaded SELinux database in %s.",
-+ format_timespan(timespan, sizeof(timespan), after_timestamp
- before_timestamp, 0));
-+#endif
- #endif
- return 0;
- }
---
-2.40.1
diff --git
a/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
b/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
deleted file mode 100644
index 5237b7abe72a..000000000000
--- a/sys-auth/elogind/files/elogind-246.10-revert-polkit-automagic.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 715ce0a6459e418f92e74c7ce52df3244c18f383 Mon Sep 17 00:00:00 2001
-From: Sven Eden <[email protected]>
-Date: Mon, 8 Mar 2021 08:40:08 +0100
-Subject: [PATCH] Revert "Disable polkit support if libpolkit is not installed"
-
-This reverts commit 1194dec4f8f2d1b8bd14e1625f34418ecfce817e.
-
-Removing polkit support with -Dpolkit=auto when libpolkit is not
-installed, removes the whole interface. This makes it impossible to
-add polkit support as a runtime dependency.
-
-Bug: #167
-Closes: #206
-Signed-off-by: Sven Eden <[email protected]>
----
- meson.build | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index 2dd05db3c..f38551f55 100644
---- a/meson.build
-+++ b/meson.build
-@@ -1157,15 +1157,6 @@ if want_polkit != 'false' and not skip_deps
- message('Old polkit detected, will install pkla files')
- install_polkit_pkla = true
- endif
--#if 1 /// Disable polkit completely if libpolkit is not there. See elogind
issue #167
-- if not libpolkit.found()
-- if want_polkit != 'auto'
-- error('Polkit requested but libpolkit was not found.')
-- endif
-- install_polkit = false
-- want_polkit = false
-- endif
--#endif // 1
- endif
- conf.set10('ENABLE_POLKIT', install_polkit)
-
diff --git a/sys-auth/elogind/files/elogind.init
b/sys-auth/elogind/files/elogind.init
deleted file mode 100644
index 019c3afbabc5..000000000000
--- a/sys-auth/elogind/files/elogind.init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need dbus
-
- # Make sure elogind is up before xdm starts any dm
- before xdm
-}
-
-start() {
- ebegin "Starting elogind"
-
- start-stop-daemon --start --quiet \
- --pidfile "${ELOGIND_PIDFILE}" \
- --exec "${ELOGIND_EXEC}" -- --daemon
- eend $?
-}
-
-stop() {
- ebegin "Stopping elogind"
- start-stop-daemon --stop --quiet --pidfile "${ELOGIND_PIDFILE}"
- eend $?
-}
