From bbcd0da4f47dd471ee1e4439731ac55fa3940422 Mon Sep 17 00:00:00 2001 From: Paul Mangan Date: Sat, 13 Oct 2012 09:45:58 +0000 Subject: [PATCH] 2012-10-13 [paul] 3.8.1cvs99 * src/common/ssl_certificate.c fix build with gnutls 3.1.3 Patch by Sean Buckheister. --- ChangeLog | 6 ++++++ PATCHSETS | 1 + configure.ac | 2 +- src/common/ssl_certificate.c | 1 + 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index d1704be5c..3f99995be 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-10-13 [paul] 3.8.1cvs99 + + * src/common/ssl_certificate.c + fix build with gnutls 3.1.3 + Patch by Sean Buckheister. + 2012-10-12 [mones] 3.8.1cvs98 * src/compose.c diff --git a/PATCHSETS b/PATCHSETS index 89f0b92b1..f0872eb7a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4473,3 +4473,4 @@ ( cvs diff -u -r 1.1.2.31 -r 1.1.2.32 src/gtk/gtkcmctree.c; cvs diff -u -r 1.1.4.64 -r 1.1.4.65 src/gtk/gtksctree.c; ) > 3.8.1cvs96.patchset ( cvs diff -u -r 1.9.2.60 -r 1.9.2.61 src/common/defs.h; ) > 3.8.1cvs97.patchset ( cvs diff -u -r 1.382.2.616 -r 1.382.2.617 src/compose.c; cvs diff -u -r 1.14.2.34 -r 1.14.2.35 src/grouplistdialog.c; cvs diff -u -r 1.179.2.267 -r 1.179.2.268 src/imap.c; cvs diff -u -r 1.2.2.36 -r 1.2.2.37 src/news_gtk.c; cvs diff -u -r 1.49.2.153 -r 1.49.2.154 src/procmime.c; cvs diff -u -r 1.150.2.130 -r 1.150.2.131 src/procmsg.c; cvs diff -u -r 1.36.2.206 -r 1.36.2.207 src/common/utils.c; cvs diff -u -r 1.20.2.81 -r 1.20.2.82 src/common/utils.h; cvs diff -u -r 1.1.4.122 -r 1.1.4.123 src/etpan/imap-thread.c; ) > 3.8.1cvs98.patchset +( cvs diff -u -r 1.4.2.44 -r 1.4.2.45 src/common/ssl_certificate.c; ) > 3.8.1cvs99.patchset diff --git a/configure.ac b/configure.ac index 46ef478bb..11ae90a67 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=8 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=98 +EXTRA_VERSION=99 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/ssl_certificate.c b/src/common/ssl_certificate.c index efc5c53e3..c1b371c65 100644 --- a/src/common/ssl_certificate.c +++ b/src/common/ssl_certificate.c @@ -93,6 +93,7 @@ static gnutls_x509_crt x509_crt_copy(gnutls_x509_crt src) size_t size; gnutls_datum tmp; gnutls_x509_crt dest; + size = 0; if (gnutls_x509_crt_init(&dest) != 0) { g_warning("couldn't gnutls_x509_crt_init\n"); -- 2.25.1