On Tue, 4 Aug 2020 17:42:35 +0200
Solene Rapenne <sol...@perso.pw> wrote:
> This is a minor update for claws-mail for fixing bugs.
>
> I also backported a patch that was done from an initial diff of mine.
> Currently the spamassassin plugin can handle mails up to a size of
> 256MB but the configuration widget defining the maximum size was
> limited to 10MB. The extra patch allows the 256MB limit to be picked
> up in the GUI.
>
>
> Index: Makefile
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/Makefile,v
> retrieving revision 1.127
> diff -u -p -r1.127 Makefile
> --- Makefile 28 May 2020 20:58:36 -0000 1.127
> +++ Makefile 4 Aug 2020 10:24:18 -0000
> @@ -6,7 +6,7 @@ COMMENT-spamassassin= spamassassin plugi
> 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}
> Index: distinfo
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/distinfo,v
> retrieving revision 1.38
> diff -u -p -r1.38 distinfo
> --- distinfo 28 May 2020 20:58:36 -0000 1.38
> +++ distinfo 4 Aug 2020 10:24:18 -0000
> @@ -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
> Index: patches/patch-src_plugins_spamassassin_spamassassin_gtk_c
> ===================================================================
> RCS file: patches/patch-src_plugins_spamassassin_spamassassin_gtk_c
> diff -N patches/patch-src_plugins_spamassassin_spamassassin_gtk_c
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-src_plugins_spamassassin_spamassassin_gtk_c 4 Aug 2020
> 14:18:25 -0000
> @@ -0,0 +1,31 @@
> +$OpenBSD$
> +
> +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);
> Index: pkg/PLIST-main
> ===================================================================
> RCS file: /home/reposync/ports/mail/claws-mail/pkg/PLIST-main,v
> retrieving revision 1.43
> diff -u -p -r1.43 PLIST-main
> --- pkg/PLIST-main 28 May 2020 20:58:36 -0000 1.43
> +++ pkg/PLIST-main 4 Aug 2020 10:24:18 -0000
> @@ -346,6 +346,9 @@ share/locale/ca/LC_MESSAGES/claws-mail.m
> 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
The update works for me.
I don't use spamassassin, but looks ok.
Greetings Ben
