[Gpg4win-commits] r1216 - in trunk: . packages patches patches/libetpan-0.57

Tue Jul 28 10:40:53 CEST 2009

Author: colinleroy
Date: 2009-07-28 10:40:52 +0200 (Tue, 28 Jul 2009)
New Revision: 1216

Added:
   trunk/patches/libetpan-0.57/
   trunk/patches/libetpan-0.57/01-gnutls_compat.patch
Removed:
   trunk/patches/claws-mail-3.7.0/
   trunk/patches/claws-mail-3.7.1/
   trunk/patches/libetpan-0.54/
Modified:
   trunk/ChangeLog
   trunk/Makefile.am
   trunk/packages/packages.current
Log:
2009-07-28  Colin Leroy  <colin at colino.net>

        * patches/libetpan-0.54: Removed
        * patches/claws-mail-3.7.0: Removed
        * patches/claws-mail-3.7.1: Removed
        * patches/libetpan-0.57/01-gnutls_compat.patch: New. Fixes
        connection to some non-compliant servers
        * Makefile.am: Reflect patches/ changes
        * packages/packages.current: Update Claws Mail and its
        plugins



Modified: trunk/ChangeLog
===================================================================

--- trunk/ChangeLog	2009-07-27 12:30:44 UTC (rev 1215)
+++ trunk/ChangeLog	2009-07-28 08:40:52 UTC (rev 1216)
@@ -1,3 +1,14 @@
+2009-07-28  Colin Leroy  <colin at colino.net>
+
+	* patches/libetpan-0.54: Removed
+	* patches/claws-mail-3.7.0: Removed
+	* patches/claws-mail-3.7.1: Removed
+	* patches/libetpan-0.57/01-gnutls_compat.patch: New. Fixes
+	connection to some non-compliant servers
+	* Makefile.am: Reflect patches/ changes
+	* packages/packages.current: Update Claws Mail and its
+	plugins
+
 2009-07-17  Marcus Brinkmann  <marcus at g10code.de>
 
 	* patches/gpgex-0.9.3/01-full-browser.patch: New file.

Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am	2009-07-27 12:30:44 UTC (rev 1215)
+++ trunk/Makefile.am	2009-07-28 08:40:52 UTC (rev 1216)
@@ -33,8 +33,6 @@
 	patches/gpgme-1.1.7/02-extern-umlaute.patch \
 	patches/gpgme-1.1.7/03-error-parsing.patch \
         patches/gpgme-1.2.0/01-w32-io-threads.patch \
-	patches/libetpan-0.54/01-config.patch \
-	patches/libetpan-0.54/02-index.patch \
 	patches/winpt/01-gpg-path.patch \
 	patches/gpgex/01-no-checksums.patch \
 	patches/gpgex-0.9.3/01-full-browser.patch \
@@ -52,10 +50,8 @@
         patches/gnupg2-2.0.12/06-opgp-sign3072.patch \
         patches/gnupg2-2.0.12/07-gpg-no-detached.patch \
 	patches/gpgol-0.9.91/01-gpgme.patch \
-	patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch \
-	patches/claws-mail-3.7.1/02-3.7.1cvs22.patch \
-        patches/claws-mail-3.7.1/03-pipe.patch \
         patches/gpa-0.9.0/01-title-prop.patch \
+	patches/libetpan-0.57/01-gnutls_compat.patch \
         patches/scute-1.2.0/01-bugfixes.patch
 
 copy-news:

Modified: trunk/packages/packages.current
===================================================================
--- trunk/packages/packages.current	2009-07-27 12:30:44 UTC (rev 1215)
+++ trunk/packages/packages.current	2009-07-28 08:40:52 UTC (rev 1216)
@@ -127,36 +127,36 @@
 # (Kept on our own mirror due to Sourceforge peculiarities.)
 
 server http://www.claws-mail.org/win32
-file   claws-mail-3.7.1.tar.bz2
-chk    58a88e705b6f27c4f3c1f44fec9dd250e7e86bb0
+file   claws-mail-3.7.2cvs11.tar.bz2
+chk    565960bfb5540983c78551f31176bbf92f14c3a6
 
 server http://www.claws-mail.org/win32
-file   attachwarner-0.2.16.tar.gz
-chk    3d44c09965d8da419f2b4e6543cb2bdc61142add
+file   attachwarner-0.2.17.tar.gz
+chk    65d92cfb41f48679cadc8fa8db17a55fdc0d6c0b
 
 server http://www.claws-mail.org/win32
-file   bsfilter_plugin-1.0cvs1.tar.gz
-chk    c5858b797820500174b67be7ed20ccafdd785581
+file   bsfilter_plugin-1.0.1cvs1.tar.gz
+chk    179f5e83431376a8914b349d51c85a733e4eb780
 
 server http://www.claws-mail.org/win32
-file   gtkhtml2_viewer-0.23cvs2.tar.gz
-chk    7b5a284f0a8c52790e216b2dbef711f068fecf22
+file   gtkhtml2_viewer-0.24cvs2.tar.gz
+chk    c6224101ba8d4e4a59112a5235567b4ca162e802
 
 server http://www.claws-mail.org/win32
-file   notification_plugin-0.21.tar.gz
-chk    a40dc1af268e665d0c8d5ca3ee5b72b07314548e
+file   notification_plugin-0.22cvs3.tar.gz
+chk    9def3108dab352b170eaf9b0a346d83b80c0a419
 
 server http://www.claws-mail.org/win32
-file   rssyl-0.24.tar.gz
-chk    98924a761d0dbc11bb6b150ca8296b92d6eb7526
+file   rssyl-0.25.tar.gz
+chk    3a2a652907c163abda7f2a7dbae1c0ba157a8728
 
 server http://www.claws-mail.org/win32
-file   tnef_parse-0.3.4.tar.gz
-chk    cf6c7abc320526cc4437763f9cb71d8a349de454
+file   tnef_parse-0.3.5cvs1.tar.gz
+chk    e7e07be77878f83ed91331eb79e99303f4302b95
 
 server http://www.claws-mail.org/win32
-file   vcalendar-2.0.4.tar.gz
-chk    6969a9500cf995e9f0e87a29ac4245363600b256
+file   vcalendar-2.0.5.tar.gz
+chk    b2b6e3ada7b36a5fdd9e1cb263249b6929efbf45
 
 #
 # Pthreads for Windows.

Added: trunk/patches/libetpan-0.57/01-gnutls_compat.patch
===================================================================
--- trunk/patches/libetpan-0.57/01-gnutls_compat.patch	2009-07-27 12:30:44 UTC (rev 1215)
+++ trunk/patches/libetpan-0.57/01-gnutls_compat.patch	2009-07-28 08:40:52 UTC (rev 1216)
@@ -0,0 +1,23 @@
+#! /bin/sh
+patch -p0 -f $* < $0
+exit $?
+
+Fix connection to servers not implementing random padding
+
+Index: src/data-types/mailstream_ssl.c
+===================================================================
+RCS file: /cvsroot/libetpan/libetpan/src/data-types/mailstream_ssl.c,v
+retrieving revision 1.69
+retrieving revision 1.71
+diff -u -p -u -r1.69 -r1.71
+--- src/data-types/mailstream_ssl.c	21 Nov 2008 17:29:43 -0000	1.69
++++ src/data-types/mailstream_ssl.c	12 Jun 2009 07:28:38 -0000	1.71
+@@ -460,7 +460,7 @@ static struct mailstream_ssl_data * ssl_
+   gnutls_cipher_set_priority (session, cipher_prio);
+   gnutls_kx_set_priority (session, kx_prio);
+   gnutls_mac_set_priority (session, mac_prio);
+-
++  gnutls_record_disable_padding(session);
+   gnutls_dh_set_prime_bits(session, 512);
+ 
+   gnutls_transport_set_ptr(session, (gnutls_transport_ptr) fd);


Property changes on: trunk/patches/libetpan-0.57/01-gnutls_compat.patch
___________________________________________________________________
Name: svn:executable
   + *

