summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasatomo Nakano <nakano@gentoo.org>2003-10-16 15:34:22 +0000
committerMasatomo Nakano <nakano@gentoo.org>2003-10-16 15:34:22 +0000
commitacbd936e4d77ee0f899df033a8ae98f1b0f58672 (patch)
tree58ef0b4e4e38123e733350117251fafa1a5d69ea /net-ftp
parentcorrected the HOMEPAGE and SRC_URI (diff)
downloadhistorical-acbd936e4d77ee0f899df033a8ae98f1b0f58672.tar.gz
historical-acbd936e4d77ee0f899df033a8ae98f1b0f58672.tar.bz2
historical-acbd936e4d77ee0f899df033a8ae98f1b0f58672.zip
Fixed merging error when USE="cjk"
Diffstat (limited to 'net-ftp')
-rw-r--r--net-ftp/ncftp/ChangeLog6
-rw-r--r--net-ftp/ncftp/Manifest6
-rw-r--r--net-ftp/ncftp/ncftp-3.1.6.ebuild5
3 files changed, 10 insertions, 7 deletions
diff --git a/net-ftp/ncftp/ChangeLog b/net-ftp/ncftp/ChangeLog
index a40168e40d47..76e8f3a9509b 100644
--- a/net-ftp/ncftp/ChangeLog
+++ b/net-ftp/ncftp/ChangeLog
@@ -1,9 +1,13 @@
# 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.15 2003/10/16 06:42:17 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ChangeLog,v 1.16 2003/10/16 15:34:17 nakano Exp $
*ncftp-3.1.6 (16 Oct 2003)
+ 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.
+
16 Oct 2003; Nick Hadaway <raker@gentoo.org> ncftp-3.1.6.ebuild:
Version bump. This updates the previous exploit fix for better
compatibility with serv-u and wsftpd servers. Other bug fixes as
diff --git a/net-ftp/ncftp/Manifest b/net-ftp/ncftp/Manifest
index b76b597613b8..ee6b64c5b4ce 100644
--- a/net-ftp/ncftp/Manifest
+++ b/net-ftp/ncftp/Manifest
@@ -1,10 +1,10 @@
-MD5 9bf62132f5b74285766f19a65f68e441 ncftp-3.1.6.ebuild 876
MD5 95c94d48dd8cc0f95ba2d85f9ccc6dff ncftp-3.1.5.ebuild 714
MD5 2b348393b4c4c767bd252397132c68b0 ncftp-3.1.5-r1.ebuild 873
-MD5 604dbd739993e56285286c3dd84396f3 ChangeLog 2404
+MD5 fe1af651010207d16b38c387c78a867b ChangeLog 2565
MD5 c78fa853cce15e28757d3e5bd55924f3 ncftp-3.1.4.ebuild 740
+MD5 61cc2fdc728b5c288165de8627553f54 ncftp-3.1.6.ebuild 820
MD5 0db6823125a4957233d344c0455e359f files/digest-ncftp-3.1.4 68
MD5 1ed78febe5ab613c947af0f8e346b8b7 files/digest-ncftp-3.1.5 68
-MD5 44079b3a4d924512b9e87e2910eba144 files/digest-ncftp-3.1.6 141
MD5 8b3b76f500340f4728601c1c99bb04fe files/ncftp-3.1.5-cjk.patch 360
MD5 d1edfa09bc04caa12d915c678245c6b1 files/digest-ncftp-3.1.5-r1 141
+MD5 44079b3a4d924512b9e87e2910eba144 files/digest-ncftp-3.1.6 141
diff --git a/net-ftp/ncftp/ncftp-3.1.6.ebuild b/net-ftp/ncftp/ncftp-3.1.6.ebuild
index fe1d5f3ac152..65473a4bb81a 100644
--- a/net-ftp/ncftp/ncftp-3.1.6.ebuild
+++ b/net-ftp/ncftp/ncftp-3.1.6.ebuild
@@ -1,8 +1,8 @@
# 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.1 2003/10/16 06:42:17 raker Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/ncftp/ncftp-3.1.6.ebuild,v 1.2 2003/10/16 15:34:18 nakano Exp $
-IUSE="cjk ipv6"
+IUSE="ipv6"
S=${WORKDIR}/${P}
IPV6_P="ncftp-315-v6-20030207"
@@ -22,7 +22,6 @@ src_unpack() {
unpack ${P}-src.tar.bz2
cd ${S}
- use cjk && epatch ${FILESDIR}/${PV}-3.1.5-cjk.patch
use ipv6 && epatch ${DISTDIR}/${IPV6_P}.diff.gz
}