Version bump. Fix up double declaration of getline function.

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

8 files changed, 334 insertions, 10 deletions

diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 5effe8d4c9c8..cfe7348a6761 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-ftp/tnftp
-# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.31 2008/06/15 18:39:45 swegener Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.32 2009/05/23 14:40:37 swegener Exp $
+
+*tnftp-20090520 (23 May 2009)
+
+  23 May 2009; Sven Wegener <swegener@gentoo.org> tnftp-20070806.ebuild,
+  +files/tnftp-20070806-getline.patch, +tnftp-20090520.ebuild,
+  +files/tnftp-20090520-getline.patch,
+  +files/tnftp-20090520-glibc-2.8-ARG_MAX.patch,
+  +files/tnftp-20090520-libedit.patch:
+  Version bump. Fix up double declaration of getline function.
 
   15 Jun 2008; Sven Wegener <swegener@gentoo.org>
   +files/tnftp-20070806-glibc-2.8-ARG_MAX.patch, tnftp-20070806.ebuild:
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 8f3b5bab8600..ac9b383b5be6 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,16 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
+AUX tnftp-20070806-getline.patch 3373 RMD160 6054191de0ce7600e162a252eceb6ccac97ada23 SHA1 4fb75febcf3bfa9e190d2d3f18bc04ce7c39383d SHA256 9fa07a4e66565baf42c75f154c9a32c0c143dc1c45c314c26e08cd0185be59c7
 AUX tnftp-20070806-glibc-2.8-ARG_MAX.patch 588 RMD160 10ffe49113f787091ae9e13f0014ff03859f508e SHA1 cc3a3ca0f7ea615402a138f5185c3ae3bd3559b5 SHA256 70a98095bf08995215ca17cd2ee986fd08d96eb6e3d1f7a3059dd30399dc049a
 AUX tnftp-20070806-libedit.patch 792 RMD160 70f2d65251b2d92a5dfc3f99bd612bb44c2aa5a9 SHA1 a008b2604288c4a00c2e7c39e41777fe1820116f SHA256 c323bf381e5bd9f128114bc9bd7722bc950f5e42e59030162d03cb2da62430ab
+AUX tnftp-20090520-getline.patch 3385 RMD160 7b6f9258130013961ac547e61ef745b5c089814c SHA1 4859b9dab6b4e7b8db496f53654dc4daa2c32b6f SHA256 9f01101f1e6ef14bab5b20895e4db5050d7c2c50804a744ac8a092b4f9fcdcc4
+AUX tnftp-20090520-glibc-2.8-ARG_MAX.patch 588 RMD160 b35d19c7f3de952539590cb560e75c491b05ea6e SHA1 dc2bcda3eea8695b716bb85004d4a032cdb1e04d SHA256 d9554f33890096095858dff3fcd4ea979226505c7c6dcb3aec1d1f3ed90b8fb7
+AUX tnftp-20090520-libedit.patch 792 RMD160 6fe6835cda5f494a91c0bc6432566ce722be4179 SHA1 2ad4a4920ec3bece36b9871058bf042af2f420cc SHA256 f28fe6c004c8f4675d1249ae229c8ecdc8d800c975f53f1cad4049aaf67378e2
 DIST tnftp-20070806.tar.gz 371223 RMD160 f70a9de5c87736aa98693a1808be5db76cdc97b0 SHA1 b6dad820e71412bd52f2c4a4ccaa7a2b62c3a22f SHA256 ee0d6c77a74bcb5edf904a7ea97bb9c023007c76bc741f22dc197b9938372a87
-EBUILD tnftp-20070806.ebuild 1177 RMD160 07c6086df9f3cb2a6ffa6c188b87c79fdf79e3fb SHA1 b2117e58d027ad034a02da8fb2557bdc30931bca SHA256 9a553af7af4a6145111d32bca51937f22c09902e1730c436116e4f4944708cc8
-MISC ChangeLog 4207 RMD160 1ffad606f90c074090a85bde4ff89603d09ff435 SHA1 ce9ad76dc3078ba070283e36c977f40afdb2f62e SHA256 21490d9df02a467b1f4586ed91d9367f980c05db3fd79d1ccc4b16473b216e19
+DIST tnftp-20090520.tar.gz 374092 RMD160 e1ca79c64704860008fad0c187abdf68c6041c44 SHA1 50f39ad379280c073913598c7de32cf1502d4d33 SHA256 8bb65d35e134b463bfb027d2e27dec58070da1e4a770ac222c0326d9fb2136ca
+EBUILD tnftp-20070806.ebuild 1218 RMD160 717e4bfe30c95ce6372a8875c90691e0f1191a82 SHA1 173f70faf598af7a7198952e1af022826cb01734 SHA256 7358ca6c3ec5b3465a2993c479f62fe5488d84599abcffac5395141262d6e89c
+EBUILD tnftp-20090520.ebuild 1223 RMD160 6d58d41a9a77061a3513ea4a71b4f932cf913fee SHA1 a2a88c7061a209ce05d3fe30ea87e9a7d1ba3d68 SHA256 2357c9affc4fedde06fb59d3bca9277db7bcd0bd502af8cbf2a92b459568fd94
+MISC ChangeLog 4565 RMD160 a5165f942a0234af3b37d45b0b412ead42dfd468 SHA1 60558b59ac6e1ad938557319940823e2979ba599 SHA256 7eb6b7c97b135e2466438e9927f4e4f8426597c9e40145315b7d7667dd9474ab
 MISC metadata.xml 298 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 SHA1 a51489bc5de3f67a0183720f9425adb2cba0e3ef SHA256 fa6086e7352367eeb9b96d059ab58bca3bd6fde533180cd5551280c808535fc9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.7 (GNU/Linux)
+Version: GnuPG v2.0.11 (GNU/Linux)
 
-iD8DBQFIVWH3I1lqEGTUzyQRAkGKAJ0Q7SoUsoxVAy0WOkCkh4vybgqHbACfRp5h
-ra1F7L5wDrNpd8kDc69t4GU=
-=M6ut
+iEYEARECAAYFAkoYCvAACgkQI1lqEGTUzyQZ4ACgzktQ0+RmX9QoIX2bcTtKg0Ba
+HlIAn3E+IOIDw9i/ocfhMy7yTKLkRL7I
+=IBJv
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/tnftp/files/tnftp-20070806-getline.patch b/net-ftp/tnftp/files/tnftp-20070806-getline.patch
new file mode 100644
index 000000000000..474322e03365
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20070806-getline.patch
@@ -0,0 +1,109 @@
+--- tnftp-20070806/src/cmds.c
++++ tnftp-20070806/src/cmds.c
+@@ -186,7 +186,7 @@
+ 	while (1) {
+ 		fprintf(ttyout, "%s %s [anpqy?]? ", promptleft, promptright);
+ 		(void)fflush(ttyout);
+-		if (getline(stdin, line, sizeof(line), &errormsg) < 0) {
++		if (ftp_getline(stdin, line, sizeof(line), &errormsg) < 0) {
+ 			mflag = 0;
+ 			fprintf(ttyout, "%s; %s aborted\n", errormsg, cmd);
+ 			return (0);
+@@ -781,7 +781,7 @@
+ 	argv[0] = "get";
+ 	mode = restart_point ? "r+" : "w";
+ 
+-	while (getline(fp, buf, sizeof(buf), NULL) >= 0) {
++	while (ftp_getline(fp, buf, sizeof(buf), NULL) >= 0) {
+ 		if (buf[0] == '\0')
+ 			continue;
+ 		argv[1] = buf;
+--- tnftp-20070806/src/extern.h
++++ tnftp-20070806/src/extern.h
+@@ -142,7 +142,7 @@
+ void	get(int, char **);
+ struct cmd *getcmd(const char *);
+ int	getit(int, char **, int, const char *);
+-int	getline(FILE *, char *, size_t, const char **);
++int	ftp_getline(FILE *, char *, size_t, const char **);
+ struct option *getoption(const char *);
+ char   *getoptionvalue(const char *);
+ void	getremoteinfo(void);
+--- tnftp-20070806/src/fetch.c
++++ tnftp-20070806/src/fetch.c
+@@ -199,7 +199,7 @@
+ 		fprintf(ttyout, "%s\n", user);
+ 	} else {
+ 		(void)fflush(ttyout);
+-		if (getline(stdin, user, sizeof(user), &errormsg) < 0) {
++		if (ftp_getline(stdin, user, sizeof(user), &errormsg) < 0) {
+ 			warnx("%s; can't authenticate", errormsg);
+ 			goto cleanup_auth_url;
+ 		}
+@@ -839,7 +839,7 @@
+ 		}
+ 
+ 				/* Read the response */
+-		len = getline(fin, buf, sizeof(buf), &errormsg);
++		len = ftp_getline(fin, buf, sizeof(buf), &errormsg);
+ 		if (len < 0) {
+ 			if (*errormsg == '\n')
+ 				errormsg++;
+@@ -863,7 +863,7 @@
+ 
+ 				/* Read the rest of the header. */
+ 		while (1) {
+-			len = getline(fin, buf, sizeof(buf), &errormsg);
++			len = ftp_getline(fin, buf, sizeof(buf), &errormsg);
+ 			if (len < 0) {
+ 				if (*errormsg == '\n')
+ 					errormsg++;
+@@ -1067,7 +1067,7 @@
+ 
+ 				fprintf(ttyout,
+ 				    "Authorization failed. Retry (y/n)? ");
+-				if (getline(stdin, reply, sizeof(reply), NULL)
++				if (ftp_getline(stdin, reply, sizeof(reply), NULL)
+ 				    < 0) {
+ 					goto cleanup_fetch_url;
+ 				}
+--- tnftp-20070806/src/main.c
++++ tnftp-20070806/src/main.c
+@@ -675,7 +675,7 @@
+ 					fprintf(ttyout, "%s ", p);
+ 			}
+ 			(void)fflush(ttyout);
+-			num = getline(stdin, line, sizeof(line), NULL);
++			num = ftp_getline(stdin, line, sizeof(line), NULL);
+ 			switch (num) {
+ 			case -1:	/* EOF */
+ 			case -2:	/* error */
+--- tnftp-20070806/src/util.c
++++ tnftp-20070806/src/util.c
+@@ -422,7 +422,7 @@
+ 		else
+ 			fprintf(ttyout, "Name (%s): ", host);
+ 		errormsg = NULL;
+-		nlen = getline(stdin, tmp, sizeof(tmp), &errormsg);
++		nlen = ftp_getline(stdin, tmp, sizeof(tmp), &errormsg);
+ 		if (nlen < 0) {
+ 			fprintf(ttyout, "%s; %s aborted.\n", errormsg, "login");
+ 			code = -1;
+@@ -530,7 +530,7 @@
+ 	fprintf(ttyout, "(%s) ", prompt);
+ 	line[len++] = ' ';
+ 	errormsg = NULL;
+-	nlen = getline(stdin, line + len, sizeof(line)-len, &errormsg);
++	nlen = ftp_getline(stdin, line + len, sizeof(line)-len, &errormsg);
+ 	if (nlen < 0) {
+ 		fprintf(ttyout, "%s; %s aborted.\n", errormsg, "operation");
+ 		intr(0);
+@@ -1295,7 +1295,7 @@
+  *	-3	line was too long
+  */
+ int
+-getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
++ftp_getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
+ {
+ 	int	rv, ch;
+ 	size_t	len;
diff --git a/net-ftp/tnftp/files/tnftp-20090520-getline.patch b/net-ftp/tnftp/files/tnftp-20090520-getline.patch
new file mode 100644
index 000000000000..e9294beca3d7
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20090520-getline.patch
@@ -0,0 +1,109 @@
+--- tnftp-20090520/src/cmds.c
++++ tnftp-20090520/src/cmds.c
+@@ -181,7 +181,7 @@
+ 	while (1) {
+ 		fprintf(ttyout, "%s %s [anpqy?]? ", promptleft, promptright);
+ 		(void)fflush(ttyout);
+-		if (getline(stdin, cline, sizeof(cline), &errormsg) < 0) {
++		if (ftp_getline(stdin, cline, sizeof(cline), &errormsg) < 0) {
+ 			mflag = 0;
+ 			fprintf(ttyout, "%s; %s aborted\n", errormsg, cmd);
+ 			return (0);
+@@ -776,7 +776,7 @@
+ 	argv[0] = cmdbuf;
+ 	gmode = restart_point ? "r+" : "w";
+ 
+-	while (getline(fp, buf, sizeof(buf), NULL) >= 0) {
++	while (ftp_getline(fp, buf, sizeof(buf), NULL) >= 0) {
+ 		if (buf[0] == '\0')
+ 			continue;
+ 		argv[1] = buf;
+--- tnftp-20090520/src/extern.h
++++ tnftp-20090520/src/extern.h
+@@ -135,7 +135,7 @@
+ void	get(int, char **);
+ struct cmd *getcmd(const char *);
+ int	getit(int, char **, int, const char *);
+-int	getline(FILE *, char *, size_t, const char **);
++int	ftp_getline(FILE *, char *, size_t, const char **);
+ struct option *getoption(const char *);
+ char   *getoptionvalue(const char *);
+ void	getremoteinfo(void);
+--- tnftp-20090520/src/fetch.c
++++ tnftp-20090520/src/fetch.c
+@@ -193,7 +193,7 @@
+ 		fprintf(ttyout, "%s\n", uuser);
+ 	} else {
+ 		(void)fflush(ttyout);
+-		if (getline(stdin, uuser, sizeof(uuser), &errormsg) < 0) {
++		if (ftp_getline(stdin, uuser, sizeof(uuser), &errormsg) < 0) {
+ 			warnx("%s; can't authenticate", errormsg);
+ 			goto cleanup_auth_url;
+ 		}
+@@ -841,7 +841,7 @@
+ 		}
+ 
+ 				/* Read the response */
+-		len = getline(fin, buf, sizeof(buf), &errormsg);
++		len = ftp_getline(fin, buf, sizeof(buf), &errormsg);
+ 		if (len < 0) {
+ 			if (*errormsg == '\n')
+ 				errormsg++;
+@@ -865,7 +865,7 @@
+ 
+ 				/* Read the rest of the header. */
+ 		while (1) {
+-			len = getline(fin, buf, sizeof(buf), &errormsg);
++			len = ftp_getline(fin, buf, sizeof(buf), &errormsg);
+ 			if (len < 0) {
+ 				if (*errormsg == '\n')
+ 					errormsg++;
+@@ -1070,7 +1070,7 @@
+ 
+ 				fprintf(ttyout,
+ 				    "Authorization failed. Retry (y/n)? ");
+-				if (getline(stdin, reply, sizeof(reply), NULL)
++				if (ftp_getline(stdin, reply, sizeof(reply), NULL)
+ 				    < 0) {
+ 					goto cleanup_fetch_url;
+ 				}
+--- tnftp-20090520/src/main.c
++++ tnftp-20090520/src/main.c
+@@ -682,7 +682,7 @@
+ 					fprintf(ttyout, "%s ", p);
+ 			}
+ 			(void)fflush(ttyout);
+-			len = getline(stdin, line, sizeof(line), NULL);
++			len = ftp_getline(stdin, line, sizeof(line), NULL);
+ 			switch (len) {
+ 			case -1:	/* EOF */
+ 			case -2:	/* error */
+--- tnftp-20090520/src/util.c
++++ tnftp-20090520/src/util.c
+@@ -415,7 +415,7 @@
+ 		else
+ 			fprintf(ttyout, "Name (%s): ", host);
+ 		errormsg = NULL;
+-		nlen = getline(stdin, tmp, sizeof(tmp), &errormsg);
++		nlen = ftp_getline(stdin, tmp, sizeof(tmp), &errormsg);
+ 		if (nlen < 0) {
+ 			fprintf(ttyout, "%s; %s aborted.\n", errormsg, "login");
+ 			code = -1;
+@@ -523,7 +523,7 @@
+ 	fprintf(ttyout, "(%s) ", aprompt);
+ 	line[len++] = ' ';
+ 	errormsg = NULL;
+-	nlen = getline(stdin, line + len, sizeof(line)-len, &errormsg);
++	nlen = ftp_getline(stdin, line + len, sizeof(line)-len, &errormsg);
+ 	if (nlen < 0) {
+ 		fprintf(ttyout, "%s; %s aborted.\n", errormsg, "operation");
+ 		intr(0);
+@@ -1255,7 +1255,7 @@
+  *	-3	line was too long
+  */
+ int
+-getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
++ftp_getline(FILE *stream, char *buf, size_t buflen, const char **errormsg)
+ {
+ 	int	rv, ch;
+ 	size_t	len;
diff --git a/net-ftp/tnftp/files/tnftp-20090520-glibc-2.8-ARG_MAX.patch b/net-ftp/tnftp/files/tnftp-20090520-glibc-2.8-ARG_MAX.patch
new file mode 100644
index 000000000000..8c0f91a069e8
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20090520-glibc-2.8-ARG_MAX.patch
@@ -0,0 +1,22 @@
+glibc-2.8 no loner provides the ARG_MAX macro.
+
+--- tnftp-20090520/libnetbsd/glob.c
++++ tnftp-20090520/libnetbsd/glob.c
+@@ -55,6 +55,8 @@
+  *	Number of matches in the current invocation of glob.
+  */
+ 
++#include <unistd.h>
++
+ #include "tnftp.h"
+ 
+ #undef	TILDE			/* XXX: AIX 4.1.5 has this in <sys/ioctl.h> */
+@@ -720,7 +722,7 @@
+ 	}
+ 	pathv[pglob->gl_offs + pglob->gl_pathc] = NULL;
+ 
+-	if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= ARG_MAX) {
++	if ((pglob->gl_flags & GLOB_LIMIT) && (newsize + *limit) >= sysconf(_SC_ARG_MAX)) {
+ 		errno = 0;
+ 		return(GLOB_NOSPACE);
+ 	}
diff --git a/net-ftp/tnftp/files/tnftp-20090520-libedit.patch b/net-ftp/tnftp/files/tnftp-20090520-libedit.patch
new file mode 100644
index 000000000000..fa0509246ce1
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20090520-libedit.patch
@@ -0,0 +1,20 @@
+Completely disable external libedit support. When libedit is installed, the
+check will automatically add -ledit to LIBS and the result will be wrong
+strlcpy check results and linking failures.
+
+https://bugs.gentoo.org/198906
+
+--- tnftp-20090520/configure.ac
++++ tnftp-20090520/configure.ac
+@@ -84,10 +84,7 @@
+                       [termcap termlib curses ncurses tinfo],
+                       [],
+                       [AC_MSG_ERROR(
+-                           [no relevant library found containing tgetent])])
+-       AC_SEARCH_LIBS([el_init],
+-                      [edit],
+-                      [have_libedit=yes], [have_libedit=no])])
++                           [no relevant library found containing tgetent])])])
+ 
+ AC_SEARCH_LIBS([gethostbyname], [nsl])
+ AC_SEARCH_LIBS([socket],
diff --git a/net-ftp/tnftp/tnftp-20070806.ebuild b/net-ftp/tnftp/tnftp-20070806.ebuild
index 88cb5d1a120a..4f4d8d6088b2 100644
--- a/net-ftp/tnftp/tnftp-20070806.ebuild
+++ b/net-ftp/tnftp/tnftp-20070806.ebuild
@@ -1,6 +1,6 @@
-# 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/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.7 2008/06/15 18:39:45 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.8 2009/05/23 14:40:37 swegener Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="none"
@@ -27,6 +27,7 @@ src_unpack() {
 
 	epatch "${FILESDIR}"/${P}-libedit.patch
 	epatch "${FILESDIR}"/${P}-glibc-2.8-ARG_MAX.patch
+	epatch "${FILESDIR}"/${P}-getline.patch
 
 	eautoconf
 }
diff --git a/net-ftp/tnftp/tnftp-20090520.ebuild b/net-ftp/tnftp/tnftp-20090520.ebuild
new file mode 100644
index 000000000000..a2acbec9c04f
--- /dev/null
+++ b/net-ftp/tnftp/tnftp-20090520.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20090520.ebuild,v 1.1 2009/05/23 14:40:37 swegener Exp $
+
+WANT_AUTOCONF="2.5"
+WANT_AUTOMAKE="none"
+
+inherit eutils autotools
+
+DESCRIPTION="NetBSD FTP client with several advanced features"
+SRC_URI="ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/${P}.tar.gz
+	ftp://ftp.netbsd.org/pub/NetBSD/misc/${PN}/old/${P}.tar.gz"
+HOMEPAGE="ftp://ftp.netbsd.org/pub/NetBSD/misc/tnftp/"
+
+SLOT="0"
+LICENSE="as-is"
+KEYWORDS="~alpha ~amd64 ~ppc ~sparc ~x86 ~x86-fbsd"
+IUSE="ipv6 socks5"
+
+DEPEND=">=sys-libs/ncurses-5.1
+	socks5? ( net-proxy/dante )"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libedit.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.8-ARG_MAX.patch
+	epatch "${FILESDIR}"/${P}-getline.patch
+
+	eautoconf
+}
+
+src_compile() {
+	econf \
+		--enable-editcomplete \
+		$(use_enable ipv6) \
+		$(use_with socks5 socks) \
+		|| die "econf failed"
+	emake || die "emake failed"
+}
+
+src_install() {
+	newbin src/ftp tnftp || die "newbin failed"
+	newman src/ftp.1 tnftp.1 || die "newman failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
+}