commit: 5c6b8bb55dbd0e2e6aa51c85ac4d4ddceda8f952
Author: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
AuthorDate: Tue Apr 13 12:59:20 2021 +0000
Commit: Dave Hughes <davidhughes205 <AT> gmail <DOT> com>
CommitDate: Tue Apr 13 12:59:20 2021 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5c6b8bb5
sys-libs/libnih: remove from overlay
Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Dave Hughes <davidhughes205 <AT> gmail.com>
sys-libs/libnih/Manifest | 1 -
.../files/libnih-1.0.3-musl-fix-signals.patch | 12 -----
.../libnih/files/libnih-1.0.3-optional-dbus.patch | 40 ---------------
.../libnih/files/libnih-1.0.3-pkg-config.patch | 56 --------------------
.../libnih/files/libnih-1.0.3-signal-race.patch | 60 ----------------------
sys-libs/libnih/libnih-1.0.3-r3.ebuild | 50 ------------------
sys-libs/libnih/metadata.xml | 11 ----
7 files changed, 230 deletions(-)
diff --git a/sys-libs/libnih/Manifest b/sys-libs/libnih/Manifest
deleted file mode 100644
index 110e84d..0000000
--- a/sys-libs/libnih/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnih-1.0.3.tar.gz 1187624 SHA256
897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405 SHA512
fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4
WHIRLPOOL
da001ba05111d3a654e6800cf283e11b5508e53d6d91b37ed277df5a889a1138e90ae13161e0af81bdcac929b105bf889e4dcdc443789f28417c6e3f61530d8c
diff --git a/sys-libs/libnih/files/libnih-1.0.3-musl-fix-signals.patch
b/sys-libs/libnih/files/libnih-1.0.3-musl-fix-signals.patch
deleted file mode 100644
index 97ef819..0000000
--- a/sys-libs/libnih/files/libnih-1.0.3-musl-fix-signals.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- libnih-1.0.3.orig/nih/signal.c
-+++ libnih-1.0.3/nih/signal.c
-@@ -87,7 +87,9 @@
- { SIGSTKFLT, "STKFLT" },
- #endif
- { SIGCHLD, "CHLD" },
-+#ifdef SIGCLD
- { SIGCLD, "CLD" },
-+#endif
- { SIGCONT, "CONT" },
- { SIGSTOP, "STOP" },
- { SIGTSTP, "TSTP" },
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 afe4374..0000000
--- a/sys-libs/libnih/files/libnih-1.0.3-optional-dbus.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- libnih-1.0.1/configure.ac
-+++ libnih-1.0.1/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])
---- libnih-1.0.1.orig/Makefile.am
-+++ libnih-1.0.1/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 979e363..0000000
--- a/sys-libs/libnih/files/libnih-1.0.3-pkg-config.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-# Bazaar merge directive format 2 (Bazaar 0.90)
-# revision_id: vap...@gentoo.org-20111019170935-fheqs03szv6mhh3o
-# target_branch: http://bazaar.launchpad.net/~scott/libnih/trunk/
-# testament_sha1: 84b368e08fdd9f8276611cdfe97d34f51cd90598
-# timestamp: 2011-10-19 13:13:52 -0400
-# base_revision_id: sc...@netsplit.com-20110901184103-d2xbvc5hbt0vqxf0
-#
-# Begin patch
-=== modified file 'nih-dbus/Makefile.am'
---- nih-dbus/Makefile.am 2009-11-21 21:44:23 +0000
-+++ nih-dbus/Makefile.am 2011-10-19 17:09:35 +0000
-@@ -49,7 +49,7 @@
- test_dbus.h
-
-
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libnih-dbus.pc
-
-
-
-=== modified file 'nih/Makefile.am'
---- nih/Makefile.am 2009-11-21 21:44:23 +0000
-+++ nih/Makefile.am 2011-10-19 17:09:35 +0000
-@@ -71,7 +71,7 @@
- test_hash.h
-
-
--pkgconfigdir = $(prefix)/lib/pkgconfig
-+pkgconfigdir = $(libdir)/pkgconfig
- pkgconfig_DATA = libnih.pc
-
-
-
-# Begin bundle
-IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWerAspcAAhZfgAAQVGf/93Mi
-DAC/7//wUASW8VttRtyKRaUhJU00ZTUab1GBT9JpNNqeiAADEEpDUwp5Gk9KeiZAANAAABIo0hE9
-GTTJJ5AMo8oB6IwmmMNDQAAAaAAAAAEkgQBGTCGmmoZQPSIxoCJYV1m4Z59VmltTEiVlNBLfEBWL
-DPUvZdcke3iHe+YuVhuGNtnl+0Xxmwcuy+RkTlRw9Ct83uYaZ7PH3vOd/AqYc6mhoKnwOCJD7ej5
-jS/rj7FmeOwxohzIMw9Ftarf11sHFhfFyWQEWL15gMctp9IL8d5sOYp0YoMOIw5htiyuYikcaPZ+
-xeB0ZI+IpppnCWQD3qlFKeI1NHACFmRBrQ2Sn1nmVurFZLNeqWK2Xy7eKAJK1SuguZhs8DekVjKE
-YGJwURdteHklA3WkfNMdKKNMQHQqnTtxAg1ShnXAzzkjnDtTSCwNhnuoY0WM1bLLCJlFM6NphCLS
-CGV+ZxUbN6YirSh9tVJWBzJKQaE5HEstAsAuqdVKlAlNKIrkYPSb3oy9WkKNsyyLYUiplUvi8C3i
-ioz+SscYWhwHzkxL/k0TPk8tL6l5FzzBa8FCKRWbDCTa0nbGzEhoJmaYEfwBog+pmXpsuVNUZmF4
-OreOMqF7JyNA1HJJ14+yxa6SRpJ51jBFyaNAojQK2ai7BtxEVZFoG3TYZiaTnR8LwZPDCtw7GqpA
-6mKFWiqtj/KxW+zQNmQbh9XE5eCCdFBTQzJmb7H3fDQpKW1njIoLHI+HeAXGDxYmu7HJ3DoZtH3Z
-7UfYYlEO8WoZpHZIMdDSCTWUE41kdp0nBWlshTuqcODflplwgnc03YlpZF9eBKQsUJi4gRvOhwmO
-XzuHW8qzc+JojHueBjZGJRiZQktKmJFoSD3k4+SOEue4uOh88jC0uRC8zDtbDCuz1fd6m5nsBrXh
-4KCGR5mWo4953Ie6CdWVops43mZdcboGGpUVirZZC+SPwwvwVSDuTAzASyFMevBBdbmdy3y0L0Y2
-oqRD3LY5+RqPM9R4/XEkdVuXmAxvF7GgrzRSIuDsTD2MANhmBxuF+EEbTKN/ciAzAUxnOdie1hol
-lqAkHxA44ja0WMKzYlmGU28kSdqB1i6h4nLevOVCnK+WtEKLpuOy6eZFThX5IsRrjenja/BSN2iu
-FFE+cHoYwJzGRI9yFKvpRUQ+H0qqaIoI5lP18lEqsPiBhRHMkpPIHqMuoiGiZyQxSXC0ynqSTYNX
-80VoGbTVLspApI9vo8XZBOScj6oHLR6qkjlnhkwwNQ8/wZdSfNBI0NSKLNasgKl6LF7FVbx4MCcj
-jYREWWzVEEVd81rloiAfu+h8H33/8DPhciqmx3QHdcdLEOKQ1mHIp8NQLYDAhQjJPmRA4hvGfSG+
-dwTBj1rKUFKGB7BYiKJ+C3dZ91NewHQ8kxHGlS0rSLioLvwrlwNSrRgtyZzWVFTWB8C7kinChIdW
-BZS4
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 4cba5ae..0000000
--- a/sys-libs/libnih/files/libnih-1.0.3-signal-race.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-https://bugs.launchpad.net/libnih/+bug/518921
-
-fix race in signal processing leading to lost signals
-
-The current loop will walk all signals one by one and run the handler
-for it if any signals were pending. Then it clears the array. But if
-a signal comes in for an earlier checked signal, it will get clobbered
-when the final clear runs.
-
-Change the logic so that we only clear entries for signals whose handler
-we explicitly call. If a different signal comes in, we'll process it
-the next time around.
-
-This was discovered & triaged by Jeffy Chen from Rockchip.
-
-=== modified file 'nih/signal.c'
---- nih/signal.c 2009-06-23 09:29:37 +0000
-+++ nih/signal.c 2015-05-21 08:12:11 +0000
-@@ -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-r3.ebuild
b/sys-libs/libnih/libnih-1.0.3-r3.ebuild
deleted file mode 100644
index add5351..0000000
--- a/sys-libs/libnih/libnih-1.0.3-r3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit versionator eutils autotools toolchain-funcs multilib flag-o-matic
-
-DESCRIPTION="Light-weight 'standard library' of C functions"
-HOMEPAGE="https://launchpad.net/libnih";
-SRC_URI="https://launchpad.net/${PN}/$(get_version_component_range
1-2)/${PV}/+download/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~mips ppc 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"
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
- epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
- epatch "${FILESDIR}"/${PN}-1.0.3-signal-race.patch
- epatch "${FILESDIR}"/${PN}-1.0.3-musl-fix-signals.patch
- 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 a889a86..0000000
--- a/sys-libs/libnih/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";>
-<pkgmetadata>
- <maintainer type="person">
- <email>vap...@gentoo.org</email>
- <description>feel free to update however you like</description>
- </maintainer>
- <upstream>
- <remote-id type="launchpad">libnih</remote-id>
- </upstream>
-</pkgmetadata>
