Version bump, rejects Diffie-Hellman Groups smaller than 1024 bits when using FTP over TLS (Logjam vulnerability)

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0x00F7AB331B0F097F

3 files changed, 79 insertions, 2 deletions

diff --git a/net-ftp/filezilla/ChangeLog b/net-ftp/filezilla/ChangeLog
index fa60d07be525..61a6132f8a4a 100644
--- a/net-ftp/filezilla/ChangeLog
+++ b/net-ftp/filezilla/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-ftp/filezilla
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.124 2015/05/20 13:27:34 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/ChangeLog,v 1.125 2015/05/22 15:45:33 voyageur Exp $
+
+*filezilla-3.11.0.1 (22 May 2015)
+
+  22 May 2015; Bernard Cafarelli <voyageur@gentoo.org>
+  +filezilla-3.11.0.1.ebuild:
+  Version bump, rejects Diffie-Hellman Groups smaller than 1024 bits when using
+  FTP over TLS (Logjam vulnerability)
 
 *filezilla-3.11.0 (20 May 2015)
 
diff --git a/net-ftp/filezilla/Manifest b/net-ftp/filezilla/Manifest
index 253623fe6ef8..3e7a9f9761db 100644
--- a/net-ftp/filezilla/Manifest
+++ b/net-ftp/filezilla/Manifest
@@ -4,6 +4,7 @@ AUX filezilla-3.7.4-debug.patch 404 SHA256 11ff65c718b4dce0b80a8263a7342d7ff2956
 DIST FileZilla_3.10.1.1_src.tar.bz2 4572160 SHA256 67dbd801b15edd446f35b8df093a24440b5fd41966928d018f03f81db12e636d SHA512 92ecf8a7943975b218ee44d24dcb7dde937125ba056059eed2b7217416269d73e8ed50fc79258cb544606e7949cb7c4ff6aedd27095e083d5ac645a27c5cd068 WHIRLPOOL 56a7be2cdd33b776e41546fcb6e4781e3689ea482a01242b9e096cef782cba6e5f49747d0626f3dc124203d2d7a6421c5706290e91322823f29b2197b310b54d
 DIST FileZilla_3.10.2_src.tar.bz2 4232889 SHA256 c08ee3bff4ce35010a5f32610ef699081662c9f8c51c20740f719e653ce9b611 SHA512 20a0c31d5600a935d6fb4b8166446f45aa90ba90a0548ba6a39dc0c720f353b25b915b6aecd21752a8cd6ca7352489a53760476ecc70c9ab5e5ae50d0aa2f42f WHIRLPOOL 15c453e3e397ad829dda8a088cb74bb21238dcdf26dff8f9dafc5bbf3c886f35138b7e06a1eddb791d29abf13960eee4f5739a23f137c34d5a4db5f5b439cd4d
 DIST FileZilla_3.10.3_src.tar.bz2 4430113 SHA256 7968e2799437c0b89741bd7afbc077156525d930e9a18543fd087fbd8979de8d SHA512 74d30ba80ed6976283ec9d48612220c940e2cba5eb29fc4526369c30c2df8a8ad48dc7e477509d4dac53160c199e12871af9d06a7a13899192cc86322e5997f3 WHIRLPOOL 201b0235a2f9539a260170871399492f20a4426004de092ca45edc52f55777222e896768e0b3d9ac9755e872500315f546d2678cd7a9a098451d471191594aeb
+DIST FileZilla_3.11.0.1_src.tar.bz2 4434678 SHA256 0309d5fbb12988a615b7e57eaf5a1b3ffad23ea4cc0e932d9ddea185fdd44c72 SHA512 b0ac96fe29e219a6fe0cab63616980de6b5e89cbc489ffffa4d4843c1f9790e52e6bfc75cec55653ca77ba0474a1f7e5b20d79d6bfc2ea6ebc56232ed626ccea WHIRLPOOL d54e19da26d74e80bf5febcc9f1465f1ca79ad5e1990a7a97f9a4c4f1759eb49741ea4d43b9dbd59d146054496b80a8ac483c98d7db68cd50b546e7367041849
 DIST FileZilla_3.11.0_src.tar.bz2 4434986 SHA256 2568a249556c87188bef47e7b8a1247d035785a005c6ad61f31e2fb212228db6 SHA512 46b9450702b5b98c8c96da37a1a60e8aef7ece43d5f8dd2b18c439afd311e7965febc2817bf8c4c605a8955a1ad0bc1ccac069c280f5548aa9302ef3b7a5c17e WHIRLPOOL 58f261da11381ce08aa01db6773084779bcf2fff156bbbb65457cc524c284cb0cc7b353f9b019bffac2de511d69200a5f8acba0439f3edb7fda8504abe0ce012
 DIST FileZilla_3.7.3_src.tar.bz2 3682494 SHA256 2b012970a6033d8ffd4629b1d57b50ace62cd3750efad70001109f25e520c042 SHA512 b20ec013110e643dd0afca960b4577dd4f17ae744caf63be64e0c8435b8812064aebb4167d0efb186ba171b26967bbc61b6b22a8866b2460530f5793d7d5ecfb WHIRLPOOL acfceb3976f53abcce8da25ea1358761ee6e1a5f556e335067ed665b710fb4a873cce4f62916a19ec784a542db367bed9380a17df37c6ae200fa52e5cd7cc910
 DIST FileZilla_3.8.1_src.tar.bz2 4089186 SHA256 66bc9c082843ffdcb915c7902900b92bdf921ed7310f2a40ff6b96b03cfa1e4f SHA512 abe4b653ac0627f1dda8ae7b6bb3d1a92454b98ce69f6eb6fcced2e63b5d35edba578ba24f06b16218fcfd23edff21cc7c76fe1c7056efb129b081fddbd83101 WHIRLPOOL 94db8545244d1cd4bf0c3f4ed1daaabf150df262334c2311196b916a1d84d06026aa34707ce7d4e74a575a7eda18cb2da4c5e326d591bdc4bf71b69a6935fff9
@@ -12,10 +13,11 @@ DIST FileZilla_3.9.0.6_src.tar.bz2 4181121 SHA256 ce7f56b383fa59dc55b16d8695e9f0
 EBUILD filezilla-3.10.1.1.ebuild 1729 SHA256 59e9a0083966dbf193977dfac5e550eb477e38ba64904f4a3bd21f4510ef1126 SHA512 7fec1434a1a51596a858cd46ba5e65d6574e291f43c9d1acebff8a0340b53f7821d9f4fafa2f6e078a86415f6d88cc1f39ae7ac4acd725f5b99f101f3c912b22 WHIRLPOOL 40222d678666e87e38b887014fd73a28ab132f38f08f4972f0564a180dd625201f1e6e1ded9a6feab4b646983e6772f940c79736c8f8ae301c938a89a51cb9f9
 EBUILD filezilla-3.10.2.ebuild 1728 SHA256 72c26309bf095789efb6b4f309e9a6cce23155634cf8eb72f94267075f217731 SHA512 4d801a0c1994196eb40bddcfc8e0691e39fb0d7dd741fe2b46b0af75be4e960b5ee6d1b012dc4cab00fc6933d76e3a48b2e4e21c548610d57ab037e9100617b2 WHIRLPOOL e1eddf26c59588d3352d5004e4d5f4468339fd84e464abf90103956ba5142f43ab432ea6e2a3b3a8f1a5ce186980682d091d29e780e8e826c156b30bc36fda26
 EBUILD filezilla-3.10.3.ebuild 1728 SHA256 28d387550db76171e5534e6e4432d6022bf466f247265f175479e44a5e717783 SHA512 59ef1c471447ca62b052e91f10265b68b972a996572dbc062b63fcc436f35aedb8069476f5d38815bbdbc9f2fc1980620f1e3bbc0438e5dbb1c8fde46dcf79f0 WHIRLPOOL 4cdae72635a69f5ec535c25fcb61aa35dae11f7e4b96a6441121330fe1271d1753d8d043380b73a15bb4bf2a8bd6b79b333d0d4c6ed206b9741866a42c52521b
+EBUILD filezilla-3.11.0.1.ebuild 1735 SHA256 6f16951419b020c6401fe8d8fb884b384fe083755d0ac18ec30a0eb448cada95 SHA512 6800d3726b3ec3c3f444e37792b22a8f6a8a8591bb95178c24a1b4acfe6fdb9ccc657cb616b2a13601f29bd8d5d2d760ab56e2c73145c7795496e9ce9a03543f WHIRLPOOL df7304eeb60c7be096863c80f20fc5e2372dcefea4c982f67f157e42a770ba6ca1337faf07c7f085ac83bcf78011fe0edfe947353427d8ddde82a0fe39f19a4f
 EBUILD filezilla-3.11.0.ebuild 1733 SHA256 6a91ac68346ccf36ba386aebc38ffee6ba4b16ff7f05047c135d6eed9fea8682 SHA512 cbaae2ef78af03ab26e1a8faa3a4556630f6a4dcf0970cc404a708bb5ba0b76fbd9071189d94f5bad6a0f3b0748be7a48582c3d0a89fd612a4d9955c23f06a6d WHIRLPOOL b5121656a73bf28ec5ed2bdeb2a770787dfdb347b3bb4067b646d6c66d733d7cb7e720ab07b9d8e3f6f4f8795aab699b3b1b38bf5cf7f0580b87809c229f760a
 EBUILD filezilla-3.7.3.ebuild 1715 SHA256 0f3a8958ff45d2eb7c007bd5a124f9677bdd8b7e825735ff55a5b1ffceed5ed1 SHA512 80290919b9da95c9ec90b9dfc508a479ae98219899fc4383aa9b8cb08710bc5fda259975fbe04274ad786a17ebfb2bbf720567fe5c91863c43445c94909e419b WHIRLPOOL 4d794d2e5a759ba31aca23462ea015af5772fc737b79e42d51a4916545a7d1a58d2d31f7c2af47f6e892d0d51bda7bd7653f931a85e891f726976ed2f7dbcc82
 EBUILD filezilla-3.8.1.ebuild 1718 SHA256 e2136ffbd25325aa156ccf99c43bb9641e863d0265e55c62f424e3e5dde5519a SHA512 1af826502a7cea5721fefdab9cbe04ea0df836735561abb529d0eba281c5d80525881dcf99710c1f106efdf345f5edaeea170f8abdb54589024c64ecd2dc9795 WHIRLPOOL 02873d525a472192755c3a6ff377bbb4dfbdc873697efd45ac98c3a2f42164bc25e167b3bea20b025adee40cafdc2b63227e387df706651d3281c9b01c1030a0
 EBUILD filezilla-3.9.0.5.ebuild 1718 SHA256 4d489eb1835292034b506dd670b5c70ecb16066e7b69da435d70adabd24efad3 SHA512 5b709fc874eabe1a7ecc87e04054f8fffe79f24d6afa8371abe9d1f66c4ce3883abbe0b65fbd9b5cf253567c41ca983e3d03be00eeac898a2e5efe95e559d4a8 WHIRLPOOL 3af8eb00d2c0512d5156f6be619bdf1379a29c0fe75409dab1e84fd10edd0fc43eee805e184430f1216cbfb4905a9b46884294c7dc2980f7792b3470ea4f1be2
 EBUILD filezilla-3.9.0.6.ebuild 1718 SHA256 b382a25c5056de8a09489831da4e69c5b39474b7c876e44204503cd4876be7f1 SHA512 b5af00fb082b7bb382ec561e87e447d6845eb02741d29444bde39450721cd737a3a82f1ef5581b1f7dc048a6b2aed93048bf06675c42f4c358ac164393fb9667 WHIRLPOOL 7b1b77c73021204a4bb4b9e35c6df607130e42af5494ecb97cbf4fd1c630e56bc3f21902f034a335c168e78a070b50414a1f7a4484a743b078711837741f0049
-MISC ChangeLog 21767 SHA256 861ad256852ab6d3ad32bea92cf60369ab1f524992f2532c7f96c2910a570aff SHA512 dd5a209b40dfe711d6431eeb8fdafa07e728562dd351746591d0d1e83e0b84907d4baa4584fc9839479ee1843a6c5b8c98bd771009de7acad7a02a1524882032 WHIRLPOOL f208e7276bc2c622a40ea87eed638ec6667b3ecf4e59ebe2eb33c85a720ae3979ebdbd73a8343cab44bdb22503250b46dadc321104173d1a78b45471abd08ffc
+MISC ChangeLog 22006 SHA256 08870da4ed7678fd3e11de843546cb87caac4923bc263ffab0e0f84368b26ded SHA512 5741a2e89c641bdd1b05e14b7589a778bd68c62fb72ce70a8a06768e2cae5564419a6c082244ab8ef810e53b83d1fb2a27e346044b4284d88cc7da8d2893f71f WHIRLPOOL de55f8948056f48e75538e586ae59baee5efd52811c83fb714aa53eae60b07f3f6d2b7a03d90de5030d2630f0397f51fd0c989e403e38c8ac7ddba4a17579dc8
 MISC metadata.xml 358 SHA256 13ba819a417c003a969b6557fd32a73ed49be658c3e0470c29a21ee807d5a28b SHA512 8008462bcccc0b22ea71170427d3318b3f403ad324bd3d2207b35b2344a5822b2b1c82c7cb379b99a08707853477a0887c65684c0b5de93b6782ae863569c373 WHIRLPOOL 5dac2fceebc89a40318fbc2ef5c3501c7726228afe431b455d6e6d485b9f3d51f2f8496abe91d2364733b82372a68e678d23e319ba7986830448ce7bd3e9cbbe
diff --git a/net-ftp/filezilla/filezilla-3.11.0.1.ebuild b/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
new file mode 100644
index 000000000000..c41473a40135
--- /dev/null
+++ b/net-ftp/filezilla/filezilla-3.11.0.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/filezilla/filezilla-3.11.0.1.ebuild,v 1.1 2015/05/22 15:45:33 voyageur Exp $
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+inherit autotools eutils flag-o-matic 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 ~arm ~ia64 ~ppc ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos"
+IUSE="aqua dbus nls test"
+
+RDEPEND=">=app-eselect/eselect-wxwidgets-0.7-r1
+	>=dev-db/sqlite-3.7
+	>=dev-libs/tinyxml-2.6.1-r1[stl]
+	net-dns/libidn
+	>=net-libs/gnutls-3.1.12
+	aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[aqua] )
+	!aqua? ( >=x11-libs/wxGTK-3.0.2.0-r1:3.0[X] x11-misc/xdg-utils )
+	dbus? ( sys-apps/dbus )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	>=sys-devel/libtool-1.4
+	nls? ( >=sys-devel/gettext-0.11 )
+	test? ( dev-util/cppunit )"
+
+S="${WORKDIR}"/${PN}-${MY_PV}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.10.2-debug.patch
+	append-cppflags -DTIXML_USE_STL
+	eautoreconf
+}
+
+src_configure() {
+	econf $(use_with dbus) $(use_enable nls locales) \
+		--with-tinyxml=system \
+		--disable-autoupdatecheck
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	doicon src/interface/resources/48x48/${PN}.png
+
+	dodoc AUTHORS ChangeLog NEWS
+
+	if use aqua ; then
+		cat > "${T}/${PN}" <<-EOF
+			#!${EPREFIX}/bin/bash
+			open "${EPREFIX}"/Applications/FileZilla.app
+		EOF
+		rm "${ED}/usr/bin/${PN}" || die
+		dobin "${T}/${PN}"
+		insinto /Applications
+		doins -r "${S}"/FileZilla.app
+	fi
+}