Fix from Fedora for building with glibc-2.8 #226513 by Peter.

Package-Manager: portage-2.2_rc1/cvs/Linux 2.6.25 x86_64

4 files changed, 75 insertions, 4 deletions

diff --git a/net-ftp/ftp/ChangeLog b/net-ftp/ftp/ChangeLog
index 6854504e58dd..13e8ae70bdaa 100644
--- a/net-ftp/ftp/ChangeLog
+++ b/net-ftp/ftp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-ftp/ftp
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.31 2008/06/16 03:49:27 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ChangeLog,v 1.32 2008/06/28 15:40:25 vapier Exp $
+
+  28 Jun 2008; Mike Frysinger <vapier@gentoo.org>
+  +files/netkit-ftp-0.17-arg_max.patch, ftp-0.17-r7.ebuild:
+  Fix from Fedora for building with glibc-2.8 #226513 by Peter.
 
   16 Jun 2008; Joseph Jezak <josejx@gentoo.org> ftp-0.17-r7.ebuild:
   Marked ppc/ppc64 stable.
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 1e798d5d793f..da2210dc665f 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -1,4 +1,8 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX netkit-ftp-0.17-acct.patch 419 RMD160 131d0f7f411a9317bef4a9489371499824dc1982 SHA1 a88683246d609d04d07c46befa154d2c05cb06f1 SHA256 c5a50791759b7f15c7743b8af9f233efa7765715044262f5220634b86a11bafa
+AUX netkit-ftp-0.17-arg_max.patch 1444 RMD160 540cfc21a483b1a443af4c7bde1480c52c97da82 SHA1 7f62c80e162f0d5949238da733ffc600dbc613da SHA256 e38bd3d24923839b0409989063ec61753fe9c52e08ea4d3ec3f347c6103a46b3
 AUX netkit-ftp-0.17-custom-cflags.patch 587 RMD160 97865bb90153947f22b99c7096f4aeccf77a2d2a SHA1 a85964284cc09f8c5b8968c9de7f74a55b8abb7d SHA256 4b29b8c788669a32eeb7e9adc9b86cae5917472d639fc0b7c8f607f7a5469dbc
 AUX netkit-ftp-0.17-dont-strcpy-overlapping.patch 1375 RMD160 518b4e7e3e07b857acd92edc862ffc05164745e2 SHA1 fbd40b6b27fe044a6d2868a974bc1b8abc7754a1 SHA256 e1c89a2128417bbd29fe6dd725c734d3a69ca1ceaa9a15aa2edc2643ae0103f1
 AUX netkit-ftp-0.17-ipv6.patch 22850 RMD160 31804e989690a30927ff2a67b6851979c683551c SHA1 3eab563b0fb991637d70c232a4b6be2dd438c2e4 SHA256 0e96e9cfd78a737b955190a98f70ac89cf5b4d7d3ee9f7676d4550ce17e13f02
@@ -10,6 +14,13 @@ AUX netkit-ftp-0.17-sigseg.patch 457 RMD160 339df1461663465326799be5b76ed6efc90c
 AUX netkit-ftp-0.17-ssl-0.2.patch 29503 RMD160 53ca3a2cad782693d752550b2d8968a34d0ca695 SHA1 98774a2a6a34d6dd62e34ea9b5f471489adc52bc SHA256 7cd2f0c1f15d466ad6e382fe1c47b3b7d16186a3e57ef3bbb299351d0e7fba2f
 DIST netkit-ftp-0.17.tar.gz 53934 RMD160 ff67bdd1f233e375f7c6e8853906edb0e3bb42a2 SHA1 815541a33bf02a43b5b41194389b8435e7890935 SHA256 61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349
 EBUILD ftp-0.17-r6.ebuild 1540 RMD160 15c4dbdf7515fac59d671a6bc0e03ee8d1662d07 SHA1 f4f6cdea12add2531d98ec616b30b8c802eb1fda SHA256 f59c39e9d6c14dd3e52423299a2c676e86f44833758b4d84946934b73b5f7c3d
-EBUILD ftp-0.17-r7.ebuild 1605 RMD160 c4a580878a7c73754a6da8beee996bff71bf891a SHA1 8a1289caf12bfa9141e45304acef14fb7858ead3 SHA256 ec780cc6c163baff0204abf0e8d542811d980c7709061ba6b4e8822aa885e805
-MISC ChangeLog 4758 RMD160 9d4fc23c6a745142731425e273f598674b55c2da SHA1 2867b4677683bc07baca90fd412c415f5ce08611 SHA256 9d682a3ec7eeaed015f3e3139ea0fda4ea9f64c508803d3435ee43461c2e77de
+EBUILD ftp-0.17-r7.ebuild 1663 RMD160 7dc670377f458d76a7e92cb2cd3269f7bc64c116 SHA1 e1e6c9f06d222bd1d4dc1895957abcb3d156140b SHA256 d799764adc1b50a51782af50728aabb7312243466f648a41d817e21e2881ca4f
+MISC ChangeLog 4933 RMD160 b0cc8fc407db4f3388913d68903560a57a57dcef SHA1 55c296f752203cfcae26325508367065bf9af550 SHA256 8645d03201a04e5a6bfdd2604bad9e86b0047cd3c1a219a6731468e12ed5a623
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.9 (GNU/Linux)
+
+iEYEARECAAYFAkhmW3AACgkQ67wieSYcaxcC7wCfYMG4BEzTZd+X73U4VuDirbWP
+xYoAoJT2r7+YX4k0CLX2NaeBfCnfaqyk
+=mFKF
+-----END PGP SIGNATURE-----
diff --git a/net-ftp/ftp/files/netkit-ftp-0.17-arg_max.patch b/net-ftp/ftp/files/netkit-ftp-0.17-arg_max.patch
new file mode 100644
index 000000000000..08a88bb54b41
--- /dev/null
+++ b/net-ftp/ftp/files/netkit-ftp-0.17-arg_max.patch
@@ -0,0 +1,55 @@
+diff -up netkit-ftp-0.17/ftp/glob.c.arg_max netkit-ftp-0.17/ftp/glob.c
+--- netkit-ftp-0.17/ftp/glob.c.arg_max	2008-04-07 11:41:14.000000000 +0200
++++ netkit-ftp-0.17/ftp/glob.c	2008-04-07 12:01:53.000000000 +0200
+@@ -50,6 +50,7 @@ char glob_rcsid[] = 
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <unistd.h>
+ 
+ #include "ftp_var.h"  /* for protos only */
+ #include "glob.h"
+@@ -57,7 +58,7 @@ char glob_rcsid[] = 
+ #define	QUOTE 0200
+ #define	TRIM 0177
+ #define	eq(a,b)		(strcmp(a, b)==0)
+-#define	GAVSIZ		(ARG_MAX/6)
++#define	GAVSIZ		(sysconf(_SC_ARG_MAX)/6)
+ #define	isdir(d)	((d.st_mode & S_IFMT) == S_IFDIR)
+ 
+ const char *globerr;
+@@ -115,7 +116,7 @@ char **
+ ftpglob(const char *v)
+ {
+ 	char agpath[BUFSIZ];
+-	entry agargv[GAVSIZ];
++	entry *agargv;
+ 	centry vv[2];
+ 	vv[0].text = v;
+ 	vv[1].text = NULL;
+@@ -133,6 +134,8 @@ ftpglob(const char *v)
+ 	/* added ()'s to sizeof, (ambigious math for the compiler) */
+ 	lastgpathp = agpath + (sizeof(agpath)- 2);
+ 
++	agargv = (entry *)malloc(sizeof (entry) * GAVSIZ);
++	if (agargv == NULL) fatal("Out of memory");
+ 	ginit(agargv); 
+ 	globcnt = 0;
+ 	collect(v);
+@@ -156,7 +159,7 @@ ginit(entry *agargv)
+ 	gargv = agargv; 
+ 	sortbas = agargv; 
+ 	gargc = 0;
+-	gnleft = ARG_MAX - 4;
++	gnleft = sysconf(_SC_ARG_MAX) - 4;
+ }
+ 
+ static 
+@@ -674,6 +677,7 @@ efree(entry *av) 
+ {
+     int i;
+     for (i=0; av[i].text; i++) free(av[i].text);
++    free((void *)av);
+ }
+ 
+ static
diff --git a/net-ftp/ftp/ftp-0.17-r7.ebuild b/net-ftp/ftp/ftp-0.17-r7.ebuild
index 508df1f14291..74f05c351bbb 100644
--- a/net-ftp/ftp/ftp-0.17-r7.ebuild
+++ b/net-ftp/ftp/ftp-0.17-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r7.ebuild,v 1.4 2008/06/28 15:39:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ftp/ftp-0.17-r7.ebuild,v 1.5 2008/06/28 15:40:25 vapier Exp $
 
 inherit eutils toolchain-funcs flag-o-matic
 
@@ -33,6 +33,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${MY_P}-segv.patch #fedora
 	epatch "${FILESDIR}"/${MY_P}-custom-cflags.patch
 	epatch "${FILESDIR}"/${MY_P}-sigseg.patch #fedora, #199206
+	epatch "${FILESDIR}"/${MY_P}-arg_max.patch #fedora, #226513
 	append-lfs-flags #101038
 }