ver bump + security stable

8 files changed, 31 insertions, 55 deletions

diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index e841ca24d9cb..0eeeee41dea6 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,12 +1,21 @@
 # ChangeLog for net-ftp/ncftp
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.17 2003/10/18 01:51:00 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.18 2004/01/07 19:31:24 vapier Exp $
 
-  17 Oct 2003; Nick Hadaway <raker@gentoo.org> ncftp-3.1.6.ebuild:
-  The ipv6 patch has not been updated yet.  Removing for now.
+*ncftp-3.1.7 (07 Jan 2004)
+
+  07 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  Version bumpage.
 
 *ncftp-3.1.6 (16 Oct 2003)
 
+  07 Jan 2004; Mike Frysinger <vapier@gentoo.org> :
+  The ipv6 patch has been updated, add back in.  Also move to stable because
+  of security issue (sorry other arches).
+
+  17 Oct 2003; Nick Hadaway <raker@gentoo.org> ncftp-3.1.6.ebuild:
+  The ipv6 patch has not been updated yet.  Removing for now.
+
   16 Oct 2003; Masatomo Nakano <nakano@gentoo.org> ncftp-3.1.6.ebuild:
   Removed CJK patch because the patch is already included in 
   the original tar ball.
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.4 b/net-ftp/ncftp/files/digest-ncftp-3.1.4
deleted file mode 100644
index 9971cefc1750..000000000000
--- a/net-ftp/ncftp/files/digest-ncftp-3.1.4
+++ /dev/null
@@ -1 +0,0 @@
-MD5 605e735209ab30d0f129d079c06705e4 ncftp-3.1.4-src.tar.bz2 393303
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.5 b/net-ftp/ncftp/files/digest-ncftp-3.1.5
deleted file mode 100644
index 84a45f3c9d5e..000000000000
--- a/net-ftp/ncftp/files/digest-ncftp-3.1.5
+++ /dev/null
@@ -1 +0,0 @@
-MD5 686ee315742a34bd4132f0d077d2c172 ncftp-3.1.5-src.tar.bz2 394777
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.6 b/net-ftp/ncftp/files/digest-ncftp-3.1.6
index ea454bca1abc..08e24fbeaeac 100644
--- a/net-ftp/ncftp/files/digest-ncftp-3.1.6
+++ b/net-ftp/ncftp/files/digest-ncftp-3.1.6
@@ -1,2 +1,2 @@
 MD5 4324d913499dc735dca961618879d21a ncftp-3.1.6-src.tar.bz2 398301
-MD5 1fb8d9125cd6aa838aa2665e2bffb61a ncftp-315-v6-20030207.diff.gz 36109
+MD5 2b686272387ff23f5b05c9665d025434 ncftp-316-v6-20040106.diff.gz 36093
diff --git a/net-ftp/ncftp/files/digest-ncftp-3.1.7 b/net-ftp/ncftp/files/digest-ncftp-3.1.7
new file mode 100644
index 000000000000..7d39e8d7c563
--- /dev/null
+++ b/net-ftp/ncftp/files/digest-ncftp-3.1.7
@@ -0,0 +1,2 @@
+MD5 2a310a3c9ca126e6b409d0d1d1ccda75 ncftp-3.1.7-src.tar.bz2 397742
+MD5 2b686272387ff23f5b05c9665d025434 ncftp-316-v6-20040106.diff.gz 36093
diff --git a/net-ftp/ncftp/ncftp-3.1.4.ebuild b/net-ftp/ncftp/ncftp-3.1.4.ebuild
deleted file mode 100644
index d0ebcae563c2..000000000000
--- a/net-ftp/ncftp/ncftp-3.1.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2003 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.4.ebuild,v 1.8 2003/02/13 14:05:18 vapier Exp $
-
-
-S=${WORKDIR}/${P}
-DESCRIPTION="An extremely configurable ftp client"
-SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2"
-HOMEPAGE="http://www.ncftp.com/"
-DEPEND="virtual/glibc
-	>=sys-libs/ncurses-5.2"
-
-SLOT="0"
-LICENSE="Clarified-Artistic"
-KEYWORDS="x86 ppc sparc alpha"
-
-src_compile() {
-
-	econf || die
-	emake || die
-}
-
-src_install() {
-	dodir /usr/share
-	make prefix=${D}/usr mandir=${D}/usr/share/man install || die
-
-	dodoc CHANGELOG FIREWALL-PROXY-README LICENSE.txt
-	dodoc READLINE-README README WHATSNEW-3.0
-}
diff --git a/net-ftp/ncftp/ncftp-3.1.6.ebuild b/net-ftp/ncftp/ncftp-3.1.6.ebuild
index 3b1e166a7a7c..ce76b7e23f7e 100644
--- a/net-ftp/ncftp/ncftp-3.1.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.6.ebuild
@@ -1,28 +1,24 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.6.ebuild,v 1.3 2003/10/18 01:51:00 raker Exp $
-
-IUSE="" #ipv6
-
-S=${WORKDIR}/${P}
-#IPV6_P="ncftp-315-v6-20030207"
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.6.ebuild,v 1.4 2004/01/07 19:31:24 vapier Exp $
 
+IPV6_P="ncftp-316-v6-20040106"
 DESCRIPTION="An extremely configurable ftp client"
-SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2"
-#ipv6? ( ftp://ftp.cc.chuo-u.ac.jp/pub/IPv6/kame/misc/${IPV6_P}.diff.gz )"
+SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2
+	ipv6? ( ftp://ftp.cc.chuo-u.ac.jp/pub/IPv6/kame/misc/${IPV6_P}.diff.gz )"
 HOMEPAGE="http://www.ncftp.com/"
 
-SLOT="0"
 LICENSE="Clarified-Artistic"
+SLOT="0"
 KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+IUSE="ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
-	unpack ${P}-src.tar.bz2
+	unpack ${A}
 	cd ${S}
-
-	#use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
+	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
 }
 
 src_install() {
diff --git a/net-ftp/ncftp/ncftp-3.1.5.ebuild b/net-ftp/ncftp/ncftp-3.1.7.ebuild
index 69ab1859685c..1cea3e5c8204 100644
--- a/net-ftp/ncftp/ncftp-3.1.5.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.7.ebuild
@@ -1,24 +1,24 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.5.ebuild,v 1.12 2003/09/07 00:12:23 msterret Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.7.ebuild,v 1.1 2004/01/07 19:31:24 vapier Exp $
 
-IUSE="cjk"
-S=${WORKDIR}/${P}
+#IPV6_P="ncftp-316-v6-20040106"
 DESCRIPTION="An extremely configurable ftp client"
 SRC_URI="ftp://ftp.ncftp.com/ncftp/${P}-src.tar.bz2"
+#	ipv6? ( ftp://ftp.cc.chuo-u.ac.jp/pub/IPv6/kame/misc/${IPV6_P}.diff.gz )"
 HOMEPAGE="http://www.ncftp.com/"
 
-SLOT="0"
 LICENSE="Clarified-Artistic"
-KEYWORDS="x86 ~ppc sparc alpha hppa amd64"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha ~hppa"
+IUSE="" #ipv6"
 
 DEPEND=">=sys-libs/ncurses-5.2"
 
 src_unpack() {
-	unpack ${P}-src.tar.bz2
+	unpack ${A}
 	cd ${S}
-
-	use cjk && epatch ${FILESDIR}/${P}-cjk.patch
+#	use ipv6 && epatch ${WORKDIR}/${IPV6_P}.diff
 }
 
 src_install() {