2009-07-28 Colin Leroy <colin@colino.net>
authorColin Leroy <colin@colino.net>
Tue, 28 Jul 2009 08:40:52 +0000 (08:40 +0000)
committerColin Leroy <colin@colino.net>
Tue, 28 Jul 2009 08:40:52 +0000 (08:40 +0000)
        * 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

17 files changed:
ChangeLog
Makefile.am
packages/packages.current
patches/claws-mail-3.7.0/01-bug_1810.patch [deleted file]
patches/claws-mail-3.7.0/02-bug_1813.patch [deleted file]
patches/claws-mail-3.7.0/03-bug_1814.patch [deleted file]
patches/claws-mail-3.7.0/04-bug_1815.patch [deleted file]
patches/claws-mail-3.7.0/05-bug_1816.patch [deleted file]
patches/claws-mail-3.7.0/06-bug_1825.patch [deleted file]
patches/claws-mail-3.7.0/07-bug_1865.patch [deleted file]
patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch [deleted file]
patches/claws-mail-3.7.1/02-3.7.1cvs22.patch [deleted file]
patches/claws-mail-3.7.1/03-pipe.patch [deleted file]
patches/claws-mail-3.7.1/04-3.7.1cvs41.patch [deleted file]
patches/libetpan-0.54/01-config.patch [deleted file]
patches/libetpan-0.54/02-index.patch [deleted file]
patches/libetpan-0.57/01-gnutls_compat.patch [new file with mode: 0755]

index 7b89587..f9c4967 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2009-07-28  Colin Leroy  <colin@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@g10code.de>
 
        * patches/gpgex-0.9.3/01-full-browser.patch: New file.
index 339407e..d721af2 100644 (file)
@@ -33,8 +33,6 @@ EXTRA_DIST = autogen.sh README.SVN \
        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 @@ EXTRA_DIST = autogen.sh README.SVN \
         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:
index 99585d9..d25708b 100644 (file)
@@ -127,36 +127,36 @@ chk  fe718884dd7ca0652613a2cb5c302ac6323605d8
 # (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.
diff --git a/patches/claws-mail-3.7.0/01-bug_1810.patch b/patches/claws-mail-3.7.0/01-bug_1810.patch
deleted file mode 100755 (executable)
index 4718b01..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
---- src/mimeview.c     6 Jan 2009 16:45:59 -0000       1.83.2.151
-+++ src/mimeview.c     8 Jan 2009 17:21:57 -0000       1.83.2.152
-@@ -1451,13 +1451,13 @@
-               KEY_PRESS_EVENT_STOP();
-               mimeview_launch(mimeview, NULL);
-               return TRUE;
--#ifndef G_OS_WIN32
-       case GDK_o:
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-+#ifndef G_OS_WIN32
-               mimeview_open_with(mimeview);
--              return TRUE;
- #endif
-+              return TRUE;
-       case GDK_c:
-               BREAK_ON_MODIFIER_KEY();
-               KEY_PRESS_EVENT_STOP();
-
diff --git a/patches/claws-mail-3.7.0/02-bug_1813.patch b/patches/claws-mail-3.7.0/02-bug_1813.patch
deleted file mode 100755 (executable)
index 2059019..0000000
+++ /dev/null
@@ -1,154 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/prefs_themes.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/prefs_themes.c,v
-retrieving revision 1.3.2.61
-retrieving revision 1.3.2.62
-diff -u -r1.3.2.61 -r1.3.2.62
---- src/prefs_themes.c 2 Jan 2009 10:51:34 -0000       1.3.2.61
-+++ src/prefs_themes.c 9 Jan 2009 08:02:05 -0000       1.3.2.62
-@@ -253,14 +253,19 @@
- static gboolean prefs_themes_is_system_theme(const gchar *dirname)
- {
-       gint len;
--      
-+      gchar *system_theme_dir;
-+      gboolean is_sys = FALSE;
-+
-       g_return_val_if_fail(dirname != NULL, FALSE);
--      len = strlen(PACKAGE_DATA_DIR);
--      if (strlen(dirname) > len && 0 == strncmp(dirname, PACKAGE_DATA_DIR, len))
--              return TRUE;
-+      system_theme_dir = stock_pixmap_get_system_theme_dir_for_theme(NULL);
-+      len = strlen(system_theme_dir);
-+      if (strlen(dirname) > len && 0 == strncmp(dirname, system_theme_dir, len))
-+              is_sys = TRUE;
-       
--      return FALSE;
-+      g_free(system_theme_dir);
-+
-+      return is_sys;
- }
- static void prefs_themes_set_themes_menu(GtkComboBox *combo, const ThemesData *tdata)
-@@ -526,9 +531,8 @@
-                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
-               switch (val) {
-               case G_ALERTALTERNATE:
--                      cinfo->dest = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
--                                                PIXMAP_THEME_DIR, G_DIR_SEPARATOR_S, 
--                                                themename, NULL);
-+                      cinfo->dest = stock_pixmap_get_system_theme_dir_for_theme(
-+                                              themename);
-                       break;
-               case G_ALERTDEFAULT:
-                       break;
-Index: src/stock_pixmap.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/stock_pixmap.c,v
-retrieving revision 1.25.2.62
-retrieving revision 1.25.2.63
-diff -u -r1.25.2.62 -r1.25.2.63
---- src/stock_pixmap.c 2 Jan 2009 13:05:54 -0000       1.25.2.62
-+++ src/stock_pixmap.c 9 Jan 2009 08:02:05 -0000       1.25.2.63
-@@ -527,6 +527,19 @@
-       closedir(dp);
- }
-+gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme)
-+{
-+      const gchar *sep = NULL;
-+      if (theme && *theme)
-+              sep = G_DIR_SEPARATOR_S;
-+#ifndef G_OS_WIN32
-+      return g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
-+                         PIXMAP_THEME_DIR, sep, theme, NULL);
-+#else
-+      return g_strconcat(get_themes_dir(), sep, theme, NULL);
-+#endif
-+}
-+
- GList *stock_pixmap_themes_list_new(void)
- {
-       gchar *defaulttheme;
-@@ -537,11 +550,9 @@
-       defaulttheme = g_strdup(DEFAULT_PIXMAP_THEME);
-       userthemes   = g_strconcat(get_rc_dir(), G_DIR_SEPARATOR_S, 
-                                  PIXMAP_THEME_DIR, NULL);
--      systemthemes = g_strconcat(PACKAGE_DATA_DIR, G_DIR_SEPARATOR_S,
--                                 PIXMAP_THEME_DIR, NULL);
-+      systemthemes = stock_pixmap_get_system_theme_dir_for_theme(NULL);
-       list = g_list_append(list, defaulttheme);
--      
-       stock_pixmap_find_themes_in_dir(&list, userthemes);
-       stock_pixmap_find_themes_in_dir(&list, systemthemes);
-Index: src/stock_pixmap.h
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/stock_pixmap.h,v
-retrieving revision 1.18.2.39
-retrieving revision 1.18.2.40
-diff -u -r1.18.2.39 -r1.18.2.40
---- src/stock_pixmap.h 2 Jan 2009 13:05:54 -0000       1.18.2.39
-+++ src/stock_pixmap.h 9 Jan 2009 08:02:05 -0000       1.18.2.40
-@@ -216,5 +216,6 @@
-                                            OverlayPosition     pos,
-                                            gint                border_x,
-                                            gint                border_y);
-+gchar *stock_pixmap_get_system_theme_dir_for_theme(const gchar *theme);
- #endif /* __STOCK_PIXMAP_H__ */
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.160
-retrieving revision 1.36.2.161
-diff -u -r1.36.2.160 -r1.36.2.161
---- src/common/utils.c 6 Jan 2009 09:26:48 -0000       1.36.2.160
-+++ src/common/utils.c 9 Jan 2009 08:02:05 -0000       1.36.2.161
-@@ -1996,6 +1996,21 @@
- #endif
- }
-+
-+#ifdef G_OS_WIN32
-+/* Return the default directory for Themes. */
-+const gchar *get_themes_dir(void)
-+{
-+      static gchar *themes_dir = NULL;
-+
-+      if (!themes_dir)
-+              themes_dir = g_strconcat(w32_get_module_dir(),
-+                                       "\\share\\claws-mail\\themes",
-+                                       NULL);
-+      return themes_dir;
-+}
-+#endif
-+
- const gchar *get_tmp_dir(void)
- {
-       static gchar *tmp_dir = NULL;
-Index: src/common/utils.h
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.h,v
-retrieving revision 1.20.2.65
-retrieving revision 1.20.2.66
-diff -u -r1.20.2.65 -r1.20.2.66
---- src/common/utils.h 13 Dec 2008 21:20:39 -0000      1.20.2.65
-+++ src/common/utils.h 9 Jan 2009 08:02:05 -0000       1.20.2.66
-@@ -359,7 +359,8 @@
- gchar *get_tmp_file                   (void);
- const gchar *get_domain_name          (void);
- #ifdef G_OS_WIN32
--const gchar *get_cert_file(void);
-+const gchar *get_themes_dir             (void);
-+const gchar *get_cert_file            (void);
- #endif
- /* file / directory handling */
- off_t get_file_size           (const gchar    *file);
-
diff --git a/patches/claws-mail-3.7.0/03-bug_1814.patch b/patches/claws-mail-3.7.0/03-bug_1814.patch
deleted file mode 100755 (executable)
index ad8642b..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/messageview.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/messageview.c,v
-retrieving revision 1.94.2.194
-retrieving revision 1.94.2.195
-diff -u -r1.94.2.194 -r1.94.2.195
---- src/messageview.c  9 Dec 2008 16:59:36 -0000       1.94.2.194
-+++ src/messageview.c  9 Jan 2009 08:09:21 -0000       1.94.2.195
-@@ -674,6 +674,9 @@
-       gtk_widget_set_size_request(window, prefs_common.msgwin_width,
-                                   prefs_common.msgwin_height);
-+#ifdef G_OS_WIN32
-+      gtk_window_move(GTK_WINDOW(window), 48, 48);
-+#endif
-       msgview = messageview_create(mainwin);
-
diff --git a/patches/claws-mail-3.7.0/04-bug_1815.patch b/patches/claws-mail-3.7.0/04-bug_1815.patch
deleted file mode 100755 (executable)
index 76740ac..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/compose.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/compose.c,v
-retrieving revision 1.382.2.492
-diff -u -p -u -r1.382.2.492 compose.c
---- src/compose.c      28 Dec 2008 16:23:07 -0000      1.382.2.492
-+++ src/compose.c      9 Jan 2009 09:27:58 -0000
-@@ -10086,8 +10086,10 @@ static void compose_attach_drag_received
-       Compose *compose = (Compose *)user_data;
-       GList *list, *tmp;
--      if (gdk_atom_name(data->type) && 
--          !strcmp(gdk_atom_name(data->type), "text/uri-list")
-+      if (((gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list"))
-+#ifdef G_OS_WIN32
-+       || (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND")))
-+#endif
-           && gtk_drag_get_source_widget(context) != 
-               summary_get_main_widget(mainwindow_get_mainwindow()->summaryview)) {
-               list = uri_list_extract_filenames((const gchar *)data->data);
-@@ -10153,11 +10155,18 @@ static void compose_insert_drag_received
-       /* strangely, testing data->type == gdk_atom_intern("text/uri-list", TRUE)
-        * does not work */
-+      debug_print("drop: %s (%s)\n", gdk_atom_name(data->type)?gdk_atom_name(data->type):"nul",
-+              data->data?data->data:"nul");
-+#ifndef G_OS_WIN32
-       if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "text/uri-list")) {
-+#else
-+      if (gdk_atom_name(data->type) && !strcmp(gdk_atom_name(data->type), "DROPFILES_DND")) {
-+#endif
-               AlertValue val = G_ALERTDEFAULT;
-               list = uri_list_extract_filenames((const gchar *)data->data);
--
-+              debug_print("list: %p (%s)\n", list, 
-+                      data->data?data->data:"nul");
-               if (list == NULL && strstr((gchar *)(data->data), "://")) {
-                       /* Assume a list of no files, and data has ://, is a remote link */
-                       gchar *tmpdata = g_strstrip(g_strdup((const gchar *)data->data));
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.161
-diff -u -p -u -r1.36.2.161 utils.c
---- src/common/utils.c 9 Jan 2009 08:02:05 -0000       1.36.2.161
-+++ src/common/utils.c 9 Jan 2009 09:28:01 -0000
-@@ -1396,6 +1396,7 @@ GList *uri_list_extract_filenames(const 
-                    * g_filename_from_uri() rejects escaped/locale encoded uri
-                    * string which come from Nautilus.
-                    */
-+#ifndef G_OS_WIN32
-                                       if (g_utf8_validate(file, -1, NULL))
-                                               locale_file
-                                                       = conv_codeset_strdup(
-@@ -1404,6 +1405,9 @@ GList *uri_list_extract_filenames(const 
-                                                               conv_get_locale_charset_str());
-                                       if (!locale_file)
-                                               locale_file = g_strdup(file + 5);
-+#else
-+                                      locale_file = g_filename_from_uri(file, NULL, NULL);
-+#endif
-                                       result = g_list_append(result, locale_file);
-                               }
-                       }
diff --git a/patches/claws-mail-3.7.0/05-bug_1816.patch b/patches/claws-mail-3.7.0/05-bug_1816.patch
deleted file mode 100755 (executable)
index 4849a2d..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/main.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/main.c,v
-retrieving revision 1.115.2.216
-diff -u -p -u -r1.115.2.216 main.c
---- src/main.c 26 Nov 2008 11:59:57 -0000      1.115.2.216
-+++ src/main.c 9 Jan 2009 09:44:35 -0000
-@@ -2341,10 +2341,9 @@ static void lock_socket_input_cb(gpointe
-               mailto = g_strdup(buf + strlen("compose_attach") + 1);
-               files = g_ptr_array_new();
-               while (fd_gets(sock, buf, sizeof(buf)) > 0) {
--                      if (buf[0] == '.' && buf[1] == '\n') {
--                              break;
--                      }
-                       strretchomp(buf);
-+                      if (!strcmp2(buf, "."))
-+                              break;
-                       g_ptr_array_add(files, g_strdup(buf));
-               }
-               open_compose_new(mailto, files);
diff --git a/patches/claws-mail-3.7.0/06-bug_1825.patch b/patches/claws-mail-3.7.0/06-bug_1825.patch
deleted file mode 100755 (executable)
index 6f8f628..0000000
+++ /dev/null
@@ -1,381 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/main.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/main.c,v
-retrieving revision 1.115.2.218
-retrieving revision 1.115.2.219
-diff -u -p -u -r1.115.2.218 -r1.115.2.219
---- src/main.c 9 Jan 2009 18:51:00 -0000       1.115.2.218
-+++ src/main.c 17 Jan 2009 16:24:30 -0000      1.115.2.219
-@@ -2493,7 +2493,7 @@ static void install_memory_sighandler()
-       struct sigaction act;
-       int flags;
--      mem_notify_fd = open("/dev/mem_notify", O_RDONLY|O_NONBLOCK);
-+      mem_notify_fd = g_open("/dev/mem_notify", O_RDONLY|O_NONBLOCK, 0);
-       if (mem_notify_fd == -1) {
-               debug_print("/dev/mem_notify not available (%s)\n", 
-                       strerror(errno));
-Index: src/mbox.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/mbox.c,v
-retrieving revision 1.28.2.44
-retrieving revision 1.28.2.45
-diff -u -p -u -r1.28.2.44 -r1.28.2.45
---- src/mbox.c 9 Jan 2009 17:46:56 -0000       1.28.2.44
-+++ src/mbox.c 17 Jan 2009 16:24:30 -0000      1.28.2.45
-@@ -358,9 +358,9 @@ gint lock_mbox(const gchar *base, LockTy
- #endif
- #if HAVE_FLOCK
--              if ((lockfd = open(base, O_RDWR)) < 0) {
-+              if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
- #else
--              if ((lockfd = open(base, O_RDWR)) < 0) {
-+              if ((lockfd = g_open(base, O_RDWR, 0)) < 0) {
- #endif
-                       FILE_OP_ERROR(base, "open");
-                       return -1;
-Index: src/common/md5.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/md5.c,v
-retrieving revision 1.2.2.6
-retrieving revision 1.2.2.7
-diff -u -p -u -r1.2.2.6 -r1.2.2.7
---- src/common/md5.c   11 Nov 2008 12:48:43 -0000      1.2.2.6
-+++ src/common/md5.c   17 Jan 2009 16:24:30 -0000      1.2.2.7
-@@ -355,7 +355,7 @@ md5_hex_digest_file(char *hexdigest, con
-       char *lastp = buf; /* point to the start of the buffer */
-       size_t total = 0; /* total length read */
-       int num_alloc = 1; /* number of blocks allocated */
--      int fd = open(file, O_RDONLY);
-+      int fd = g_open(file, O_RDONLY, 0);
-       if (fd == -1) {
-               FILE_OP_ERROR(file, "open");
-Index: src/common/ssl_certificate.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/ssl_certificate.c,v
-retrieving revision 1.4.2.35
-retrieving revision 1.4.2.36
-diff -u -p -u -r1.4.2.35 -r1.4.2.36
---- src/common/ssl_certificate.c       9 Jan 2009 17:47:12 -0000       1.4.2.35
-+++ src/common/ssl_certificate.c       17 Jan 2009 16:24:31 -0000      1.4.2.36
-@@ -537,7 +537,7 @@ static guint check_cert(gnutls_x509_crt 
-       FILE *fp;
-       if (claws_ssl_get_cert_file())
--              fp = fopen(claws_ssl_get_cert_file(), "r");
-+              fp = g_fopen(claws_ssl_get_cert_file(), "r");
-       else
-               return (guint)-1;
-Index: src/common/tags.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/Attic/tags.c,v
-retrieving revision 1.1.2.9
-retrieving revision 1.1.2.10
-diff -u -p -u -r1.1.2.9 -r1.1.2.10
---- src/common/tags.c  9 Jan 2009 17:47:12 -0000       1.1.2.9
-+++ src/common/tags.c  17 Jan 2009 16:24:31 -0000      1.1.2.10
-@@ -50,7 +50,7 @@ void tags_read_tags(void)
-                       TAGS_RC, NULL);
-       gchar tmp[255];
-       gint id;
--      FILE *fp = fopen(file, "rb");
-+      FILE *fp = g_fopen(file, "rb");
-       
-       g_free(file);
-@@ -122,10 +122,10 @@ void tags_write_tags(void)
-                       TAGS_RC, NULL);
-       TagWriteData data;
--      FILE *fp = fopen(file, "wb");
-+      FILE *fp = g_fopen(file, "wb");
-                       
-       if (!fp) {
--              FILE_OP_ERROR(file, "fopen");
-+              FILE_OP_ERROR(file, "g_fopen");
-               g_free(file);
-               g_free(file_new);
-               return;
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.163
-retrieving revision 1.36.2.164
-diff -u -p -u -r1.36.2.163 -r1.36.2.164
---- src/common/utils.c 9 Jan 2009 18:55:52 -0000       1.36.2.163
-+++ src/common/utils.c 17 Jan 2009 16:24:31 -0000      1.36.2.164
-@@ -196,6 +196,17 @@ FILE* g_fopen(const gchar *filename, con
-       return fopen(filename, mode);
- #endif
- }
-+int g_open(const gchar *filename, int flags, int mode)
-+{
-+#ifdef G_OS_WIN32
-+      char *name = g_win32_locale_filename_from_utf8(filename);
-+      int fd = open(name, flags, mode);
-+      g_free(name);
-+      return fp;
-+#else
-+      return open(filename, flags, mode);
-+#endif
-+}
- #endif /* GLIB_CHECK_VERSION && G_OS_UNIX */
-@@ -207,7 +218,7 @@ gint mkstemp_name(gchar *template, gchar
-       int tmpfd;
-       *name_used = g_strdup_printf("%s.%ld",_mktemp(template),count++);
--      tmpfd = open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
-+      tmpfd = g_open (*name_used, (O_CREAT | O_RDWR | O_BINARY),
-                                   (S_IRUSR | S_IWUSR));
-       tempfiles=g_slist_append(tempfiles, g_strdup(*name_used));
-@@ -469,11 +480,11 @@ gint file_strip_crs(const gchar *file)
-       if (file == NULL)
-               goto freeout;
--      fp = fopen(file, "rb");
-+      fp = g_fopen(file, "rb");
-       if (!fp)
-               goto freeout;
--      outfp = fopen(out, "wb");
-+      outfp = g_fopen(out, "wb");
-       if (!outfp) {
-               fclose(fp);
-               goto freeout;
-@@ -2098,7 +2109,7 @@ off_t get_file_size_as_crlf(const gchar 
-       gchar buf[BUFFSIZE];
-       if ((fp = g_fopen(file, "rb")) == NULL) {
--              FILE_OP_ERROR(file, "fopen");
-+              FILE_OP_ERROR(file, "g_fopen");
-               return -1;
-       }
-@@ -2489,12 +2500,12 @@ gint append_file(const gchar *src, const
-       gboolean err = FALSE;
-       if ((src_fp = g_fopen(src, "rb")) == NULL) {
--              FILE_OP_ERROR(src, "fopen");
-+              FILE_OP_ERROR(src, "g_fopen");
-               return -1;
-       }
-       if ((dest_fp = g_fopen(dest, "ab")) == NULL) {
--              FILE_OP_ERROR(dest, "fopen");
-+              FILE_OP_ERROR(dest, "g_fopen");
-               fclose(src_fp);
-               return -1;
-       }
-@@ -2543,7 +2554,7 @@ gint copy_file(const gchar *src, const g
-       gboolean err = FALSE;
-       if ((src_fp = g_fopen(src, "rb")) == NULL) {
--              FILE_OP_ERROR(src, "fopen");
-+              FILE_OP_ERROR(src, "g_fopen");
-               return -1;
-       }
-       if (is_file_exist(dest)) {
-@@ -2557,7 +2568,7 @@ gint copy_file(const gchar *src, const g
-       }
-       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
--              FILE_OP_ERROR(dest, "fopen");
-+              FILE_OP_ERROR(dest, "g_fopen");
-               fclose(src_fp);
-               if (dest_bak) {
-                       if (rename_force(dest_bak, dest) < 0)
-@@ -2678,7 +2689,7 @@ gint copy_file_part(FILE *fp, off_t offs
-       gboolean err = FALSE;
-       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
--              FILE_OP_ERROR(dest, "fopen");
-+              FILE_OP_ERROR(dest, "g_fopen");
-               return -1;
-       }
-@@ -2749,12 +2760,12 @@ gint canonicalize_file(const gchar *src,
-       gboolean last_linebreak = FALSE;
-       if ((src_fp = g_fopen(src, "rb")) == NULL) {
--              FILE_OP_ERROR(src, "fopen");
-+              FILE_OP_ERROR(src, "g_fopen");
-               return -1;
-       }
-       if ((dest_fp = g_fopen(dest, "wb")) == NULL) {
--              FILE_OP_ERROR(dest, "fopen");
-+              FILE_OP_ERROR(dest, "g_fopen");
-               fclose(src_fp);
-               return -1;
-       }
-@@ -3056,7 +3067,7 @@ gint str_write_to_file(const gchar *str,
-       g_return_val_if_fail(file != NULL, -1);
-       if ((fp = g_fopen(file, "wb")) == NULL) {
--              FILE_OP_ERROR(file, "fopen");
-+              FILE_OP_ERROR(file, "g_fopen");
-               return -1;
-       }
-@@ -3147,14 +3158,14 @@ static gchar *file_read_to_str_full(cons
-       }
- #ifdef G_OS_WIN32
--      fp = fopen (file, "rb");
-+      fp = g_fopen (file, "rb");
-       if (fp == NULL) {
-               FILE_OP_ERROR(file, "open");
-               return NULL;
-       }
- #else   
-       /* test whether the file is readable without blocking */
--      fd = open(file, O_RDONLY | O_NONBLOCK);
-+      fd = g_open(file, O_RDONLY | O_NONBLOCK, 0);
-       if (fd == -1) {
-               FILE_OP_ERROR(file, "open");
-               return NULL;
-@@ -4572,7 +4583,7 @@ gchar *make_http_string(const gchar *bp,
- static gchar *mailcap_get_command_in_file(const gchar *path, const gchar *type, const gchar *file_to_open)
- {
--      FILE *fp = fopen(path, "rb");
-+      FILE *fp = g_fopen(path, "rb");
-       gchar buf[BUFFSIZE];
-       gchar *result = NULL;
-       if (!fp)
-@@ -4685,8 +4696,8 @@ void mailcap_update_default(const gchar 
-       gchar *path = NULL, *outpath = NULL;
-       path = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap", NULL);
-       outpath = g_strconcat(get_home_dir(), G_DIR_SEPARATOR_S, ".mailcap.new", NULL);
--      FILE *fp = fopen(path, "rb");
--      FILE *outfp = fopen(outpath, "wb");
-+      FILE *fp = g_fopen(path, "rb");
-+      FILE *outfp = g_fopen(outpath, "wb");
-       gchar buf[BUFFSIZE];
-       gboolean err = FALSE;
-Index: src/etpan/imap-thread.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/etpan/Attic/imap-thread.c,v
-retrieving revision 1.1.4.107
-retrieving revision 1.1.4.108
-diff -u -p -u -r1.1.4.107 -r1.1.4.108
---- src/etpan/imap-thread.c    9 Jan 2009 17:47:14 -0000       1.1.4.107
-+++ src/etpan/imap-thread.c    17 Jan 2009 16:24:31 -0000      1.1.4.108
-@@ -2459,7 +2459,7 @@ static void fetch_content_run(struct etp
-       result->error = r;
-       
-       if (r == MAILIMAP_NO_ERROR) {
--              fd = open(param->filename, O_RDWR | O_CREAT, 0600);
-+              fd = g_open(param->filename, O_RDWR | O_CREAT, 0600);
-               if (fd < 0) {
-                       result->error = MAILIMAP_ERROR_FETCH;
-                       goto free;
-@@ -2960,7 +2960,7 @@ static void append_run(struct etpan_thre
-       }
-       size = stat_buf.st_size;
-       
--      fd = open(param->filename, O_RDONLY);
-+      fd = g_open(param->filename, O_RDONLY, 0);
-       if (fd < 0) {
-               result->error = MAILIMAP_ERROR_APPEND;
-               return;
-@@ -3246,7 +3246,7 @@ static void do_exec_command(int fd, cons
-       /* Detach from the controlling tty if we have one. Otherwise,
-          SSH might do something stupid like trying to use it instead
-          of running $SSH_ASKPASS. Doh. */
--      fd = open("/dev/tty", O_RDONLY);
-+      fd = g_open("/dev/tty", O_RDONLY, 0);
-       if (fd != -1) {
-               ioctl(fd, TIOCNOTTY, NULL);
-               close(fd);
-Index: src/plugins/bogofilter/bogofilter.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/bogofilter/Attic/bogofilter.c,v
-retrieving revision 1.1.2.39
-retrieving revision 1.1.2.40
-diff -u -p -u -r1.1.2.39 -r1.1.2.40
---- src/plugins/bogofilter/bogofilter.c        9 Jan 2009 17:47:19 -0000       1.1.2.39
-+++ src/plugins/bogofilter/bogofilter.c        17 Jan 2009 16:24:31 -0000      1.1.2.40
-@@ -272,8 +272,8 @@ static void bogofilter_do_filter(BogoFil
-                                           FOLDER_TYPE(msginfo->folder->folder) == F_MH &&
-                                           config.insert_header) {
-                                               gchar *tmpfile = get_tmp_file();
--                                              FILE *input = fopen(file, "r");
--                                              FILE *output = fopen(tmpfile, "w");
-+                                              FILE *input = g_fopen(file, "r");
-+                                              FILE *output = g_fopen(tmpfile, "w");
-                                               if (strstr(parts[2], "\n"))
-                                                       *(strstr(parts[2], "\n")) = '\0';
-                                               if (input && !output) 
-Index: src/plugins/pgpinline/pgpinline.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/pgpinline/Attic/pgpinline.c,v
-retrieving revision 1.1.2.42
-retrieving revision 1.1.2.43
-diff -u -p -u -r1.1.2.42 -r1.1.2.43
---- src/plugins/pgpinline/pgpinline.c  9 Jan 2009 17:47:21 -0000       1.1.2.42
-+++ src/plugins/pgpinline/pgpinline.c  17 Jan 2009 16:24:31 -0000      1.1.2.43
-@@ -133,7 +133,7 @@ static gchar *get_part_as_string(MimeInf
-                       printf("error dumping file\n");
-                       return NULL;
-               }
--              fp = fopen(filename,"rb");
-+              fp = g_fopen(filename,"rb");
-               if (!fp) {
-                       printf("error reading file\n");
-                       return NULL;
-Index: src/plugins/smime/smime.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/plugins/smime/Attic/smime.c,v
-retrieving revision 1.1.2.3
-retrieving revision 1.1.2.4
-diff -u -p -u -r1.1.2.3 -r1.1.2.4
---- src/plugins/smime/smime.c  9 Jan 2009 17:47:22 -0000       1.1.2.3
-+++ src/plugins/smime/smime.c  17 Jan 2009 16:24:32 -0000      1.1.2.4
-@@ -430,7 +430,7 @@ static MimeInfo *smime_decrypt(MimeInfo 
-               get_mime_tmp_dir(), G_DIR_SEPARATOR, ++id);
-       if ((dstfp = g_fopen(fname, "wb")) == NULL) {
--              FILE_OP_ERROR(fname, "fopen");
-+              FILE_OP_ERROR(fname, "g_fopen");
-               g_free(fname);
-               gpgme_data_release(plain);
-               gpgme_release(ctx);
-@@ -795,7 +795,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
-       /* write message content to temporary file */
-       tmpfile = get_tmp_file();
--      fp = fopen(tmpfile, "wb");
-+      fp = g_fopen(tmpfile, "wb");
-       if (fp == NULL) {
-               perror("get_tmp_file");
-               return FALSE;
-@@ -805,7 +805,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
-       procmime_write_mimeinfo(msgcontent, fp);
-       fclose(fp);
-       canonicalize_file_replace(tmpfile);
--      fp = fopen(tmpfile, "rb");
-+      fp = g_fopen(tmpfile, "rb");
-       if (fp == NULL) {
-               perror("get_tmp_file");
-               return FALSE;
-@@ -834,7 +834,7 @@ gboolean smime_encrypt(MimeInfo *mimeinf
-       }
-       tmpfile = get_tmp_file();
--      fp = fopen(tmpfile, "wb");
-+      fp = g_fopen(tmpfile, "wb");
-       if (fp) {
-               if (fwrite(enccontent, 1, len, fp) < len) {
-                       FILE_OP_ERROR(tmpfile, "fwrite");
diff --git a/patches/claws-mail-3.7.0/07-bug_1865.patch b/patches/claws-mail-3.7.0/07-bug_1865.patch
deleted file mode 100755 (executable)
index d6ebb6f..0000000
+++ /dev/null
@@ -1,82 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-Index: src/prefs_filtering.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/prefs_filtering.c,v
-retrieving revision 1.59.2.78
-diff -u -p -u -r1.59.2.78 prefs_filtering.c
---- src/prefs_filtering.c      23 Feb 2009 16:55:43 -0000      1.59.2.78
-+++ src/prefs_filtering.c      3 Mar 2009 14:14:22 -0000
-@@ -653,9 +653,13 @@ static void rename_path(GSList * filters
-       gint oldpathlen;
-         GSList * action_cur;
-         GSList * cur;
--
-+      const gchar *separator=G_DIR_SEPARATOR_S;
-+      gboolean matched = FALSE;
-+#ifdef G_OS_WIN32
-+again:
-+#endif
-       oldpathlen = strlen(old_path);
--      old_path_with_sep = g_strconcat(old_path,G_DIR_SEPARATOR_S,NULL);
-+      old_path_with_sep = g_strconcat(old_path,separator,NULL);
-       for (cur = filters; cur != NULL; cur = cur->next) {
-               FilteringProp   *filtering = (FilteringProp *)cur->data;
-@@ -685,28 +689,30 @@ static void rename_path(GSList * filters
-                                         while (*base == G_DIR_SEPARATOR) base++;
-                                         if (*base == '\0')
-                                                 dest_path = g_strconcat(prefix,
--                                                    G_DIR_SEPARATOR_S,
-+                                                    separator,
-                                                     new_path, NULL);
-                                         else
-                                                 dest_path = g_strconcat(prefix,
--                                                    G_DIR_SEPARATOR_S,
-+                                                    separator,
-                                                     new_path,
--                                                    G_DIR_SEPARATOR_S,
-+                                                    separator,
-                                                     base, NULL);
-                                         
-                                         g_free(prefix);
-                                         g_free(action->destination);
-                                         action->destination = dest_path;
-+                                      matched = TRUE;
-                                 } else { /* for non-leaf folders */
-                                         /* compare with trailing slash */
-                                         if (!strncmp(old_path_with_sep, action->destination, oldpathlen+1)) {
-                                                 
-                                                 suffix = action->destination + oldpathlen + 1;
-                                                 dest_path = g_strconcat(new_path,
--                                                    G_DIR_SEPARATOR_S,
-+                                                    separator,
-                                                     suffix, NULL);
-                                                 g_free(action->destination);
-                                                 action->destination = dest_path;
-+                                              matched = TRUE;
-                                         }
-                                 }
-                         } else {
-@@ -715,10 +721,19 @@ static void rename_path(GSList * filters
-                                         dest_path = g_strdup(new_path);
-                                         g_free(action->destination);
-                                         action->destination = dest_path;
-+                                      matched = TRUE;
-                                 }
-                         }
-                 }
-         }
-+      
-+      g_free(old_path_with_sep);
-+#ifdef G_OS_WIN32
-+      if (!strcmp(separator, G_DIR_SEPARATOR_S) && !matched) {
-+              separator = "/";
-+              goto again;
-+      }
-+#endif
- }
- static gboolean prefs_filtering_rename_path_func(GNode *node, gpointer data)
diff --git a/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch b/patches/claws-mail-3.7.1/01-fix-spaces-after-re.patch
deleted file mode 100755 (executable)
index 06316ba..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-2009-03-14 [colin]      3.7.1cvs12
-
-        * src/common/utils.c
-                Win32: fix subject prefix length
-
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.166
-retrieving revision 1.36.2.167
-diff -u -p -u -r1.36.2.166 -r1.36.2.167
---- src/common/utils.c 23 Feb 2009 16:55:48 -0000      1.36.2.166
-+++ src/common/utils.c 14 Mar 2009 08:19:21 -0000      1.36.2.167
-@@ -3773,8 +3773,12 @@ int subject_get_prefix_length(const gcha
-       for (n = 0; n < PREFIXES; n++) {
-               int len = strlen(prefixes[n]);
--              if (!strncasecmp(subject, prefixes[n], len))
--                      return len;
-+              if (!strncasecmp(subject, prefixes[n], len)) {
-+                      if (subject[len] == ' ')
-+                              return len+1;
-+                      else
-+                              return len;
-+              }
-       }
-       return 0;
- #endif
diff --git a/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch b/patches/claws-mail-3.7.1/02-3.7.1cvs22.patch
deleted file mode 100755 (executable)
index 89379ec..0000000
+++ /dev/null
@@ -1,78 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-2009-03-19 [colin]     3.7.1cvs22
-
-       * src/toolbar.c
-               Put spam button in default toolbar even if
-               bogofilter and spamassassin are not built.
-               Other anti-spam plugin could exist! :)
-       * src/common/utils.c
-               Fix exit status fetch on win32
-
-Index: src/toolbar.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/toolbar.c,v
-retrieving revision 1.43.2.107
-retrieving revision 1.43.2.108
-diff -u -p -u -r1.43.2.107 -r1.43.2.108
---- src/toolbar.c      23 Feb 2009 16:55:46 -0000      1.43.2.107
-+++ src/toolbar.c      19 Mar 2009 16:35:36 -0000      1.43.2.108
-@@ -489,10 +489,8 @@ static void toolbar_set_default_main(voi
-               { A_SEPARATOR},
-               { A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
-               { A_LEARN_SPAM},
- #endif
--#endif
-               { A_SEPARATOR},
-               { A_GOTO_NEXT}
-       };
-@@ -593,10 +591,8 @@ static void toolbar_set_default_msgview(
-               { A_SEPARATOR},
-               { A_TRASH},
- #ifndef GENERIC_UMPC
--#if (defined(USE_SPAMASSASSIN_PLUGIN) || defined(USE_BOGOFILTER_PLUGIN))
-               { A_LEARN_SPAM},
- #endif
--#endif
-               { A_GOTO_NEXT}
-       };
-       
-Index: src/common/utils.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/common/utils.c,v
-retrieving revision 1.36.2.168
-retrieving revision 1.36.2.169
-diff -u -p -u -r1.36.2.168 -r1.36.2.169
---- src/common/utils.c 17 Mar 2009 18:04:04 -0000      1.36.2.168
-+++ src/common/utils.c 19 Mar 2009 16:35:36 -0000      1.36.2.169
-@@ -3286,18 +3286,25 @@ static gint execute_sync(gchar *const ar
-       cm_return_val_if_fail(argv != NULL && argv[0] != NULL, -1);
-+#ifdef G_OS_UNIX
-       if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH,
-                        NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
-               g_warning("Couldn't execute command: %s\n", argv[0]);
-               return -1;
-       }
--#ifdef G_OS_UNIX
-       if (WIFEXITED(status))
-               return WEXITSTATUS(status);
-       else
-               return -1;
- #else
-+      if (g_spawn_sync(NULL, (gchar **)argv, NULL, G_SPAWN_SEARCH_PATH| 
-+                       G_SPAWN_CHILD_INHERITS_STDIN|G_SPAWN_LEAVE_DESCRIPTORS_OPEN,
-+                       NULL, NULL, NULL, NULL, &status, NULL) == FALSE) {
-+              g_warning("Couldn't execute command: %s\n", argv[0]);
-+              return -1;
-+      }
-+
-       return status;
- #endif
- }
diff --git a/patches/claws-mail-3.7.1/03-pipe.patch b/patches/claws-mail-3.7.1/03-pipe.patch
deleted file mode 100755 (executable)
index ccfa1a4..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-Marcus: New glib dropped pipe() macro.
-
-diff -rup claws-mail-3.7.1-cur/src/common/w32lib.h claws-mail-3.7.1/src/common/w32lib.h
---- claws-mail-3.7.1-cur/src/common/w32lib.h   2009-03-06 07:01:00.000000000 +0100
-+++ claws-mail-3.7.1/src/common/w32lib.h       2009-04-02 20:54:46.000000000 +0200
-@@ -74,6 +74,7 @@
- #include <windows.h>
- #include <io.h>
- #include <stdio.h>
-+#include <glib.h>
- #ifdef __MINGW32__
- #include <_mingw.h>
-@@ -193,6 +194,10 @@ unsigned int sleep( unsigned int seconds
- int link( const char *oldpath, const char *newpath );
- int usleep( unsigned long usec );
-+#if GLIB_CHECK_VERSION(2, 13, 2)
-+#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
-+#endif
-+
- /*** stdlib ***/
- long int random( void );
- void srandom( unsigned int seed );
-diff -rup claws-mail-3.7.1-cur/src/etpan/etpan-thread-manager.c claws-mail-3.7.1/src/etpan/etpan-thread-manager.c
---- claws-mail-3.7.1-cur/src/etpan/etpan-thread-manager.c      2009-04-02 16:10:46.000000000 +0200
-+++ claws-mail-3.7.1/src/etpan/etpan-thread-manager.c  2009-04-02 20:55:09.000000000 +0200
-@@ -66,5 +66,9 @@ enum {
-   TERMINATE_STATE_DONE,
- };
-+#if GLIB_CHECK_VERSION (2, 13, 2)
-+#define pipe(phandles)  _pipe (phandles, 4096, _O_BINARY)
-+#endif
-+ 
- struct etpan_thread_manager * etpan_thread_manager_new(void)
- {
diff --git a/patches/claws-mail-3.7.1/04-3.7.1cvs41.patch b/patches/claws-mail-3.7.1/04-3.7.1cvs41.patch
deleted file mode 100755 (executable)
index 370fdc8..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-patch -p0 -f $* < $0
-exit $?
-
-2009-04-08 [colin]      3.7.1cvs41
-
-        * src/gtk/manage_window.c
-                Disable transient windows on win32 - seems to
-                fix most focusing issues
-
-Index: src/gtk/manage_window.c
-===================================================================
-RCS file: /srv/cvs/claws-mail/claws/src/gtk/manage_window.c,v
-retrieving revision 1.1.4.8
-retrieving revision 1.1.4.9
-diff -u -p -u -r1.1.4.8 -r1.1.4.9
---- src/gtk/manage_window.c    9 Jan 2009 17:47:17 -0000       1.1.4.8
-+++ src/gtk/manage_window.c    8 Apr 2009 16:03:42 -0000       1.1.4.9
-@@ -67,9 +67,8 @@ void manage_window_destroy(GtkWidget *wi
- void manage_window_set_transient(GtkWindow *window)
- {
--      /* debug_print("manage_window_set_transient(): window = %p, focus_window = %p\n",
--                  window, focus_window); */
--
-+#ifndef G_OS_WIN32
-       if (window && focus_window)
-               gtk_window_set_transient_for(window, GTK_WINDOW(focus_window));
-+#endif
- }
diff --git a/patches/libetpan-0.54/01-config.patch b/patches/libetpan-0.54/01-config.patch
deleted file mode 100755 (executable)
index 56cc458..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-diff -rup libetpan-0.54/libetpan-config.h.in libetpan-0.52-dev-20071209/libetpan-config.h.in
---- libetpan-0.54/libetpan-config.h.in 2008-02-17 14:13:25.000000000 +0100
-+++ libetpan-0.52-dev-20071209/libetpan-config.h.in    2007-12-09 00:57:43.000000000 +0100
-@@ -6,7 +6,7 @@
- #define CONFIG_H
- #include "config.h"
- #endif
--@ifdef WIN32
-+@if WIN32
- @     define MMAP_UNAVAILABLE
- @endif
- @ifdef _MSC_VER
diff --git a/patches/libetpan-0.54/02-index.patch b/patches/libetpan-0.54/02-index.patch
deleted file mode 100755 (executable)
index 548b4cc..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh
-patch -p1 -f $* < $0
-exit $?
-
-diff -rup libetpan-0.54-orgi/tests/option-parser.c libetpan-0.54/tests/option-parser.c
---- libetpan-0.54-orgi/tests/option-parser.c   2008-02-20 23:15:53.000000000 +0100
-+++ libetpan-0.54/tests/option-parser.c        2008-04-25 17:24:27.000000000 +0200
-@@ -110,7 +110,7 @@ int parse_options(int argc, char ** argv
-   * flags_directory = NULL;
-   while (1) {
--    r = getopt_long(argc, argv, "d:s:p:txu:v:l:ac:f:D", long_options, &index);
-+    r = getopt_long(argc, argv, "d:s:p:txu:v:l:ac:f:D", long_options, &indx);
-     
-     if (r == -1)
-       break;
-Only in libetpan-0.54/tests: option-parser.c~
diff --git a/patches/libetpan-0.57/01-gnutls_compat.patch b/patches/libetpan-0.57/01-gnutls_compat.patch
new file mode 100755 (executable)
index 0000000..372c232
--- /dev/null
@@ -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);