Source Mage code commit list

[Ladislav Hagara <scm AT sourcemage.org>]

GIT changes to master grimoire by Ladislav Hagara <hgr AT vabo.cz>:

 dev/null                                      |binary
 ftp/filezilla/DETAILS                         |    2 +-
 ftp/filezilla/FileZilla_3.5.2_src.tar.bz2.sig |    0 
 ftp/filezilla/FileZilla_3.5.3_src.tar.bz2.sig |binary
 ftp/filezilla/HISTORY                         |    4 ++++
 ftp/filezilla/PRE_BUILD                       |    4 ----
 ftp/filezilla/gnutls3.patch                   |   23 -----------------------
 7 files changed, 5 insertions(+), 28 deletions(-)

New commits:
commit 36b68ddbab5858d405588a72484400b85eb27171
Author: Ladislav Hagara <hgr AT vabo.cz>
Commit: Ladislav Hagara <hgr AT vabo.cz>

    filezilla 3.5.3

diff --git a/ftp/filezilla/DETAILS b/ftp/filezilla/DETAILS
index a0ce3a2..385f18f 100755
--- a/ftp/filezilla/DETAILS
+++ b/ftp/filezilla/DETAILS
@@ -1,5 +1,5 @@
            SPELL=filezilla
-         VERSION=3.5.2
+         VERSION=3.5.3
           SOURCE="FileZilla_${VERSION}_src.tar.bz2"
    SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/${SOURCE}
       SOURCE_GPG="gurus.gpg:${SOURCE}.sig"
diff --git a/ftp/filezilla/FileZilla_3.5.2_src.tar.bz2.sig 
b/ftp/filezilla/FileZilla_3.5.2_src.tar.bz2.sig
deleted file mode 100644
index 438ee90..0000000
Binary files a/ftp/filezilla/FileZilla_3.5.2_src.tar.bz2.sig and /dev/null 
differ
diff --git a/ftp/filezilla/FileZilla_3.5.3_src.tar.bz2.sig 
b/ftp/filezilla/FileZilla_3.5.3_src.tar.bz2.sig
new file mode 100644
index 0000000..5303bda
Binary files /dev/null and b/ftp/filezilla/FileZilla_3.5.3_src.tar.bz2.sig 
differ
diff --git a/ftp/filezilla/HISTORY b/ftp/filezilla/HISTORY
index 7fb87a2..dfe4cd8 100644
--- a/ftp/filezilla/HISTORY
+++ b/ftp/filezilla/HISTORY
@@ -1,3 +1,7 @@
+2012-01-09 Ladislav Hagara <hgr AT vabo.cz>
+       * DETAILS: 3.5.3
+       * PRE_BUILD, gnutls3.patch: removed, fixed upstream
+
 2011-11-10 Sukneet Basuta <sukneet AT sourcemage.org>
        * DETAILS: updated spell to 3.5.2
          switched to guru signed spell
diff --git a/ftp/filezilla/PRE_BUILD b/ftp/filezilla/PRE_BUILD
deleted file mode 100755
index eda3d7f..0000000
--- a/ftp/filezilla/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-# patch for gnutls 3
-# http://trac.filezilla-project.org/ticket/7742
-patch -p1 -d $SOURCE_DIRECTORY < $SPELL_DIRECTORY/gnutls3.patch
diff --git a/ftp/filezilla/gnutls3.patch b/ftp/filezilla/gnutls3.patch
deleted file mode 100644
index 7ad2de2..0000000
--- a/ftp/filezilla/gnutls3.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-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;
-