summaryrefslogtreecommitdiff
path: root/sys-libs/libnih
diff options
context:
space:
mode:
Diffstat (limited to 'sys-libs/libnih')
-rw-r--r--sys-libs/libnih/Manifest9
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-expat-2.2.5.patch15
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-fno-common.patch11
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-glibc-2.24.patch57
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch40
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch24
-rw-r--r--sys-libs/libnih/files/libnih-1.0.3-signal-race.patch44
-rw-r--r--sys-libs/libnih/libnih-1.0.3-r4.ebuild55
-rw-r--r--sys-libs/libnih/metadata.xml8
9 files changed, 0 insertions, 263 deletions
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
deleted file mode 100644
index 0b47b1ea8d6b..000000000000
--- a/sys-libs/libnih/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-AUX libnih-1.0.3-expat-2.2.5.patch 465 BLAKE2B e260bd17a18d51ae48cae66226a19d06bdb724d72993f484a2cb69cfc202514d259cbd8a3b96516d049011757b8dd760e8ef8c0da17cfd20a842fd142c1f04c5 SHA512 8cc5785c60187c9716f92978fb567de67d80cc302bed26dab34a2dd2e3bd3e52ab8caca033abb2b757ff19a00bf68576d37501f6173e46c001a3c408dabf49a0
-AUX libnih-1.0.3-fno-common.patch 267 BLAKE2B 157f1c34239b90ff6a2ab76a0c29f8d8cc563979e4f42405c8bab7f78bb0352a3ec3fa4d02d7b1cb1bc07970f289be7f39ed095cc3b19c6a166a343de02eac64 SHA512 b0e08aca019b9e0c1e2954b67036dac8d07b347fcb33a17163706b788896c5e5d9f95f23f6ffbe5a061f2e0773ed9179f94a68e162386c39df9ceeb8c8c17508
-AUX libnih-1.0.3-glibc-2.24.patch 2176 BLAKE2B b72a328ab9ccc7c56756887d7954c80cdd40daee359ac681c599e3dfd447dffb0919ff1f3b2c86be4e85280b7b243086d59dcac67e387cb4e55b87e08bf717b7 SHA512 92746d83b598eadf96dae490d4f23aee1262e54dda2bba752a13db88b7eb717f8e56d749c4487ca8f034206509f77b027e4ada37895d56f19f14f49ed23f5eb6
-AUX libnih-1.0.3-optional-dbus.patch 1113 BLAKE2B b7c30e666fcb641edbb2168058d837f90e0cf0fc8e290ed91fbe2da7de15ab884c4b312aa8f8cffda878010da794d587a73fdc49954d0c551161184e22537c2c SHA512 c46e434a5e162fedbe06408680ab5d08e875ad35aaa058974724565c5b8f1719a56187fb78bbd0cc87729dcde05cfa571678297b8e5d9cfe7e1bb18a3ed78961
-AUX libnih-1.0.3-pkg-config.patch 393 BLAKE2B 77ed2af4429624e03e86f00cdb58c015f19c1acc690f2f76efbef4142c5a166be478860b14756dbe5ee99a73824d16d50505098c5d1aa5b89e4df9c99536c793 SHA512 c483a5032fdb727d6ae106e27b7c66b184b5aae19d7ed3ba5796533f444763facdacb5c0e08b2ac4e371056dab6ee0478d26fbc190ea149c9f976accaba1abb8
-AUX libnih-1.0.3-signal-race.patch 1432 BLAKE2B b08b7356d2fae755fbe45b2a45b4081c9e1b27ab5aa3a1f71a6945ced5048bc587883de5b9181887a8124f4fc025bcbea4e668ae0e93d5b97e56f67788dd42a8 SHA512 5bd1ff4d7774db62cb6f54721c3b30b5fba1f085a69b28da12f85f448efacb6efd0dd9b9b61801ceb3fc94ca1616fb898bdce33e873f9e57486e44f26c063ed5
-DIST libnih-1.0.3.tar.gz 1187624 BLAKE2B f8f9fcdda86eabff39de0b0f92cd1f8c1c0eeb0c86ec4970e5bef1cc0dff0fda83db64975ece93d5d8ede5d0613d5f363dd7456c59fe966feb5e61e5b8913627 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
-EBUILD libnih-1.0.3-r4.ebuild 1550 BLAKE2B 2702bb63c838405c689983a5b9f78a876a6076d8d720fd8e73125c33e92c7903532d9599e0f8ffef6ac419ffcaec6dc582d3c26cc564d3989bd057a9b77e1542 SHA512 520144da2e52984531ff89f216dcdefb5b0c61a314226c2ac7abcc572b866ef0a15db45f72d19396224bb8fa617ab9587be96125dfeb1dfe529d4df9ab1a19d4
-MISC metadata.xml 241 BLAKE2B 02f7c7b912751df8725055416a093647e79dfdbf7f06c9f56246c67f6a1176997454dd3aaaa493ecf7d00d8ae295066e2861ac10bee860a94eef6085437561af SHA512 31e21c0bed310c4a025385f24c5b76f2e588999912fa548ca343947d95ad448b3a1232211cd4427607550c0f5de2e562e2b4e492415b6d207c954a516b811a84
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 02b5e4c0a9e2..000000000000
--- 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 2b3a9cef5b48..000000000000
--- 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 9b90f3539d7c..000000000000
--- 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 49ad68a07b5a..000000000000
--- 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 6516de799432..000000000000
--- 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 364af7f5383e..000000000000
--- 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 a5fefa9e8dce..000000000000
--- 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 c029a63d0b84..000000000000
--- 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>
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 00:57:16 +0000