On Sun, 4 Sep 2011 22:31:28 +0200 roberth <[email protected]> wrote:
> On Sun, 4 Sep 2011 22:08:06 +0200 > Landry Breuil <[email protected]> wrote: thanks, for having a look at it! > > Not sure you wanted to comment out BUILD/RUN_DEPENDS there, nor > > updated PLIST :) ah, ok, i missed to include the PLIST update, kk. included/fixed. > -RUN_DEPENDS = mail/claws-mail>=3.7.6 > -BUILD_DEPENDS = ${RUN_DEPENDS} > +#RUN_DEPENDS = mail/claws-mail>=3.7.10 > +#BUILD_DEPENDS = ${RUN_DEPENDS} fixed. Index: mail/claws-mail/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail/Makefile,v retrieving revision 1.46 diff -u -p -r1.46 Makefile --- mail/claws-mail/Makefile 30 Aug 2011 06:54:11 -0000 1.46 +++ mail/claws-mail/Makefile 1 Sep 2011 19:49:28 -0000 @@ -7,9 +7,8 @@ COMMENT-bogofilter= bogofilter plugin COMMENT-clamav= clamav plugin COMMENT-spamassassin= spamassassin plugin -V= 3.7.9 +V= 3.7.10 DISTNAME= claws-mail-${V} -REVISION-main= 1 PKGNAME-main= ${DISTNAME} PKGNAME-bogofilter= claws-mail-bogofilter-${V} PKGNAME-spamassassin= claws-mail-spamassassin-${V} Index: mail/claws-mail/distinfo =================================================================== RCS file: /cvs/ports/mail/claws-mail/distinfo,v retrieving revision 1.21 diff -u -p -r1.21 distinfo --- mail/claws-mail/distinfo 21 Apr 2011 13:10:42 -0000 1.21 +++ mail/claws-mail/distinfo 1 Sep 2011 19:49:36 -0000 @@ -1,5 +1,5 @@ -MD5 (claws/claws-mail-3.7.9.tar.bz2) = L50tyr+E4xLP61bvp5m1sw== -RMD160 (claws/claws-mail-3.7.9.tar.bz2) = kxChqkMPnSaUfqjNJfOo72PrirM= -SHA1 (claws/claws-mail-3.7.9.tar.bz2) = pdXZPV1tbKvbq9ORck11ZKMERJo= -SHA256 (claws/claws-mail-3.7.9.tar.bz2) = s6XZHiXdAjDCG+QWPCdYaTd9IghDtXE3+X4Oy073dsM= -SIZE (claws/claws-mail-3.7.9.tar.bz2) = 7086757 +MD5 (claws/claws-mail-3.7.10.tar.bz2) = /PWNz/UvCQj/O8No2CBAiw== +RMD160 (claws/claws-mail-3.7.10.tar.bz2) = baJjsMzDE6s0ZkjNubXBKHNGIdU= +SHA1 (claws/claws-mail-3.7.10.tar.bz2) = bNtWlb//j46rK8v9XZhXbKN6Xt0= +SHA256 (claws/claws-mail-3.7.10.tar.bz2) = XEEZYw5LCz0UhvPZbvhHpIwTie9kJta11uZUVBNyFjg= +SIZE (claws/claws-mail-3.7.10.tar.bz2) = 7165265 Index: mail/claws-mail/patches/patch-src_main_c =================================================================== RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_main_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_main_c --- mail/claws-mail/patches/patch-src_main_c 13 Jun 2011 20:52:26 -0000 1.1 +++ 20:52:mail/claws-mail/patches/patch-src_main_c 4 Sep 2011 20:52:15:25:00 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_main_c,v 1.1 2011/06/13 20:52:26 landry Exp $ - -Fix a segfault at startup, from upstream bug #2414: -http://lists.claws-mail.org/pipermail/commits/2011-April/001364.html -http://www.thewildbeast.co.uk/claws-mail/bugzilla/show_bug.cgi?id=2414 ---- src/main.c.orig Sat Jun 11 18:19:00 2011 -+++ src/main.c Sat Jun 11 18:19:32 2011 -@@ -331,7 +331,7 @@ static void startup_notification_complete(gboolean wit - gtk_widget_show(hack); - } - -- xdisplay = gdk_display_get_default(); -+ xdisplay = GDK_DISPLAY_XDISPLAY(gdk_display_get_default()); - sn_display = sn_display_new(xdisplay, - sn_error_trap_push, - sn_error_trap_pop); Index: mail/claws-mail/patches/patch-src_mainwindow_c =================================================================== RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_mainwindow_c,v retrieving revision 1.1 diff -u -p -r1.1 patch-src_mainwindow_c --- mail/claws-mail/patches/patch-src_mainwindow_c 21 Apr 2011 13:10:42 -0000 1.1 +++ 13:10:mail/claws-mail/patches/patch-src_mainwindow_c 4 Sep 2011 13:10:15:25:07 -0000 @@ -1,13 +0,0 @@ -# $OpenBSD: patch-src_mainwindow_c,v 1.1 2011/04/21 13:10:42 landry Exp $ -# from upstream cvs, 3.7.9cvs2 - to be removed next update -# fixes bug 2396 - starts minimized under gnome shell ---- src/mainwindow.c.orig Fri Apr 15 00:54:38 2011 -+++ src/mainwindow.c Fri Apr 15 00:58:38 2011 -@@ -3573,6 +3573,7 @@ void main_window_popup(MainWindow *mainwin) - if (first_start) { - #ifdef G_OS_UNIX - gtk_window_deiconify(GTK_WINDOW(mainwin->window)); -+ gtkut_window_popup(mainwin->window); - #endif - first_start = FALSE; - } else { --- /dev/null Sun Sep 4 17:28:11 2011 +++ mail/claws-mail/patches/patch-src_common_socket_c Thu Sep 1 23:09:25 2011 @@ -0,0 +1,87 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs10, bug 2402 - "cope with GnuTLS 2.12 changes" +--- src/common/socket.c_bak Thu Sep 1 21:54:50 2011 ++++ src/common/socket.c Thu Sep 1 21:59:55 2011 +@@ -129,19 +129,21 @@ static guint io_timeout = 60; + + static GList *sock_connect_data_list = NULL; + +-static gboolean sock_prepare (GSource *source, ++static gboolean ssl_sock_prepare (GSource *source, + gint *timeout); +-static gboolean sock_check (GSource *source); +-static gboolean sock_dispatch (GSource *source, ++static gboolean ssl_sock_check (GSource *source); ++static gboolean ssl_sock_dispatch (GSource *source, + GSourceFunc callback, + gpointer user_data); + +-GSourceFuncs sock_watch_funcs = { +- sock_prepare, +- sock_check, +- sock_dispatch, ++#ifdef USE_GNUTLS ++GSourceFuncs ssl_watch_funcs = { ++ ssl_sock_prepare, ++ ssl_sock_check, ++ ssl_sock_dispatch, + NULL + }; ++#endif + + static gint sock_connect_with_timeout (gint sock, + const struct sockaddr *serv_addr, +@@ -457,13 +459,14 @@ gboolean sock_is_nonblocking_mode(SockInfo *sock) + } + + +-static gboolean sock_prepare(GSource *source, gint *timeout) ++#ifdef USE_GNUTLS ++static gboolean ssl_sock_prepare(GSource *source, gint *timeout) + { + *timeout = 1; + return FALSE; + } + +-static gboolean sock_check(GSource *source) ++static gboolean ssl_sock_check(GSource *source) + { + SockInfo *sock = ((SockSource *)source)->sock; + struct timeval timeout = {0, 0}; +@@ -475,6 +478,10 @@ static gboolean sock_check(GSource *source) + + condition = sock->condition; + ++ if ((condition & G_IO_IN) == G_IO_IN && ++ gnutls_record_check_pending(sock->ssl) != 0) ++ return TRUE; ++ + FD_ZERO(&fds); + FD_SET(sock->sock, &fds); + +@@ -486,7 +493,7 @@ static gboolean sock_check(GSource *source) + return FD_ISSET(sock->sock, &fds) != 0; + } + +-static gboolean sock_dispatch(GSource *source, GSourceFunc callback, ++static gboolean ssl_sock_dispatch(GSource *source, GSourceFunc callback, + gpointer user_data) + { + SockInfo *sock = ((SockSource *)source)->sock; +@@ -496,6 +503,7 @@ static gboolean sock_dispatch(GSource *source, GSource + + return sock->callback(sock, sock->condition, sock->data); + } ++#endif + + static gboolean sock_watch_cb(GIOChannel *source, GIOCondition condition, + gpointer data) +@@ -521,7 +529,7 @@ guint sock_add_watch(SockInfo *sock, GIOCondition cond + #ifdef USE_GNUTLS + if (sock->ssl) + { +- GSource *source = g_source_new(&sock_watch_funcs, ++ GSource *source = g_source_new(&ssl_watch_funcs, + sizeof(SockSource)); + ((SockSource *) source)->sock = sock; + g_source_set_priority(source, G_PRIORITY_DEFAULT); --- /dev/null Sun Sep 4 17:28:40 2011 +++ mail/claws-mail/patches/patch-src_common_ssl_c Thu Sep 1 23:12:20 2011 @@ -0,0 +1,23 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs10, bug 2402 - "cope with GnuTLS 2.12 changes" +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/common/ssl.c_bak Thu Sep 1 21:56:48 2011 ++++ src/common/ssl.c Thu Sep 1 21:59:55 2011 +@@ -270,7 +270,7 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf + if (session == NULL || r != 0) + return FALSE; + +- gnutls_transport_set_lowat (session, 1); ++ gnutls_transport_set_lowat (session, 0); + gnutls_set_default_priority(session); + gnutls_protocol_set_priority (session, proto_prio); + gnutls_cipher_set_priority (session, cipher_prio); +@@ -319,7 +319,7 @@ gboolean ssl_init_socket_with_method(SockInfo *sockinf + + r = gnutls_certificate_verify_peers2(session, &status); + +- if (!ssl_certificate_check(cert, status, sockinfo->canonical_name, sockinfo->hostname, sockinfo->port)) { ++ if (!ssl_certificate_check(cert, status, sockinfo->hostname, sockinfo->port)) { + gnutls_x509_crt_deinit(cert); + gnutls_certificate_free_credentials(xcred); + gnutls_deinit(session); --- /dev/null Sun Sep 4 17:28:54 2011 +++ mail/claws-mail/patches/patch-src_common_ssl_certificate_c Thu Sep 1 23:12:45 2011 @@ -0,0 +1,197 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/common/ssl_certificate.c_bak Thu Sep 1 21:56:56 2011 ++++ src/common/ssl_certificate.c Thu Sep 1 21:59:50 2011 +@@ -63,52 +63,6 @@ static gchar *get_certificate_path(const gchar *host, + host, ".", port, ".cert", NULL); + } + +-static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup); +-static char * get_fqdn(char *host) +-{ +-#ifdef INET6 +- gint gai_err; +- struct addrinfo hints, *res; +-#else +- struct hostent *hp; +-#endif +- +- if (host == NULL || strlen(host) == 0) +- return g_strdup(""); +-#ifdef INET6 +- memset(&hints, 0, sizeof(hints)); +- hints.ai_flags = AI_CANONNAME; +- hints.ai_family = AF_UNSPEC; +- hints.ai_socktype = SOCK_STREAM; +- hints.ai_protocol = IPPROTO_TCP; +- +- gai_err = getaddrinfo(host, NULL, &hints, &res); +- if (gai_err != 0) { +- g_warning("getaddrinfo for %s failed: %s\n", +- host, gai_strerror(gai_err)); +- return g_strdup(host); +- } +- if (res != NULL) { +- if (res->ai_canonname && strlen(res->ai_canonname)) { +- gchar *fqdn = g_strdup(res->ai_canonname); +- freeaddrinfo(res); +- return fqdn; +- } else { +- freeaddrinfo(res); +- return g_strdup(host); +- } +- } else { +- return g_strdup(host); +- } +-#else +- hp = my_gethostbyname(host); +- if (hp == NULL) +- return g_strdup(host); /*caller should free*/ +- else +- return g_strdup(hp->h_name); +-#endif +-} +- + char * readable_fingerprint(unsigned char *src, int len) + { + int i=0; +@@ -173,7 +127,7 @@ static gnutls_x509_crt x509_crt_copy(gnutls_x509_crt s + } + #endif + +-static SSLCertificate *ssl_certificate_new_lookup(gnutls_x509_crt x509_cert, gchar *host, gushort port, gboolean lookup) ++static SSLCertificate *ssl_certificate_new(gnutls_x509_crt x509_cert, const gchar *host, gushort port) + { + SSLCertificate *cert = g_new0(SSLCertificate, 1); + size_t n; +@@ -185,10 +139,7 @@ static SSLCertificate *ssl_certificate_new_lookup(gnut + } + cert->x509_cert = x509_crt_copy(x509_cert); + cert->status = (guint)-1; +- if (lookup) +- cert->host = get_fqdn(host); +- else +- cert->host = g_strdup(host); ++ cert->host = g_strdup(host); + cert->port = port; + + /* fingerprint */ +@@ -402,37 +353,26 @@ void ssl_certificate_delete_from_disk(SSLCertificate * + g_free(buf); + } + +-SSLCertificate *ssl_certificate_find (gchar *host, gushort port, const gchar *fingerprint) ++SSLCertificate *ssl_certificate_find (const gchar *host, gushort port, const gchar *fingerprint) + { +- return ssl_certificate_find_lookup (host, port, fingerprint, TRUE); +-} +- +-SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gchar *fingerprint, gboolean lookup) +-{ + gchar *file = NULL; + gchar *buf; +- gchar *fqdn_host; + SSLCertificate *cert = NULL; + gnutls_x509_crt tmp_x509; + FILE *fp = NULL; + gboolean must_rename = FALSE; + +- if (lookup) +- fqdn_host = get_fqdn(host); +- else +- fqdn_host = g_strdup(host); +- + buf = g_strdup_printf("%d", port); + + if (fingerprint != NULL) { +- file = get_certificate_path(fqdn_host, buf, fingerprint); ++ file = get_certificate_path(host, buf, fingerprint); + fp = g_fopen(file, "rb"); + } + if (fp == NULL) { + /* see if we have the old one */ + debug_print("didn't get %s\n", file); + g_free(file); +- file = get_certificate_path(fqdn_host, buf, NULL); ++ file = get_certificate_path(host, buf, NULL); + fp = g_fopen(file, "rb"); + + if (fp) { +@@ -444,13 +384,12 @@ SSLCertificate *ssl_certificate_find_lookup (gchar *ho + } + if (fp == NULL) { + g_free(file); +- g_free(fqdn_host); + g_free(buf); + return NULL; + } + + if ((tmp_x509 = gnutls_d2i_X509_fp(fp, 0)) != NULL) { +- cert = ssl_certificate_new_lookup(tmp_x509, fqdn_host, port, lookup); ++ cert = ssl_certificate_new(tmp_x509, host, port); + debug_print("got cert %p\n", cert); + gnutls_x509_crt_deinit(tmp_x509); + } +@@ -458,15 +397,14 @@ SSLCertificate *ssl_certificate_find_lookup (gchar *ho + g_free(file); + + if (must_rename) { +- gchar *old = get_certificate_path(fqdn_host, buf, NULL); +- gchar *new = get_certificate_path(fqdn_host, buf, fingerprint); ++ gchar *old = get_certificate_path(host, buf, NULL); ++ gchar *new = get_certificate_path(host, buf, fingerprint); + if (strcmp(old, new)) + move_file(old, new, TRUE); + g_free(old); + g_free(new); + } + g_free(buf); +- g_free(fqdn_host); + + return cert; + } +@@ -605,30 +543,19 @@ char *ssl_certificate_check_signer (gnutls_x509_crt ce + return NULL; + } + +-gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port) ++gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, const gchar *host, gushort port) + { + SSLCertificate *current_cert = NULL; + SSLCertificate *known_cert; + SSLCertHookData cert_hook_data; +- gchar *fqdn_host = NULL; + gchar *fingerprint; + size_t n; + unsigned char md[128]; + +- if (fqdn) +- fqdn_host = g_strdup(fqdn); +- else if (host) +- fqdn_host = get_fqdn(host); +- else { +- g_warning("no host!\n"); +- return FALSE; +- } +- +- current_cert = ssl_certificate_new_lookup(x509_cert, fqdn_host, port, FALSE); ++ current_cert = ssl_certificate_new(x509_cert, host, port); + + if (current_cert == NULL) { + debug_print("Buggy certificate !\n"); +- g_free(fqdn_host); + return FALSE; + } + +@@ -638,10 +565,9 @@ gboolean ssl_certificate_check (gnutls_x509_crt x509_c + gnutls_x509_crt_get_fingerprint(x509_cert, GNUTLS_DIG_MD5, md, &n); + fingerprint = readable_fingerprint(md, n); + +- known_cert = ssl_certificate_find_lookup (fqdn_host, port, fingerprint, FALSE); ++ known_cert = ssl_certificate_find(host, port, fingerprint); + + g_free(fingerprint); +- g_free(fqdn_host); + + if (known_cert == NULL) { + cert_hook_data.cert = current_cert; --- /dev/null Sun Sep 4 17:28:58 2011 +++ mail/claws-mail/patches/patch-src_common_ssl_certificate_h Thu Sep 1 23:13:01 2011 @@ -0,0 +1,16 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/common/ssl_certificate.h_bak Thu Sep 1 21:57:06 2011 ++++ src/common/ssl_certificate.h Thu Sep 1 21:59:50 2011 +@@ -56,9 +56,8 @@ struct _SSLCertHookData + gboolean accept; + }; + +-SSLCertificate *ssl_certificate_find (gchar *host, gushort port, const gchar *fingerprint); +-SSLCertificate *ssl_certificate_find_lookup (gchar *host, gushort port, const gchar *fingerprint, gboolean lookup); +-gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, gchar *fqdn, gchar *host, gushort port); ++SSLCertificate *ssl_certificate_find (const gchar *host, gushort port, const gchar *fingerprint); ++gboolean ssl_certificate_check (gnutls_x509_crt x509_cert, guint status, const gchar *host, gushort port); + void ssl_certificate_destroy(SSLCertificate *cert); + void ssl_certificate_delete_from_disk(SSLCertificate *cert); + char * readable_fingerprint(unsigned char *src, int len); --- /dev/null Sun Sep 4 17:29:13 2011 +++ mail/claws-mail/patches/patch-src_etpan_imap-thread_c Thu Sep 1 23:13:58 2011 @@ -0,0 +1,26 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/etpan/imap-thread.c_bak Thu Sep 1 21:57:13 2011 ++++ src/etpan/imap-thread.c Thu Sep 1 21:59:50 2011 +@@ -533,8 +533,8 @@ static int etpan_certificate_check(const unsigned char + if (cert == NULL) { + g_warning("IMAP: can't get cert\n"); + return 0; +- } else if (ssl_certificate_check(cert, NULL, +- (gchar *)param->server, (gushort)param->port) == TRUE) { ++ } else if (ssl_certificate_check(cert, (gchar *)param->server, ++ (gushort)param->port) == TRUE) { + X509_free(cert); + return 0; + } else { +@@ -558,8 +558,8 @@ static int etpan_certificate_check(const unsigned char + if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { + g_warning("IMAP: can't get cert\n"); + return 0; +- } else if (ssl_certificate_check(cert, (guint)-1, NULL, +- (gchar *)param->server, (gushort)param->port) == TRUE) { ++ } else if (ssl_certificate_check(cert, (guint)-1, (gchar *)param->server, ++ (gushort)param->port) == TRUE) { + gnutls_x509_crt_deinit(cert); + return 0; + } else { --- /dev/null Sun Sep 4 17:29:20 2011 +++ mail/claws-mail/patches/patch-src_etpan_nntp-thread_c Thu Sep 1 23:14:13 2011 @@ -0,0 +1,22 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/etpan/nntp-thread.c_bak Thu Sep 1 21:57:21 2011 ++++ src/etpan/nntp-thread.c Thu Sep 1 21:59:50 2011 +@@ -384,7 +384,7 @@ static int etpan_certificate_check(const unsigned char + if (cert == NULL) { + g_warning("nntp: can't get cert\n"); + return 0; +- } else if (ssl_certificate_check(cert, NULL, ++ } else if (ssl_certificate_check(cert, + (gchar *)param->server, (gushort)param->port) == TRUE) { + X509_free(cert); + return 0; +@@ -409,7 +409,7 @@ static int etpan_certificate_check(const unsigned char + if (gnutls_x509_crt_import(cert, &tmp, GNUTLS_X509_FMT_DER) < 0) { + g_warning("nntp: can't get cert\n"); + return 0; +- } else if (ssl_certificate_check(cert, (guint)-1, NULL, ++ } else if (ssl_certificate_check(cert, (guint)-1, + (gchar *)param->server, (gushort)param->port) == TRUE) { + gnutls_x509_crt_deinit(cert); + return 0; --- /dev/null Sun Sep 4 17:29:47 2011 +++ mail/claws-mail/patches/patch-src_plugins_pgpinline_pgpinline.c Thu Sep 1 23:07:24 2011 @@ -0,0 +1,17 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs14, bug 2431 - "fix memleak handling pgp encrypted mails" +--- src/plugins/pgpinline/pgpinline.c_bak Thu Sep 1 21:56:12 2011 ++++ src/plugins/pgpinline/pgpinline.c Thu Sep 1 22:00:11 2011 +@@ -475,10 +475,12 @@ static MimeInfo *pgpinline_decrypt(MimeInfo *mimeinfo) + if (len > 0) { + if (fwrite(chars, 1, len, dstfp) < len) { + FILE_OP_ERROR(fname, "fwrite"); ++ g_free(chars); + privacy_set_error(_("Couldn't write to decrypted file %s"), fname); + goto FILE_ERROR; + } + } ++ g_free(chars); + /* Store any part after encrypted text */ + if (fwrite(_("--- End of PGP/Inline encrypted data ---\n"), 1, + strlen(_("--- End of PGP/Inline encrypted data ---\n")), --- /dev/null Sun Sep 4 17:30:04 2011 +++ mail/claws-mail/patches/patch-src_plugins_pgpmime_pgpmime_c Thu Sep 1 23:07:50 2011 @@ -0,0 +1,21 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs14, bug 2431 - "fix memleak handling pgp encrypted mails" +--- src/plugins/pgpmime/pgpmime.c_bak Thu Sep 1 21:56:24 2011 ++++ src/plugins/pgpmime/pgpmime.c Thu Sep 1 22:00:11 2011 +@@ -364,6 +364,7 @@ static MimeInfo 22:00:*pgpmime_decrypt(MimeInfo *mimeinfo) + if (len > 0) { + if (fwrite(chars, 1, len, dstfp) < len) { + FILE_OP_ERROR(fname, "fwrite"); ++ g_free(chars); + fclose(dstfp); + privacy_set_error(_("Couldn't write to decrypted file %s"), fname); + g_free(fname); +@@ -373,6 +374,8 @@ static MimeInfo *pgpmime_decrypt(MimeInfo *mimeinfo) + return NULL; + } + } ++ g_free(chars); ++ + if (fclose(dstfp) == EOF) { + FILE_OP_ERROR(fname, "fclose"); + privacy_set_error(_("Couldn't close decrypted file %s"), fname); --- /dev/null Sun Sep 4 17:30:18 2011 +++ mail/claws-mail/patches/patch-src_ssl_manager_c Thu Sep 1 23:11:57 2011 @@ -0,0 +1,13 @@ +$OpenBSD$ +# from upstream, 3.7.10cvs8, bug 2127 - "fix ssl cert checking" +--- src/ssl_manager.c_bak Thu Sep 1 21:56:41 2011 ++++ src/ssl_manager.c Thu Sep 1 21:59:50 2011 +@@ -348,7 +348,7 @@ static void ssl_manager_load_certs (void) + port = get_port(d->d_name); + fp = get_fingerprint(d->d_name); + +- cert = ssl_certificate_find_lookup(server, atoi(port), fp, FALSE); ++ cert = ssl_certificate_find(server, atoi(port), fp); + + ssl_manager_list_view_insert_cert(manager.certlist, NULL, + server, port, cert); Index: mail/claws-mail-attremover/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail-attremover/Makefile,v retrieving revision 1.11 diff -u -p -r1.11 Makefile --- mail/claws-mail-attremover/Makefile 1 Aug 2011 19:42:19 -0000 1.11 +++ mail/claws-mail-attremover/Makefile 4 Sep 2011 20:35:10 -0000 @@ -7,7 +7,7 @@ COMMENT = remove attachments from emails VERSION = 1.0.12 DISTNAME = att_remover-${VERSION} PKGNAME = claws-mail-attremover-${VERSION} -REVISION = 4 +REVISION = 5 MASTER_SITES = http://www.claws-mail.org/downloads/plugins/ CATEGORIES = mail DIST_SUBDIR = claws @@ -27,7 +27,7 @@ MODULES = devel/gettext LIB_DEPENDS = x11/gtk+2 -RUN_DEPENDS = mail/claws-mail>=3.7.6 +RUN_DEPENDS = mail/claws-mail BUILD_DEPENDS = ${RUN_DEPENDS} WANTLIB = X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes \ Index: mail/claws-mail-attremover/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/claws-mail-attremover/pkg/PLIST,v retrieving revision 1.2 diff -u -p -r1.2 PLIST --- mail/claws-mail-attremover/pkg/PLIST 25 May 2010 14:05:44 -0000 1.2 +++ mail/claws-mail-attremover/pkg/PLIST 4 Sep 2011 16:24:27 -0000 @@ -1,3 +1,5 @@ @comment $OpenBSD: PLIST,v 1.2 2010/05/25 14:05:44 ajacoutot Exp $ +lib/claws-mail/ +lib/claws-mail/plugins/ @comment lib/claws-mail/plugins/att_remover.la lib/claws-mail/plugins/att_remover.so Index: mail/claws-mail-htmlviewer/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail-htmlviewer/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- mail/claws-mail-htmlviewer/Makefile 21 Apr 2011 13:13:59 -0000 1.25 +++ mail/claws-mail-htmlviewer/Makefile 31 Aug 2011 23:18:13 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY= Yes COMMENT= HTML renderer plugin for Claws Mail -VERSION= 0.30 +VERSION= 0.31 DISTNAME= gtkhtml2_viewer-${VERSION} PKGNAME= claws-mail-htmlviewer-${VERSION} MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ Index: mail/claws-mail-htmlviewer/distinfo =================================================================== RCS file: /cvs/ports/mail/claws-mail-htmlviewer/distinfo,v retrieving revision 1.15 diff -u -p -r1.15 distinfo --- mail/claws-mail-htmlviewer/distinfo 21 Apr 2011 13:13:59 -0000 1.15 +++ mail/claws-mail-htmlviewer/distinfo 1 Sep 2011 21:20:18 -0000 @@ -1,5 +1,5 @@ -MD5 (claws/gtkhtml2_viewer-0.30.tar.gz) = kEkqFXfLwC0ML9Nwr7K1wA== -RMD160 (claws/gtkhtml2_viewer-0.30.tar.gz) = eFNMonphRuQO/kVXL5TE5wr4yOo= -SHA1 (claws/gtkhtml2_viewer-0.30.tar.gz) = kxwAvZ4oy6CPGG/tS6LvOV/JTM0= -SHA256 (claws/gtkhtml2_viewer-0.30.tar.gz) = iRibCcRKfpGUoYgTL3p8Q9CH0CgUk5xNNbvfpqeHo1A= -SIZE (claws/gtkhtml2_viewer-0.30.tar.gz) = 684440 +MD5 (claws/gtkhtml2_viewer-0.31.tar.gz) = psnfpvlpzNhEeWpXJLUhZw== +RMD160 (claws/gtkhtml2_viewer-0.31.tar.gz) = RZspkj5q6RX0kVRWoC/9yeR7GYE= +SHA1 (claws/gtkhtml2_viewer-0.31.tar.gz) = ikloRS2CkMfQhxhAZlfPPepCGo0= +SHA256 (claws/gtkhtml2_viewer-0.31.tar.gz) = TUH22WHvqsD1FwXlBSuscyvAva/uLvIIKpz52J8YOuU= +SIZE (claws/gtkhtml2_viewer-0.31.tar.gz) = 693080 Index: mail/claws-mail-htmlviewer/pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/claws-mail-htmlviewer/pkg/PLIST,v retrieving revision 1.6 diff -u -p -r1.6 PLIST --- mail/claws-mail-htmlviewer/pkg/PLIST 25 May 2010 15:13:36 -0000 1.6 +++ mail/claws-mail-htmlviewer/pkg/PLIST 1 Sep 2011 21:34:34 -0000 @@ -11,6 +11,7 @@ share/locale/hu/LC_MESSAGES/gtkhtml2_vie share/locale/id/LC_MESSAGES/gtkhtml2_viewer.mo share/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo share/locale/ja/LC_MESSAGES/gtkhtml2_viewer.mo +share/locale/lt/LC_MESSAGES/gtkhtml2_viewer.mo share/locale/nl/LC_MESSAGES/gtkhtml2_viewer.mo share/locale/pl/LC_MESSAGES/gtkhtml2_viewer.mo share/locale/pt_BR/LC_MESSAGES/gtkhtml2_viewer.mo Index: mail/claws-mail-notification/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail-notification/Makefile,v retrieving revision 1.24 diff -u -p -r1.24 Makefile --- mail/claws-mail-notification/Makefile 21 Apr 2011 13:13:59 -0000 1.24 +++ mail/claws-mail-notification/Makefile 31 Aug 2011 23:19:33 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY= Yes COMMENT= notification plugin for Claws-mail -VERSION= 0.27 +VERSION= 0.28 DISTNAME= notification_plugin-${VERSION} PKGNAME= claws-mail-notification-${VERSION} MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ Index: mail/claws-mail-notification/distinfo =================================================================== RCS file: /cvs/ports/mail/claws-mail-notification/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- mail/claws-mail-notification/distinfo 21 Apr 2011 13:13:59 -0000 1.13 +++ mail/claws-mail-notification/distinfo 4 Sep 2011 14:59:05 -0000 @@ -1,5 +1,5 @@ -MD5 (claws/notification_plugin-0.27.tar.gz) = qvKZlC06THBE8RvA1l373A== -RMD160 (claws/notification_plugin-0.27.tar.gz) = 3+P89p3DMvnrzKExdWvYpEDMcHo= -SHA1 (claws/notification_plugin-0.27.tar.gz) = w8wwtfMBD7FSlg3gmvuR6hMneAc= -SHA256 (claws/notification_plugin-0.27.tar.gz) = mq4mg76TJPH+x2EK8SHgc8lH1VUnhMwXFEFrj0b15V0= -SIZE (claws/notification_plugin-0.27.tar.gz) = 532402 +MD5 (claws/notification_plugin-0.28.tar.gz) = XLCzVldNaKMGEmrE+Ctktw== +RMD160 (claws/notification_plugin-0.28.tar.gz) = ElheFN0vIfJ9XVn70kY32ezdQZI= +SHA1 (claws/notification_plugin-0.28.tar.gz) = O8Jdr8oqdFxxFc2U1/kJ8tMYFKs= +SHA256 (claws/notification_plugin-0.28.tar.gz) = YZI+QSERvqXHmhvLP2duSotoHOlwQofqJkm/wAFP9TA= +SIZE (claws/notification_plugin-0.28.tar.gz) = 538454 Index: mail/claws-mail-notification/patches/patch-src_notification_popup_c =================================================================== RCS file: /cvs/ports/mail/claws-mail-notification/patches/patch-src_notification_popup_c,v file: retrieving revision 1.1 diff -u -p -r1.1 patch-src_notification_popup_c --- mail/claws-mail-notification/patches/patch-src_notification_popup_c 21 Apr 2011 07:05:36 -0000 1.1 +++ mail/claws-mail-notification/patches/patch-src_notification_popup_c 4 Sep 2011 15:25:13 -0000 @@ -1,16 +0,0 @@ -$OpenBSD: patch-src_notification_popup_c,v 1.1 2011/04/21 07:05:36 ajacoutot Exp $ - -Fix with libnotify>=0.7 -(notify_notification_new has lost its widget argument) - ---- src/notification_popup.c.orig Tue Apr 19 14:20:58 2011 -+++ src/notification_popup.c Tue Apr 19 14:21:06 2011 -@@ -339,7 +339,7 @@ static gboolean notification_libnotify_create(MsgInfo - break; - } - -- ppopup->notification = notify_notification_new(summary, utf8_str, NULL, NULL); -+ ppopup->notification = notify_notification_new(summary, utf8_str, NULL); - g_free(utf8_str); - if(ppopup->notification == NULL) { - debug_print("Notification Plugin: Failed to create a new " Index: mail/claws-mail-notification/patches/patch-src_notification_trayicon_c =================================================================== RCS file: /cvs/ports/mail/claws-mail-notification/patches/patch-src_notification_trayicon_c,v file: retrieving revision 1.1 diff -u -p -r1.1 patch-src_notification_trayicon_c --- mail/claws-mail-notification/patches/patch-src_notification_trayicon_c 21 Apr 2011 07:05:36 -0000 1.1 +++ mail/claws-mail-notification/patches/patch-src_notification_trayicon_c 4 Sep 2011 15:25:19 -0000 @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_notification_trayicon_c,v 1.1 2011/04/21 07:05:36 ajacoutot Exp $ - -Fix with libnotify>=0.7 -(notify_notification_new has lost its widget argument) -(notify_notification_attach_to_status_icon is gone) - ---- src/notification_trayicon.c.orig Tue Apr 19 14:19:52 2011 -+++ src/notification_trayicon.c Tue Apr 19 14:20:07 2011 -@@ -601,8 +601,8 @@ static gboolean notification_trayicon_popup_create(Msg - summary = notification_trayicon_popup_assemble_summary(); - utf8_str = notification_trayicon_popup_assemble_body(msginfo); - -- popup.notification = notify_notification_new(summary, utf8_str, NULL, NULL); -- notify_notification_attach_to_status_icon(popup.notification, trayicon); -+ popup.notification = notify_notification_new(summary, utf8_str, NULL); -+// notify_notification_attach_to_status_icon(popup.notification, trayicon); - - g_free(summary); - g_free(utf8_str); Index: mail/claws-mail-rssyl/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail-rssyl/Makefile,v retrieving revision 1.25 diff -u -p -r1.25 Makefile --- mail/claws-mail-rssyl/Makefile 21 Apr 2011 13:13:59 -0000 1.25 +++ mail/claws-mail-rssyl/Makefile 31 Aug 2011 23:20:14 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY= Yes COMMENT= RSS aggregator plugin for Claws-mail -VERSION= 0.30 +VERSION= 0.31 DISTNAME= rssyl-${VERSION} PKGNAME= claws-mail-rssyl-${VERSION} MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ Index: mail/claws-mail-rssyl/distinfo =================================================================== RCS file: /cvs/ports/mail/claws-mail-rssyl/distinfo,v retrieving revision 1.13 diff -u -p -r1.13 distinfo --- mail/claws-mail-rssyl/distinfo 21 Apr 2011 13:13:59 -0000 1.13 +++ mail/claws-mail-rssyl/distinfo 4 Sep 2011 15:13:14 -0000 @@ -1,5 +1,5 @@ -MD5 (claws/rssyl-0.30.tar.gz) = 0ejC2tXSe2T6P6pT41cgpw== -RMD160 (claws/rssyl-0.30.tar.gz) = MI8ccMLy1a1j9g69iOkKx8XuFsc= -SHA1 (claws/rssyl-0.30.tar.gz) = GIy9Sc3dYHuws8kn0KrMivTlbOA= -SHA256 (claws/rssyl-0.30.tar.gz) = 3gTOMHNBBfO50tQHyPRPg/+EVijV3KOdgZh3QHTWxwA= -SIZE (claws/rssyl-0.30.tar.gz) = 478581 +MD5 (claws/rssyl-0.31.tar.gz) = staIrsf1gYr0XA6ceMPpyQ== +RMD160 (claws/rssyl-0.31.tar.gz) = Wo2NXEJRK2lIbHVpGgavOYbrbjg= +SHA1 (claws/rssyl-0.31.tar.gz) = ByMJ3ZdiCPQQ088skwkpjeioYrs= +SHA256 (claws/rssyl-0.31.tar.gz) = 0JPUlQsJRE+D5ZmCx0LYNfhePNY1co+ZVmcz0DbwBM4= +SIZE (claws/rssyl-0.31.tar.gz) = 482749 Index: mail/claws-mail-vcalendar/Makefile =================================================================== RCS file: /cvs/ports/mail/claws-mail-vcalendar/Makefile,v retrieving revision 1.26 diff -u -p -r1.26 Makefile --- mail/claws-mail-vcalendar/Makefile 21 Apr 2011 13:13:59 -0000 1.26 +++ mail/claws-mail-vcalendar/Makefile 31 Aug 2011 23:21:09 -0000 @@ -4,7 +4,7 @@ SHARED_ONLY= Yes COMMENT= groupware plugin for Claws-mail -VERSION= 2.0.10 +VERSION= 2.0.11 DISTNAME= vcalendar-${VERSION} PKGNAME= claws-mail-vcalendar-${VERSION} MASTER_SITES= http://www.claws-mail.org/downloads/plugins/ Index: mail/claws-mail-vcalendar/distinfo =================================================================== RCS file: /cvs/ports/mail/claws-mail-vcalendar/distinfo,v retrieving revision 1.14 diff -u -p -r1.14 distinfo --- mail/claws-mail-vcalendar/distinfo 21 Apr 2011 13:13:59 -0000 1.14 +++ mail/claws-mail-vcalendar/distinfo 31 Aug 2011 23:41:36 -0000 @@ -1,5 +1,5 @@ -MD5 (claws/vcalendar-2.0.10.tar.gz) = lc/6Nlet1vP99JV5NtMXJQ== -RMD160 (claws/vcalendar-2.0.10.tar.gz) = 28VQ0tXvfAO61IZtgH5rIy4xPXM= -SHA1 (claws/vcalendar-2.0.10.tar.gz) = lUYw1pVI/pdl5oOYOgAQS6FRz00= -SHA256 (claws/vcalendar-2.0.10.tar.gz) = etGG4PAINE4eBvwc1ooS4m33+agzcLkhRCBU/o0kTjo= -SIZE (claws/vcalendar-2.0.10.tar.gz) = 833896 +MD5 (claws/vcalendar-2.0.11.tar.gz) = Hvo9xQF9bQ4cmHkYluh3hQ== +RMD160 (claws/vcalendar-2.0.11.tar.gz) = 6w8hqkKmGcBmhh4Axp8+J8rhEJA= +SHA1 (claws/vcalendar-2.0.11.tar.gz) = FbLiwvieqz/aUVGr2BoEzl4FrZM= +SHA256 (claws/vcalendar-2.0.11.tar.gz) = 4c6QNM4ScinEUzzk5ClWdFu7ev8FvTNWsbrhXJMGuos= +SIZE (claws/vcalendar-2.0.11.tar.gz) = 837130
