On Thu, Jun 28, 2012 at 12:42:06AM +0200, Christopher Zimmermann wrote:
> Hi,
>
> heres an update to claws-mail 3.8.1
Nice.. but can you justify all the new patches ? backported from
upstream ? Fixes some known upstream-reported failures ?
Landry
> Index: claws-mail/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/Makefile,v
> retrieving revision 1.52
> diff -u -p -r1.52 Makefile
> --- claws-mail/Makefile 15 Jun 2012 08:32:16 -0000 1.52
> +++ claws-mail/Makefile 27 Jun 2012 22:39:20 -0000
> @@ -7,14 +7,12 @@ COMMENT-bogofilter= bogofilter plugin
> COMMENT-clamav= clamav plugin
> COMMENT-spamassassin= spamassassin plugin
>
> -V= 3.8.0
> +V= 3.8.1
> DISTNAME= claws-mail-${V}
> PKGNAME-main= ${DISTNAME}
> PKGNAME-bogofilter= claws-mail-bogofilter-${V}
> PKGNAME-spamassassin= claws-mail-spamassassin-${V}
> CATEGORIES= mail news
> -
> -REVISION-main= 0
>
> HOMEPAGE= http://www.claws-mail.org/
>
> Index: claws-mail/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/distinfo,v
> retrieving revision 1.22
> diff -u -p -r1.22 distinfo
> --- claws-mail/distinfo 23 Jan 2012 18:57:33 -0000 1.22
> +++ claws-mail/distinfo 27 Jun 2012 22:39:20 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/claws-mail-3.8.0.tar.bz2) = 358WV9fzSVmiIFNE2VLC4w==
> -RMD160 (claws/claws-mail-3.8.0.tar.bz2) = WD4pZu/aei/WIR6sQwAbV8PQ784=
> -SHA1 (claws/claws-mail-3.8.0.tar.bz2) = 3mAQOSB0YzGU4qpYmOZtc8Nb2lo=
> -SHA256 (claws/claws-mail-3.8.0.tar.bz2) =
> 7JReOw899vHxP88UmtPuUwbA5ldbs3XPVY6QKKDrYjE=
> -SIZE (claws/claws-mail-3.8.0.tar.bz2) = 7190415
> +MD5 (claws/claws-mail-3.8.1.tar.bz2) = 04iSn7HI8E1LyyE5+q+ecA==
> +RMD160 (claws/claws-mail-3.8.1.tar.bz2) = 5Q3dgFieftufHBcqg+f0Hdjew3I=
> +SHA1 (claws/claws-mail-3.8.1.tar.bz2) = xRnQcSG/swlcej1H5TtnJr85ftg=
> +SHA256 (claws/claws-mail-3.8.1.tar.bz2) =
> tCH9kTaU+dBGNSErDEfJgIo/IKT5pd0VtvTNUCLG7m8=
> +SIZE (claws/claws-mail-3.8.1.tar.bz2) = 7335864
> Index: claws-mail/patches/patch-src_common_defs_h
> ===================================================================
> RCS file: claws-mail/patches/patch-src_common_defs_h
> diff -N claws-mail/patches/patch-src_common_defs_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ claws-mail/patches/patch-src_common_defs_h 27 Jun 2012 22:39:20
> -0000
> @@ -0,0 +1,13 @@
> +$OpenBSD$
> +--- src/common/defs.h.orig Fri Dec 16 09:09:34 2011
> ++++ src/common/defs.h Tue Apr 3 13:07:33 2012
> +@@ -148,6 +148,9 @@
> +
> + #define BUFFSIZE 8192
> +
> ++/* according to RFC 821 1000 characters including CRLF */
> ++#define MAXSMTPTEXTLEN 1000
> ++
> + #ifndef MAXPATHLEN
> + # define MAXPATHLEN 4095
> + #endif
> Index: claws-mail/patches/patch-src_common_quoted-printable_c
> ===================================================================
> RCS file: claws-mail/patches/patch-src_common_quoted-printable_c
> diff -N claws-mail/patches/patch-src_common_quoted-printable_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ claws-mail/patches/patch-src_common_quoted-printable_c 27 Jun 2012
> 22:39:20 -0000
> @@ -0,0 +1,133 @@
> +$OpenBSD$
> +--- src/common/quoted-printable.c.orig Fri Dec 16 09:09:34 2011
> ++++ src/common/quoted-printable.c Tue Apr 3 13:07:33 2012
> +@@ -22,66 +22,78 @@
> +
> + #include "utils.h"
> +
> ++/* Processes at most 78 characters from in buffer,
> ++ * and stores one NULL-terminated line of at most 76 characters (excl. \0)
> of
> ++ * quoted-printable output without terminating newline characters in out
> buffer.
> ++ * Except when encoding text, every output line ends in a soft line break.
> ++ * Therefore the caller can chain multiple lines of encoded data resulting
> from
> ++ * sequential runs by glueing them together with line breaks.
> ++ * The number of processed input characters is returned. */
> ++
> + #define MAX_LINELEN 76
> +
> + #define IS_LBREAK(p) \
> +- (*(p) == '\0' || *(p) == '\n' || (*(p) == '\r' && *((p) + 1) == '\n'))
> ++ ((p)[0] == '\n' ? 1 : ((p)[0] == '\r' && (p)[1] == '\n') ? 2 : 0)
> +
> +-#define SOFT_LBREAK_IF_REQUIRED(n) \
> +- if (len + (n) > MAX_LINELEN || \
> +- (len + (n) == MAX_LINELEN && (!IS_LBREAK(inp + 1)))) { \
> +- *outp++ = '='; \
> +- *outp++ = '\n'; \
> +- len = 0; \
> +- }
> +-
> +-void qp_encode_line(gchar *out, const guchar *in)
> ++gint qp_encode(gboolean text, gchar *out, const guchar *in, gint len)
> + {
> +- const guchar *inp = in;
> +- gchar *outp = out;
> +- guchar ch;
> +- gint len = 0;
> ++ /* counters of input/output characters */
> ++ gint inc = 0;
> ++ gint outc = 1; /* one character reserved for '=' soft line break */
> +
> +- while (*inp != '\0') {
> +- ch = *inp;
> +-
> +- if (IS_LBREAK(inp)) {
> +- *outp++ = '\n';
> +- len = 0;
> +- if (*inp == '\r')
> +- inp++;
> +- inp++;
> +- } else if (ch == '\t' || ch == ' ') {
> +- if (IS_LBREAK(inp + 1)) {
> +- SOFT_LBREAK_IF_REQUIRED(3);
> +- *outp++ = '=';
> +- get_hex_str(outp, ch);
> +- outp += 2;
> +- len += 3;
> +- inp++;
> +- } else {
> +- SOFT_LBREAK_IF_REQUIRED(1);
> +- *outp++ = *inp++;
> +- len++;
> ++ while(inc < len) {
> ++ /* allow literal linebreaks in text */
> ++ if(text) {
> ++ if(IS_LBREAK(in)) {
> ++ /* inserting linebreaks is the job of our
> caller */
> ++ g_assert(outc <= MAX_LINELEN);
> ++ *out = '\0';
> ++ return inc + IS_LBREAK(in);
> + }
> +- } else if ((ch >= 33 && ch <= 60) || (ch >= 62 && ch <= 126)) {
> +- SOFT_LBREAK_IF_REQUIRED(1);
> +- *outp++ = *inp++;
> +- len++;
> +- } else {
> +- SOFT_LBREAK_IF_REQUIRED(3);
> +- *outp++ = '=';
> +- get_hex_str(outp, ch);
> +- outp += 2;
> +- len += 3;
> +- inp++;
> ++ if(IS_LBREAK(in+1)) {
> ++ /* free the reserved character since no
> softbreak
> ++ * will be needed after the current character */
> ++ outc--;
> ++ /* guard against whitespace before a literal
> linebreak */
> ++ if(*in == ' ' || *in == '\t') {
> ++ goto escape;
> ++ }
> ++ }
> + }
> ++ if(*in == '=') {
> ++ goto escape;
> ++ }
> ++ /* Cave: Whitespace is unconditionally output literally,
> ++ * but according to the RFC it must not be output before a
> ++ * linebreak.
> ++ * This requirement is obeyed by quoting all linebreaks
> ++ * and therefore ending all lines with '='. */
> ++ else if((*in >= ' ' && *in <= '~') || *in == '\t') {
> ++ if(outc + 1 <= MAX_LINELEN) {
> ++ *out++ = *in++;
> ++ outc++;
> ++ inc++;
> ++ }
> ++ else break;
> ++ }
> ++ else {
> ++escape:
> ++ if(outc + 3 <= MAX_LINELEN) {
> ++ *out++ = '=';
> ++ outc++;
> ++ get_hex_str(out, *in);
> ++ out += 2;
> ++ outc += 2;
> ++ in++;
> ++ inc++;
> ++ }
> ++ else break;
> ++ }
> + }
> +-
> +- if (len > 0)
> +- *outp++ = '\n';
> +-
> +- *outp = '\0';
> ++ g_assert(outc <= MAX_LINELEN);
> ++ *out++ = '=';
> ++ *out = '\0';
> ++ return inc;
> + }
> +
> + gint qp_decode_line(gchar *str)
> Index: claws-mail/patches/patch-src_common_quoted-printable_h
> ===================================================================
> RCS file: claws-mail/patches/patch-src_common_quoted-printable_h
> diff -N claws-mail/patches/patch-src_common_quoted-printable_h
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ claws-mail/patches/patch-src_common_quoted-printable_h 27 Jun 2012
> 22:39:20 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +--- src/common/quoted-printable.h.orig Fri Dec 16 09:09:34 2011
> ++++ src/common/quoted-printable.h Tue Apr 3 13:07:33 2012
> +@@ -22,8 +22,10 @@
> +
> + #include <glib.h>
> +
> +-void qp_encode_line (gchar *out,
> +- const guchar *in);
> ++gint qp_encode (gboolean text,
> ++ gchar *out,
> ++ const guchar *in,
> ++ gint len);
> + gint qp_decode_line (gchar *str);
> + gint qp_decode_const (gchar *out,
> + gint avail,
> Index: claws-mail/patches/patch-src_common_smtp_c
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_common_smtp_c,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-src_common_smtp_c
> --- claws-mail/patches/patch-src_common_smtp_c 17 Oct 2008 12:46:33
> -0000 1.1
> +++ claws-mail/patches/patch-src_common_smtp_c 27 Jun 2012 22:39:20
> -0000
> @@ -1,6 +1,6 @@
> $OpenBSD: patch-src_common_smtp_c,v 1.1 2008/10/17 12:46:33 landry Exp $
> ---- src/common/smtp.c.orig Sat Oct 4 16:19:23 2008
> -+++ src/common/smtp.c Sat Oct 4 16:21:59 2008
> +--- src/common/smtp.c.orig Fri Dec 16 09:09:34 2011
> ++++ src/common/smtp.c Tue Apr 3 13:03:02 2012
> @@ -124,7 +124,7 @@ static void smtp_session_destroy(Session *session)
>
> gint smtp_from(SMTPSession *session)
> @@ -9,8 +9,8 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
> + gchar buf[MESSAGEBUFSIZE];
> gchar *mail_size = NULL;
>
> - g_return_val_if_fail(session->from != NULL, SM_ERROR);
> -@@ -182,7 +182,7 @@ static gint smtp_auth(SMTPSession *session)
> + cm_return_val_if_fail(session->from != NULL, SM_ERROR);
> +@@ -188,7 +188,7 @@ static gint smtp_auth(SMTPSession *session)
>
> static gint smtp_auth_recv(SMTPSession *session, const gchar *msg)
> {
> @@ -19,7 +19,7 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
>
> switch (session->auth_type) {
> case SMTPAUTH_LOGIN:
> -@@ -258,7 +258,7 @@ static gint smtp_auth_recv(SMTPSession *session, const
> +@@ -264,7 +264,7 @@ static gint smtp_auth_recv(SMTPSession *session, const
>
> static gint smtp_auth_login_user_recv(SMTPSession *session, const gchar
> *msg)
> {
> @@ -28,7 +28,7 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
>
> session->state = SMTP_AUTH_LOGIN_PASS;
>
> -@@ -278,7 +278,7 @@ static gint smtp_auth_login_user_recv(SMTPSession *ses
> +@@ -284,7 +284,7 @@ static gint smtp_auth_login_user_recv(SMTPSession *ses
>
> static gint smtp_ehlo(SMTPSession *session)
> {
> @@ -37,7 +37,7 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
>
> session->state = SMTP_EHLO;
>
> -@@ -357,7 +357,7 @@ static gint smtp_auth_cram_md5(SMTPSession *session)
> +@@ -363,7 +363,7 @@ static gint smtp_auth_cram_md5(SMTPSession *session)
>
> static gint smtp_auth_plain(SMTPSession *session)
> {
> @@ -46,7 +46,7 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
>
> /*
> * +1 +1 +1
> -@@ -422,7 +422,7 @@ static gint smtp_auth_login(SMTPSession *session)
> +@@ -428,7 +428,7 @@ static gint smtp_auth_login(SMTPSession *session)
>
> static gint smtp_helo(SMTPSession *session)
> {
> @@ -55,7 +55,7 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
>
> session->state = SMTP_HELO;
>
> -@@ -437,7 +437,7 @@ static gint smtp_helo(SMTPSession *session)
> +@@ -443,7 +443,7 @@ static gint smtp_helo(SMTPSession *session)
>
> static gint smtp_rcpt(SMTPSession *session)
> {
> @@ -63,4 +63,4 @@ $OpenBSD: patch-src_common_smtp_c,v 1.1
> + gchar buf[MESSAGEBUFSIZE];
> gchar *to;
>
> - g_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
> + cm_return_val_if_fail(session->cur_to != NULL, SM_ERROR);
> Index: claws-mail/patches/patch-src_inc_c
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_inc_c,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-src_inc_c
> --- claws-mail/patches/patch-src_inc_c 17 Oct 2008 12:46:33 -0000
> 1.6
> +++ claws-mail/patches/patch-src_inc_c 27 Jun 2012 22:39:20 -0000
> @@ -1,16 +1,16 @@
> $OpenBSD: patch-src_inc_c,v 1.6 2008/10/17 12:46:33 landry Exp $
> ---- src/inc.c.orig Thu Sep 18 05:44:28 2008
> -+++ src/inc.c Sat Oct 4 16:02:19 2008
> -@@ -85,7 +85,7 @@ static GdkPixbuf *currentpix;
> +--- src/inc.c.orig Wed Jun 27 11:05:23 2012
> ++++ src/inc.c Thu Jun 28 00:13:06 2012
> +@@ -88,7 +88,7 @@ static GdkPixbuf *currentpix;
> static GdkPixbuf *errorpix;
> static GdkPixbuf *okpix;
>
> -#define MSGBUFSIZE 8192
> +#define MESSAGEBUFSIZE 8192
>
> + static void inc_update_stats(gint new_msgs);
> static void inc_finished (MainWindow *mainwin,
> - gboolean new_messages,
> -@@ -946,7 +946,7 @@ static void inc_progress_dialog_set_label(IncProgressD
> +@@ -969,7 +969,7 @@ static void inc_progress_dialog_set_label(IncProgressD
> static void inc_progress_dialog_set_progress(IncProgressDialog *inc_dialog,
> IncSession *inc_session)
> {
> Index: claws-mail/patches/patch-src_messageview_c
> ===================================================================
> RCS file: claws-mail/patches/patch-src_messageview_c
> diff -N claws-mail/patches/patch-src_messageview_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ claws-mail/patches/patch-src_messageview_c 27 Jun 2012 22:39:20
> -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +--- src/messageview.c.orig Wed Jun 27 11:05:23 2012
> ++++ src/messageview.c Thu Jun 28 00:13:06 2012
> +@@ -988,8 +988,9 @@ static gint disposition_notification_send(MsgInfo *msg
> + extract_address(orig_to);
> + }
> + if (msginfo->subject && *(msginfo->subject)) {
> +- enc_sub = g_malloc0(strlen(msginfo->subject)*8);
> +- qp_encode_line(enc_sub, (const guchar *)msginfo->subject);
> ++ gint len = strlen(msginfo->subject);
> ++ enc_sub = g_malloc0(len*8);
> ++ qp_encode(TRUE, enc_sub, (const guchar *)msginfo->subject, len);
> + g_strstrip(enc_sub);
> + }
> + ok = fprintf(fp,"MIME-Version: 1.0\n"
> Index: claws-mail/patches/patch-src_procmime_c
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/patches/patch-src_procmime_c,v
> retrieving revision 1.6
> diff -u -p -r1.6 patch-src_procmime_c
> --- claws-mail/patches/patch-src_procmime_c 17 Oct 2008 12:46:33 -0000
> 1.6
> +++ claws-mail/patches/patch-src_procmime_c 27 Jun 2012 22:39:20 -0000
> @@ -1,7 +1,87 @@
> $OpenBSD: patch-src_procmime_c,v 1.6 2008/10/17 12:46:33 landry Exp $
> ---- src/procmime.c.orig Wed Oct 1 03:10:29 2008
> -+++ src/procmime.c Sat Oct 4 16:02:19 2008
> -@@ -1085,7 +1085,7 @@ GList *procmime_get_mime_type_list(void)
> +--- src/procmime.c.orig Fri Dec 16 09:09:32 2011
> ++++ src/procmime.c Tue Apr 3 14:59:40 2012
> +@@ -562,16 +562,29 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, E
> + g_free(tmp_file);
> + }
> + } else if (encoding == ENC_QUOTED_PRINTABLE) {
> +- gchar inbuf[BUFFSIZE], outbuf[BUFFSIZE * 4];
> ++ gchar inbuf[79], outbuf[77];
> ++ gint n, len = 0;
> ++ gboolean firstrun = TRUE;
> +
> +- while (fgets(inbuf, sizeof(inbuf), infp) != NULL) {
> +- qp_encode_line(outbuf, inbuf);
> ++ while ((len += fread(inbuf + len, 1,
> ++ sizeof(inbuf) - len - 1,
> ++ infp)) > 0)
> ++ {
> ++ if (firstrun == FALSE)
> ++ if (fputs("\r\n", outfp) == EOF)
> ++ err = TRUE;
> +
> ++ inbuf[len] = '\0';
> ++ n = qp_encode(mimeinfo->type == MIMETYPE_TEXT,
> ++ outbuf, inbuf, len);
> ++ len -= n;
> ++ memmove(inbuf, inbuf + n, len);
> ++
> + if (!strncmp("From ", outbuf, sizeof("From ")-1)) {
> + gchar *tmpbuf = outbuf;
> +-
> ++
> + tmpbuf += sizeof("From ")-1;
> +-
> ++
> + if (fputs("=46rom ", outfp) == EOF)
> + err = TRUE;
> + if (fputs(tmpbuf, outfp) == EOF)
> +@@ -580,14 +593,40 @@ gboolean procmime_encode_content(MimeInfo *mimeinfo, E
> + if (fputs(outbuf, outfp) == EOF)
> + err = TRUE;
> + }
> ++ firstrun = FALSE;
> + }
> + } else {
> +- gchar buf[BUFFSIZE];
> ++ gchar buf[MAXSMTPTEXTLEN+1];
> ++ gint leftover = 0;
> +
> +- while (fgets(buf, sizeof(buf), infp) != NULL) {
> +- strcrchomp(buf);
> +- if (fputs(buf, outfp) == EOF)
> ++ while (fgets(buf + leftover,
> ++ sizeof(buf) - leftover,
> ++ infp) != NULL)
> ++ {
> ++ gchar *l, *c = buf;
> ++ leftover = 0;
> ++
> ++ while (*c != '\0') {
> ++ if (
> ++ *c == '\n'
> ++ || (*c == '\r' && *(c+1) == '\n'))
> ++ {
> ++ *c = '\0';
> ++ break;
> ++ }
> ++ c++;
> ++ }
> ++ while (c - buf > MAXSMTPTEXTLEN - 2) {
> ++ *c = *(c-1);
> ++ *--c = '\0';
> ++ leftover++;
> ++ }
> ++
> ++ if (fputs(buf, outfp) == EOF || putc('\n', outfp) ==
> EOF)
> + err = TRUE;
> ++
> ++ for (l = buf; l-buf < leftover; l++)
> ++ *l = *++c;
> + }
> + }
> +
> +@@ -1094,7 +1133,7 @@ GList *procmime_get_mime_type_list(void)
> #endif
> {
> fp_is_glob_file = FALSE;
> @@ -10,3 +90,74 @@ $OpenBSD: patch-src_procmime_c,v 1.6 200
> if ((fp = g_fopen(SYSCONFDIR "/mime.types", "rb"))
> == NULL) {
> FILE_OP_ERROR(SYSCONFDIR "/mime.types",
> +@@ -1174,11 +1213,12 @@ EncodingType
> procmime_get_encoding_for_text_file(const
> + {
> + FILE *fp;
> + guchar buf[BUFFSIZE];
> ++ gboolean cr = FALSE;
> + size_t len;
> ++ gint linelen = 0, maxlinelen = 0;
> + size_t octet_chars = 0;
> + size_t total_len = 0;
> + gfloat octet_percentage;
> +- gboolean force_b64 = FALSE;
> +
> + if ((fp = g_fopen(file, "rb")) == NULL) {
> + FILE_OP_ERROR(file, "fopen");
> +@@ -1190,11 +1230,27 @@ EncodingType
> procmime_get_encoding_for_text_file(const
> + gint i;
> +
> + for (p = buf, i = 0; i < len; ++p, ++i) {
> +- if (*p & 0x80)
> +- ++octet_chars;
> +- if (*p == '\0') {
> +- force_b64 = TRUE;
> ++ switch (*p) {
> ++ case '\n':
> ++ if (cr) linelen--;
> ++ maxlinelen = MAX(linelen, maxlinelen);
> ++ linelen = 0;
> ++ cr = FALSE;
> ++ break;
> ++ case '\r':
> ++ cr = TRUE;
> ++ linelen++;
> ++ break;
> ++ case '\0':
> + *has_binary = TRUE;
> ++ maxlinelen = G_MAXINT;
> ++ cr = FALSE;
> ++ break;
> ++ default:
> ++ if (*p & 0x80)
> ++ octet_chars++;
> ++ linelen++;
> ++ cr = FALSE;
> + }
> + }
> + total_len += len;
> +@@ -1208,15 +1264,20 @@ EncodingType
> procmime_get_encoding_for_text_file(const
> + octet_percentage = 0.0;
> +
> + debug_print("procmime_get_encoding_for_text_file(): "
> +- "8bit chars: %zd / %zd (%f%%)\n", octet_chars, total_len,
> +- 100.0 * octet_percentage);
> ++ "8bit chars: %zd / %zd (%f%%). "
> ++ "maximum line length: %d chars\n",
> ++ octet_chars, total_len, 100.0 * octet_percentage,
> ++ maxlinelen);
> +
> +- if (octet_percentage > 0.20 || force_b64) {
> ++ if (octet_percentage > 0.20) {
> + debug_print("using BASE64\n");
> + return ENC_BASE64;
> +- } else if (octet_chars > 0) {
> ++ } else if (maxlinelen > MAXSMTPTEXTLEN-2) {
> + debug_print("using quoted-printable\n");
> + return ENC_QUOTED_PRINTABLE;
> ++ } else if (octet_chars > 0) {
> ++ debug_print("using 8bit\n");
> ++ return ENC_8BIT;
> + } else {
> + debug_print("using 7bit\n");
> + return ENC_7BIT;
> Index: claws-mail/pkg/PLIST-main
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail/pkg/PLIST-main,v
> retrieving revision 1.25
> diff -u -p -r1.25 PLIST-main
> --- claws-mail/pkg/PLIST-main 15 Jun 2012 08:32:16 -0000 1.25
> +++ claws-mail/pkg/PLIST-main 27 Jun 2012 22:39:20 -0000
> @@ -45,6 +45,7 @@ include/claws-mail/addrcustomattr.h
> include/claws-mail/addrdefs.h
> include/claws-mail/addrduplicates.h
> include/claws-mail/addressadd.h
> +include/claws-mail/addressbook-dbus.h
> include/claws-mail/addressbook.h
> include/claws-mail/addressbook_foldersel.h
> include/claws-mail/addressitem.h
> @@ -349,6 +350,7 @@ share/locale/sk/LC_MESSAGES/claws-mail.m
> share/locale/sv/LC_MESSAGES/claws-mail.mo
> share/locale/uk/LC_MESSAGES/claws-mail.mo
> share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
> +share/locale/zh_TW/LC_MESSAGES/claws-mail.mo
> @exec %D/bin/update-desktop-database
> @unexec-delete %D/bin/update-desktop-database
> @exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
> Index: claws-mail-attremover/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-attremover/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- claws-mail-attremover/Makefile 23 Jan 2012 18:57:33 -0000 1.13
> +++ claws-mail-attremover/Makefile 27 Jun 2012 22:39:20 -0000
> @@ -4,7 +4,7 @@ SHARED_ONLY = Yes
>
> COMMENT = remove attachments from emails
>
> -VERSION = 1.0.13
> +VERSION = 1.0.14
> DISTNAME = att_remover-${VERSION}
> PKGNAME = claws-mail-attremover-${VERSION}
> MASTER_SITES = http://www.claws-mail.org/downloads/plugins/
> Index: claws-mail-attremover/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-attremover/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- claws-mail-attremover/distinfo 23 Jan 2012 18:57:33 -0000 1.3
> +++ claws-mail-attremover/distinfo 27 Jun 2012 22:39:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/att_remover-1.0.13.tar.gz) = X9DVfAP0xF8bSgCdP5v3Ag==
> -RMD160 (claws/att_remover-1.0.13.tar.gz) = s6KXbS7mJs/z9S9LWoIzv0oxKcA=
> -SHA1 (claws/att_remover-1.0.13.tar.gz) = m5xsqcKsPsAdbQkBVfMbcNtL5EU=
> -SHA256 (claws/att_remover-1.0.13.tar.gz) =
> a8bPJYGVA2N/IedGxLT+G9axtqspW51pNL6vSl3mflg=
> -SIZE (claws/att_remover-1.0.13.tar.gz) = 315845
> +MD5 (claws/att_remover-1.0.14.tar.gz) = /eJBMY18BawpbWFRk3cwcw==
> +RMD160 (claws/att_remover-1.0.14.tar.gz) = SZnYWUYt6s1QZF65CW+yZLiey7k=
> +SHA1 (claws/att_remover-1.0.14.tar.gz) = 78c5pAyNztn+hT8vr3fBnonpo60=
> +SHA256 (claws/att_remover-1.0.14.tar.gz) =
> p01cnWxcJGPlLylWwY/yKZm6puZsL+PI52M2sGNiLOw=
> +SIZE (claws/att_remover-1.0.14.tar.gz) = 318353
> Index: claws-mail-htmlviewer/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-htmlviewer/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- claws-mail-htmlviewer/Makefile 23 Jan 2012 18:57:33 -0000 1.27
> +++ claws-mail-htmlviewer/Makefile 27 Jun 2012 22:39:21 -0000
> @@ -4,7 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= HTML renderer plugin for Claws Mail
>
> -VERSION= 0.32
> +VERSION= 0.33
> DISTNAME= gtkhtml2_viewer-${VERSION}
> PKGNAME= claws-mail-htmlviewer-${VERSION}
> MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
> @@ -24,7 +24,7 @@ LIBTOOL_FLAGS= --tag=disable-static
>
> MODULES= devel/gettext
>
> -RUN_DEPENDS= mail/claws-mail>=3.8.0
> +RUN_DEPENDS= mail/claws-mail>=3.8.1
> BUILD_DEPENDS= ${RUN_DEPENDS}
> LIB_DEPENDS= textproc/libxml \
> net/curl \
> Index: claws-mail-htmlviewer/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-htmlviewer/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- claws-mail-htmlviewer/distinfo 23 Jan 2012 18:57:33 -0000 1.16
> +++ claws-mail-htmlviewer/distinfo 27 Jun 2012 22:39:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/gtkhtml2_viewer-0.32.tar.gz) = gqUBHtmZWiEbq2zq1CI15g==
> -RMD160 (claws/gtkhtml2_viewer-0.32.tar.gz) = u/8+xvSDWW1KszLCMH9F+yu4Egs=
> -SHA1 (claws/gtkhtml2_viewer-0.32.tar.gz) = A6wPi2GcyZh84fxkf4LYtibgJPM=
> -SHA256 (claws/gtkhtml2_viewer-0.32.tar.gz) =
> D1wZGLqXuNtd81UupK495onDb0APZCchcFD2C5mOlqk=
> -SIZE (claws/gtkhtml2_viewer-0.32.tar.gz) = 713715
> +MD5 (claws/gtkhtml2_viewer-0.33.tar.gz) = Xd6qf69Vp5DBcKQ8HfjPQA==
> +RMD160 (claws/gtkhtml2_viewer-0.33.tar.gz) = L6z2GYdpS7vXzTS0uGg0KRnUSSE=
> +SHA1 (claws/gtkhtml2_viewer-0.33.tar.gz) = XEhr7DyC+8qStvTWApfbNn76haw=
> +SHA256 (claws/gtkhtml2_viewer-0.33.tar.gz) =
> huTgjVMDa6ozub1iRkhriJP228jBqu6Eoc+ZsjhvbYI=
> +SIZE (claws/gtkhtml2_viewer-0.33.tar.gz) = 714851
> Index: claws-mail-notification/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-notification/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- claws-mail-notification/Makefile 23 Jan 2012 18:57:33 -0000 1.26
> +++ claws-mail-notification/Makefile 27 Jun 2012 22:39:21 -0000
> @@ -4,7 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= notification plugin for Claws-mail
>
> -VERSION= 0.29
> +VERSION= 0.30
> DISTNAME= notification_plugin-${VERSION}
> PKGNAME= claws-mail-notification-${VERSION}
> MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
> @@ -35,7 +35,7 @@ MODULES= devel/gettext
> LIB_DEPENDS= devel/libnotify>=0.7.2 \
> x11/gtk+2
>
> -RUN_DEPENDS= mail/claws-mail>=3.8.0 \
> +RUN_DEPENDS= mail/claws-mail>=3.8.1 \
>
> notification-daemon-*|notification-daemon-xfce-*|xfce4-notifyd-*:sysutils/notification-daemon
> BUILD_DEPENDS= ${RUN_DEPENDS}
>
> Index: claws-mail-notification/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-notification/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- claws-mail-notification/distinfo 23 Jan 2012 18:57:33 -0000 1.14
> +++ claws-mail-notification/distinfo 27 Jun 2012 22:39:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/notification_plugin-0.29.tar.gz) = UWHu3PLNmu+XdwgPBKK0wQ==
> -RMD160 (claws/notification_plugin-0.29.tar.gz) = 3/yfZsWd9uaUrRv9O5pjJ1oJA5g=
> -SHA1 (claws/notification_plugin-0.29.tar.gz) = v9VvTTUJvZkcCauHycZ0izBPflw=
> -SHA256 (claws/notification_plugin-0.29.tar.gz) =
> RK35jLAaAYvXjmNyZazXFp3cGqfH9UnZprmakDX+F0s=
> -SIZE (claws/notification_plugin-0.29.tar.gz) = 558931
> +MD5 (claws/notification_plugin-0.30.tar.gz) = BUyL8Yp+ipAQDd/8qIIbPA==
> +RMD160 (claws/notification_plugin-0.30.tar.gz) = RnabgzbkoPeAq2WacLmCAU3T8f8=
> +SHA1 (claws/notification_plugin-0.30.tar.gz) = YmHrhOOjtZUt0gONQbMuIlbB4Yc=
> +SHA256 (claws/notification_plugin-0.30.tar.gz) =
> xJymdRZ4w050Wkuelcz2P5VfKZCcAKhWmd0Ip0yUiDE=
> +SIZE (claws/notification_plugin-0.30.tar.gz) = 561050
> Index: claws-mail-rssyl/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-rssyl/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- claws-mail-rssyl/Makefile 23 Jan 2012 18:57:33 -0000 1.27
> +++ claws-mail-rssyl/Makefile 27 Jun 2012 22:39:21 -0000
> @@ -4,7 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= RSS aggregator plugin for Claws-mail
>
> -VERSION= 0.32
> +VERSION= 0.33
> DISTNAME= rssyl-${VERSION}
> PKGNAME= claws-mail-rssyl-${VERSION}
> MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
> @@ -24,7 +24,7 @@ LIBTOOL_FLAGS= --tag=disable-static
>
> MODULES= devel/gettext
>
> -RUN_DEPENDS= mail/claws-mail>=3.8.0
> +RUN_DEPENDS= mail/claws-mail>=3.8.1
> BUILD_DEPENDS= ${RUN_DEPENDS}
> LIB_DEPENDS= textproc/libxml \
> x11/gtk+2 \
> Index: claws-mail-rssyl/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-rssyl/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- claws-mail-rssyl/distinfo 23 Jan 2012 18:57:33 -0000 1.14
> +++ claws-mail-rssyl/distinfo 27 Jun 2012 22:39:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/rssyl-0.32.tar.gz) = FlA1EhEz6hH+gjZrdfK/kw==
> -RMD160 (claws/rssyl-0.32.tar.gz) = OSlwsQm8SrhPnWmUAJZQN8bWCaE=
> -SHA1 (claws/rssyl-0.32.tar.gz) = 1k4AVVGMEwQgbfH0J83ASujJrKU=
> -SHA256 (claws/rssyl-0.32.tar.gz) =
> cu9Lo7hshFBTAPi315Bd3psWd/arXXTp5SnoVpqx2wE=
> -SIZE (claws/rssyl-0.32.tar.gz) = 502613
> +MD5 (claws/rssyl-0.33.tar.gz) = CfagJu5BHNEqwry4k6zang==
> +RMD160 (claws/rssyl-0.33.tar.gz) = wtxaVyyXLa6vjJdqo95cGOFc1MQ=
> +SHA1 (claws/rssyl-0.33.tar.gz) = +r67Tn9SmKmnS/737NT4WomwL2o=
> +SHA256 (claws/rssyl-0.33.tar.gz) =
> pSE/C9lJkj+Q/HMCn75rRE+kEL9uLSidh0p2bU/apqM=
> +SIZE (claws/rssyl-0.33.tar.gz) = 507341
> Index: claws-mail-rssyl/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-rssyl/pkg/PLIST,v
> retrieving revision 1.6
> diff -u -p -r1.6 PLIST
> --- claws-mail-rssyl/pkg/PLIST 23 Jan 2012 18:57:33 -0000 1.6
> +++ claws-mail-rssyl/pkg/PLIST 27 Jun 2012 22:39:21 -0000
> @@ -11,6 +11,7 @@ share/locale/hu/LC_MESSAGES/rssyl.mo
> share/locale/id_ID/LC_MESSAGES/rssyl.mo
> share/locale/it/LC_MESSAGES/rssyl.mo
> share/locale/ja/LC_MESSAGES/rssyl.mo
> +share/locale/lt/LC_MESSAGES/rssyl.mo
> share/locale/nl/LC_MESSAGES/rssyl.mo
> share/locale/pl/LC_MESSAGES/rssyl.mo
> share/locale/pt_BR/LC_MESSAGES/rssyl.mo
> Index: claws-mail-vcalendar/Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-vcalendar/Makefile,v
> retrieving revision 1.28
> diff -u -p -r1.28 Makefile
> --- claws-mail-vcalendar/Makefile 23 Jan 2012 18:57:33 -0000 1.28
> +++ claws-mail-vcalendar/Makefile 27 Jun 2012 22:39:21 -0000
> @@ -4,7 +4,7 @@ SHARED_ONLY= Yes
>
> COMMENT= groupware plugin for Claws-mail
>
> -VERSION= 2.0.12
> +VERSION= 2.0.13
> DISTNAME= vcalendar-${VERSION}
> PKGNAME= claws-mail-vcalendar-${VERSION}
> MASTER_SITES= http://www.claws-mail.org/downloads/plugins/
> @@ -27,7 +27,7 @@ MODULES= devel/gettext
> LIB_DEPENDS= x11/gtk+2 \
> net/curl
>
> -RUN_DEPENDS= mail/claws-mail>=3.8.0
> +RUN_DEPENDS= mail/claws-mail>=3.8.1
> BUILD_DEPENDS= ${RUN_DEPENDS}
>
> WANTLIB += X11 Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes
> Index: claws-mail-vcalendar/distinfo
> ===================================================================
> RCS file: /cvs/ports/mail/claws-mail-vcalendar/distinfo,v
> retrieving revision 1.15
> diff -u -p -r1.15 distinfo
> --- claws-mail-vcalendar/distinfo 23 Jan 2012 18:57:33 -0000 1.15
> +++ claws-mail-vcalendar/distinfo 27 Jun 2012 22:39:21 -0000
> @@ -1,5 +1,5 @@
> -MD5 (claws/vcalendar-2.0.12.tar.gz) = sv+QyFJN5N7FFcGBZBJSOA==
> -RMD160 (claws/vcalendar-2.0.12.tar.gz) = mzGLVSpbDCVlRKOGKLNAhVBIe/8=
> -SHA1 (claws/vcalendar-2.0.12.tar.gz) = PDqkhr8JPufk58kaKmrXFXCDGTU=
> -SHA256 (claws/vcalendar-2.0.12.tar.gz) =
> CCaodCUqmDn4hoH7lv7bv+4GwehD9BiKkvR116JhXPc=
> -SIZE (claws/vcalendar-2.0.12.tar.gz) = 858245
> +MD5 (claws/vcalendar-2.0.13.tar.gz) = f470Z8Seufv3FGfbJRIOUw==
> +RMD160 (claws/vcalendar-2.0.13.tar.gz) = o0hGqnFPB2eSk0vY6nlPXQ23K6I=
> +SHA1 (claws/vcalendar-2.0.13.tar.gz) = CC/eIn5ss1FLq1NCNxgzEXTmYXw=
> +SHA256 (claws/vcalendar-2.0.13.tar.gz) =
> iXHTuef8VDQ7AqhsCshoR/NiuzRaB30lSPSHL/Sg6bg=
> +SIZE (claws/vcalendar-2.0.13.tar.gz) = 861524
>
>
