Fix 227281, glibc-2.8 compatibility.

Package-Manager: portage-2.1.5.5

4 files changed, 35 insertions, 4 deletions

diff --git a/app-shells/fish/ChangeLog b/app-shells/fish/ChangeLog
index 6188d56d4a12..25d3a1ada847 100644
--- a/app-shells/fish/ChangeLog
+++ b/app-shells/fish/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/fish
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.34 2008/01/13 09:45:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/ChangeLog,v 1.35 2008/06/15 22:27:56 loki_val Exp $
+
+  15 Jun 2008; Peter Alfredsen <loki_val@gentoo.org>
+  +files/fish-1.23.0-glibc-2.8.patch, fish-1.23.0.ebuild:
+  Fix 227281, glibc-2.8 compatibility.
 
 *fish-1.23.0 (13 Jan 2008)
 
diff --git a/app-shells/fish/Manifest b/app-shells/fish/Manifest
index bec71b24fbeb..3998f31ab4e1 100644
--- a/app-shells/fish/Manifest
+++ b/app-shells/fish/Manifest
@@ -1,3 +1,4 @@
+AUX fish-1.23.0-glibc-2.8.patch 545 RMD160 eba94b5952a95e4791776f0c873efa0930c3d453 SHA1 cd114eda6d8c9cf89f22c33cc7674260fa93068b SHA256 ea903595943729e82203d745982a00c46cbca45aa0d2ee53e09ca6f5c0bf22be
 DIST fish-1.21.12.tar.bz2 706246 RMD160 b8172eee345fe84959acc88f242742bcf1018e50 SHA1 8ab4da3ffc4acb5cd56e395bdbef83eb6c8cf8ab SHA256 4235fc3d14ae39fad792eb288f1117cb9578bbc0f6076fb213aafb1848bec9c0
 DIST fish-1.21.8.tar.bz2 572197 RMD160 68cfaf807b45a8652dfd486169ef829ba37c6427 SHA1 bfb5fae340d2b253d6bf241765d6282de5dec80a SHA256 49e8a4e289ca9a6acace39a0056dd5abc335940904c8a11034dd52b98f2afd38
 DIST fish-1.22.1.tar.bz2 733413 RMD160 5dc03d8d91b68bebeebe6c26a2e5b7484e0b0e9a SHA1 24727d9ff87cb868ef9d4f3db34098bfe2cdce74 SHA256 98704c6098f830c2e3b7ab667f88641cda85e53cb29b4e81bb267fe5b4c61ded
@@ -9,6 +10,6 @@ EBUILD fish-1.21.8.ebuild 1227 RMD160 6c56f674adb8d2cea322695a26701b7435499571 S
 EBUILD fish-1.22.1.ebuild 1301 RMD160 ba021d3c37de5bb0fdb35dd06a9b490406ccb72b SHA1 0c3ef79ab662b3ecbf902d484912eb8f19775460 SHA256 047f239a73d6beead9788bd98bf59601c144462fbfeab44d93ccda5d6694e5ed
 EBUILD fish-1.22.2.ebuild 1399 RMD160 f3a1e08d4b0c7570f2e93ce50ddc0882e1ef0005 SHA1 b3813a1b873543db45347dd1172a7cb20fee7b70 SHA256 8d3eecbc6267c71185f6248b398838cd1e72f2a981ae67be48b86f3b939ce89b
 EBUILD fish-1.22.3.ebuild 1330 RMD160 2cf1092dbb6f2379785966546704c57f4b0ed7b4 SHA1 c88aa8de69d7ef6accdb8bbda1dce3ea379d9472 SHA256 a941115fb058c94905ea7d6d7eb5d6e6c32c9ef8e08bed65f95aae336a2b9c33
-EBUILD fish-1.23.0.ebuild 1330 RMD160 0d9376f21d237f4388ff6c60bc1483f2928f99ac SHA1 ede19a6e6a71a150b12b0c645f3991d06704810f SHA256 d4f867e9e49e63721a67c07d40eab23b01cbcf7ed5f678a3467542271ad0ceb9
-MISC ChangeLog 6876 RMD160 bba2542d809ce95397a78ea5e5eb91e0199303ab SHA1 8a97fa1d5b8873208610e53fb0b12668b6e49435 SHA256 964b669dc67dcdc09d8a42762ec413ba9ad9c26d87a849974228685fd19dc385
+EBUILD fish-1.23.0.ebuild 1391 RMD160 209c1a69b41d4d92688678c7d68665a67ec7faab SHA1 9247a17a7403ae0ce141d4afe8c8dcdd334b7746 SHA256 89c1554bfa244bb25e22b7e6685820bc11d6f00c934dea1fbf8ba2d167c39b16
+MISC ChangeLog 7026 RMD160 fa6924dce7ef876e07a6bc69eb0d4c20962cd1d7 SHA1 632317f6e2331ef6a0489871141412f2a4053a15 SHA256 fe15704e44425a1af01fdf97ec11aa927d557cea7bd2bf3b7d60da7b11a9d2a9
 MISC metadata.xml 225 RMD160 7d34ec0d318713a7c56169cd33b6e37c466ea28c SHA1 60ce86a1f6f02dce594e21d3c794bcbe7758a7c2 SHA256 347ac757bb9b39010be57bc7d7ebcb29aa458f6b5071815bfea9d2c097a8d524
diff --git a/app-shells/fish/files/fish-1.23.0-glibc-2.8.patch b/app-shells/fish/files/fish-1.23.0-glibc-2.8.patch
new file mode 100644
index 000000000000..25c28319bf92
--- /dev/null
+++ b/app-shells/fish/files/fish-1.23.0-glibc-2.8.patch
@@ -0,0 +1,22 @@
+diff -NrU5 fish-1.23.0.orig/exec.c fish-1.23.0/exec.c
+--- fish-1.23.0.orig/exec.c	2008-06-16 00:16:10.000000000 +0200
++++ fish-1.23.0/exec.c	2008-06-16 00:21:02.000000000 +0200
+@@ -11,10 +11,18 @@
+ #include <stdio.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <termios.h>
+ #include <unistd.h>
++
++#if defined(_SC_ARG_MAX) 
++# if defined(ARG_MAX) 
++#    undef ARG_MAX 
++# endif 
++# define ARG_MAX sysconf (_SC_ARG_MAX) 
++#endif 
++
+ #include <fcntl.h>
+ #include <errno.h>
+ #include <wchar.h>
+ #include <string.h>
+ #include <limits.h>
diff --git a/app-shells/fish/fish-1.23.0.ebuild b/app-shells/fish/fish-1.23.0.ebuild
index 5316b2bec0ea..e421cb10226e 100644
--- a/app-shells/fish/fish-1.23.0.ebuild
+++ b/app-shells/fish/fish-1.23.0.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.0.ebuild,v 1.1 2008/01/13 09:45:07 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/fish/fish-1.23.0.ebuild,v 1.2 2008/06/15 22:27:56 loki_val Exp $
+
+inherit base
 
 DESCRIPTION="fish is the Friendly Interactive SHell"
 HOMEPAGE="http://fishshell.org/"
@@ -16,6 +18,8 @@ RDEPEND="sys-libs/ncurses
 DEPEND="${RDEPEND}
 	app-doc/doxygen"
 
+PATCHES=( "${FILESDIR}/${P}-glibc-2.8.patch" )
+
 src_compile() {
 	# Set things up for fish to be a default shell.
 	# It has to be in /bin in case /usr is unavailable.