dev-libs/libdaemon: fix stdarg usage, patch by Alex Rostovtsev (fixes bug #182999)

Package-Manager: portage-2.1.3_rc5

5 files changed, 101 insertions, 15 deletions

diff --git a/dev-libs/libdaemon/ChangeLog b/dev-libs/libdaemon/ChangeLog
index 21cd269cfe37..ba96165c47f4 100644
--- a/dev-libs/libdaemon/ChangeLog
+++ b/dev-libs/libdaemon/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-libs/libdaemon
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.39 2007/06/22 17:36:57 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.40 2007/06/29 18:56:07 remi Exp $
+
+*libdaemon-0.11-r1 (29 Jun 2007)
+
+  29 Jun 2007; Remi Cardona <remi@gentoo.org>
+  +files/libdaemon-0.11-daemon_close_all.patch, +libdaemon-0.11-r1.ebuild:
+  fix stdarg usage, patch by Alex Rostovtsev (fixes bug #182999)
 
 *libdaemon-0.11 (22 Jun 2007)
 
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 9d2f133c6ec5..6f8eacb3b615 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,6 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX libdaemon-0.11-daemon_close_all.patch 762 RMD160 25392c0be8c2ede9dd9b8fa87eea46dce1c93193 SHA1 d67ab0572445321b5d7fff9b83b16d48bbe9eaa6 SHA256 39154e7cbe5a7f15584404ccdcdd648dfb7bdacc01958b56c739b5b4476c5d9a
+MD5 63bf0e5735b0a458be9ca49a5cbfefc1 files/libdaemon-0.11-daemon_close_all.patch 762
+RMD160 25392c0be8c2ede9dd9b8fa87eea46dce1c93193 files/libdaemon-0.11-daemon_close_all.patch 762
+SHA256 39154e7cbe5a7f15584404ccdcdd648dfb7bdacc01958b56c739b5b4476c5d9a files/libdaemon-0.11-daemon_close_all.patch 762
 DIST libdaemon-0.10.tar.gz 345084 RMD160 af210b110ab89d0c4289bf3241ab2b176ef40c1d SHA1 2606710f5b130078c313cbdb86765cf2da20c334 SHA256 83004489cce844d4f9180fb74cc4781bb79e31aecf60d529608a510cf114484e
 DIST libdaemon-0.11.tar.gz 355080 RMD160 b557fb95c441fe4fc7f577ff6a86cd398d368aac SHA1 b20c048f6d36f6f72e320e2660d80df7c21ff48e SHA256 d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0
 DIST libdaemon-0.3.tar.gz 338092 RMD160 3fe798318c888580b668532e4bd0deaa4c438dff SHA1 9a24422dbff979fd595da548626e57fa6ec8c19e SHA256 3123b77e54873f5cc59f5f953653821a42ac1302bcd678ec142a852c07c7f343
@@ -11,6 +12,10 @@ EBUILD libdaemon-0.10.ebuild 1031 RMD160 7e18b6580493e9885719d71a21d9eadd967eaba
 MD5 3825bf58e2d6cf8277fa31f893d2341a libdaemon-0.10.ebuild 1031
 RMD160 7e18b6580493e9885719d71a21d9eadd967eaba2 libdaemon-0.10.ebuild 1031
 SHA256 0a650132e0f0e65c1e58a0d36db522c62495f6868b5851049dbd5bde553acd23 libdaemon-0.10.ebuild 1031
+EBUILD libdaemon-0.11-r1.ebuild 1149 RMD160 798724d35de90264c1d2420136ecad7a4c6d08a8 SHA1 483b04dbcffdd47a360359ff36018d895e2190b9 SHA256 49b7a6b5dc94589537041e145123b33c6f45ea8f1f08511420d309cf9039ac35
+MD5 2d6be2722f55371e4e593a5a6c26c593 libdaemon-0.11-r1.ebuild 1149
+RMD160 798724d35de90264c1d2420136ecad7a4c6d08a8 libdaemon-0.11-r1.ebuild 1149
+SHA256 49b7a6b5dc94589537041e145123b33c6f45ea8f1f08511420d309cf9039ac35 libdaemon-0.11-r1.ebuild 1149
 EBUILD libdaemon-0.11.ebuild 1040 RMD160 2aa32c67ab0d9bffa7a6220dbe63bda819e7fd64 SHA1 69e59ee5c6510cd1635985f077a56be53ce68ace SHA256 cab8f6b8f0ce5f59d04e80c363546cd60fa86702fa0ae9d391d571e6cd78873f
 MD5 d5a8e560d7824a4e3e86ded241488f72 libdaemon-0.11.ebuild 1040
 RMD160 2aa32c67ab0d9bffa7a6220dbe63bda819e7fd64 libdaemon-0.11.ebuild 1040
@@ -31,10 +36,10 @@ EBUILD libdaemon-0.8.ebuild 977 RMD160 6bd9df28df49c8c317b3807ba620a49123166066
 MD5 a5203aec64374a17adeaf293b956fbbc libdaemon-0.8.ebuild 977
 RMD160 6bd9df28df49c8c317b3807ba620a49123166066 libdaemon-0.8.ebuild 977
 SHA256 acfc1dcec966a9f6ae35e0171d6afb3ddfb07868c3b38c3ad5454e46cb988968 libdaemon-0.8.ebuild 977
-MISC ChangeLog 4649 RMD160 7e35404630958f0e0631b31f0d77e5763594298f SHA1 7bc43d2baf0534cc28980a62f5af797d2e26c8ac SHA256 17e9a0a6df7c67308b4ef6039274313f04fcd603ecb2c181a6d2ff8073a9f8de
-MD5 1032ffc506d583ebbd5bb185555c07e1 ChangeLog 4649
-RMD160 7e35404630958f0e0631b31f0d77e5763594298f ChangeLog 4649
-SHA256 17e9a0a6df7c67308b4ef6039274313f04fcd603ecb2c181a6d2ff8073a9f8de ChangeLog 4649
+MISC ChangeLog 4866 RMD160 5f8a8207f68df11b077c48af74045d6c5e0696be SHA1 58d24961bf33674d592976c777fb9e9f33f466db SHA256 028389691f610dc99e6da21a92ae86635e09b11bf31f61d7ef3e25b48f558919
+MD5 23dda5f95eac26042e5fafd4df591d01 ChangeLog 4866
+RMD160 5f8a8207f68df11b077c48af74045d6c5e0696be ChangeLog 4866
+SHA256 028389691f610dc99e6da21a92ae86635e09b11bf31f61d7ef3e25b48f558919 ChangeLog 4866
 MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829
 MD5 f8262495085fcfa7f25596eadfaa7a35 metadata.xml 236
 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae metadata.xml 236
@@ -45,6 +50,9 @@ SHA256 86114b76da870cae2f6db61568779e03dbf1558c4265165dd6097810b9e07f60 files/di
 MD5 016a37526d7e8e15ddc7874fc9f3a04a files/digest-libdaemon-0.11 244
 RMD160 375094e6d8b84fe69505a6d8dc9e8930629436c5 files/digest-libdaemon-0.11 244
 SHA256 70287349a4b8f20802c644bb1c37cf4a0c48d479302cada81f807f6a8fe7417f files/digest-libdaemon-0.11 244
+MD5 016a37526d7e8e15ddc7874fc9f3a04a files/digest-libdaemon-0.11-r1 244
+RMD160 375094e6d8b84fe69505a6d8dc9e8930629436c5 files/digest-libdaemon-0.11-r1 244
+SHA256 70287349a4b8f20802c644bb1c37cf4a0c48d479302cada81f807f6a8fe7417f files/digest-libdaemon-0.11-r1 244
 MD5 85230e36bfad6b01c99d927e30fe2f54 files/digest-libdaemon-0.3 241
 RMD160 f390000f8cd0d0ee11903acda3b9e0dec572e8d2 files/digest-libdaemon-0.3 241
 SHA256 2503480e163539b8c813b80e37db7aee1853f05ce0668997d5a8f2ba6ef32106 files/digest-libdaemon-0.3 241
@@ -57,10 +65,3 @@ SHA256 9d29a22b7e3ac7073bb604651126c25158fd6de4c9ca864253918c1208bfd762 files/di
 MD5 dc9bde26ea50502794baaa937edee0ff files/digest-libdaemon-0.8 241
 RMD160 e2a90a27cbcf6e34e378c8e1d0925dd258e4be33 files/digest-libdaemon-0.8 241
 SHA256 a22dece7a11fd3c0bf60c70d1e090f0898eefed92fb40affa4d6088db1822cb1 files/digest-libdaemon-0.8 241
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.4 (GNU/Linux)
-
-iD8DBQFGfux7p/wUKkr7RBoRAtDLAJ43iT8CKGfvgfLEsd22dT3GpVb/ogCgpdWr
-6SEaD3JBaZZQM69Z7YGDXo0=
-=BA0L
------END PGP SIGNATURE-----
diff --git a/dev-libs/libdaemon/files/digest-libdaemon-0.11-r1 b/dev-libs/libdaemon/files/digest-libdaemon-0.11-r1
new file mode 100644
index 000000000000..97b5058a3c40
--- /dev/null
+++ b/dev-libs/libdaemon/files/digest-libdaemon-0.11-r1
@@ -0,0 +1,3 @@
+MD5 b99a608ae9a762e809b667bfa20d86dd libdaemon-0.11.tar.gz 355080
+RMD160 b557fb95c441fe4fc7f577ff6a86cd398d368aac libdaemon-0.11.tar.gz 355080
+SHA256 d54efe38aad450363c46eaa32b1bf29cbd3b7f8c870c0ffcaec8891c22681eb0 libdaemon-0.11.tar.gz 355080
diff --git a/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch b/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch
new file mode 100644
index 000000000000..840eceec4a9f
--- /dev/null
+++ b/dev-libs/libdaemon/files/libdaemon-0.11-daemon_close_all.patch
@@ -0,0 +1,31 @@
+diff -ru libdaemon-0.11.orig/libdaemon/dfork.c libdaemon-0.11/libdaemon/dfork.c
+--- libdaemon-0.11.orig/libdaemon/dfork.c	2007-06-11 11:36:11.000000000 -0400
++++ libdaemon-0.11/libdaemon/dfork.c	2007-06-28 16:30:28.000000000 -0400
+@@ -357,6 +357,11 @@
+     int n, i, r;
+     int *p;
+ 
++    if (except_fd < 0) {
++        int t = -1;
++        return daemon_close_allv(&t);
++    }
++
+     va_start(original_ap, except_fd);
+     va_copy(ap, original_ap);
+ 
+@@ -365,12 +370,13 @@
+ 
+     va_end(ap);
+ 
+-    if (!(p = malloc(sizeof(int) * (n+1)))) {
++    if (!(p = malloc(sizeof(int) * (n+2)))) {
+         va_end(original_ap);
+         return -1;
+     }
+ 
+-    i = 0;
++    p[0] = except_fd;
++    i = 1;
+     while ((p[i++] = va_arg(original_ap, int)) >= 0)
+         ;
+ 
diff --git a/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild
new file mode 100644
index 000000000000..fa1300f878ec
--- /dev/null
+++ b/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.11-r1.ebuild,v 1.1 2007/06/29 18:56:07 remi Exp $
+
+inherit eutils
+
+DESCRIPTION="Simple library for creating daemon processes in C"
+HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
+SRC_URI="http://0pointer.de/lennart/projects/libdaemon/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="doc"
+
+DEPEND="doc? ( app-doc/doxygen )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-daemon_close_all.patch"
+}
+
+src_compile() {
+	econf --disable-lynx || die "econf failed"
+	emake || die "emake failed"
+
+	if use doc ; then
+		einfo "Building documentation"
+		make doxygen || die "make doxygen failed"
+	fi
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	if use doc; then
+		ln -sf doc/reference/html reference
+		dohtml -r doc/README.html reference
+		doman doc/reference/man/man*/*
+	fi
+
+	dodoc README
+	docinto examples ; dodoc examples/testd.c
+}