add a patch from upstream to fix build on bsd/solaris

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 56 insertions, 11 deletions

diff --git a/dev-libs/libdaemon/ChangeLog b/dev-libs/libdaemon/ChangeLog
index a38ccacdbccc..6689f3edc351 100644
--- a/dev-libs/libdaemon/ChangeLog
+++ b/dev-libs/libdaemon/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-libs/libdaemon
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.56 2008/10/05 20:22:00 eva Exp $
+# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/ChangeLog,v 1.57 2009/02/11 07:40:38 aballier Exp $
+
+  11 Feb 2009; Alexis Ballier <aballier@gentoo.org>
+  +files/libdaemon-0.13-bsd.patch, libdaemon-0.13-r1.ebuild:
+  add a patch from upstream to fix build on bsd/solaris
 
 *libdaemon-0.13-r1 (05 Oct 2008)
 
diff --git a/dev-libs/libdaemon/Manifest b/dev-libs/libdaemon/Manifest
index 3deb48a7fa8f..506f4041b1ad 100644
--- a/dev-libs/libdaemon/Manifest
+++ b/dev-libs/libdaemon/Manifest
@@ -1,18 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX libdaemon-0.13-bsd.patch 1276 RMD160 adbdcecd89492011034c1d2d9519f01a571188e6 SHA1 cd322f918c4d84e5c723b34e551451f3ff879892 SHA256 56211ce64e377a38caf76c133ee4cc4467432fef52bb1a91947d9cff5783731e
 DIST libdaemon-0.10.tar.gz 345084 RMD160 af210b110ab89d0c4289bf3241ab2b176ef40c1d SHA1 2606710f5b130078c313cbdb86765cf2da20c334 SHA256 83004489cce844d4f9180fb74cc4781bb79e31aecf60d529608a510cf114484e
 DIST libdaemon-0.12.tar.gz 355167 RMD160 ccadae8f8dcac3ddac154cc7e1e1d47da8302c7d SHA1 2b45ab37df853afd25f7985ed699b799e0464413 SHA256 39e7c9f8644d1af310d076c1a5cc648040033e4724e7edfd85eb983ad88336d0
 DIST libdaemon-0.13.tar.gz 368119 RMD160 7fc41dc7a147d969b29e5a359442716859de7e0e SHA1 2c67eedf0dfe303a86bee64feba3e40d21abbd01 SHA256 bd949d459d2da54f1cdfbd1f4592e32541e8a195aca56fa7a8329ed79836d709
 EBUILD libdaemon-0.10.ebuild 980 RMD160 28f66a1c6c3d541b311c50dcfd7ce0a443457d9b SHA1 d573651327b67b06f65003e09cf0fa5107ddba5a SHA256 f726d1f8e5ca5fbc6c24e19c0888b6dc61b1dc240deb0bf5594530bb70e253ba
 EBUILD libdaemon-0.12.ebuild 1142 RMD160 6f12eb49e5e194987c16940182d9d876a3dfca42 SHA1 1f7e435e503420f316894dca424b2e7cf15cebf9 SHA256 3ea2bf38f0e708032fa2afa5d1c34a16f47021718b330ea9f30ade2ae8582b42
-EBUILD libdaemon-0.13-r1.ebuild 1147 RMD160 d0b5078cdb8d936a9a5ab1854825a5c7d6abd96d SHA1 894e132912f49f739f784da888e899959f932754 SHA256 b7dc334ffd8a9871057e99638486e640fdffed1fb3082c203908947e8228b6d6
-MISC ChangeLog 7057 RMD160 1c5f37fbf7e84b37a3d020328ed53e5878b998c3 SHA1 c2e95e9cf72eedfefc5ff03b600500891203c7b0 SHA256 41b1d8e7963d4d6cb6e6e84a6eaf08684acdf23dd882e2699522afb1fe2612c0
+EBUILD libdaemon-0.13-r1.ebuild 1206 RMD160 733f882508f0d3bebeb0ab73671dacec835d379d SHA1 6b7876de2c4c6f485c936c2379c47eb8647c7d09 SHA256 390086e768342cee721f4e2b67c7d365a83a5f63ade37c7a72dd944e45f8670e
+MISC ChangeLog 7232 RMD160 037ad80b71b23f06723a36e81253b1f7a7438bea SHA1 2b1c55327f70f443614970ee10ceea20307c46de SHA256 f5a7d27a2bc450a06afd5767d6f8cf92fcc83bfcf67adbc58d69ff03c215ba12
 MISC metadata.xml 222 RMD160 00fb9f2d3c658e03d9e9d89e73bd4011dcefc95d SHA1 0857e7a0a06f5d945053bcb101a43a7a39bc2cd9 SHA256 4f4cafd1c0eb72511445987957cc1f0d5482314a75a28b46640c9b22915ac385
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAkkW05wACgkQ67wieSYcaxfkxgCfQ/v7IzU62vGz5GBdkvR1sudG
-YOAAoK8CDYWbPIjyRpW3KXatqCaQM+FN
-=lZUP
+iEYEARECAAYFAkmSgPsACgkQvFcC4BYPU0pc6QCgooLbDtS7cUG1NaU9wVNA7/e1
+4wAAoLKJwTHzPZxjVNKrcV4g2fE1YbsY
+=wpPO
 -----END PGP SIGNATURE-----
diff --git a/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch b/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch
new file mode 100644
index 000000000000..8a439d52a62e
--- /dev/null
+++ b/dev-libs/libdaemon/files/libdaemon-0.13-bsd.patch
@@ -0,0 +1,39 @@
+commit 5b1daf072556c1fc9a00e8735fa0cdba280c2231
+Author: Diego 'Flameeyes' Pettenò <flameeyes@gmail.com>
+Date:   Wed Oct 1 13:26:32 2008 +0200
+
+    Fix building on OpenSolaris (without _NSIG definition).
+    
+    On OpenSolaris, the _NSIG macro is not defined, but NSIG is; as it's
+    not possible to use NSIG under glibc (it would miss the SIGRT*
+    series), define a SIGNAL_UPPER_BOUND depending on the system (and
+    error out if the system lacks both NSIG and _NSIG).
+
+diff --git a/libdaemon/dfork.c b/libdaemon/dfork.c
+index f1ba7c1..6b94944 100644
+--- a/libdaemon/dfork.c
++++ b/libdaemon/dfork.c
+@@ -42,6 +42,14 @@
+ #include "dnonblock.h"
+ #include "dlog.h"
+ 
++#if defined(_NSIG) /* On glibc NSIG does not count RT signals */
++# define SIGNAL_UPPER_BOUND _NSIG
++#elif defined(NSIG) /* Solaris defines just this */
++# define SIGNAL_UPPER_BOUND NSIG
++#else
++# error "Unknown upper bound for signals"
++#endif
++
+ static int _daemon_retval_pipe[2] = { -1, -1 };
+ 
+ static int _null_open(int f, int fd) {
+@@ -665,7 +673,7 @@ int daemon_reset_sigs(int except, ...) {
+ int daemon_reset_sigsv(const int except[]) {
+     int sig;
+ 
+-    for (sig = 1; sig < _NSIG; sig++) {
++    for (sig = 1; sig < SIGNAL_UPPER_BOUND; sig++) {
+         int reset = 1;
+ 
+         switch (sig) {
diff --git a/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild b/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild
index 2d11b4587763..f2706e113f03 100644
--- a/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild
+++ b/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild,v 1.1 2008/10/05 20:22:00 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libdaemon/libdaemon-0.13-r1.ebuild,v 1.2 2009/02/11 07:40:38 aballier Exp $
 
-inherit libtool
+inherit libtool eutils
 
 DESCRIPTION="Simple library for creating daemon processes in C"
 HOMEPAGE="http://0pointer.de/lennart/projects/libdaemon/"
@@ -18,7 +18,8 @@ DEPEND="doc? ( app-doc/doxygen )"
 
 src_unpack() {
 	unpack ${A}
-
+	cd "${S}"
+	epatch "${FILESDIR}/${P}-bsd.patch"
 	elibtoolize
 }