[pan2] GMIME_REQUIRED=2.5.5 GNUTLS_REQUIRED=2.12.10 (with nettle as crypto backend)

[Heinrich MÃller <henmull src gnome org>]

commit b9780ec037607732f9e4317aaec765d24a03d661
Author: Heinrich MÃller <henmull src gnome org>
Date:   Wed Jan 4 20:21:42 2012 +0100

    GMIME_REQUIRED=2.5.5
    GNUTLS_REQUIRED=2.12.10 (with nettle as crypto backend)

 configure.in                     |   25 ++++++++++++-------------
 pan/gui/gui.cc                   |    3 ---
 pan/tasks/socket-impl-main.cc    |    3 ++-
 pan/tasks/socket-impl-openssl.cc |    2 +-
 pan/usenet-utils/ssl-utils.h     |   11 ++++++-----
 5 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/configure.in b/configure.in
index 21dd30b..55f9f0e 100644
--- a/configure.in
+++ b/configure.in
@@ -46,11 +46,11 @@ dnl GtkSpell is optional: GTKSPELL_REQUIRED refers to the minimum version
 dnl needed if you want to build Pan with spellchecking in the Post window.
 
 GLIB_REQUIRED=2.17.6
-GMIME_REQUIRED=2.6.0
+GMIME_REQUIRED=2.5.5
 GTK_REQUIRED=2.16.0
 GTK3_REQUIRED=3.0.0
 GTKSPELL_REQUIRED=2.0.7
-GNUTLS_REQUIRED=3.0.9
+GNUTLS_REQUIRED=2.12.10
 LIBNOTIFY_REQUIRED=0.4.1
 LIBGSASL_REQUIRED=1.6.1
 LIBGKR_REQUIRED=3.2.2
@@ -125,7 +125,6 @@ if test "x$want_gnutls" = "xyes" ; then
   AC_SUBST([GNUTLS_LIBS])
 fi
 
-
 dnl Check for libnotify if user-enabled for popup notifications
 AC_ARG_ENABLE([libnotify],
 AC_HELP_STRING([--enable-libnotify],[enable libnotify support]),[enable_libnotify=$enableval],[enable_libnotify=yes])
@@ -139,16 +138,16 @@ if test "x$enable_libnotify" = "xyes" ; then
 fi
 
 dnl check for libgsasl for secure authentication
-AC_ARG_ENABLE([libgsasl],
-AC_HELP_STRING([--enable-libgsasl],[enable libgsasl support]),[enable_libgsasl=$enableval],[enable_libgsasl=yes])
-if test "x$enable_libgsasl" = "xyes" ; then
-  PKG_CHECK_MODULES([LIBGSASL],[libgsasl >= $LIBGSASL_REQUIRED],[HAVE_SASL="yes"],[HAVE_SASL="no"])
-  AC_SUBST([LIBGSASL_CFLAGS])
-  AC_SUBST([LIBGSASL_LIBS])
-  if test "x$HAVE_SASL" = "xyes"; then
-    AC_DEFINE([HAVE_SASL],[1],[libgsasl for secure authentication])
-  fi
-fi
+dnl AC_ARG_ENABLE([libgsasl],
+dnl AC_HELP_STRING([--enable-libgsasl],[enable libgsasl support]),[enable_libgsasl=$enableval],[enable_libgsasl=yes])
+dnl if test "x$enable_libgsasl" = "xyes" ; then
+  dnl PKG_CHECK_MODULES([LIBGSASL],[libgsasl >= $LIBGSASL_REQUIRED],[HAVE_SASL="yes"],[HAVE_SASL="no"])
+  dnl AC_SUBST([LIBGSASL_CFLAGS])
+  dnl AC_SUBST([LIBGSASL_LIBS])
+  dnl if test "x$HAVE_SASL" = "xyes"; then
+  dnl   AC_DEFINE([HAVE_SASL],[1],[libgsasl for secure authentication])
+  dnl fi
+dnl fi
 
 dnl Check for gnome-keyring if user-enabled for popup notifications
 AC_ARG_ENABLE([gkr],
diff --git a/pan/gui/gui.cc b/pan/gui/gui.cc
index 13d12d9..fc2e245 100644
--- a/pan/gui/gui.cc
+++ b/pan/gui/gui.cc
@@ -361,7 +361,6 @@ namespace
 
 GUI :: ~GUI ()
 {
-  std::cerr<<"dtor gui\n";
 
   const std::string accel_filename (get_accel_filename());
   gtk_accel_map_save (accel_filename.c_str());
@@ -1602,8 +1601,6 @@ namespace
   GtkWidget* pack_widgets (Prefs& prefs, GtkWidget * w1, GtkWidget * w2, int orient, gint uglyhack_idx)
   {
 
-    std::cerr<<"pack widgets\n";
-
     GtkWidget * w;
     if (w1!=NULL && w2!=NULL) {
       int pos = uglyhack_idx==0
diff --git a/pan/tasks/socket-impl-main.cc b/pan/tasks/socket-impl-main.cc
index 589dacb..4e4bd1f 100644
--- a/pan/tasks/socket-impl-main.cc
+++ b/pan/tasks/socket-impl-main.cc
@@ -38,9 +38,9 @@
 #include <cstring>
 
 #ifdef HAVE_GNUTLS
-  #include <gcrypt.h>
   #include <pan/usenet-utils/ssl-utils.h>
 #endif
+
 #include <pan/general/debug.h>
 #include <pan/general/log.h>
 #include <pan/general/locking.h>
@@ -108,6 +108,7 @@ namespace
   };
 }
 
+
 SocketCreator :: SocketCreator(Data& d, CertStore& cs) : data(d), store(cs)
 {
 
diff --git a/pan/tasks/socket-impl-openssl.cc b/pan/tasks/socket-impl-openssl.cc
index 74d48a6..133b3ec 100644
--- a/pan/tasks/socket-impl-openssl.cc
+++ b/pan/tasks/socket-impl-openssl.cc
@@ -795,7 +795,7 @@ GIOChannelSocketGnuTLS :: gnutls_get_iochannel(GIOChannel* channel, const char*
 
 	if(!(fd = g_io_channel_unix_get_fd(channel))) return 0;
 
-  if (gnutls_init (&session, GNUTLS_CLIENT | GNUTLS_NONBLOCK) != 0) return 0;
+  if (gnutls_init (&session, GNUTLS_CLIENT) != 0) return 0;
   if (gnutls_set_default_priority (session) != 0) return 0;
 
   gnutls_priority_set_direct (
diff --git a/pan/usenet-utils/ssl-utils.h b/pan/usenet-utils/ssl-utils.h
index 25ce687..86e925c 100644
--- a/pan/usenet-utils/ssl-utils.h
+++ b/pan/usenet-utils/ssl-utils.h
@@ -98,11 +98,12 @@ namespace pan
       iss = dn_buf;
       delete dn_buf;
 
-      gnutls_x509_crt_get_subject_unique_id(cert, NULL, &size);
-      dn_buf = new char[size];
-      gnutls_x509_crt_get_subject_unique_id(cert, dn_buf, &size);
-      sub = dn_buf;
-      delete dn_buf;
+      // FIXME : LEAVE this out for now
+//      gnutls_x509_crt_get_subject_unique_id(cert, NULL, &size);
+//      dn_buf = new char[size];
+//      gnutls_x509_crt_get_subject_unique_id(cert, dn_buf, &size);
+//      sub = dn_buf;
+//      delete dn_buf;
 
       /* init map */
       int i(0);