From abcf87c553a18aec8372de7f690b5aa91a7a0d24 Mon Sep 17 00:00:00 2001
From: root <root@rshg054.dnsready.net>
Date: Mon, 26 Sep 2011 23:14:33 +0000
Subject: Mon Sep 26 23:14:33 UTC 2011

---
 community/filezilla/PKGBUILD       | 17 ++++++++++-------
 community/filezilla/gnutls-3.patch | 27 +++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 7 deletions(-)
 create mode 100644 community/filezilla/gnutls-3.patch

(limited to 'community/filezilla')

diff --git a/community/filezilla/PKGBUILD b/community/filezilla/PKGBUILD
index b9d467799..d81c7e6f8 100644
--- a/community/filezilla/PKGBUILD
+++ b/community/filezilla/PKGBUILD
@@ -1,21 +1,24 @@
-# $Id: PKGBUILD 54980 2011-08-29 11:06:13Z bluewind $
+# $Id: PKGBUILD 55926 2011-09-25 10:42:49Z bluewind $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=filezilla
 pkgver=3.5.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Fast and reliable FTP, FTPS and SFTP client"
 arch=('i686' 'x86_64')
 url="http://filezilla-project.org/"
 license=('GPL')
 depends=('dbus-core' 'xdg-utils' 'wxgtk' 'libidn' 'hicolor-icon-theme' 'sqlite3')
 install=filezilla.install
-source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2")
-md5sums=('8afb7aee4ba72b6363dcfe469bc7fbef')
+source=("http://downloads.sourceforge.net/project/filezilla/FileZilla_Client/${pkgver}/FileZilla_${pkgver}_src.tar.bz2"
+gnutls-3.patch)
+md5sums=('8afb7aee4ba72b6363dcfe469bc7fbef'
+'0646cf7d6f90766961724102cf2cebd6')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "${pkgname}-${pkgver}"
+  patch -p1 -i "$srcdir/gnutls-3.patch"
    ./autogen.sh
   ./configure \
     --prefix=/usr \
@@ -28,7 +31,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${pkgname}-${pkgver}"
 
-  make DESTDIR=${pkgdir} install
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/filezilla/gnutls-3.patch b/community/filezilla/gnutls-3.patch
new file mode 100644
index 000000000..88e4ac9e7
--- /dev/null
+++ b/community/filezilla/gnutls-3.patch
@@ -0,0 +1,27 @@
+Fix FS#25669
+
+Upstream bug: http://trac.filezilla-project.org/ticket/7742
+
+diff --git a/src/engine/tlssocket.cpp b/src/engine/tlssocket.cpp
+index e9a5105..7ddb1ae 100644
+--- a/src/engine/tlssocket.cpp
++++ b/src/engine/tlssocket.cpp
+@@ -97,7 +97,7 @@ bool CTlsSocket::Init()
+ 		return false;
+ 	}
+ 
+-	res = gnutls_priority_set_direct(m_session, "SECURE256:+CTYPE-X509:-CTYPE-OPENPGP", 0);
++	res = gnutls_priority_set_direct(m_session, "NORMAL:+CTYPE-X509:-CTYPE-OPENPGP", 0);
+ 	if (res)
+ 	{
+ 		LogError(res);
+@@ -113,7 +113,9 @@ bool CTlsSocket::Init()
+ 	gnutls_transport_set_push_function(m_session, PushFunction);
+ 	gnutls_transport_set_pull_function(m_session, PullFunction);
+ 	gnutls_transport_set_ptr(m_session, (gnutls_transport_ptr_t)this);
++#if GNUTLS_VERSION_MAJOR < 3
+ 	gnutls_transport_set_lowat(m_session, 0);
++#endif
+ 
+ 	m_shutdown_requested = false;
+ 
-- 
cgit v1.2.3-54-g00ecf