Update patches to make them fuzz-free, and update S/MIME plugin to
authorMarcus Brinkmann <mb@g10code.com>
Tue, 3 Jul 2007 17:01:06 +0000 (17:01 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Tue, 3 Jul 2007 17:01:06 +0000 (17:01 +0000)
version 0.7.1.

patches/claws-mail-2.10.0/02-w32-icon.patch
patches/claws-mail-2.10.0/03-w32-port.patch
patches/claws-mail-2.10.0/04-smime-plugin.patch
patches/claws-mail-2.10.0/99-auto.patch

index 7f1cb39..3fab8ed 100755 (executable)
@@ -14,9 +14,9 @@ For the logo, see actually 01-w32-logo.patch.
        (EXTRA_DIST): Add w32-logo.ico and w32-resource.rc.
 
 
-diff -rupN claws-mail-2.9.2-p01/src/Makefile.am claws-mail-2.9.2/src/Makefile.am
---- claws-mail-2.9.2-p01/src/Makefile.am       2007-05-08 09:59:22.000000000 +0200
-+++ claws-mail-2.9.2/src/Makefile.am   2007-07-02 19:45:47.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/Makefile.am claws-mail-2.10.0/src/Makefile.am
+--- claws-mail-2.10.0-orig/src/Makefile.am     2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/Makefile.am  2007-07-03 18:28:46.000000000 +0200
 @@ -14,6 +14,21 @@ install-exec-hook:
        @rm -f $(DESTDIR)$(bindir)/sylpheed-claws
        @ln -s claws-mail $(DESTDIR)$(bindir)/sylpheed-claws
@@ -39,15 +39,15 @@ diff -rupN claws-mail-2.9.2-p01/src/Makefile.am claws-mail-2.9.2/src/Makefile.am
  claws_mail_SOURCES = \
        account.c \
        action.c \
-@@ -297,6 +312,7 @@ BUILT_SOURCES = \
+@@ -301,6 +316,7 @@ BUILT_SOURCES = \
        quote_fmt_parse.h
  
  EXTRA_DIST = \
 +      w32-logo.ico w32-resource.rc \
-       pixmaps/addr_one.xpm \
-       pixmaps/addr_two.xpm \
-       pixmaps/address_book.xpm \
-@@ -454,7 +470,11 @@ arch_ldflags :=
+       pixmaps/addr_one.xpm \
+       pixmaps/addr_two.xpm \
+       pixmaps/address_book.xpm \
+@@ -456,7 +472,11 @@ arch_ldflags :=
  endif
  
  claws_mail_LDFLAGS = \
@@ -60,8 +60,8 @@ diff -rupN claws-mail-2.9.2-p01/src/Makefile.am claws-mail-2.9.2/src/Makefile.am
  
  claws_mail_LDADD = \
        $(etpan_library) \
-diff -rupN claws-mail-2.9.2-p01/src/w32-resource.rc claws-mail-2.9.2/src/w32-resource.rc
---- claws-mail-2.9.2-p01/src/w32-resource.rc   1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/w32-resource.rc       2007-07-02 19:46:07.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/w32-resource.rc claws-mail-2.10.0/src/w32-resource.rc
+--- claws-mail-2.10.0-orig/src/w32-resource.rc 1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/w32-resource.rc      2007-07-03 18:28:46.000000000 +0200
 @@ -0,0 +1 @@
 +1 ICON "w32-logo.ico"
index 2be547b..2fa3796 100755 (executable)
@@ -58,9 +58,9 @@ exit $?
        * src/plugins/pgpmime/mypgpcore.def: Update.
 
 
-diff -rup claws-mail-2.9.2-orig/autogen.sh claws-mail-2.9.2/autogen.sh
---- claws-mail-2.9.2-orig/autogen.sh   2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/autogen.sh        2007-06-29 16:59:34.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/autogen.sh claws-mail-2.10.0/autogen.sh
+--- claws-mail-2.10.0-orig/autogen.sh  2007-07-02 10:32:22.000000000 +0200
++++ claws-mail-2.10.0/autogen.sh       2007-07-03 18:31:59.000000000 +0200
 @@ -40,6 +40,7 @@ if test "$1" = "--build-w32"; then
               --disable-openssl --disable-dillo-viewer-plugin \
               --disable-nls --disable-libetpan --disable-aspell \
@@ -69,49 +69,23 @@ diff -rup claws-mail-2.9.2-orig/autogen.sh claws-mail-2.9.2/autogen.sh
               PKG_CONFIG_LIBDIR="$w32root/lib/pkgconfig"
  
      rc=$?
-diff -rup claws-mail-2.9.2-orig/src/common/w32lib.h claws-mail-2.9.2/src/common/w32lib.h
---- claws-mail-2.9.2-orig/src/common/w32lib.h  2007-05-08 09:59:21.000000000 +0200
-+++ claws-mail-2.9.2/src/common/w32lib.h       2007-05-21 11:46:41.000000000 +0200
-@@ -44,6 +44,12 @@
- /* Changes are:
-+2007-05-21  Werner Koch  <wk@g10code.com>
-+
-+      * src/common/w32_account.c: New.
-+
-+      * src/common/w32lib.h: Undef "interface".
-+
- 2005-11-17  Werner Koch  <wk@g10code.com>
+diff -rupN claws-mail-2.10.0-orig/src/common/log.c claws-mail-2.10.0/src/common/log.c
+--- claws-mail-2.10.0-orig/src/common/log.c    2007-07-02 10:32:17.000000000 +0200
++++ claws-mail-2.10.0/src/common/log.c 2007-07-03 18:31:59.000000000 +0200
+@@ -23,6 +23,10 @@
  
-       Add boilerplate text to all files and explain legal status.
-@@ -76,6 +82,13 @@
- #include <dirent.h>
- #endif
+ #include "defs.h"
  
-+/* Mingw32 3.4.4 defines interface to struct and thus breaks our own
-+   use of that symbol.  Undef it here. */
-+#if defined(_BASETYPS_H) && defined(interface) 
-+#undef interface
++#ifdef G_OS_WIN32
++#  include <w32lib.h>
 +#endif
 +
-+
- /* types */
- /*** ??? ***/
- #ifndef __MINGW32__
-@@ -188,6 +201,9 @@ int kill( pid_t pid, int sig );
- FILE *popen( const char *command, const char *type );
- int pclose( FILE *stream );
-+/*** w32_account.c ***/
-+int w32_is_administrator (void);
-+
- /*** misc ***/
- char *read_w32_registry_string( char *parent, char *section, char *key );
- char *get_content_type_from_registry_with_ext( char *ext );
-diff -rup claws-mail-2.9.2-orig/src/common/Makefile.am claws-mail-2.9.2/src/common/Makefile.am
---- claws-mail-2.9.2/src/common/Makefile.am    2007-05-08 09:59:21.000000000 +0200
-+++ claws-mail-2.9.2/src/common/Makefile.am    2007-05-21 11:46:16.000000000 +0200
+ #include <stdio.h>
+ #include <glib.h>
+ #include <glib/gi18n.h>
+diff -rupN claws-mail-2.10.0-orig/src/common/Makefile.am claws-mail-2.10.0/src/common/Makefile.am
+--- claws-mail-2.10.0-orig/src/common/Makefile.am      2007-07-02 10:32:17.000000000 +0200
++++ claws-mail-2.10.0/src/common/Makefile.am   2007-07-03 18:31:59.000000000 +0200
 @@ -5,7 +5,7 @@ if OS_WIN32
  arch_sources = fnmatch.c \
                 w32_dirent.c w32_reg.c w32_signal.c w32_stat.c \
@@ -121,9 +95,147 @@ diff -rup claws-mail-2.9.2-orig/src/common/Makefile.am claws-mail-2.9.2/src/comm
  arch_headers = fnmatch.h w32lib.h
  else
  arch_files = 
-diff -rupN /dev/null claws-mail-2.9.2/src/common/w32_account.c
---- /dev/null  2007-05-14 05:46:41.000000000 +0200
-+++ claws-mail-2.9.2/src/common/w32_account.c  2007-05-21 11:52:32.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/common/timing.h claws-mail-2.10.0/src/common/timing.h
+--- claws-mail-2.10.0-orig/src/common/timing.h 2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/common/timing.h      2007-07-03 18:31:59.000000000 +0200
+@@ -29,6 +29,7 @@
+ #ifndef __TIMING_H__
+ #define __TIMING_H__
++#include <glib.h>
+ #include <sys/time.h>
+ #ifdef HAVE_CONFIG_H
+ #  include "config.h"
+@@ -49,13 +50,38 @@
+ #define START_TIMING(str) do {} while(0);
+ #define END_TIMING() do {} while(0);
+ #else
++
++#ifdef G_OS_WIN32
++
++#include <w32lib.h>
++
++/* no {} by purpose */
++#define START_TIMING(str)                                             \
++        LARGE_INTEGER frequency;                                      \
++      LARGE_INTEGER start;                                            \
++      LARGE_INTEGER end;                                              \
++      LARGE_INTEGER diff;                                             \
++      const char *timing_name=str;                                    \
++      QueryPerformanceFrequency (&frequency);                         \
++      QueryPerformanceCounter (&start);                               \
++
++#define END_TIMING()                                                  \
++      QueryPerformanceCounter (&end);                                 \
++        diff.QuadPart = (double)                                      \
++              ((end.QuadPart - start.QuadPart)        \
++              * (double)1000.0/(double)frequency.QuadPart);           \
++        debug_print("TIMING %s: %ds%03dms\n",                         \
++              timing_name, (unsigned int) (diff.QuadPart / 1000000),  \
++              (unsigned int) ((diff.QuadPart / 1000) % 1000));
++
++#else
+ /* no {} by purpose */
+ #define START_TIMING(str)                                             \
+       struct timeval start;                                           \
+       struct timeval end;                                             \
+       struct timeval diff;                                            \
+       const char *timing_name=str;                                    \
+-      gettimeofday(&start, NULL);                                     \
++      gettimeofday(&start, NULL);
+ #ifdef __GLIBC__
+ #define END_TIMING()                                                  \
+@@ -64,7 +90,7 @@
+       debug_print("TIMING %s %s: %ds%03dms\n",                        \
+               __FUNCTION__,                                           \
+               timing_name, (unsigned int)diff.tv_sec,                 \
+-              (unsigned int)diff.tv_usec/1000);                       
++              (unsigned int)diff.tv_usec/1000);
+ #else
+ #define END_TIMING()                                                  \
+       gettimeofday(&end, NULL);                                       \
+@@ -76,3 +102,4 @@
+ #endif 
+ #endif 
++#endif
+diff -rupN claws-mail-2.10.0-orig/src/common/utils.c claws-mail-2.10.0/src/common/utils.c
+--- claws-mail-2.10.0-orig/src/common/utils.c  2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/common/utils.c       2007-07-03 18:31:59.000000000 +0200
+@@ -57,6 +57,7 @@
+ #  include <direct.h>
+ #  include <io.h>
+ #  include <fcntl.h>
++#  include <w32lib.h>
+ #endif
+ #ifdef MAEMO
+@@ -75,6 +76,18 @@ static gboolean debug_mode = FALSE;
+ static GSList *tempfiles=NULL;
+ #endif
++/* Return true if we are running as root.  This function should beused
++   instead of getuid () == 0.  */
++gboolean superuser_p (void)
++{
++#ifdef G_OS_WIN32
++  return w32_is_administrator ();
++#else
++  return !getuid();
++#endif  
++}
++
++
+ #if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
+ gint g_chdir(const gchar *path)
+@@ -4766,7 +4779,12 @@ gint copy_dir(const gchar *src, const gc
+                               g_dir_close(dir);
+                               return r;
+                       }
+-              } else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
++                }
++#ifndef G_OS_WIN32
++                /* Windows has no symlinks.  Or well, Vista seems to
++                   have something like this but the semantics might be
++                   different.  Thus we don't use it under Windows. */
++               else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
+                       GError *error;
+                       gint r = 0;
+                       gchar *target = g_file_read_link(old_file, &error);
+@@ -4777,7 +4795,9 @@ gint copy_dir(const gchar *src, const gc
+                               g_dir_close(dir);
+                               return r;
+                       }
+-              } else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
++                 }
++#endif /*G_OS_WIN32*/
++              else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
+                       gint r = copy_dir(old_file, new_file);
+                       if (r < 0) {
+                               g_dir_close(dir);
+diff -rupN claws-mail-2.10.0-orig/src/common/utils.h claws-mail-2.10.0/src/common/utils.h
+--- claws-mail-2.10.0-orig/src/common/utils.h  2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/common/utils.h       2007-07-03 18:31:59.000000000 +0200
+@@ -204,6 +204,14 @@ gboolean debug_get_mode           (void);
+ #define Str(x)        #x
+ #define Xstr(x)       Str(x)
++
++/* System related stuff.  */
++
++gboolean superuser_p (void);
++
++
++/* String utilities.  */
++
+ void list_free_strings                (GList          *list);
+ void slist_free_strings               (GSList         *list);
+diff -rupN claws-mail-2.10.0-orig/src/common/w32_account.c claws-mail-2.10.0/src/common/w32_account.c
+--- claws-mail-2.10.0-orig/src/common/w32_account.c    1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/common/w32_account.c 2007-07-03 18:31:59.000000000 +0200
 @@ -0,0 +1,149 @@
 +/* w32_account.c - Account related W32 functions.
 +   Copyright (C) 2007 g10 Code GmbH 
@@ -274,148 +386,73 @@ diff -rupN /dev/null claws-mail-2.9.2/src/common/w32_account.c
 +  return is_admin;
 +}
 +
-diff -rup claws-mail-2.9.2-orig/src/common/utils.c claws-mail-2.9.2/src/common/utils.c
---- claws-mail-2.9.2-orig/src/common/utils.c   2007-05-08 09:59:21.000000000 +0200
-+++ claws-mail-2.9.2/src/common/utils.c        2007-05-21 11:55:02.000000000 +0200
-@@ -56,6 +56,7 @@
- #  include <direct.h>
- #  include <io.h>
- #  include <fcntl.h>
-+#  include <w32lib.h>
- #endif
- #ifdef MAEMO
-@@ -74,6 +75,18 @@ static gboolean debug_mode = FALSE;
- static GSList *tempfiles=NULL;
- #endif
-+/* Return true if we are running as root.  This function should beused
-+   instead of getuid () == 0.  */
-+gboolean superuser_p (void)
-+{
-+#ifdef G_OS_WIN32
-+  return w32_is_administrator ();
-+#else
-+  return !getuid();
-+#endif  
-+}
-+
-+
+diff -rupN claws-mail-2.10.0-orig/src/common/w32lib.h claws-mail-2.10.0/src/common/w32lib.h
+--- claws-mail-2.10.0-orig/src/common/w32lib.h 2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/common/w32lib.h      2007-07-03 18:31:59.000000000 +0200
+@@ -44,6 +44,12 @@
  
- #if !GLIB_CHECK_VERSION(2, 7, 0) && !defined(G_OS_UNIX)
- gint g_chdir(const gchar *path)
-@@ -4728,7 +4741,12 @@ gint copy_dir(const gchar *src, const gc
-                               g_dir_close(dir);
-                               return r;
-                       }
--              } else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
-+                }
-+#ifndef G_OS_WIN32
-+                /* Windows has no symlinks.  Or well, Vista seems to
-+                   have something like this but the semantics might be
-+                   different.  Thus we don't use it under Windows. */
-+               else if (g_file_test(old_file, G_FILE_TEST_IS_SYMLINK)) {
-                       GError *error;
-                       gint r = 0;
-                       gchar *target = g_file_read_link(old_file, &error);
-@@ -4739,7 +4757,9 @@ gint copy_dir(const gchar *src, const gc
-                               g_dir_close(dir);
-                               return r;
-                       }
--              } else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
-+                 }
-+#endif /*G_OS_WIN32*/
-+              else if (g_file_test(old_file, G_FILE_TEST_IS_DIR)) {
-                       gint r = copy_dir(old_file, new_file);
-                       if (r < 0) {
-                               g_dir_close(dir);
-diff -rup claws-mail-2.9.2-orig/src/common/utils.h claws-mail-2.9.2/src/common/utils.h
---- claws-mail-2.9.2-orig/src/common/utils.h   2007-05-08 09:59:21.000000000 +0200
-+++ claws-mail-2.9.2/src/common/utils.h        2007-05-21 11:49:32.000000000 +0200
-@@ -204,6 +204,14 @@ gboolean debug_get_mode           (void);
- #define Str(x)        #x
- #define Xstr(x)       Str(x)
+ /* Changes are:
  
++2007-05-21  Werner Koch  <wk@g10code.com>
 +
-+/* System related stuff.  */
-+
-+gboolean superuser_p (void);
-+
++      * src/common/w32_account.c: New.
 +
-+/* String utilities.  */
++      * src/common/w32lib.h: Undef "interface".
 +
- void list_free_strings                (GList          *list);
- void slist_free_strings               (GSList         *list);
+ 2005-11-17  Werner Koch  <wk@g10code.com>
  
-diff -rup claws-mail-2.9.2-orig/src/common/timing.h claws-mail-2.9.2/src/common/timing.h
---- claws-mail-2.9.2-orig/src/common/timing.h  2007-05-08 09:59:21.000000000 +0200
-+++ claws-mail-2.9.2/src/common/timing.h       2007-06-29 19:41:56.000000000 +0200
-@@ -29,6 +29,7 @@
- #ifndef __TIMING_H__
- #define __TIMING_H__
+       Add boilerplate text to all files and explain legal status.
+@@ -76,6 +82,13 @@
+ #include <dirent.h>
+ #endif
  
-+#include <glib.h>
- #include <sys/time.h>
- #ifdef HAVE_CONFIG_H
- #  include "config.h"
-@@ -49,13 +50,38 @@
- #define START_TIMING(str) do {} while(0);
- #define END_TIMING() do {} while(0);
- #else
-+
-+#ifdef G_OS_WIN32
-+
-+#include <w32lib.h>
++/* Mingw32 3.4.4 defines interface to struct and thus breaks our own
++   use of that symbol.  Undef it here. */
++#if defined(_BASETYPS_H) && defined(interface) 
++#undef interface
++#endif
 +
-+/* no {} by purpose */
-+#define START_TIMING(str)                                             \
-+        LARGE_INTEGER frequency;                                      \
-+      LARGE_INTEGER start;                                            \
-+      LARGE_INTEGER end;                                              \
-+      LARGE_INTEGER diff;                                             \
-+      const char *timing_name=str;                                    \
-+      QueryPerformanceFrequency (&frequency);                         \
-+      QueryPerformanceCounter (&start);                               \
 +
-+#define END_TIMING()                                                  \
-+      QueryPerformanceCounter (&end);                                 \
-+        diff.QuadPart = (double)                                      \
-+              ((end.QuadPart - start.QuadPart)        \
-+              * (double)1000.0/(double)frequency.QuadPart);           \
-+        debug_print("TIMING %s: %ds%03dms\n",                         \
-+              timing_name, (unsigned int) (diff.QuadPart / 1000000),  \
-+              (unsigned int) ((diff.QuadPart / 1000) % 1000));
+ /* types */
+ /*** ??? ***/
+ #ifndef __MINGW32__
+@@ -188,8 +201,18 @@ int kill( pid_t pid, int sig );
+ FILE *popen( const char *command, const char *type );
+ int pclose( FILE *stream );
++/*** w32_account.c ***/
++int w32_is_administrator (void);
 +
-+#else
- /* no {} by purpose */
- #define START_TIMING(str)                                             \
-       struct timeval start;                                           \
-       struct timeval end;                                             \
-       struct timeval diff;                                            \
-       const char *timing_name=str;                                    \
--      gettimeofday(&start, NULL);                                     \
-+      gettimeofday(&start, NULL);
+ /*** misc ***/
+ char *read_w32_registry_string( char *parent, char *section, char *key );
+ char *get_content_type_from_registry_with_ext( char *ext );
  
- #ifdef __GLIBC__
- #define END_TIMING()                                                  \
-@@ -64,7 +90,7 @@
-       debug_print("TIMING %s %s: %ds%03dms\n",                        \
-               __FUNCTION__,                                           \
-               timing_name, (unsigned int)diff.tv_sec,                 \
--              (unsigned int)diff.tv_usec/1000);                       
-+              (unsigned int)diff.tv_usec/1000);
- #else
- #define END_TIMING()                                                  \
-       gettimeofday(&end, NULL);                                       \
-@@ -76,3 +102,4 @@
++\f
++/* Simulate thread-safe versions of some functions.  */
++#define gmtime_r(time, resultp) gmtime (time)
++#define localtime_r(time, resultp) localtime (time)
++#define asctime_r(time, buffer) asctime (time)
++#define ctime_r(time, buffer) ctime (time)
++
+ #endif
+diff -rupN claws-mail-2.10.0-orig/src/exporthtml.c claws-mail-2.10.0/src/exporthtml.c
+--- claws-mail-2.10.0-orig/src/exporthtml.c    2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/exporthtml.c 2007-07-03 18:31:59.000000000 +0200
+@@ -33,6 +33,10 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
  
- #endif 
- #endif 
++#ifdef G_OS_WIN32
++#  include <w32lib.h>
 +#endif
-diff -rup claws-mail-2.9.2-orig/src/gtk/Makefile.am claws-mail-2.9.2/src/gtk/Makefile.am
---- claws-mail-2.9.2-orig/src/gtk/Makefile.am  2007-05-08 09:59:19.000000000 +0200
-+++ claws-mail-2.9.2/src/gtk/Makefile.am       2007-06-29 16:48:05.000000000 +0200
-@@ -65,6 +65,7 @@ clawsgtkinclude_HEADERS = \
++
+ #include "mgutils.h"
+ #include "utils.h"
+ #include "exporthtml.h"
+diff -rupN claws-mail-2.10.0-orig/src/gtk/Makefile.am claws-mail-2.10.0/src/gtk/Makefile.am
+--- claws-mail-2.10.0-orig/src/gtk/Makefile.am 2007-07-02 10:32:15.000000000 +0200
++++ claws-mail-2.10.0/src/gtk/Makefile.am      2007-07-03 18:31:59.000000000 +0200
+@@ -66,6 +66,7 @@ clawsgtkinclude_HEADERS = \
  
  AM_CPPFLAGS = \
        -I$(srcdir)/../common \
@@ -423,10 +460,10 @@ diff -rup claws-mail-2.9.2-orig/src/gtk/Makefile.am claws-mail-2.9.2/src/gtk/Mak
        -I$(srcdir)/.. \
        $(GTK_CFLAGS) \
        $(OPENSSL_CFLAGS) \
-diff -rup claws-mail-2.9.2-orig/src/Makefile.am claws-mail-2.9.2/src/Makefile.am
---- claws-mail-2.9.2-orig/src/Makefile.am      2007-07-02 19:45:47.000000000 +0200
-+++ claws-mail-2.9.2/src/Makefile.am   2007-06-29 17:03:48.000000000 +0200
-@@ -460,6 +444,7 @@ EXTRA_DIST = \
+diff -rupN claws-mail-2.10.0-orig/src/Makefile.am claws-mail-2.10.0/src/Makefile.am
+--- claws-mail-2.10.0-orig/src/Makefile.am     2007-07-03 18:28:46.000000000 +0200
++++ claws-mail-2.10.0/src/Makefile.am  2007-07-03 18:31:59.000000000 +0200
+@@ -462,6 +462,7 @@ EXTRA_DIST = \
  
  INCLUDES = \
        -I$(srcdir)/common \
@@ -434,9 +471,23 @@ diff -rup claws-mail-2.9.2-orig/src/Makefile.am claws-mail-2.9.2/src/Makefile.am
        -I$(srcdir)/gtk \
        -I$(srcdir)/etpan
  
-diff -rup claws-mail-2.9.2-orig/src/msgcache.c claws-mail-2.9.2/src/msgcache.c
---- claws-mail-2.9.2-orig/src/msgcache.c       2007-05-08 09:59:22.000000000 +0200
-+++ claws-mail-2.9.2/src/msgcache.c    2007-06-29 20:17:41.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/mbox.c claws-mail-2.10.0/src/mbox.c
+--- claws-mail-2.10.0-orig/src/mbox.c  2007-07-02 10:32:19.000000000 +0200
++++ claws-mail-2.10.0/src/mbox.c       2007-07-03 18:31:59.000000000 +0200
+@@ -37,6 +37,10 @@
+ #include <time.h>
+ #include <errno.h>
++#ifdef G_OS_WIN32
++#  include <w32lib.h>
++#endif
++
+ #include "mbox.h"
+ #include "procmsg.h"
+ #include "folder.h"
+diff -rupN claws-mail-2.10.0-orig/src/msgcache.c claws-mail-2.10.0/src/msgcache.c
+--- claws-mail-2.10.0-orig/src/msgcache.c      2007-07-02 10:32:18.000000000 +0200
++++ claws-mail-2.10.0/src/msgcache.c   2007-07-03 18:31:59.000000000 +0200
 @@ -28,7 +28,12 @@
  
  #include <glib.h>
@@ -591,30 +642,9 @@ diff -rup claws-mail-2.9.2-orig/src/msgcache.c claws-mail-2.9.2/src/msgcache.c
                ftruncate(fileno(write_fps.cache_fp), write_fps.cache_size);
                ftruncate(fileno(write_fps.mark_fp), write_fps.mark_size);
        } else {
-diff -rup claws-mail-2.9.2-orig/src/prefs_themes.c claws-mail-2.9.2/src/prefs_themes.c
---- claws-mail-2.9.2-orig/src/prefs_themes.c   2007-05-08 09:59:19.000000000 +0200
-+++ claws-mail-2.9.2/src/prefs_themes.c        2007-05-21 11:51:35.000000000 +0200
-@@ -445,7 +445,7 @@ static void prefs_themes_btn_remove_clic
-       tmp = g_path_get_basename(theme_str);
-       if (IS_SYSTEM_THEME(theme_str)) {
--              if (getuid() != 0) {
-+              if (!superuser_p()) {
-                       alertpanel_error(_("Only root can remove system themes"));
-                       return;
-               }
-@@ -518,7 +518,7 @@ static void prefs_themes_btn_install_cli
-               if (G_ALERTALTERNATE != val)
-                       goto end_inst;
-       }
--      if (getuid() == 0) {
-+      if (superuser_p ()) {
-               val = alertpanel(alert_title,
-                                _("Do you want to install theme for all users?"),
-                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/claws.def claws-mail-2.9.2/src/plugins/pgpcore/claws.def
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/claws.def        2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/claws.def     2007-07-02 19:51:25.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/claws.def claws-mail-2.10.0/src/plugins/pgpcore/claws.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/claws.def       2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/claws.def    2007-07-03 18:31:59.000000000 +0200
 @@ -1,26 +1,37 @@
  LIBRARY CLAWS-MAIL.EXE
  EXPORTS
@@ -669,9 +699,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/claws.def claws-mail-2.9.2/s
 +textview_set_font
 +textview_show_icon
 +textview_show_mime_part
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/Makefile.am claws-mail-2.9.2/src/plugins/pgpcore/Makefile.am
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/Makefile.am      2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/Makefile.am   2007-06-29 20:29:45.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.am claws-mail-2.10.0/src/plugins/pgpcore/Makefile.am
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.am     2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/Makefile.am  2007-07-03 18:31:59.000000000 +0200
 @@ -72,6 +72,7 @@ pgpcore_la_LIBADD = $(cygwin_export_lib)
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -680,9 +710,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/Makefile.am claws-mail-2.9.2
        -I$(top_srcdir)/src/gtk
  
  AM_CPPFLAGS = \
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/passphrase.c claws-mail-2.9.2/src/plugins/pgpcore/passphrase.c
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/passphrase.c     2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/passphrase.c  2007-05-21 10:19:05.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/passphrase.c claws-mail-2.10.0/src/plugins/pgpcore/passphrase.c
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/passphrase.c    2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/passphrase.c 2007-07-03 18:31:59.000000000 +0200
 @@ -44,7 +44,7 @@
  #include <string.h>
  #include <sys/types.h>
@@ -692,9 +722,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/passphrase.c claws-mail-2.9.
  #else
  #include <sys/mman.h>
  #endif
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/pgp_viewer.c claws-mail-2.9.2/src/plugins/pgpcore/pgp_viewer.c
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/pgp_viewer.c     2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/pgp_viewer.c  2007-05-21 10:21:25.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/pgp_viewer.c claws-mail-2.10.0/src/plugins/pgpcore/pgp_viewer.c
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/pgp_viewer.c    2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/pgp_viewer.c 2007-07-03 18:31:59.000000000 +0200
 @@ -26,7 +26,9 @@
  #include <glib.h>
  #include <glib/gi18n.h>
@@ -706,9 +736,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/pgp_viewer.c claws-mail-2.9.
  #if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
  #  include <sys/signal.h>
  #endif
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/plugin.def claws-mail-2.9.2/src/plugins/pgpcore/plugin.def
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/plugin.def       2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/plugin.def    2007-06-30 01:59:46.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/plugin.def claws-mail-2.10.0/src/plugins/pgpcore/plugin.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/plugin.def      2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/plugin.def   2007-07-03 18:31:59.000000000 +0200
 @@ -1,13 +1,15 @@
  EXPORTS
 -        plugin_init
@@ -737,9 +767,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/plugin.def claws-mail-2.9.2/
 +        prefs_gpg_remove_skip_encryption_warning
 +        prefs_gpg_should_skip_encryption_warning
          prefs_gpg_get_config
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/sgpgme.c claws-mail-2.9.2/src/plugins/pgpcore/sgpgme.c
---- claws-mail-2.9.2-orig/src/plugins/pgpcore/sgpgme.c 2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpcore/sgpgme.c      2007-05-21 10:21:47.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/sgpgme.c claws-mail-2.10.0/src/plugins/pgpcore/sgpgme.c
+--- claws-mail-2.10.0-orig/src/plugins/pgpcore/sgpgme.c        2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/sgpgme.c     2007-07-03 18:31:59.000000000 +0200
 @@ -33,7 +33,9 @@
  #include <stdlib.h>
  #include <errno.h>
@@ -751,9 +781,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpcore/sgpgme.c claws-mail-2.9.2/sr
  #if (defined(__DragonFly__) || defined (__NetBSD__) || defined (__FreeBSD__) || defined (__OpenBSD__))
  #  include <sys/signal.h>
  #endif
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/claws.def claws-mail-2.9.2/src/plugins/pgpinline/claws.def
---- claws-mail-2.9.2-orig/src/plugins/pgpinline/claws.def      2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpinline/claws.def   2007-07-02 19:53:21.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/claws.def claws-mail-2.10.0/src/plugins/pgpinline/claws.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpinline/claws.def     2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpinline/claws.def  2007-07-03 18:31:59.000000000 +0200
 @@ -1,5 +1,6 @@
  LIBRARY CLAWS-MAIL.EXE
  EXPORTS
@@ -778,9 +808,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/claws.def claws-mail-2.9.2
 -privacy_set_error
 -privacy_get_error
 -privacy_reset_error
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/Makefile.am claws-mail-2.9.2/src/plugins/pgpinline/Makefile.am
---- claws-mail-2.9.2-orig/src/plugins/pgpinline/Makefile.am    2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpinline/Makefile.am 2007-06-30 00:25:06.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.am claws-mail-2.10.0/src/plugins/pgpinline/Makefile.am
+--- claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.am   2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpinline/Makefile.am        2007-07-03 18:31:59.000000000 +0200
 @@ -71,6 +71,7 @@ pgpinline_la_LIBADD = $(plugin_ldadd) $(
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -789,9 +819,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/Makefile.am claws-mail-2.9
        -I$(top_srcdir)/src/gtk
  
  AM_CPPFLAGS = \
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/mypgpcore.def claws-mail-2.9.2/src/plugins/pgpinline/mypgpcore.def
---- claws-mail-2.9.2-orig/src/plugins/pgpinline/mypgpcore.def  2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpinline/mypgpcore.def       2007-07-02 19:54:29.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/mypgpcore.def claws-mail-2.10.0/src/plugins/pgpinline/mypgpcore.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpinline/mypgpcore.def 2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpinline/mypgpcore.def      2007-07-03 18:31:59.000000000 +0200
 @@ -1,14 +1,16 @@
  LIBRARY PGPCORE.DLL
  EXPORTS
@@ -821,9 +851,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/mypgpcore.def claws-mail-2
 +sgpgme_sigstat_info_full
 +sgpgme_sigstat_info_short
 +sgpgme_verify_signature
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/plugin.def claws-mail-2.9.2/src/plugins/pgpinline/plugin.def
---- claws-mail-2.9.2-orig/src/plugins/pgpinline/plugin.def     2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpinline/plugin.def  2007-06-30 01:05:15.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/plugin.def claws-mail-2.10.0/src/plugins/pgpinline/plugin.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpinline/plugin.def    2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpinline/plugin.def 2007-07-03 18:31:59.000000000 +0200
 @@ -1,9 +1,10 @@
  EXPORTS
 -        plugin_init
@@ -838,9 +868,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpinline/plugin.def claws-mail-2.9.
 +      plugin_provides
          plugin_version
  
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/claws.def claws-mail-2.9.2/src/plugins/pgpmime/claws.def
---- claws-mail-2.9.2-orig/src/plugins/pgpmime/claws.def        2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpmime/claws.def     2007-07-02 19:53:39.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/claws.def claws-mail-2.10.0/src/plugins/pgpmime/claws.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpmime/claws.def       2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpmime/claws.def    2007-07-03 18:31:59.000000000 +0200
 @@ -1,6 +1,7 @@
  LIBRARY CLAWS-MAIL.EXE
  EXPORTS
@@ -866,9 +896,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/claws.def claws-mail-2.9.2/s
 -privacy_set_error
 -privacy_get_error
 -privacy_reset_error
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/Makefile.am claws-mail-2.9.2/src/plugins/pgpmime/Makefile.am
---- claws-mail-2.9.2-orig/src/plugins/pgpmime/Makefile.am      2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpmime/Makefile.am   2007-06-30 00:20:29.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.am claws-mail-2.10.0/src/plugins/pgpmime/Makefile.am
+--- claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.am     2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpmime/Makefile.am  2007-07-03 18:31:59.000000000 +0200
 @@ -70,6 +70,7 @@ pgpmime_la_LIBADD = $(plugin_ldadd) $(pg
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -877,9 +907,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/Makefile.am claws-mail-2.9.2
        -I$(top_srcdir)/src/gtk
  
  AM_CPPFLAGS = \
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/mypgpcore.def claws-mail-2.9.2/src/plugins/pgpmime/mypgpcore.def
---- claws-mail-2.9.2-orig/src/plugins/pgpmime/mypgpcore.def    2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpmime/mypgpcore.def 2007-07-02 19:55:09.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/mypgpcore.def claws-mail-2.10.0/src/plugins/pgpmime/mypgpcore.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpmime/mypgpcore.def   2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpmime/mypgpcore.def        2007-07-03 18:31:59.000000000 +0200
 @@ -1,14 +1,17 @@
  LIBRARY PGPCORE.DLL
  EXPORTS
@@ -910,9 +940,9 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/mypgpcore.def claws-mail-2.9
 +sgpgme_sigstat_info_full
 +sgpgme_sigstat_info_short
 +sgpgme_verify_signature
-diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/plugin.def claws-mail-2.9.2/src/plugins/pgpmime/plugin.def
---- claws-mail-2.9.2-orig/src/plugins/pgpmime/plugin.def       2007-05-08 09:59:23.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/pgpmime/plugin.def    2007-06-30 01:05:27.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/plugin.def claws-mail-2.10.0/src/plugins/pgpmime/plugin.def
+--- claws-mail-2.10.0-orig/src/plugins/pgpmime/plugin.def      2007-07-02 10:32:21.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpmime/plugin.def   2007-07-03 18:31:59.000000000 +0200
 @@ -1,8 +1,9 @@
  EXPORTS
 -        plugin_init
@@ -925,67 +955,10 @@ diff -rup claws-mail-2.9.2-orig/src/plugins/pgpmime/plugin.def claws-mail-2.9.2/
          plugin_type
 -        plugin_licence
 +      plugin_provides
-         plugin_versio
-ndiff -rup claws-mail-2.10.0-orig/src/common/log.c claws-mail-2.10.0/src/common/log.c
---- claws-mail-2.10.0-orig/src/common/log.c    2007-07-02 10:32:17.000000000 +0200
-+++ claws-mail-2.10.0/src/common/log.c 2007-07-02 23:29:10.000000000 +0200
-@@ -23,6 +23,10 @@
- #include "defs.h"
-+#ifdef G_OS_WIN32
-+#  include <w32lib.h>
-+#endif
-+
- #include <stdio.h>
- #include <glib.h>
- #include <glib/gi18n.h>
-diff -rup claws-mail-2.10.0-orig/src/common/w32lib.h claws-mail-2.10.0/src/common/w32lib.h
---- claws-mail-2.10.0-orig/src/common/w32lib.h 2007-07-02 23:47:23.000000000 +0200
-+++ claws-mail-2.10.0/src/common/w32lib.h      2007-07-02 23:31:31.000000000 +0200
-@@ -208,4 +208,11 @@ int w32_is_administrator (void);
- char *read_w32_registry_string( char *parent, char *section, char *key );
- char *get_content_type_from_registry_with_ext( char *ext );
-+\f
-+/* Simulate thread-safe versions of some functions.  */
-+#define gmtime_r(time, resultp) gmtime (time)
-+#define localtime_r(time, resultp) localtime (time)
-+#define asctime_r(time, buffer) asctime (time)
-+#define ctime_r(time, buffer) ctime (time)
-+
- #endif
-diff -rup claws-mail-2.10.0-orig/src/exporthtml.c claws-mail-2.10.0/src/exporthtml.c
---- claws-mail-2.10.0-orig/src/exporthtml.c    2007-07-02 10:32:21.000000000 +0200
-+++ claws-mail-2.10.0/src/exporthtml.c 2007-07-02 23:36:46.000000000 +0200
-@@ -33,6 +33,10 @@
- #include <glib.h>
- #include <glib/gi18n.h>
-+#ifdef G_OS_WIN32
-+#  include <w32lib.h>
-+#endif
-+
- #include "mgutils.h"
- #include "utils.h"
- #include "exporthtml.h"
-diff -rup claws-mail-2.10.0-orig/src/mbox.c claws-mail-2.10.0/src/mbox.c
---- claws-mail-2.10.0-orig/src/mbox.c  2007-07-02 10:32:19.000000000 +0200
-+++ claws-mail-2.10.0/src/mbox.c       2007-07-02 23:37:17.000000000 +0200
-@@ -37,6 +37,10 @@
- #include <time.h>
- #include <errno.h>
-+#ifdef G_OS_WIN32
-+#  include <w32lib.h>
-+#endif
-+
- #include "mbox.h"
- #include "procmsg.h"
- #include "folder.h"
-diff -rup claws-mail-2.10.0-orig/src/prefs_summaries.c claws-mail-2.10.0/src/prefs_summaries.c
+         plugin_version
+diff -rupN claws-mail-2.10.0-orig/src/prefs_summaries.c claws-mail-2.10.0/src/prefs_summaries.c
 --- claws-mail-2.10.0-orig/src/prefs_summaries.c       2007-07-02 10:32:18.000000000 +0200
-+++ claws-mail-2.10.0/src/prefs_summaries.c    2007-07-02 23:37:27.000000000 +0200
++++ claws-mail-2.10.0/src/prefs_summaries.c    2007-07-03 18:31:59.000000000 +0200
 @@ -31,6 +31,10 @@
  #include <gtk/gtk.h>
  #include <gdk/gdkkeysyms.h>
@@ -997,9 +970,30 @@ diff -rup claws-mail-2.10.0-orig/src/prefs_summaries.c claws-mail-2.10.0/src/pre
  #include "prefs_common.h"
  #include "prefs_gtk.h"
  #include "prefs_summary_open.h"
-diff -rup claws-mail-2.10.0-orig/src/procheader.c claws-mail-2.10.0/src/procheader.c
+diff -rupN claws-mail-2.10.0-orig/src/prefs_themes.c claws-mail-2.10.0/src/prefs_themes.c
+--- claws-mail-2.10.0-orig/src/prefs_themes.c  2007-07-02 10:32:15.000000000 +0200
++++ claws-mail-2.10.0/src/prefs_themes.c       2007-07-03 18:31:59.000000000 +0200
+@@ -445,7 +445,7 @@ static void prefs_themes_btn_remove_clic
+       tmp = g_path_get_basename(theme_str);
+       if (IS_SYSTEM_THEME(theme_str)) {
+-              if (getuid() != 0) {
++              if (!superuser_p()) {
+                       alertpanel_error(_("Only root can remove system themes"));
+                       return;
+               }
+@@ -518,7 +518,7 @@ static void prefs_themes_btn_install_cli
+               if (G_ALERTALTERNATE != val)
+                       goto end_inst;
+       }
+-      if (getuid() == 0) {
++      if (superuser_p ()) {
+               val = alertpanel(alert_title,
+                                _("Do you want to install theme for all users?"),
+                                GTK_STOCK_NO, GTK_STOCK_YES, NULL);
+diff -rupN claws-mail-2.10.0-orig/src/procheader.c claws-mail-2.10.0/src/procheader.c
 --- claws-mail-2.10.0-orig/src/procheader.c    2007-07-02 10:32:19.000000000 +0200
-+++ claws-mail-2.10.0/src/procheader.c 2007-07-02 23:36:56.000000000 +0200
++++ claws-mail-2.10.0/src/procheader.c 2007-07-03 18:31:59.000000000 +0200
 @@ -29,6 +29,10 @@
  #include <time.h>
  #include <sys/stat.h>
index e8b3d2d..6c93cb3 100755 (executable)
@@ -4,13 +4,14 @@ exit $?
 
 2007-06-30  Marcus Brinkmann  <marcus@g10code.de>
 
-       * Add the SMIME plugin straight to the source.  This makes
-          building it so much simpler.
+       * Add the S/MIME 0.7.1 plugin from claws-mail-extra-plugins-2.10.0
+       straight to the source.  This makes building it so much simpler.
 
-diff -ruN claws-mail-2.9.2-p03/configure.ac claws-mail-2.9.2/configure.ac
---- claws-mail-2.9.2-p03/configure.ac  2007-07-02 20:53:34.000000000 +0200
-+++ claws-mail-2.9.2/configure.ac      2007-07-02 20:54:13.000000000 +0200
-@@ -888,6 +888,7 @@
+
+diff -rupN claws-mail-2.10.0-orig/configure.ac claws-mail-2.10.0/configure.ac
+--- claws-mail-2.10.0-orig/configure.ac        2007-07-02 10:33:02.000000000 +0200
++++ claws-mail-2.10.0/configure.ac     2007-07-03 18:36:43.000000000 +0200
+@@ -895,6 +895,7 @@ src/plugins/clamav/Makefile
  src/plugins/pgpcore/Makefile
  src/plugins/pgpmime/Makefile
  src/plugins/pgpinline/Makefile
@@ -18,19 +19,19 @@ diff -ruN claws-mail-2.9.2-p03/configure.ac claws-mail-2.9.2/configure.ac
  doc/Makefile
  doc/man/Makefile
  tools/Makefile
-diff -ruN claws-mail-2.9.2-p03/src/plugins/Makefile.am claws-mail-2.9.2/src/plugins/Makefile.am
---- claws-mail-2.9.2-p03/src/plugins/Makefile.am       2007-07-02 20:53:34.000000000 +0200
-+++ claws-mail-2.9.2/src/plugins/Makefile.am   2007-07-02 20:54:14.000000000 +0200
-@@ -40,4 +40,5 @@
+diff -rupN claws-mail-2.10.0-orig/src/plugins/Makefile.am claws-mail-2.10.0/src/plugins/Makefile.am
+--- claws-mail-2.10.0-orig/src/plugins/Makefile.am     2007-07-02 10:32:20.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/Makefile.am  2007-07-03 18:36:43.000000000 +0200
+@@ -40,4 +40,5 @@ SUBDIRS = $(demo_dir) \
        $(clamav_dir) \
        $(pgpcore_dir) \
        $(pgpmime_dir) \
 -      $(pgpinline_dir)
 +      $(pgpinline_dir) \
 +      smime
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/claws.def claws-mail-2.9.2/src/plugins/smime/claws.def
---- claws-mail-2.9.2-p03/src/plugins/smime/claws.def   1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/claws.def       2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/claws.def claws-mail-2.10.0/src/plugins/smime/claws.def
+--- claws-mail-2.10.0-orig/src/plugins/smime/claws.def 1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/claws.def      2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,28 @@
 +LIBRARY CLAWS-MAIL.EXE
 +EXPORTS
@@ -60,9 +61,9 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/claws.def claws-mail-2.9.2/src/
 +procmime_write_mime_header
 +procmime_write_mimeinfo
 +str_write_to_file
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/Makefile.am claws-mail-2.9.2/src/plugins/smime/Makefile.am
---- claws-mail-2.9.2-p03/src/plugins/smime/Makefile.am 1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/Makefile.am     2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/Makefile.am claws-mail-2.10.0/src/plugins/smime/Makefile.am
+--- claws-mail-2.10.0-orig/src/plugins/smime/Makefile.am       1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/Makefile.am    2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,82 @@
 +EXTRA_DIST = version.rc plugin.def claws.def mypgpcore.def smime.deps
 +
@@ -146,9 +147,9 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/Makefile.am claws-mail-2.9.2/sr
 +clean-local:
 +      rm -f libclaws.a
 +      rm -f libmypgpcore.a
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/mypgpcore.def claws-mail-2.9.2/src/plugins/smime/mypgpcore.def
---- claws-mail-2.9.2-p03/src/plugins/smime/mypgpcore.def       1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/mypgpcore.def   2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/mypgpcore.def claws-mail-2.10.0/src/plugins/smime/mypgpcore.def
+--- claws-mail-2.10.0-orig/src/plugins/smime/mypgpcore.def     1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/mypgpcore.def  2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,13 @@
 +LIBRARY PGPCORE.DLL
 +EXPORTS
@@ -163,9 +164,9 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/mypgpcore.def claws-mail-2.9.2/
 +sgpgme_sigstat_info_full
 +sgpgme_sigstat_info_short
 +sgpgme_verify_signature
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/plugin.c claws-mail-2.9.2/src/plugins/smime/plugin.c
---- claws-mail-2.9.2-p03/src/plugins/smime/plugin.c    1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/plugin.c        2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/plugin.c claws-mail-2.10.0/src/plugins/smime/plugin.c
+--- claws-mail-2.10.0-orig/src/plugins/smime/plugin.c  1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/plugin.c       2007-07-03 18:39:18.000000000 +0200
 @@ -0,0 +1,90 @@
 +/*
 + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
@@ -202,7 +203,7 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/plugin.c claws-mail-2.9.2/src/p
 +
 +gint plugin_init(gchar **error)
 +{
-+      if (!check_plugin_version(MAKE_NUMERIC_VERSION(2, 7, 2, 63), 
++      if (!check_plugin_version(MAKE_NUMERIC_VERSION(2,9,2,72),
 +                              VERSION_NUMERIC, _("S/MIME"), error))
 +              return -1;
 +
@@ -257,9 +258,9 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/plugin.c claws-mail-2.9.2/src/p
 +{
 +      return VERSION;
 +}
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/plugin.def claws-mail-2.9.2/src/plugins/smime/plugin.def
---- claws-mail-2.9.2-p03/src/plugins/smime/plugin.def  1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/plugin.def      2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/plugin.def claws-mail-2.10.0/src/plugins/smime/plugin.def
+--- claws-mail-2.10.0-orig/src/plugins/smime/plugin.def        1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/plugin.def     2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,9 @@
 +EXPORTS
 +        plugin_desc
@@ -270,10 +271,10 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/plugin.def claws-mail-2.9.2/src
 +        plugin_type
 +      plugin_provides
 +        plugin_version
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.c claws-mail-2.9.2/src/plugins/smime/smime.c
---- claws-mail-2.9.2-p03/src/plugins/smime/smime.c     1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/smime.c 2007-07-02 20:54:14.000000000 +0200
-@@ -0,0 +1,860 @@
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/smime.c claws-mail-2.10.0/src/plugins/smime/smime.c
+--- claws-mail-2.10.0-orig/src/plugins/smime/smime.c   1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/smime.c        2007-07-03 18:38:38.000000000 +0200
+@@ -0,0 +1,879 @@
 +/* 
 + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
 + * Copyright (C) 1999-2007 Colin Leroy <colin@colino.net> and 
@@ -931,6 +932,23 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.c claws-mail-2.9.2/src/pl
 +      return sgpgme_get_encrypt_data(recp_names, GPGME_PROTOCOL_CMS);
 +}
 +
++static const gchar *smime_get_encrypt_warning(void)
++{
++      if (prefs_gpg_should_skip_encryption_warning(smime_system.id))
++              return NULL;
++      else
++              return _("Please note that email headers, like Subject, "
++                       "are not encrypted by the S/MIME system.");
++}
++
++static void smime_inhibit_encrypt_warning(gboolean inhibit)
++{
++      if (inhibit)
++              prefs_gpg_add_skip_encryption_warning(smime_system.id);
++      else
++              prefs_gpg_remove_skip_encryption_warning(smime_system.id);
++}
++
 +static gchar *fp_read_noconv(FILE *fp)
 +{
 +      GByteArray *array;
@@ -1114,6 +1132,8 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.c claws-mail-2.9.2/src/pl
 +      TRUE,
 +      smime_get_encrypt_data,
 +      smime_encrypt,
++      smime_get_encrypt_warning,
++      smime_inhibit_encrypt_warning,
 +};
 +
 +void smime_init()
@@ -1134,14 +1154,14 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.c claws-mail-2.9.2/src/pl
 +      return features;
 +}
 +#endif /* USE_GPGME */
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.deps claws-mail-2.9.2/src/plugins/smime/smime.deps
---- claws-mail-2.9.2-p03/src/plugins/smime/smime.deps  1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/smime.deps      2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/smime.deps claws-mail-2.10.0/src/plugins/smime/smime.deps
+--- claws-mail-2.10.0-orig/src/plugins/smime/smime.deps        1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/smime.deps     2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1 @@
 +pgpcore
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.h claws-mail-2.9.2/src/plugins/smime/smime.h
---- claws-mail-2.9.2-p03/src/plugins/smime/smime.h     1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/smime.h 2007-07-02 20:54:14.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/smime.h claws-mail-2.10.0/src/plugins/smime/smime.h
+--- claws-mail-2.10.0-orig/src/plugins/smime/smime.h   1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/smime.h        2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,27 @@
 +/*
 + * Claws Mail -- a GTK+ based, lightweight, and fast e-mail client
@@ -1170,9 +1190,9 @@ diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/smime.h claws-mail-2.9.2/src/pl
 +void smime_done(void);
 +
 +#endif /* PGPMIME_H */
-diff -ruN claws-mail-2.9.2-p03/src/plugins/smime/version.rc claws-mail-2.9.2/src/plugins/smime/version.rc
---- claws-mail-2.9.2-p03/src/plugins/smime/version.rc  1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.9.2/src/plugins/smime/version.rc      2007-07-02 20:54:15.000000000 +0200
+diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/version.rc claws-mail-2.10.0/src/plugins/smime/version.rc
+--- claws-mail-2.10.0-orig/src/plugins/smime/version.rc        1970-01-01 01:00:00.000000000 +0100
++++ claws-mail-2.10.0/src/plugins/smime/version.rc     2007-07-03 18:36:43.000000000 +0200
 @@ -0,0 +1,36 @@
 +1 VERSIONINFO
 + FILEVERSION 0, 0, 0, 0
index dd2b48f..6965d31 100755 (executable)
@@ -8,10 +8,12 @@ exit $?
 
 $ aclocal -I m4   && libtoolize --force --copy   && autoheader   && automake --add-missing --foreign --copy   && autoconf
 
+       but removing autom4te.cache before creating the diff.
+
 
 diff -rupN claws-mail-2.10.0-orig/aclocal.m4 claws-mail-2.10.0/aclocal.m4
 --- claws-mail-2.10.0-orig/aclocal.m4  2007-07-02 12:03:02.000000000 +0200
-+++ claws-mail-2.10.0/aclocal.m4       2007-07-02 22:55:40.000000000 +0200
++++ claws-mail-2.10.0/aclocal.m4       2007-07-03 18:42:31.000000000 +0200
 @@ -8029,7 +8029,7 @@ path to pkg-config.
  
  _PKG_TEXT
@@ -165,7 +167,7 @@ diff -rupN claws-mail-2.10.0-orig/config/config.sub claws-mail-2.10.0/config/con
                ;;
 diff -rupN claws-mail-2.10.0-orig/configure claws-mail-2.10.0/configure
 --- claws-mail-2.10.0-orig/configure   2007-07-02 12:03:19.000000000 +0200
-+++ claws-mail-2.10.0/configure        2007-07-02 22:56:00.000000000 +0200
++++ claws-mail-2.10.0/configure        2007-07-03 18:42:59.000000000 +0200
 @@ -26664,7 +26664,7 @@ Alternatively, you may set the environme
  and GLIB_LIBS to avoid the need to call pkg-config.
  See the pkg-config man page for more details.
@@ -221,7 +223,7 @@ diff -rupN claws-mail-2.10.0-orig/configure claws-mail-2.10.0/configure
      "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;;
 diff -rupN claws-mail-2.10.0-orig/src/common/Makefile.in claws-mail-2.10.0/src/common/Makefile.in
 --- claws-mail-2.10.0-orig/src/common/Makefile.in      2007-07-02 12:03:14.000000000 +0200
-+++ claws-mail-2.10.0/src/common/Makefile.in   2007-07-02 22:55:53.000000000 +0200
++++ claws-mail-2.10.0/src/common/Makefile.in   2007-07-03 18:42:49.000000000 +0200
 @@ -57,15 +57,16 @@ libclawscommon_la_DEPENDENCIES = $(am__D
        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1)
  am__libclawscommon_la_SOURCES_DIST = fnmatch.c w32_dirent.c w32_reg.c \
@@ -264,7 +266,7 @@ diff -rupN claws-mail-2.10.0-orig/src/common/Makefile.in claws-mail-2.10.0/src/c
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/w32_signal.Plo@am__quote@
 diff -rupN claws-mail-2.10.0-orig/src/gtk/Makefile.in claws-mail-2.10.0/src/gtk/Makefile.in
 --- claws-mail-2.10.0-orig/src/gtk/Makefile.in 2007-07-02 12:03:15.000000000 +0200
-+++ claws-mail-2.10.0/src/gtk/Makefile.in      2007-07-02 22:55:54.000000000 +0200
++++ claws-mail-2.10.0/src/gtk/Makefile.in      2007-07-03 18:42:50.000000000 +0200
 @@ -340,6 +340,7 @@ clawsgtkinclude_HEADERS = \
  
  AM_CPPFLAGS = \
@@ -275,7 +277,7 @@ diff -rupN claws-mail-2.10.0-orig/src/gtk/Makefile.in claws-mail-2.10.0/src/gtk/
        $(OPENSSL_CFLAGS) \
 diff -rupN claws-mail-2.10.0-orig/src/Makefile.in claws-mail-2.10.0/src/Makefile.in
 --- claws-mail-2.10.0-orig/src/Makefile.in     2007-07-02 12:03:14.000000000 +0200
-+++ claws-mail-2.10.0/src/Makefile.in  2007-07-02 22:55:53.000000000 +0200
++++ claws-mail-2.10.0/src/Makefile.in  2007-07-03 18:42:49.000000000 +0200
 @@ -115,15 +115,6 @@ am_claws_mail_OBJECTS = account.$(OBJEXT
  claws_mail_OBJECTS = $(am_claws_mail_OBJECTS)
  @CLAWS_LIBETPAN_TRUE@am__DEPENDENCIES_1 = etpan/libclawsetpan.la
@@ -347,7 +349,7 @@ diff -rupN claws-mail-2.10.0-orig/src/Makefile.in claws-mail-2.10.0/src/Makefile
  @CYGWIN_TRUE@ @rm -f claws-mail.def claws-mail.base claws-mail.exp libclaws-mail.a .libs/libclaws-mail.a
 diff -rupN claws-mail-2.10.0-orig/src/plugins/Makefile.in claws-mail-2.10.0/src/plugins/Makefile.in
 --- claws-mail-2.10.0-orig/src/plugins/Makefile.in     2007-07-02 12:03:15.000000000 +0200
-+++ claws-mail-2.10.0/src/plugins/Makefile.in  2007-07-02 22:55:54.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/Makefile.in  2007-07-03 18:42:50.000000000 +0200
 @@ -60,7 +60,7 @@ RECURSIVE_CLEAN_TARGETS = mostlyclean-re
  ETAGS = etags
  CTAGS = ctags
@@ -369,7 +371,7 @@ diff -rupN claws-mail-2.10.0-orig/src/plugins/Makefile.in claws-mail-2.10.0/src/
  
 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.in claws-mail-2.10.0/src/plugins/pgpcore/Makefile.in
 --- claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.in     2007-07-02 12:03:17.000000000 +0200
-+++ claws-mail-2.10.0/src/plugins/pgpcore/Makefile.in  2007-07-02 22:55:57.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpcore/Makefile.in  2007-07-03 18:42:52.000000000 +0200
 @@ -321,6 +321,7 @@ pgpcore_la_LIBADD = $(cygwin_export_lib)
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -380,7 +382,7 @@ diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpcore/Makefile.in claws-mail-2.1
  AM_CPPFLAGS = \
 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.in claws-mail-2.10.0/src/plugins/pgpinline/Makefile.in
 --- claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.in   2007-07-02 12:03:17.000000000 +0200
-+++ claws-mail-2.10.0/src/plugins/pgpinline/Makefile.in        2007-07-02 22:55:57.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpinline/Makefile.in        2007-07-03 18:42:53.000000000 +0200
 @@ -319,6 +319,7 @@ pgpinline_la_LIBADD = $(plugin_ldadd) $(
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -391,7 +393,7 @@ diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpinline/Makefile.in claws-mail-2
  AM_CPPFLAGS = \
 diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.in claws-mail-2.10.0/src/plugins/pgpmime/Makefile.in
 --- claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.in     2007-07-02 12:03:17.000000000 +0200
-+++ claws-mail-2.10.0/src/plugins/pgpmime/Makefile.in  2007-07-02 22:55:57.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/pgpmime/Makefile.in  2007-07-03 18:42:53.000000000 +0200
 @@ -318,6 +318,7 @@ pgpmime_la_LIBADD = $(plugin_ldadd) $(pg
  INCLUDES = \
        -I$(top_srcdir)/src \
@@ -402,7 +404,7 @@ diff -rupN claws-mail-2.10.0-orig/src/plugins/pgpmime/Makefile.in claws-mail-2.1
  AM_CPPFLAGS = \
 diff -rupN claws-mail-2.10.0-orig/src/plugins/smime/Makefile.in claws-mail-2.10.0/src/plugins/smime/Makefile.in
 --- claws-mail-2.10.0-orig/src/plugins/smime/Makefile.in       1970-01-01 01:00:00.000000000 +0100
-+++ claws-mail-2.10.0/src/plugins/smime/Makefile.in    2007-07-02 22:55:57.000000000 +0200
++++ claws-mail-2.10.0/src/plugins/smime/Makefile.in    2007-07-03 18:42:53.000000000 +0200
 @@ -0,0 +1,661 @@
 +# Makefile.in generated by automake 1.10 from Makefile.am.
 +# @configure_input@