Take strndup from gnulib too, breaks on Linux (#361417).

Rename libsvar.patch to more generic gnulib.patch.

Package-Manager: portage-2.2.01.18125-prefix/cvs/AIX 00C0078A4C00

5 files changed, 97 insertions, 33 deletions

diff --git a/sys-apps/baselayout-prefix/ChangeLog b/sys-apps/baselayout-prefix/ChangeLog
index 0aebc5f0cc2d..37d3e019b90d 100644
--- a/sys-apps/baselayout-prefix/ChangeLog
+++ b/sys-apps/baselayout-prefix/ChangeLog
@@ -1,6 +1,12 @@
 # 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.7 2011/03/30 11:34:45 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/ChangeLog,v 1.8 2011/03/31 16:21:27 haubi Exp $
+
+  31 Mar 2011; Michael Haubenwallner <haubi@gentoo.org>
+  baselayout-prefix-1.12.5-r10.ebuild, +files/baselayout-1.12.5-gnulib.patch,
+  -files/baselayout-1.12.5-libsvar.patch:
+  Take strndup from gnulib too, breaks on Linux (#361417).
+  Rename libsvar.patch to more generic gnulib.patch.
 
 *baselayout-prefix-1.12.5-r10 (30 Mar 2011)
 
diff --git a/sys-apps/baselayout-prefix/Manifest b/sys-apps/baselayout-prefix/Manifest
index 2973ce4047d9..3e2ce57cae3d 100644
--- a/sys-apps/baselayout-prefix/Manifest
+++ b/sys-apps/baselayout-prefix/Manifest
@@ -1,6 +1,6 @@
 AUX baselayout-1.12.5-aix.patch 2462 RMD160 63ef5b25f51ac773ae77fb4afc01b53221c144ae SHA1 01c299e2761247675192fe04619b11ebe02ddff3 SHA256 78e193dd8d68e2fc7ca32bca1059a20943231197bff3db07b8ef3ea3659d5f6b
 AUX baselayout-1.12.5-darwin-kvm.patch 431 RMD160 66200390deb12673cb11370b3d8bbf20551eba5e SHA1 679c7d152c3858800bf0e319134bce615d47e6be SHA256 2a6513beeffdb62af9cca8eafd3fa4ca3b2ab892fbe771a79ce0593be64f849f
-AUX baselayout-1.12.5-libsvar.patch 612 RMD160 02c5790c5f3611b75bdfe3ccfaa6addcbdcd04be SHA1 2025a568d0f930e5c9e50d073042c628cf2fa9a9 SHA256 81a1187deabad8de9dcdf614fd52d8951a9a57a0324fec1c51a154ec5dc5b821
+AUX baselayout-1.12.5-gnulib.patch 2110 RMD160 87007dc493c8a0489c08c96de9497d36da31fd31 SHA1 7d77ea55d3bb8da7d05a1d7970c38def4b9dfc4e SHA256 377ca60f1439e88de65972b6bed89f65441063c26afecae06d83eaf5de74645b
 AUX baselayout-1.12.5-prefix-chaining-bash.patch 862 RMD160 f514ef370a4858f63c23cfbef9bdbb59c074e50d SHA1 70b02ea0148dd43df2012de2413aef505051b87c SHA256 0fe5200752a3c6437e17f833b307e8dbebaa6c3786adf9814f060445f702550b
 AUX baselayout-1.12.5-prefix-chaining-eprefix.patch 991 RMD160 74c0326b2800a9b6c9670550fab3ddfbf42bb9d0 SHA1 0593cc4963b9611159e0a791f8743702ab875883 SHA256 1d6b1f66f2bbf5417d36808ab8bce951a9ecdbcf4992ffb3fcd32af8a6e7b048
 AUX baselayout-1.12.5-prefix-chaining-pkgconfig.patch 568 RMD160 ec1dc56f66f3cceb7afe1695f2e887299f430d97 SHA1 51fa2775a998a1519253213cb62d5db980d18cc4 SHA256 6c7cdea50afc178693b954bf295dfe1de7fa06108f662f5aa0d539c69ba1f28f
@@ -15,9 +15,9 @@ AUX baselayout-1.12.5-prefix.patch 14807 RMD160 5be4ca65ee754d1c95bb00c488ddd5a7
 AUX baselayout-1.12.5-solaris.patch 1860 RMD160 92f3ab1b092c0a81b924dfe90312311d3502a2b0 SHA1 4170e03100a24bfb821cf61c0e2fcdaeb77dda0d SHA256 2d2f304af9e975507793dbe6ff1a360317bef1758ac0b601dffbfad69ec2d93b
 AUX baselayout-1.12.5-strsep.patch 778 RMD160 8447c3a7908bfbd3c3385e2b521f6c042d78a8aa SHA1 122611f8badb4432f41dad47b4a5e75e39c7de9b SHA256 81b1dbaeef76e8c394f2c2c61407dd5ede20dc0ab682be206163eda30b743fe9
 AUX baselayout-1.12.5-termios_h.patch 893 RMD160 398140de16da1b2fb874ef00f1caaa6c828372f4 SHA1 b3debc214fe8edbf734611990901018e32ea289b SHA256 60b4251ebce7488b415686178a0eae207adf18240f80523dbc0b4bc70a53ae99
-DIST baselayout-1.12.5-gnulib-1.tar.bz2 117130 RMD160 ad914c850a8efbb3288770cbaa8061216216d814 SHA1 ac80ffae17516d23d61767e6fd8f86b15185b1ba SHA256 537a4f54db03745e7c8794f9b6af947f0bc49beede8f99b514b12c4c303e8ab7
+DIST baselayout-1.12.5-gnulib-2.tar.bz2 118355 RMD160 b8ffd7fb21f709e82e268358cff229cdde81df97 SHA1 23b06d800c0381e9dc124b270b53ace665730288 SHA256 ca279cbca8a0b39aa247e5ce56eadc3e2dba557cf5765be7a1971ffe12953900
 DIST baselayout-1.12.5.tar.bz2 220693 RMD160 85f03fe3b0ff0521ec4226a1b6788575052923b7 SHA1 39ef351ceec1238cbf27d7b9671f244ccf5cca33 SHA256 4ab5512f35c547549b0406221ed92c71a5a86a11044f1d9f0d87f7ec44d39817
-EBUILD baselayout-prefix-1.12.5-r10.ebuild 6763 RMD160 d4d2d7360e4c87eed4a74d119d06f30acf92fc53 SHA1 1f013700561819bb3d084ff6045d11ffffbbcf36 SHA256 e0f9782941026dca4435a35533f9ba35aaa85906dba06b0cf75601978d8aa119
+EBUILD baselayout-prefix-1.12.5-r10.ebuild 6789 RMD160 a27f52b56de5989e7539bdd59bb7739625b91e33 SHA1 85ef33d7aa018ca6811bff9269ea45cdc78a7b54 SHA256 e2f61467f809fbfb6394399d052c82d9196c5a7b515381cc2aaa2a7c6869eb35
 EBUILD baselayout-prefix-1.12.5-r9.ebuild 6090 RMD160 5d2efafb4b0c98ce481ec337b22fbcd904dbefb4 SHA1 3e33dd1b8b431993218fb47fa2d3435c2113db06 SHA256 a4a125e509269b58323b275a6eb29056a9a95ac6502f02a2104529f4e4fbc4e1
-MISC ChangeLog 6271 RMD160 b0af9add20a652652e862aa6f08a9b938e5dd6ef SHA1 1d8d3e686d54bd54fb05d766cbc74ce84f748b92 SHA256 6e67f0b47884a54db5afe2fa58bf4b9be8cab1e55b32ae4997316de04acbbc3c
+MISC ChangeLog 6560 RMD160 9173add05aded5f886f376c3e1e02f5498723e63 SHA1 1127378dc4730b46e459d9683c5e8e4b171a39ca SHA256 f40ec52b02956a4e169796f3acd37bf91987a50171e7d48e316160b166d9b806
 MISC metadata.xml 318 RMD160 d64b41bf7b5d0a12823b249c08ded6bbd5a7cbf5 SHA1 3598e969bff5d6802f19a3ed63017ec66383e58f SHA256 752beeb1c1ed6af782e2a2d9576720a8903af33d6b724426dbee987bc88fe6f7
diff --git a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild
index e9ada9ae648f..3f66465da694 100644
--- a/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild
+++ b/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild
@@ -1,21 +1,20 @@
 # 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-r10.ebuild,v 1.1 2011/03/30 11:34:45 haubi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/baselayout-prefix/baselayout-prefix-1.12.5-r10.ebuild,v 1.2 2011/03/31 16:21:27 haubi Exp $
 
 EAPI=3
 
 inherit eutils toolchain-funcs multilib prefix flag-o-matic autotools
 
 # Needed gnulib modules:
-#   getopt: for AIX
-#   strsep: for Solaris
+#   getopt strndup strsep
 # Avoid depending on dev-libs/gnulib, might be missing during bootstrap.
-# The gnulib tarball has been created using these commands (basically):
-# $ gnulib-tool --create-testdir --dir=gnulib getopt strsep
-# $ eautoreconf
-# $ econf
+# The gnulib tarball has been created using these commands (basically),
+# from dev-libs/gnulib-2009.03.03.14.07.45-r1:
+# $ gnulib-tool --create-testdir --dir=gnulib getopt strndup strsep
+# $ ./configure
 # $ make maintainer-clean
-GNULIBV=1
+GNULIBV=2
 
 DESCRIPTION="Minimal baselayout for Gentoo Prefix installs"
 HOMEPAGE="http://www.gentoo.org/"
@@ -64,7 +63,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P/-prefix/}-aix.patch
 	epatch "${FILESDIR}"/${P/-prefix/}-darwin-kvm.patch
 	epatch "${FILESDIR}"/${P/-prefix/}-solaris.patch
-	epatch "${FILESDIR}"/${P/-prefix/}-libsvar.patch
+	epatch "${FILESDIR}"/${P/-prefix/}-gnulib.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-gnulib.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-gnulib.patch
new file mode 100644
index 000000000000..dfb64c633206
--- /dev/null
+++ b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-gnulib.patch
@@ -0,0 +1,78 @@
+Need to add libraries after object files, or solaris
+linker might not see library's symbols to be needed
+when added to LDFLAGS.
+
+Take strndup from gnulib too, this decl breaks on Linux (#361417).
+
+VERSION is defined in gnulib's config.h.
+
+--- src/Makefile.orig	2011-03-30 13:15:56 +0200
++++ src/Makefile	2011-03-30 13:16:52 +0200
+@@ -30,10 +30,10 @@
+ 	$(CC) $(CFLAGS) -c -o $@ $^
+ 
+ runscript: runscript.o rs-misc.o
+-	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_RS)
++	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_RS)
+ 
+ start-stop-daemon: start-stop-daemon.c
+-	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_SSD)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_SSD)
+ 
+ install: $(TARGET)
+ 	install -m 0755 -d $(DESTDIR)/bin
+--- src/core/misc.c.orig	2011-03-31 17:46:46 +0200
++++ src/core/misc.c	2011-03-31 17:47:03 +0200
+@@ -86,31 +86,6 @@
+ 	return new_path;
+ }
+ 
+-char *strndup(const char *str, size_t size) {
+-	char *new_str = NULL;
+-	size_t len;
+-
+-	if (NULL == str) {
+-		DBG_MSG("Invalid argument passed!\n");
+-		errno = EINVAL;
+-		return NULL;
+-	}
+-
+-	/* Check lenght of str without breaching the size limit */
+-	for (len = 0;(len < size) && ('\0' != str[len]);len++);
+-
+-	new_str = malloc(len + 1);
+-	if (NULL == new_str) {
+-		DBG_MSG("Failed to allocate buffer!\n");
+-		return NULL;
+-	}
+-
+-	/* Make sure our string is NULL terminated */
+-	new_str[len] = '\0';
+-	
+-	return (char *)memcpy(new_str, str, len);
+-}
+-
+ char *gbasename(const char *path) {
+ 	char *new_path = NULL;
+ 	
+--- src/core/misc.h.orig	2011-03-31 17:46:43 +0200
++++ src/core/misc.h	2011-03-31 18:06:58 +0200
+@@ -246,8 +246,6 @@
+  * with the malloc() call. */
+ char *strcatpaths(const char *pathname1, const char *pathname2);
+ 
+-/* Compat functions for GNU extensions */
+-char *strndup(const char *str, size_t size);
+ /* Same as basename(3), but do not modify path */
+ char *gbasename(const char *path);
+ 
+--- src/start-stop-daemon.c.orig	2011-03-31 18:11:02 +0200
++++ src/start-stop-daemon.c	2011-03-31 18:11:03 +0200
+@@ -31,6 +31,7 @@
+  * 
+  */
+ 
++#undef VERSION
+ #define VERSION "1.13.11+gentoo"
+ 
+ #define NONRETURNPRINTFFORMAT(x, y) \
diff --git a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch b/sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch
deleted file mode 100644
index 22a3624ae5f6..000000000000
--- a/sys-apps/baselayout-prefix/files/baselayout-1.12.5-libsvar.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Need to add libraries after object files, or solaris
-linker might not see library's symbols to be needed
-when added to LDFLAGS.
-
---- src/Makefile.orig	2011-03-30 13:15:56 +0200
-+++ src/Makefile	2011-03-30 13:16:52 +0200
-@@ -30,10 +30,10 @@
- 	$(CC) $(CFLAGS) -c -o $@ $^
- 
- runscript: runscript.o rs-misc.o
--	$(LD) $(LDFLAGS) -o $@ $^ $(LDFLAGS_RS)
-+	$(LD) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_RS)
- 
- start-stop-daemon: start-stop-daemon.c
--	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LDFLAGS_SSD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^ $(LIBS) $(LDFLAGS_SSD)
- 
- install: $(TARGET)
- 	install -m 0755 -d $(DESTDIR)/bin