Add a patch to fix linking failure, bug #198906.

Package-Manager: portage-2.1.3.19

6 files changed, 97 insertions, 30 deletions

diff --git a/net-ftp/tnftp/ChangeLog b/net-ftp/tnftp/ChangeLog
index 175437894583..45d527309a1f 100644
--- a/net-ftp/tnftp/ChangeLog
+++ b/net-ftp/tnftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/tnftp
-# Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.24 2007/08/06 17:18:41 swegener Exp $
+# Copyright 2000-2008 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/ChangeLog,v 1.25 2008/01/01 19:20:17 swegener Exp $
+
+  01 Jan 2008; Sven Wegener <swegener@gentoo.org>
+  +files/tnftp-20050625-libedit.patch, +files/tnftp-20070806-libedit.patch,
+  tnftp-20050625-r1.ebuild, tnftp-20070806.ebuild:
+  Add a patch to fix linking failure, bug #198906.
 
 *tnftp-20070806 (06 Aug 2007)
 
diff --git a/net-ftp/tnftp/Manifest b/net-ftp/tnftp/Manifest
index 96b67d27b8c3..7a79e231cf01 100644
--- a/net-ftp/tnftp/Manifest
+++ b/net-ftp/tnftp/Manifest
@@ -1,20 +1,25 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX tnftp-20050625-libedit.patch 594 RMD160 c1305f1ad910f06cf85b54f4c3d2157c7a894922 SHA1 41aba49506a073d0e4d5cc16603ebd6002714a7e SHA256 d33a9a3e39726f697041ebc6331731eab53d0f3995d47eeba1ee161d4086c512
+MD5 b5cdb21ef1c86aa25ef53a99652d0c2f files/tnftp-20050625-libedit.patch 594
+RMD160 c1305f1ad910f06cf85b54f4c3d2157c7a894922 files/tnftp-20050625-libedit.patch 594
+SHA256 d33a9a3e39726f697041ebc6331731eab53d0f3995d47eeba1ee161d4086c512 files/tnftp-20050625-libedit.patch 594
+AUX tnftp-20070806-libedit.patch 792 RMD160 70f2d65251b2d92a5dfc3f99bd612bb44c2aa5a9 SHA1 a008b2604288c4a00c2e7c39e41777fe1820116f SHA256 c323bf381e5bd9f128114bc9bd7722bc950f5e42e59030162d03cb2da62430ab
+MD5 9f462de6327b1c6746cc07cdd9eaa238 files/tnftp-20070806-libedit.patch 792
+RMD160 70f2d65251b2d92a5dfc3f99bd612bb44c2aa5a9 files/tnftp-20070806-libedit.patch 792
+SHA256 c323bf381e5bd9f128114bc9bd7722bc950f5e42e59030162d03cb2da62430ab files/tnftp-20070806-libedit.patch 792
 DIST tnftp-20050625.tar.gz 313915 RMD160 74a310cf0e28cbc183141aff277458e35df1295a SHA1 1dd0996775755000686b59f5c2fbdb0ecaadfff7 SHA256 6194383702bfef8d7731660f9359c5946e2ba8176df9382ae39584942a28d6b3
 DIST tnftp-20070806.tar.gz 371223 RMD160 f70a9de5c87736aa98693a1808be5db76cdc97b0 SHA1 b6dad820e71412bd52f2c4a4ccaa7a2b62c3a22f SHA256 ee0d6c77a74bcb5edf904a7ea97bb9c023007c76bc741f22dc197b9938372a87
-EBUILD tnftp-20050625-r1.ebuild 920 RMD160 8ffa92faaf35154a7ccf92eb74d2a99545376b88 SHA1 cd21046aa67a54c28796c81254d0e8e4bd0fbae6 SHA256 7aa0e74f2bc2d13afaddc690bbf48c74184950e908d58ee0e27d62f6b2472a5a
-MD5 f935e8d0fb7d433c654a1b4e749cee6a tnftp-20050625-r1.ebuild 920
-RMD160 8ffa92faaf35154a7ccf92eb74d2a99545376b88 tnftp-20050625-r1.ebuild 920
-SHA256 7aa0e74f2bc2d13afaddc690bbf48c74184950e908d58ee0e27d62f6b2472a5a tnftp-20050625-r1.ebuild 920
-EBUILD tnftp-20070806.ebuild 986 RMD160 d7219918eb6ab6c97ecc7baeb44f92dd627d87a3 SHA1 975e512e948780a30f853fa12bb5f1aa7a61ffbe SHA256 5972fc2291daba805e1d5c9479233ea1d2be954a99e04d04baab59c56f3abe0f
-MD5 59a663808ed07b65c778e694b8cb489d tnftp-20070806.ebuild 986
-RMD160 d7219918eb6ab6c97ecc7baeb44f92dd627d87a3 tnftp-20070806.ebuild 986
-SHA256 5972fc2291daba805e1d5c9479233ea1d2be954a99e04d04baab59c56f3abe0f tnftp-20070806.ebuild 986
-MISC ChangeLog 3236 RMD160 f6065316fb1d5a632f62ecd9264287e364f92717 SHA1 b81c4800940420ce083cf81556cf9258cb974d5d SHA256 af5aeb88dd958cacf20019abb0e4dbd7ea956edb046cfe29adb545d0af26e7f8
-MD5 617a9e77eed5aaf6a1754627e17cb493 ChangeLog 3236
-RMD160 f6065316fb1d5a632f62ecd9264287e364f92717 ChangeLog 3236
-SHA256 af5aeb88dd958cacf20019abb0e4dbd7ea956edb046cfe29adb545d0af26e7f8 ChangeLog 3236
+EBUILD tnftp-20050625-r1.ebuild 1076 RMD160 d574e77a82b05fe31100e506b10117b4a23f8fe3 SHA1 4cf394cf560587d644dfeecfb07974280a86adc2 SHA256 f3f2bc49651b569ea6bb6c2b78df5ef8a6f3d586eaf0fb67c5c55c2050889133
+MD5 9ab2bf5dbb59342e176b1a6d1e645e74 tnftp-20050625-r1.ebuild 1076
+RMD160 d574e77a82b05fe31100e506b10117b4a23f8fe3 tnftp-20050625-r1.ebuild 1076
+SHA256 f3f2bc49651b569ea6bb6c2b78df5ef8a6f3d586eaf0fb67c5c55c2050889133 tnftp-20050625-r1.ebuild 1076
+EBUILD tnftp-20070806.ebuild 1142 RMD160 e19557cd66dcf1994b961f519ab2748f8e614129 SHA1 14bbbac260e90f1d44be37a297906eb9620eb575 SHA256 08184f936671b40c4e838079f8658f6664a3eafbe189b35f4336c8922043b722
+MD5 93e3747abd11d33e3943f778175bdf42 tnftp-20070806.ebuild 1142
+RMD160 e19557cd66dcf1994b961f519ab2748f8e614129 tnftp-20070806.ebuild 1142
+SHA256 08184f936671b40c4e838079f8658f6664a3eafbe189b35f4336c8922043b722 tnftp-20070806.ebuild 1142
+MISC ChangeLog 3465 RMD160 3d56d890904969995fff773137088a2bab818257 SHA1 24e99a64360fdce29f25ff5b9562b5d7284f8a1f SHA256 797dcca00bcddcf5c84012019217add2363ac3c3055988160f73e34cab726daf
+MD5 8e8a8afffa7e7b3bf49b4069869771df ChangeLog 3465
+RMD160 3d56d890904969995fff773137088a2bab818257 ChangeLog 3465
+SHA256 797dcca00bcddcf5c84012019217add2363ac3c3055988160f73e34cab726daf ChangeLog 3465
 MISC metadata.xml 298 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 SHA1 a51489bc5de3f67a0183720f9425adb2cba0e3ef SHA256 fa6086e7352367eeb9b96d059ab58bca3bd6fde533180cd5551280c808535fc9
 MD5 1f7353efef0082c74884b4a97c1191ba metadata.xml 298
 RMD160 60625e202ed0ef00f82e7d7e5bf05b4412526f36 metadata.xml 298
@@ -25,10 +30,3 @@ SHA256 d5deebc39bded3a39d1df3638b4537bc0b1d7bf74266daecc0861db4df2b6eb2 files/di
 MD5 d0269e884a97e460282382a306d859bc files/digest-tnftp-20070806 244
 RMD160 afeb74644c10f662b240dbd60c29357a47b2f583 files/digest-tnftp-20070806 244
 SHA256 c4f4d75a5c7fa9d06cf4032e0719af3a1220f75e2e137e5f4cbbb9e3b26627a8 files/digest-tnftp-20070806 244
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.5 (GNU/Linux)
-
-iD8DBQFGt1f6I1lqEGTUzyQRArbTAJ464dYnnPWQxYXu2wCiPtXfWtN0bACdGRmu
-cljl9BgZp8o1kVo1aDLS/jk=
-=YIj6
------END PGP SIGNATURE-----
diff --git a/net-ftp/tnftp/files/tnftp-20050625-libedit.patch b/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
new file mode 100644
index 000000000000..25b05f02107c
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20050625-libedit.patch
@@ -0,0 +1,16 @@
+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-20050625/configure.in
++++ tnftp-20050625/configure.in
+@@ -40,7 +40,6 @@
+ if test $opt_editcomplete = yes; then
+ 	AC_SEARCH_LIBS(tgetent, [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])
+ fi
+ AC_LIBRARY_NET
+ AC_LIBRARY_SOCKS
diff --git a/net-ftp/tnftp/files/tnftp-20070806-libedit.patch b/net-ftp/tnftp/files/tnftp-20070806-libedit.patch
new file mode 100644
index 000000000000..235f4fd4b61e
--- /dev/null
+++ b/net-ftp/tnftp/files/tnftp-20070806-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-20070806/configure.ac
++++ tnftp-20070806/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-20050625-r1.ebuild b/net-ftp/tnftp/tnftp-20050625-r1.ebuild
index 35a38158ce85..e39cd7e0bf2c 100644
--- a/net-ftp/tnftp/tnftp-20050625-r1.ebuild
+++ b/net-ftp/tnftp/tnftp-20050625-r1.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625-r1.ebuild,v 1.5 2007/04/16 22:36:32 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20050625-r1.ebuild,v 1.6 2008/01/01 19:20:17 swegener Exp $
+
+WANT_AUTOCONF="2.1"
+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
@@ -15,6 +20,15 @@ IUSE="ipv6"
 DEPEND=">=sys-libs/ncurses-5.1"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libedit.patch
+
+	eautoconf
+}
+
 src_compile() {
 	econf \
 		--enable-editcomplete \
@@ -26,5 +40,5 @@ src_compile() {
 src_install() {
 	newbin src/ftp tnftp || die "newbin failed"
 	newman src/ftp.1 tnftp.1 || die "newman failed"
-	dodoc COPYING ChangeLog README THANKS || die "dodoc failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
 }
diff --git a/net-ftp/tnftp/tnftp-20070806.ebuild b/net-ftp/tnftp/tnftp-20070806.ebuild
index 3b6388cc0e72..ded05157cb35 100644
--- a/net-ftp/tnftp/tnftp-20070806.ebuild
+++ b/net-ftp/tnftp/tnftp-20070806.ebuild
@@ -1,6 +1,11 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 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.1 2007/08/06 17:18:41 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/tnftp/tnftp-20070806.ebuild,v 1.2 2008/01/01 19:20:17 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
@@ -16,6 +21,15 @@ DEPEND=">=sys-libs/ncurses-5.1
 	socks5? ( net-proxy/dante )"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-libedit.patch
+
+	eautoconf
+}
+
 src_compile() {
 	econf \
 		--enable-editcomplete \
@@ -28,5 +42,5 @@ src_compile() {
 src_install() {
 	newbin src/ftp tnftp || die "newbin failed"
 	newman src/ftp.1 tnftp.1 || die "newman failed"
-	dodoc COPYING ChangeLog README THANKS || die "dodoc failed"
+	dodoc ChangeLog README THANKS || die "dodoc failed"
 }