Add patch to fix compilation on Solaris, bug #360917

Package-Manager: portage-2.2.01.18155-prefix/cvs/Darwin powerpc

4 files changed, 121 insertions, 7 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index df1ccc01db1d..817a55bdde06 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/baselayout-prefix
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.4 2011/03/28 15:09:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.5 2011/03/28 15:38:17 grobian Exp $
+
+  28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
+  baselayout-prefix-1.12.5-r9.ebuild, +files/baselayout-1.12.5-solaris.patch:
+  Add patch to fix compilation on Solaris, bug #360917
 
   28 Mar 2011; Fabian Groffen <grobian@gentoo.org>
   baselayout-prefix-1.12.5-r9.ebuild,
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 4feabe333f73..e2a9e1a5e23e 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -14,15 +14,16 @@ AUX baselayout-1.12.5-prefix-pidof.patch 329 RMD160 eca62253ec62c3c88b8e95a9fef7
 AUX baselayout-1.12.5-prefix-sh.patch 8171 RMD160 c85d0c98d5cf7539571f13a40fa27cbe547d3439 SHA1 121d9ec49256f2bbeae18ccaa3cea22a9168db50 SHA256 aed4b37186ec24ea5189e5be20f1a05cf76f277054a6a5761195ef803b88acad
 AUX baselayout-1.12.5-prefix-src.patch 3629 RMD160 cda870fae2abf559770d0ac7e5d00a4657906ba5 SHA1 27bec4c8f878b1d5c8a2c5cf8c646a818d01a175 SHA256 3f7565deda1f82e5906b350c178b8b414a2b37f8155439e0c6f2689c76ca2ba3
 AUX baselayout-1.12.5-prefix.patch 14807 RMD160 5be4ca65ee754d1c95bb00c488ddd5a77240e9fe SHA1 24d4677f7ade70a712ef73fde33db5b82da39f45 SHA256 a79a3d2f35e03e75c858ef81ccada82b3de4b5bb96168386a1f652bac198ad6c
+AUX baselayout-1.12.5-solaris.patch 2638 RMD160 de2a3df0a2999977265f3590ef3a2443d5a1f7e2 SHA1 3686f0e903b3ef48dc0ee705c3fbc909b00d32e4 SHA256 9f25a700755d7d7f55f003158a9bd52ebda4da559d528a987f8a585baddb44dc
 AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
-EBUILD baselayout-prefix-1.12.5-r9.ebuild 5979 RMD160 76bffed85d726a45e714f67a7880ee5da59fae9f SHA1 f84fe524934cd07dda1d99de152e7faa77277b7f SHA256 4640288825cfdffdd27dec04d4ee72759e8a8452de06b7b8f6a700b052e93ce1
-MISC ChangeLog 5459 RMD160 388bb705bf805066ab4906a4a334c21de7bfe7aa SHA1 2e5e090028dc874ed1f13e1a958a08336777cc42 SHA256 92ca8bf4c0cfcc69418723721639f66ce66774086eddb829107a7a8d0d168665
+EBUILD baselayout-prefix-1.12.5-r9.ebuild 6029 RMD160 e00bd97286a3cdf9d0284ca8e577c85cfff7b1f6 SHA1 e492afb1690fd3e64ccdab34fb552dc8158ab0ec SHA256 40b6def0dc1459b9008009f7fd1f6768c98008383bc1cc856698f5fecec220f7
+MISC ChangeLog 5644 RMD160 d4216e2c5d48ad08c75f01f2aaabdbc1e920d5c3 SHA1 9cf95a3983b65296cc5afe04847c8f03442a838a SHA256 9dc1153236ee24af82439bf69939ba86648dacfdbc60eacd252fdee60f6a287f
 MISC metadata.xml 318 RMD160 d64b41bf7b5d0a12823b249c08ded6bbd5a7cbf5 SHA1 3598e969bff5d6802f19a3ed63017ec66383e58f SHA256 752beeb1c1ed6af782e2a2d9576720a8903af33d6b724426dbee987bc88fe6f7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (Darwin)
 
-iEYEARECAAYFAk2QpEoACgkQX3X2B8XHTommggCfUk4isIIHBZS6ZTUtAyaiujVt
-U58An3Z4Qs9CwZ+gc5PggiQnDyx4HYZY
-=7jqy
+iEYEARECAAYFAk2QqxEACgkQX3X2B8XHTon0OACeMBi9do5S+XdCuHyLIDmGX+xu
+vxMAoIP3LUdO8OtjwWLKja11M3Sunkq3
+=euqV
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
index 2b3d4ba856ef..2b65bac48025 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild,v 1.5 2011/03/28 15:09:22 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r9.ebuild,v 1.6 2011/03/28 15:38:17 grobian Exp $
 
 EAPI=3
 
@@ -50,6 +50,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P/-prefix/}-termios_h.patch # required by aix.patch
 	epatch "${FILESDIR}"/${P/-prefix/}-aix.patch
 	epatch "${FILESDIR}"/${P/-prefix/}-darwin-kvm.patch
+	epatch "${FILESDIR}"/${P/-prefix/}-solaris.patch
 
 	# The consoletype application in this form will only work on Linux
 	[[ ${CHOST} == *-linux-* ]] || epatch "${FILESDIR}"/${P/-prefix/}-prefix-no-consoletype.patch
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch
new file mode 100644
index 000000000000..c3ee513f90be
--- /dev/null
+++ b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-solaris.patch
@@ -0,0 +1,108 @@
+--- src/start-stop-daemon.c
++++ src/start-stop-daemon.c
+@@ -44,7 +44,7 @@
+ #  define OSLinux
+ #elif defined(__GNU__)
+ #  define OSHURD
+-#elif defined(__sparc__)
++#elif defined (__SVR4) && defined (__sun)
+ #  define OSsunos
+ #elif defined(OPENBSD) || defined(__OpenBSD__)
+ #  define OSOpenBSD
+@@ -94,6 +94,9 @@
+ #if defined(OSaix)
+ #include <sys/procfs.h>
+ #endif
++#if defined(OSsunos)
++#include <procfs.h>
++#endif
+ 
+ #include <errno.h>
+ #include <stdio.h>
+@@ -188,7 +191,7 @@
+ static void do_pidfile(const char *name);
+ static void do_stop(int signal_nr, int quietmode,
+ 		    int *n_killed, int *n_notkilled, int retry_nr);
+-#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
++#if defined(OSLinux) || defined(OShpux) || defined(OSaix) || defined(OSsunos)
+ static int pid_is_exec(pid_t pid, const struct stat *esb);
+ #endif
+ 
+@@ -765,7 +768,7 @@
+ static void
+ check(pid_t pid)
+ {
+-#if defined(OSLinux) || defined(OShpux) || defined(OSaix)
++#if defined(OSLinux) || defined(OShpux) || defined(OSaix) || defined(OSsunos)
+ 	if (execname && !pid_is_exec(pid, &exec_stat))
+ 		return;
+ #elif defined(OSHURD) || defined(OSFreeBSD) || defined(OSNetBSD) || defined(OSDarwin)
+@@ -801,7 +804,7 @@
+ /* WTA: this  needs to be an autoconf check for /proc/pid existance.
+  */
+ 
+-#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix)
++#if defined(OSLinux) || defined (OSsunos) || defined(OSfreebsd) || defined(OSaix) || defined(OSsunos)
+ static void
+ do_procinit(void)
+ {
+@@ -1069,7 +1072,7 @@
+ }
+ #endif /* OShpux */
+ 
+-#if defined(OSaix)
++#if defined(OSaix) || defined(OSsunos)
+ /* max possible pid (signed long) in theory:
+  * 32bit: 2147483647 (10 digits)
+  * 64bit: 9223372036854775807 (19 digits)
+@@ -1119,7 +1122,7 @@
+ 	}
+ 	return strcmp(name, psi.pr_fname) == 0;
+ }
+-#endif /* OSaix */
++#endif /* OSaix || OSsunos */
+ 
+ 
+ static void
+--- src/core/misc.h
++++ src/core/misc.h
+@@ -284,5 +284,9 @@
+ void file_unmap(char *buf, size_t bufsize);
+ size_t buf_get_line(char *buf, size_t buflen, size_t cur);
+ 
++#if defined (__SVR4) && defined (__sun)
++char* strsep(char** str, const char* delims);
++#endif
++
+ #endif /* _MISC_H */
+ 
+--- src/core/misc.c
++++ src/core/misc.c
+@@ -647,3 +647,27 @@
+ 	return count - cur;
+ }
+ 
++#if defined (__SVR4) && defined (__sun)
++char* strsep(char** str, const char* delims)
++{
++	char* token;
++
++	if (*str == NULL) {
++		/* No more tokens */
++		return NULL;
++	}
++
++	token=*str;
++	while (**str != '\0') {
++		if (strchr(delims, **str) != NULL) {
++			**str = '\0';
++			(*str)++;
++			return token;
++		}
++		(*str)++;
++	}
++	/* There is no other token */
++	*str = NULL;
++	return token;
++}
++#endif