* [gentoo-commits] repo/gentoo:master commit in: sys-libs/libnih/files/, sys-libs/libnih/, profiles/
@ 2021-02-05 22:59 Andreas Sturmlechner
0 siblings, 0 replies; only message in thread
From: Andreas Sturmlechner @ 2021-02-05 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 20dd338970fb5ae80cb73ca23a0cedbeeca88991
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 5 22:57:52 2021 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Feb 5 22:57:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=20dd3389
sys-libs/libnih: Remove last-rited package
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
profiles/package.mask | 6 ---
sys-libs/libnih/Manifest | 1 -
.../libnih/files/libnih-1.0.3-expat-2.2.5.patch | 15 ------
.../libnih/files/libnih-1.0.3-fno-common.patch | 11 -----
.../libnih/files/libnih-1.0.3-glibc-2.24.patch | 57 ----------------------
.../libnih/files/libnih-1.0.3-optional-dbus.patch | 40 ---------------
.../libnih/files/libnih-1.0.3-pkg-config.patch | 24 ---------
.../libnih/files/libnih-1.0.3-signal-race.patch | 44 -----------------
sys-libs/libnih/libnih-1.0.3-r4.ebuild | 55 ---------------------
sys-libs/libnih/metadata.xml | 8 ---
10 files changed, 261 deletions(-)
diff --git a/profiles/package.mask b/profiles/package.mask
index f6c03982fa6..fe2515bf028 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -170,12 +170,6 @@ x11-terms/eterm
# Removal in ~30 days. Bug: #764353
x11-terms/pangoterm
-# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-06)
-# Post-consolekit cleanup, dead upstream since 2016.
-# https://s3hh.wordpress.com/2016/06/18/whither-cgmanager/
-# Masked for removal in 30 days.
-sys-libs/libnih
-
# Andreas Sturmlechner <asturm@gentoo.org> (2021-01-06)
# Abandoned upstream, countless bugs. Replaced by builtin functions in elogind
# or systemd. Alternatives: sys-power/suspend, sys-power/hibernate-script.
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
deleted file mode 100644
index 2b231bc8694..00000000000
--- a/sys-libs/libnih/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
diff --git a/sys-libs/libnih/files/libnih-1.0.3-expat-2.2.5.patch b/sys-libs/libnih/files/libnih-1.0.3-expat-2.2.5.patch
deleted file mode 100644
index 02b5e4c0a9e..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-expat-2.2.5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Adapt test suite to expat 2.2.5
-Author: Axel Beckert <abe@debian.org>
-Bug-Debian: https://bugs.debian.org/886416
-
---- a/nih-dbus-tool/tests/test_parse.c
-+++ b/nih-dbus-tool/tests/test_parse.c
-@@ -7950,7 +7950,7 @@
-
- TEST_EQ_P (node, NULL);
-
-- TEST_FILE_EQ (output, ("test:foo:2:0: "
-+ TEST_FILE_EQ (output, ("test:foo:1:36: "
- "Invalid object path in <node> name attribute\n"));
- TEST_FILE_END (output);
- TEST_FILE_RESET (output);
diff --git a/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch b/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch
deleted file mode 100644
index 2b3a9cef5b4..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/nih-dbus-tool/output.h
-+++ b/nih-dbus-tool/output.h
-@@ -27,7 +27,7 @@
-
- NIH_BEGIN_EXTERN
-
--char *output_package;
-+extern char *output_package;
-
- int output (const char *source_path, int source_fd,
- const char *header_path, int header_fd,
diff --git a/sys-libs/libnih/files/libnih-1.0.3-glibc-2.24.patch b/sys-libs/libnih/files/libnih-1.0.3-glibc-2.24.patch
deleted file mode 100644
index 9b90f3539d7..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-glibc-2.24.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-With glibc >= 2.24, raise() temporarily blocks signals to make this
-function async-signal-safe. This has the consequence that the SIGCONT
-signal send by the call to PTRACE_CONT is delivered slightly later. In
-turn it means the next ptrace event received is the SIGCONT signal
-instead of the expected one.
-
-Unfortunately the libnih testsuite has very precise expectations, and
-do not expect such an event. Fix that by catching it and waiting for the
-following event.
-
---- libnih-1.0.3.orig/nih/tests/test_child.c
-+++ libnih-1.0.3/nih/tests/test_child.c
-@@ -360,6 +360,14 @@ test_poll (void)
-
- waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-+ /* ptrace might catch the SIGCONT emitted with PTRACE_CONT, catch it
-+ and wait for the next event.
-+ */
-+ if (siginfo.si_code == CLD_TRAPPED && siginfo.si_status == SIGCONT) {
-+ assert0 (ptrace (PTRACE_CONT, pid, NULL, NULL));
-+ waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-+ }
-+
- watch = nih_child_add_watch (NULL, pid, NIH_CHILD_TRAPPED,
- my_handler, &watch);
-
-@@ -420,6 +428,14 @@ test_poll (void)
- /* Wait for ptrace to stop the parent (signalling the fork) */
- waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-+ /* ptrace might catch the SIGCONT emitted with PTRACE_CONT, catch it
-+ and wait for the next event.
-+ */
-+ if (siginfo.si_code == CLD_TRAPPED && siginfo.si_status == SIGCONT) {
-+ assert0 (ptrace (PTRACE_CONT, pid, NULL, NULL));
-+ waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-+ }
-+
- /* Will be able to get the child pid now, we have to do it here
- * because we want to wait on it to ensure the test is synchronous;
- * otherwise nih_child_poll() could actually eat the child event
-@@ -489,6 +505,14 @@ test_poll (void)
-
- waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-
-+ /* ptrace might catch the SIGCONT emitted with PTRACE_CONT, catch it
-+ and wait for the next event.
-+ */
-+ if (siginfo.si_code == CLD_TRAPPED && siginfo.si_status == SIGCONT) {
-+ assert0 (ptrace (PTRACE_CONT, pid, NULL, NULL));
-+ waitid (P_PID, pid, &siginfo, WSTOPPED | WNOWAIT);
-+ }
-+
- watch = nih_child_add_watch (NULL, pid, NIH_CHILD_PTRACE,
- my_handler, &watch);
-
diff --git a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch b/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
deleted file mode 100644
index 49ad68a07b5..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -23,12 +23,21 @@
- PKG_PROG_PKG_CONFIG([0.22])
-
- # Checks for libraries.
--PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
--AC_CHECK_LIB([expat], [XML_ParserCreate],
-+AC_ARG_WITH([dbus],
-+ [AS_HELP_STRING([--without-dbus],
-+ [disable support for dbus])],
-+ [],
-+ [with_dbus=yes])
-+
-+AS_IF([test "x$with_dbus" != xno],[
-+ PKG_CHECK_MODULES([DBUS], [dbus-1 >= 1.2.16])
-+ AC_CHECK_LIB([expat], [XML_ParserCreate],
- [AC_CHECK_LIB([expat], [XML_StopParser],
- [AC_SUBST([EXPAT_LIBS], [-lexpat])],
- [AC_MSG_ERROR([expat >= 2.0.0 required])])],
-- [AC_MSG_ERROR([expat library not found])])
-+ [AC_MSG_ERROR([expat library not found])])])
-+
-+AM_CONDITIONAL([DBUS_SUPPORT], [test "x$with_dbus" != xno])
-
- # Checks for header files.
- AC_CHECK_HEADERS([valgrind/valgrind.h])
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,6 +1,9 @@
- ## Process this file with automake to produce Makefile.in
-
--SUBDIRS = m4 intl nih nih-dbus nih-dbus-tool po
-+SUBDIRS = m4 intl nih po
-+if DBUS_SUPPORT
-+SUBDIRS += nih-dbus nih-dbus-tool
-+endif
-
- EXTRA_DIST = HACKING
-
diff --git a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch b/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
deleted file mode 100644
index 6516de79943..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- a/nih-dbus/Makefile.am
-+++ b/nih-dbus/Makefile.am
-@@ -49,7 +49,7 @@
- test_dbus.h
-
-
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libnih-dbus.pc
-
-
-
---- a/nih/Makefile.am
-+++ b/nih/Makefile.am
-@@ -71,7 +71,7 @@
- test_hash.h
-
-
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libnih.pc
-
-
-
diff --git a/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch b/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
deleted file mode 100644
index 364af7f5383..00000000000
--- a/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
+++ /dev/null
@@ -1,44 +0,0 @@
---- a/nih/signal.c
-+++ b/nih/signal.c
-@@ -337,17 +337,37 @@
-
- nih_signal_init ();
-
-+ /* Since this poller runs w/out signals masked, we do not want to try
-+ * and clear any other signals (like zeroing the caught array at the
-+ * end). If we do that, we open a race:
-+ * - Walk the list of signals.
-+ * - First one is not set so we move on to the second one.
-+ * - First signal comes in while processing second and increments the
-+ * caught array entry.
-+ * - Finish walking the whole list.
-+ * - Zero out the whole list and thus throw away the first signal.
-+ * Since the signal handlers can take any length of time, this race
-+ * can be open for a variable amount of time.
-+ */
-+
- NIH_LIST_FOREACH_SAFE (nih_signals, iter) {
- NihSignal *signal = (NihSignal *)iter;
-
- if (! signals_caught[signal->signum])
- continue;
-
-+ /* Now that we know we're going to process this signal, clear
-+ * out all pending counts for it. There is a slight race here
-+ * where the same signal can come in, but the API has never
-+ * guaranteed exact coverage since POSIX does not provide it --
-+ * more than one signal can be collapsed into one event. All
-+ * we can guarantee is that we'll notice signals that come in
-+ * once the handler runs.
-+ */
-+ signals_caught[signal->signum] = 0;
-+
- signal->handler (signal->data, signal);
- }
--
-- for (s = 0; s < NUM_SIGNALS; s++)
-- signals_caught[s] = 0;
- }
-
-
-
diff --git a/sys-libs/libnih/libnih-1.0.3-r4.ebuild b/sys-libs/libnih/libnih-1.0.3-r4.ebuild
deleted file mode 100644
index a5fefa9e8dc..00000000000
--- a/sys-libs/libnih/libnih-1.0.3-r4.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools toolchain-funcs multilib flag-o-matic usr-ldscript
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih"
-SRC_URI="https://launchpad.net/${PN}/$(ver_cut 1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
-IUSE="+dbus nls static-libs +threads"
-
-# The configure phase will check for valgrind headers, and the tests will use
-# that header, but only to do dynamic valgrind detection. The tests aren't
-# run directly through valgrind, only by developers directly. So don't bother
-# depending on valgrind here. #559830
-RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
-DEPEND="${RDEPEND}
- sys-devel/gettext
- virtual/pkgconfig"
-PATCHES=(
- "${FILESDIR}"/${P}-optional-dbus.patch
- "${FILESDIR}"/${P}-pkg-config.patch
- "${FILESDIR}"/${P}-signal-race.patch
- "${FILESDIR}"/${P}-fno-common.patch
- "${FILESDIR}"/${P}-expat-2.2.5.patch
- "${FILESDIR}"/${P}-glibc-2.24.patch
-)
-
-src_prepare() {
- default
- eautoreconf
-}
-
-src_configure() {
- append-lfs-flags
- econf \
- $(use_with dbus) \
- $(use_enable nls) \
- $(use_enable static-libs static) \
- $(use_enable threads) \
- $(use_enable threads threading)
-}
-
-src_install() {
- default
-
- # we need to be in / because upstart needs libnih
- gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
- use static-libs || rm "${ED}"/usr/$(get_libdir)/*.la
-}
diff --git a/sys-libs/libnih/metadata.xml b/sys-libs/libnih/metadata.xml
deleted file mode 100644
index c029a63d0b8..00000000000
--- a/sys-libs/libnih/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="launchpad">libnih</remote-id>
- </upstream>
-</pkgmetadata>
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-02-05 22:59 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-05 22:59 [gentoo-commits] repo/gentoo:master commit in: sys-libs/libnih/files/, sys-libs/libnih/, profiles/ Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox