bump(sys-libs/libnih): sync with upstream

This commit is contained in:
Nick Owens 2016-03-02 14:26:26 -08:00
parent 8abdd40e9a
commit 3c6964ba21
9 changed files with 281 additions and 61 deletions

View File

@ -1,13 +0,0 @@
DEFINED_PHASES=configure install prepare
DEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext dev-util/pkgconfig test? ( dev-util/valgrind ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Light-weight 'standard library' of C functions
EAPI=2
HOMEPAGE=https://launchpad.net/libnih
IUSE=+dbus nls static-libs test +threads
KEYWORDS=amd64 arm x86
LICENSE=GPL-2
RDEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )
SLOT=0
SRC_URI=http://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz
_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 42408102d713fbad60ca21349865edb4 versionator cd0bcdb170807e4a1984115e9d53a26f
_md5_=21d4c75a271f9501e74c135801fb985a

View File

@ -0,0 +1,13 @@
DEFINED_PHASES=configure install prepare
DEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 ) sys-devel/gettext virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
DESCRIPTION=Light-weight 'standard library' of C functions
EAPI=4
HOMEPAGE=https://launchpad.net/libnih
IUSE=+dbus nls static-libs +threads
KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~x86
LICENSE=GPL-2
RDEPEND=dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )
SLOT=0
SRC_URI=https://launchpad.net/libnih/1.0/1.0.3/+download/libnih-1.0.3.tar.gz
_eclasses_=autotools 199350adb9ae3c85e275b1409e43c90d eutils 9fb270e417e0e83d64ca52586c4a79de flag-o-matic c9602887773166fe300444712fc7ff98 libtool 52d0e17251d04645ffaa61bfdd858944 multilib 62927b3db3a589b0806255f3a002d5d3 toolchain-funcs 7a212e5e01adfa4805c9978366e6ee85 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
_md5_=01a0e647f55766fecb1b9028e9ca1f0c

View File

@ -0,0 +1,103 @@
# ChangeLog for sys-libs/libnih
# Copyright 1999-2016 Gentoo Foundation; Distributed under the GPL v2
# (auto-generated from git log)
*libnih-1.0.3-r3 (09 Aug 2015)
*libnih-1.0.3-r2 (09 Aug 2015)
*libnih-1.0.3-r1 (09 Aug 2015)
*libnih-1.0.3 (09 Aug 2015)
09 Aug 2015; Robin H. Johnson <robbat2@gentoo.org>
+files/libnih-1.0.3-optional-dbus.patch,
+files/libnih-1.0.3-pkg-config.patch, +files/libnih-1.0.3-signal-race.patch,
+libnih-1.0.3.ebuild, +libnih-1.0.3-r1.ebuild, +libnih-1.0.3-r2.ebuild,
+libnih-1.0.3-r3.ebuild, +metadata.xml:
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.
This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.
Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.
Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration
tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this
project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo
developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve
cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014
work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on
the bikeshed
24 Aug 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
Use https by default
Convert all URLs for sites supporting encrypted connections from http to
https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Justin Lecher <jlec@gentoo.org> libnih-1.0.3.ebuild,
libnih-1.0.3-r1.ebuild, libnih-1.0.3-r2.ebuild, libnih-1.0.3-r3.ebuild:
Convert all URIs for launchpad.net from http to https
Signed-off-by: Justin Lecher <jlec@gentoo.org>
24 Aug 2015; Mike Gilbert <floppym@gentoo.org> metadata.xml:
Revert DOCTYPE SYSTEM https changes in metadata.xml
repoman does not yet accept the https version.
This partially reverts eaaface92ee81f30a6ac66fe7acbcc42c00dc450.
Bug: https://bugs.gentoo.org/552720
07 Sep 2015; Mike Frysinger <vapier@gentoo.org> libnih-1.0.3-r3.ebuild:
drop unused valgrind dep #559830
07 Sep 2015; Mike Frysinger <vapier@gentoo.org> -libnih-1.0.3.ebuild,
-libnih-1.0.3-r1.ebuild, -libnih-1.0.3-r2.ebuild:
drop old
08 Sep 2015; Jeroen Roovers <jer@gentoo.org> libnih-1.0.3-r3.ebuild:
Mark ~hppa (bug #559770).
Package-Manager: portage-2.2.20.1
22 Sep 2015; Jeroen Roovers <jer@gentoo.org> libnih-1.0.3-r3.ebuild:
Mark ~ppc64 (bug #559770).
Package-Manager: portage-2.2.20.1
RepoMan-Options: --ignore-arches
22 Sep 2015; Tobias Klausmann <klausman@gentoo.org> libnih-1.0.3-r3.ebuild:
add ~alpha keyword
Gentoo-Bug: 559770
Package-Manager: portage-2.2.21
03 Jan 2016; Agostino Sarubbo <ago@gentoo.org> libnih-1.0.3-r3.ebuild:
amd64 stable wrt bug #570122
Package-Manager: portage-2.2.26
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo <ago@gentoo.org>
24 Jan 2016; Michał Górny <mgorny@gentoo.org> metadata.xml:
Set appropriate maintainer types in metadata.xml (GLEP 67)

View File

@ -0,0 +1,36 @@
# ChangeLog for sys-libs/libnih
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/ChangeLog,v 1.7 2015/05/21 08:28:24 vapier Exp $
*libnih-1.0.3-r3 (21 May 2015)
21 May 2015; Mike Frysinger <vapier@gentoo.org>
+files/libnih-1.0.3-signal-race.patch, +libnih-1.0.3-r3.ebuild:
Workaround from Chromium OS for race in signal loop processing.
*libnih-1.0.3-r2 (05 Mar 2015)
05 Mar 2015; Mike Frysinger <vapier@gentoo.org> +libnih-1.0.3-r2.ebuild:
Build with LFS for 32bit systems.
*libnih-1.0.3-r1 (30 Oct 2014)
30 Oct 2014; Mike Frysinger <vapier@gentoo.org> +libnih-1.0.3-r1.ebuild:
Migrate to EAPI=4.
24 May 2012; Mike Frysinger <vapier@gentoo.org> libnih-1.0.3.ebuild:
Inherit toolchain-funcs for gen_usr_ldscript.
04 May 2012; Jeff Horelick <jdhore@gentoo.org> libnih-1.0.3.ebuild:
dev-util/pkgconfig -> virtual/pkgconfig
19 Oct 2011; Mike Frysinger <vapier@gentoo.org> libnih-1.0.3.ebuild:
Fix build when USE=-dbus.
*libnih-1.0.3 (19 Oct 2011)
19 Oct 2011; Mike Frysinger <vapier@gentoo.org> +libnih-1.0.3.ebuild,
+files/libnih-1.0.3-optional-dbus.patch,
+files/libnih-1.0.3-pkg-config.patch, +metadata.xml:
Initial ebuild merging the ChromeOS version, dev-zero, Bruno Tarquini, and my
work #310093.

View File

@ -1 +1,8 @@
DIST libnih-1.0.3.tar.gz 1187624 RMD160 954df698ae272b5f9a30e191bf3deb382bd92d51 SHA1 db1f3e46a47f8a58f8179ca56f304d1550f41eb0 SHA256 897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405
AUX libnih-1.0.3-optional-dbus.patch 1162 SHA256 93e81914a402ebc512c7df46e00f85b54ed073a66fcf9fe465cb58d757546abf SHA512 bd979f8e9d27d775e12b3a93082084b8837bc9eb4f48476c3356aa4b4f865eda517e6fcf90f5575686dbcdc0fef4a21c640e413d9d3611bb1f1077bfa9fd8c86 WHIRLPOOL 2eb2421f74c9ced344791ab3477035b5e71516962ebfc886f4a21837977854092aec28e68ba81345305f06ee00cf8e466bb5d3863c75d0291c0a9992aba17a6a
AUX libnih-1.0.3-pkg-config.patch 2491 SHA256 cefe32c74c2c23f991e78bb8eaf97da8bcd1b4f252c1aed334e75027568f24d7 SHA512 b99d580f4487cf3d25fa37f3f7b62ce32d9df80c6c0b01ad04b6850215ec0cc24cfea48aaf8ff89afe28db239b5ed212f139e86353d9991152d488c6edce5017 WHIRLPOOL e6a6f4c2d88e4e2da3cbdba8f4b2a43f608ba7e0042f63c6b881653d23a51527d2061bea56924bb624bee5751bea69f4bdc4a206aa32ad62abcf29ea3c6999bc
AUX libnih-1.0.3-signal-race.patch 2081 SHA256 e7c67f06c0812cabf4f2af05f8d66ecd8819278416f29e7dd6122d9091b6368e SHA512 5367cb0c6382004cc2a829b9b71f0c02a09e4983940afac90c4c5c0bfbda53fb36a6cc7e38ede7a895ce28f99a4f69e89392ebaadefdc536eb7efa90c2426ff8 WHIRLPOOL 2435627ed636ffff2e45b5a2708999a20b88525f438f3382a9acaa08c1ca4b81a7b4d926a6b7930add8c5b692f5790b52af8145cd8a0f8cac8b7f069a7ef4046
DIST libnih-1.0.3.tar.gz 1187624 SHA256 897572df7565c0a90a81532671e23c63f99b4efde2eecbbf11e7857fbc61f405 SHA512 fce40d2445b28c27b8838631681ca3206a4f053b2dd4fc488fc9ef98bbd3d933e3d62b82cf346be2ef1677f6457f692cf5544cd915a6bb1e5c618f98ffa101b4 WHIRLPOOL da001ba05111d3a654e6800cf283e11b5508e53d6d91b37ed277df5a889a1138e90ae13161e0af81bdcac929b105bf889e4dcdc443789f28417c6e3f61530d8c
EBUILD libnih-1.0.3-r3.ebuild 1480 SHA256 97afe94130df8d824046880a2a1c745a66fe755599499ce26b4286bff9f52487 SHA512 be1cfb905ffe8d3569f7873d91c00ee6db98e4b5b24731af9965913e265cb7bfdf418523811733d0dea5088ad51263343ab3389b2ff6f14c36f8767d5b65ab37 WHIRLPOOL 2359aee1003b9594357d282b73ce17c4a3257c8cb61bca99a8ea5503e112c37b02a2032d03e9eb5e06b868ce7609cb5df95cedc7198d9c38b90960005220b68e
MISC ChangeLog 3662 SHA256 5c868b06d244a9257c88c555a74bee95120566f5d06c394995907e741854f38d SHA512 7cba81b7640972660777dd9561fb29ed89e9b87c50bed956023e5278552f68ba772d6a3cfc999c2cc8387b52f618d61515ae0b72c513aa86b8920f4201424685 WHIRLPOOL f1ad1673ee0a159aba02533f8004325878d71fea710f5a62ef9eaab35b1937e36e1a83408261a974c7154e6fa29610cd73fcc7fa5f97ad758e00c33ecc13e7b5
MISC ChangeLog-2015 1319 SHA256 8a3331765ca6aa2bf6f762377b07f96cd81bd6191d7be48d013afe62992fd9f0 SHA512 688f83b3d22960c4048fbd834b052f4f2975dd71745b24df1ca9f82999bb90cea7eb7d4cab1b7824d9d4659c8057660bd5555efd70359154b3240a49dc4ac57f WHIRLPOOL af96b664b92ad80649247f9751822e5f0869e77f419697129420bcce4e87755eb2f41310f43070c82679d44ca3199edd07414363c23d908e24465949a9f8f66d
MISC metadata.xml 357 SHA256 b2b2590a099343e5a92652941311b719c648b1dd33325e9d19d3298e5a213bf7 SHA512 c9748a867960a45077282ebfbb48051e3995bee6648f14547ac5385b8baddcd36f927bfd94dfcd1656342de935ee97a2f376e687470720ea761e035c7c5feddd WHIRLPOOL d4e69e09195bbca0713c2c13c5d107560d0854ec1f6d545a84b529e518ec20e76ec89d25b6b3d33cb2f5bd32ac2ecf36fe89074408d39567a4ddc3fca4800c31

View File

@ -0,0 +1,60 @@
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;
}

View File

@ -0,0 +1,50 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
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="~alpha amd64 ~arm ~arm64 ~hppa ~mips ~ppc64 ~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
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
}

View File

@ -1,47 +0,0 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-libs/libnih/libnih-1.0.3.ebuild,v 1.1 2011/10/19 17:27:02 vapier Exp $
EAPI="2"
inherit versionator eutils autotools
DESCRIPTION="Light-weight 'standard library' of C functions"
HOMEPAGE="https://launchpad.net/libnih"
SRC_URI="http://launchpad.net/${PN}/$(get_version_component_range 1-2)/${PV}/+download/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="amd64 arm x86"
IUSE="+dbus nls static-libs test +threads"
RDEPEND="dbus? ( dev-libs/expat >=sys-apps/dbus-1.2.16 )"
DEPEND="${RDEPEND}
sys-devel/gettext
dev-util/pkgconfig
test? ( dev-util/valgrind )"
src_prepare() {
epatch "${FILESDIR}"/${PN}-1.0.3-optional-dbus.patch
epatch "${FILESDIR}"/${PN}-1.0.3-pkg-config.patch
eautoreconf
}
src_configure() {
econf \
$(use_with dbus) \
$(use_enable nls) \
$(use_enable static-libs static) \
$(use_enable threads) \
$(use_enable threads threading)
}
src_install() {
emake DESTDIR="${D}" install || die
# we need to be in / because upstart needs libnih
gen_usr_ldscript -a nih $(use dbus && echo nih-dbus)
use static-libs || rm "${D}"/usr/lib*/*.la
dodoc AUTHORS ChangeLog HACKING NEWS README TODO
}

View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
<email>vapier@gentoo.org</email>
<description>feel free to update however you like</description>
</maintainer>
<upstream>
<remote-id type="launchpad">libnih</remote-id>
</upstream>
</pkgmetadata>