Version bump. Fix up double declaration of getline function.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

7 files changed, 322 insertions, 4 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/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"
+}