Pullup ticket #6522 - requested by nia

mail/balsa: security fix

Revisions pulled up:
- mail/balsa/Makefile                                           1.169
- mail/balsa/distinfo                                           1.27
- mail/balsa/patches/patch-sounds_Makefile.in                   1.2
- mail/balsa/patches/patch-src_sendmsg-window.c                 deleted

---
   Module Name:	pkgsrc
   Committed By:	nia
   Date:		Sun Oct 17 10:08:53 UTC 2021

   Modified Files:
   	pkgsrc/mail/balsa: Makefile distinfo
   	pkgsrc/mail/balsa/patches: patch-sounds_Makefile.in
   Removed Files:
   	pkgsrc/mail/balsa/patches: patch-src_sendmsg-window.c

   Log Message:
   balsa: update to 2.6.3

   This fixes the STARTTLS-related crash bugs mentioned here:
   https://nostarttls.secvuln.info/

   * Balsa-2.6.3 release. Release date 2021-08-18

   - Improve Autocrypt-related error messages.
   - Improvements to communication with GnuPG key servers.
   - Create standard-compatible HTML messages.
   - Implement sender-dependent HTML message preferences.
   - Reuse HTTP connections when rendering HTML messages.
   - Do not send empty Reply-To, Cc, etc headers.
   - More robust IMAP parser and response handling.
   - Code cleanups, platform-dependent build fixes

4 files changed, 13 insertions, 30 deletions

diff --git a/mail/balsa/Makefile b/mail/balsa/Makefile
index cbb210184ba..cae72b0b38f 100644
--- a/mail/balsa/Makefile
+++ b/mail/balsa/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.167 2021/05/24 19:52:36 wiz Exp $
+# $NetBSD: Makefile,v 1.167.4.1 2021/10/17 16:23:57 tm Exp $
 
-DISTNAME=	balsa-2.6.2
-PKGREVISION=	3
+DISTNAME=	balsa-2.6.3
 CATEGORIES=	mail
 MASTER_SITES=	https://pawsa.fedorapeople.org/balsa/
-EXTRACT_SUFX=	.tar.bz2
+EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://pawsa.fedorapeople.org/balsa/
diff --git a/mail/balsa/distinfo b/mail/balsa/distinfo
index 99c6410e347..b13a19e3a79 100644
--- a/mail/balsa/distinfo
+++ b/mail/balsa/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.25 2021/03/14 07:43:47 nia Exp $
+$NetBSD: distinfo,v 1.25.6.1 2021/10/17 16:23:57 tm Exp $
 
-SHA1 (balsa-2.6.2.tar.bz2) = 251498405494c1f3bffa9e2fee195f9759dcb5b0
-RMD160 (balsa-2.6.2.tar.bz2) = 370cce30ba22facae4fcd41c8f2a29cbd09d617b
-SHA512 (balsa-2.6.2.tar.bz2) = 7049722f74d7a7d93cd2d68ce7d38a99a04a566f180bac39009ba59bb0aeca603a5237db7a91e860f2f905591bf84f803007b9887f2c69c426b4a6dbc81f1488
-Size (balsa-2.6.2.tar.bz2) = 4567897 bytes
-SHA1 (patch-sounds_Makefile.in) = 5c131b93f1431bb0c6f62a44cd6dbad4e5c5edc2
-SHA1 (patch-src_sendmsg-window.c) = 95974c6aef30355f4fa7471b8d46dac8c3f7faf2
+SHA1 (balsa-2.6.3.tar.xz) = 1184d7a98ea01c2605fa50db8c6a3e7d714965ff
+RMD160 (balsa-2.6.3.tar.xz) = 0fbb48dd6b6dda1dc0d264f41eb35912b7039d0d
+SHA512 (balsa-2.6.3.tar.xz) = 7e64f75423dd37536812854e56db1af97c00bc35f640d82c22d86e5212c766926430f1c99423f1a972daf6f20d084d4cf16d89e13deb2f1ce550c016cd132f8d
+Size (balsa-2.6.3.tar.xz) = 3761940 bytes
+SHA1 (patch-sounds_Makefile.in) = 5f0f7daecc5f22dc8733305a547760a73466b37c
diff --git a/mail/balsa/patches/patch-sounds_Makefile.in b/mail/balsa/patches/patch-sounds_Makefile.in
index ebf6b338f9e..2e172491942 100644
--- a/mail/balsa/patches/patch-sounds_Makefile.in
+++ b/mail/balsa/patches/patch-sounds_Makefile.in
@@ -1,10 +1,10 @@
-$NetBSD: patch-sounds_Makefile.in,v 1.1 2019/09/14 18:57:10 nia Exp $
+$NetBSD: patch-sounds_Makefile.in,v 1.1.18.1 2021/10/17 16:23:57 tm Exp $
 
 Install configuration file to examples.
 
---- sounds/Makefile.in.orig	2019-09-14 18:40:39.609951201 +0000
+--- sounds/Makefile.in.orig	2021-08-18 19:36:20.000000000 +0000
 +++ sounds/Makefile.in
-@@ -351,7 +351,7 @@ top_srcdir = @top_srcdir@
+@@ -352,7 +352,7 @@ top_srcdir = @top_srcdir@
  balsa_SOUNDS = startup.wav newmail.wav
  balsasoundsdir = $(datadir)/sounds/balsa
  balsasounds_DATA = $(balsa_SOUNDS)
@@ -12,4 +12,4 @@ Install configuration file to examples.
 +soundlistdir = $(datadir)/examples/balsa
  soundlist_in_files = balsa.soundlist.in
  soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist)
- EXTRA_DIST = $(balsa_SOUNDS) $(soundlist_in_files)
+ EXTRA_DIST = $(balsa_SOUNDS) $(soundlist_in_files) \
diff --git a/mail/balsa/patches/patch-src_sendmsg-window.c b/mail/balsa/patches/patch-src_sendmsg-window.c
deleted file mode 100644
index a3bcba0a9ec..00000000000
--- a/mail/balsa/patches/patch-src_sendmsg-window.c
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_sendmsg-window.c,v 1.2 2021/03/14 07:43:48 nia Exp $
-
-Support enchant2.
-
---- src/sendmsg-window.c.orig	2020-12-18 20:27:46.000000000 +0000
-+++ src/sendmsg-window.c
-@@ -72,7 +72,7 @@
- #elif HAVE_GSPELL
- #include <gspell/gspell.h>
- #else                           /* HAVE_GTKSPELL */
--#include <enchant/enchant.h>
-+#include <enchant.h>
- #include "spell-check.h"
- #endif                          /* HAVE_GTKSPELL */
- #if HAVE_GTKSOURCEVIEW