Version bump, mostly bugfixes. Also fixes a vulnerability regarding the way some errors are handled on SSL/TLS secured data transfers

Package-Manager: portage-2.2_rc8/cvs/Linux 2.6.26-gentoo x86_64

4 files changed, 13 insertions, 49 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index 98ae1aee41ae..be40112f280b 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.15 2008/07/23 19:46:11 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.16 2008/08/13 09:06:14 voyageur Exp $
+
+*filezilla-3.1.1.1 (13 Aug 2008)
+
+  13 Aug 2008; Bernard Cafarelli <voyageur@gentoo.org>
+  -filezilla-3.0.11.1.ebuild, -filezilla-3.1.0.ebuild,
+  +filezilla-3.1.1.1.ebuild:
+  Version bump, mostly bugfixes. Also fixes a vulnerability regarding the
+  way some errors are handled on SSL/TLS secured data transfers
 
 *filezilla-3.1.0 (23 Jul 2008)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 9164a4c4a6bf..5cdb690597b2 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -1,8 +1,6 @@
-DIST FileZilla_3.0.11.1_src.tar.bz2 2172349 RMD160 875a582e7ef22ab212610452f5f5d27fb6f94119 SHA1 ebad07a7ca8625a39647a850ae9b215958918edb SHA256 7504e60bbc9611e4914584a8751d6ec9c9f515d58efc2558497598abe3982e86
 DIST FileZilla_3.0.4_src.tar.bz2 1875419 RMD160 e615c0bebf1e93dc9a5d311856a351a238411961 SHA1 795c0754f6fbc6164e2ab6b25839b6010ddbfbb2 SHA256 2cb617a96c0ba145ee54c0c6a388fa2e735b9db9fba1b5f1fd76ec97c22b5801
-DIST FileZilla_3.1.0_src.tar.bz2 2409248 RMD160 7c62151f45a5ef617ddbf355d18969d01196f05b SHA1 52f08b262f1de8b7eed1f9df4b4f40ba71bbf198 SHA256 e7e6322410e626911b1e197a41e3640b7281d00a5c50c6be71aec901c04869f8
-EBUILD filezilla-3.0.11.1.ebuild 1050 RMD160 cbb1a3cac91b943b677cae740a40cf13de34103b SHA1 1f9c77527e49c152888f0181ebd0afb56b3d7f8c SHA256 4ed57a14135144a75193319d014a006a310fab4bc92cddc9961e4b96616da9ec
+DIST FileZilla_3.1.1.1_src.tar.bz2 2577107 RMD160 19976306e774a590e117bd1ee1a11bb870c3f5c8 SHA1 68787d69871810140bb5b83a8f6d2b931168fb63 SHA256 66ab5fa44fcb6f6d72fd2e5f064ddbb11f3e7d5ce8a6e3f3e1ccf9e35dc8a90c
 EBUILD filezilla-3.0.4.ebuild 1046 RMD160 1ab30d775ce6093bee506cb34c6bb4935737610e SHA1 3bcf0616da32b231f20da3e99489c3b5b2d7e1d7 SHA256 7374f4d1f15bcb26aa6174007f55f22992cd4491febe4749406724b8c446c885
-EBUILD filezilla-3.1.0.ebuild 1049 RMD160 d06a1ddd01b19affdbfe3173bada424b4698a499 SHA1 de00b576edd5af1883866e17c82519ef44f6f8ba SHA256 f18065592d1bfa0c36672ab1d3b7c7f3471bd8dfe64321ee2bad3fc69a9e68f3
-MISC ChangeLog 2633 RMD160 a39d4e6b47bccc9625ff89e18918d7ae7fe75d25 SHA1 d35752c68137dc96cdcb9c9bf80815789355cc0c SHA256 3e75521e8361e9a65cc09b71860cb3a7875969b8c7db81bf4cf6a7c28f5b706c
+EBUILD filezilla-3.1.1.1.ebuild 1051 RMD160 31bb4c3211d6633ce41a759a3f1bbaac8b139a15 SHA1 d6e44513f9b4e289dd7ae839c394047e1e42583e SHA256 09e6d1d5118355c981a9aae09c87f80eabdbfdf91e04574ca9b3fc4d5c2fae42
+MISC ChangeLog 2945 RMD160 066f9d0002fc93a4b1335acd3bedd1e8b8a98e1b SHA1 27bf9559cf6817c7700406919a54f66c4d4cf2f2 SHA256 5d5b80a8722167d572701dd47aca2b84cfb543784a438416d1cf079ad6a31efb
 MISC metadata.xml 439 RMD160 777e90ac25186a53c9ca6ee4cc32a272d9841e48 SHA1 b98ba90029186fcdf7d1716d27db919ba1fe293d SHA256 075b0c0d73cfd724cd58017dc5827f1d7502b77010fce101424b3201be734162
diff --git a/net-ftp/filezilla/filezilla-3.1.0.ebuild b/net-ftp/filezilla/filezilla-3.1.0.ebuild
deleted file mode 100644
index 613985f50fdc..000000000000
--- a/net-ftp/filezilla/filezilla-3.1.0.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.1.0.ebuild,v 1.1 2008/07/23 19:46:11 voyageur Exp $
-
-WX_GTK_VER="2.8"
-
-inherit eutils multilib wxwidgets
-
-MY_PV=${PV/_/-}
-MY_P="FileZilla_${MY_PV}"
-
-DESCRIPTION="FTP client with lots of useful features and an intuitive interface"
-HOMEPAGE="http://filezilla-project.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}_src.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-RDEPEND="net-dns/libidn
-	>=x11-libs/wxGTK-2.8.6
-	>=app-admin/eselect-wxwidgets-0.7-r1"
-DEPEND="${RDEPEND}
-	>=sys-devel/libtool-1.4
-	>=sys-devel/gettext-0.11
-	>=net-libs/gnutls-2.0.4"
-
-S="${WORKDIR}"/${PN}-${MY_PV}
-
-src_compile() {
-	econf || die "econf failed"
-	emake || die "emake failed"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-
-	doicon src/interface/resources/48x48/${PN}.png || die "doicon failed"
-
-	dodoc AUTHORS ChangeLog NEWS
-}
diff --git a/net-ftp/filezilla/filezilla-3.0.11.1.ebuild b/net-ftp/filezilla/filezilla-3.1.1.1.ebuild
index f0833c45ea59..f7b1f9aaed52 100644
--- a/net-ftp/filezilla/filezilla-3.0.11.1.ebuild
+++ b/net-ftp/filezilla/filezilla-3.1.1.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.0.11.1.ebuild,v 1.2 2008/07/13 19:35:18 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.1.1.1.ebuild,v 1.1 2008/08/13 09:06:14 voyageur Exp $
 
 WX_GTK_VER="2.8"