Update to 3.17.6

Backport a patch to increase spamassassin
plugin maximum file size in the GUI parameters
This commit is contained in:
solene 2020-08-20 06:50:33 +00:00
parent d96e8e9fe6
commit dd6080d9a5
4 changed files with 39 additions and 5 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.127 2020/05/28 20:58:36 solene Exp $
# $OpenBSD: Makefile,v 1.128 2020/08/20 06:50:33 solene Exp $
COMMENT-main= mail and news client
COMMENT-bogofilter= bogofilter plugin
@ -6,7 +6,7 @@ COMMENT-spamassassin= spamassassin plugin
COMMENT-pdfviewer= pdfviewer plugin
COMMENT-gdata= gdata plugin
V= 3.17.5
V= 3.17.6
DISTNAME= claws-mail-${V}
PKGNAME-main= ${DISTNAME}
PKGNAME-bogofilter= claws-mail-bogofilter-${V}

View File

@ -1,2 +1,2 @@
SHA256 (claws/claws-mail-3.17.5.tar.gz) = 955MfwidCOayszI6kLb0aZGhVM4Wi6SoKdWTt6V2jHs=
SIZE (claws/claws-mail-3.17.5.tar.gz) = 12186940
SHA256 (claws/claws-mail-3.17.6.tar.gz) = hXdnOowjjcXESByisQNzkHmVo0DTuIJvd7WYYBr63HA=
SIZE (claws/claws-mail-3.17.6.tar.gz) = 12479765

View File

@ -0,0 +1,31 @@
$OpenBSD: patch-src_plugins_spamassassin_spamassassin_gtk_c,v 1.1 2020/08/20 06:50:33 solene Exp $
Import commit 5cc88aae7217d6ea385a580a30dc79ea0c91c27f
Spamassassin plugin can handle files up to 256 MB
but the configuration GUI widget only allowed 10 MB
maximum files.
Index: src/plugins/spamassassin/spamassassin_gtk.c
--- src/plugins/spamassassin/spamassassin_gtk.c.orig
+++ src/plugins/spamassassin/spamassassin_gtk.c
@@ -41,7 +41,10 @@
#include "menu.h"
#include "addressbook.h"
#include "combobox.h"
+#include "libspamc.h"
+#define SA_MAX_SIZE_KB (SPAMC_MAX_MESSAGE_LEN / 1024)
+
struct SpamAssassinPage
{
PrefsPage page;
@@ -375,7 +378,7 @@ static void spamassassin_create_widget_func(PrefsPage
gtk_widget_show(max_size_label);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_label, FALSE, FALSE, 0);
- max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, 10000, 10, 10, 0));
+ max_size_spinbtn_adj = GTK_ADJUSTMENT(gtk_adjustment_new(250, 0, SA_MAX_SIZE_KB, 10, 10, 0));
max_size_spinbtn = gtk_spin_button_new(GTK_ADJUSTMENT(max_size_spinbtn_adj), 1, 0);
gtk_widget_show(max_size_spinbtn);
gtk_box_pack_start(GTK_BOX(hbox_max_size), max_size_spinbtn, FALSE, FALSE, 0);

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.43 2020/05/28 20:58:36 solene Exp $
@comment $OpenBSD: PLIST-main,v 1.44 2020/08/20 06:50:33 solene Exp $
@conflict claws-mail-attremover-*
@conflict claws-mail-notification-*
@conflict claws-mail-rssyl-*
@ -346,6 +346,9 @@ share/locale/ca/LC_MESSAGES/claws-mail.mo
share/locale/cs/LC_MESSAGES/claws-mail.mo
share/locale/da/LC_MESSAGES/claws-mail.mo
share/locale/de/LC_MESSAGES/claws-mail.mo
share/locale/el_GR/
share/locale/el_GR/LC_MESSAGES/
share/locale/el_GR/LC_MESSAGES/claws-mail.mo
share/locale/en_GB/LC_MESSAGES/claws-mail.mo
share/locale/es/LC_MESSAGES/claws-mail.mo
share/locale/fi/LC_MESSAGES/claws-mail.mo