2007-12-21 [paul] 3.2.0cvs14

	* src/common/ssl_certificate.c
		fix FreeBSD build with IPV6 support

diff --git a/ChangeLog b/ChangeLog
index a5b21c907777688bfcab13d996af65be09bb7407..5044dd6eb7249cb83e7f70d30b074c2bec99437f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-12-21 [paul]      3.2.0cvs14
+
+       * src/common/ssl_certificate.c
+               fix FreeBSD build with IPV6 support 
+

 2007-12-20 [colin]     3.2.0cvs13
 
        * src/imap.c
 2007-12-20 [colin]     3.2.0cvs13
 
        * src/imap.c

diff --git a/PATCHSETS b/PATCHSETS
index a9ca475c7552c0365d7317288bf814dbfde8ddcc..5718c9bfc41703c03fd39ac29d7fec5b1e4d7126 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3150,3 +3150,4 @@
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 doc/man/claws-mail.1;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 po/es.po;  ) > 3.2.0cvs11.patchset
 ( cvs diff -u -r 1.179.2.204 -r 1.179.2.205 src/imap.c;  cvs diff -u -r 1.34.2.19 -r 1.34.2.20 src/imap.h;  cvs diff -u -r 1.105.2.121 -r 1.105.2.122 src/prefs_account.c;  ) > 3.2.0cvs12.patchset
 ( cvs diff -u -r 1.179.2.205 -r 1.179.2.206 src/imap.c;  ) > 3.2.0cvs13.patchset
 ( cvs diff -u -r 1.1.2.4 -r 1.1.2.5 doc/man/claws-mail.1;  cvs diff -u -r 1.60.2.48 -r 1.60.2.49 po/es.po;  ) > 3.2.0cvs11.patchset
 ( cvs diff -u -r 1.179.2.204 -r 1.179.2.205 src/imap.c;  cvs diff -u -r 1.34.2.19 -r 1.34.2.20 src/imap.h;  cvs diff -u -r 1.105.2.121 -r 1.105.2.122 src/prefs_account.c;  ) > 3.2.0cvs12.patchset
 ( cvs diff -u -r 1.179.2.205 -r 1.179.2.206 src/imap.c;  ) > 3.2.0cvs13.patchset

+( cvs diff -u -r 1.4.2.24 -r 1.4.2.25 src/common/ssl_certificate.c;  ) > 3.2.0cvs14.patchset

diff --git a/configure.ac b/configure.ac
index e2677b41b9c96a76c616606f44ad907bf36a9aa4..86bd8f900874cfabf92fd5f1a3e4c67c49d20962 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=2
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=13
+EXTRA_VERSION=14

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c
index 00b7fd658d3e9201b504da36408b39cdb30ee257..f8d0b02727633d0763b123993bde703f46e41068 100644 (file)
--- a/src/common/ssl_certificate.c
+++ b/src/common/ssl_certificate.c
@@ -28,12 +28,15 @@
 #else
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
 #else
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <sys/stat.h>

-#include <stdio.h>

 #include <unistd.h>
 #include <string.h>
 #endif
 #include <unistd.h>
 #include <string.h>
 #endif

+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <stdio.h>
+#include <netdb.h>

 #include <glib.h>
 #include <glib/gi18n.h>
 
 #include <glib.h>
 #include <glib/gi18n.h>