Fri Mar 3 11:19:19 2023 UTC ()
Replace fix for issue #74 with official fix from upstream (commit a6470d7).
Bump PKGREVISION


(bouyer)
diff -r1.72 -r1.73 pkgsrc/mail/mimedefang/Makefile
diff -r1.33 -r1.34 pkgsrc/mail/mimedefang/distinfo
diff -r0 -r1.1 pkgsrc/mail/mimedefang/patches/patch-modules_lib_Mail_MIMEDefang_Actions.pm
diff -r1.1 -r0 pkgsrc/mail/mimedefang/patches/patch-modules_lib_Mail_MIMEDefang_MIME.pm
cvs diff -r1.72 -r1.73 pkgsrc/mail/mimedefang/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/mimedefang/Makefile 2023/02/28 20:23:13 1.72
+++ pkgsrc/mail/mimedefang/Makefile 2023/03/03 11:19:19 1.73
@@ -1,19 +1,19 @@ @@ -1,19 +1,19 @@
1# $NetBSD: Makefile,v 1.72 2023/02/28 20:23:13 bouyer Exp $ 1# $NetBSD: Makefile,v 1.73 2023/03/03 11:19:19 bouyer Exp $
2 2
3DISTNAME= mimedefang-3.3 3DISTNAME= mimedefang-3.3
4CATEGORIES= mail 4CATEGORIES= mail
5MASTER_SITES= https://mimedefang.org/releases/ 5MASTER_SITES= https://mimedefang.org/releases/
6PKGREVISION= 1 6PKGREVISION= 2
7 7
8MAINTAINER= pettai@NetBSD.org 8MAINTAINER= pettai@NetBSD.org
9HOMEPAGE= https://www.mimedefang.org/ 9HOMEPAGE= https://www.mimedefang.org/
10COMMENT= To inspect/modify e-mail as it passes through your mail relay 10COMMENT= To inspect/modify e-mail as it passes through your mail relay
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13DEPENDS+= p5-Digest-SHA1>=2.00:../../security/p5-Digest-SHA1 13DEPENDS+= p5-Digest-SHA1>=2.00:../../security/p5-Digest-SHA1
14DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser 14DEPENDS+= p5-HTML-Parser>=3.26:../../www/p5-HTML-Parser
15DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset 15DEPENDS+= p5-HTML-Tagset>=3.03:../../www/p5-HTML-Tagset
16DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy 16DEPENDS+= p5-IO-stringy>=2.108:../../devel/p5-IO-stringy
17DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools 17DEPENDS+= p5-MailTools>=1.44:../../mail/p5-MailTools
18DEPENDS+= p5-MIME-tools>=5.413:../../mail/p5-MIME-tools 18DEPENDS+= p5-MIME-tools>=5.413:../../mail/p5-MIME-tools
19DEPENDS+= spamassassin>=2.31:../../mail/spamassassin 19DEPENDS+= spamassassin>=2.31:../../mail/spamassassin
cvs diff -r1.33 -r1.34 pkgsrc/mail/mimedefang/distinfo (expand / switch to unified diff)

--- pkgsrc/mail/mimedefang/distinfo 2023/02/28 20:23:13 1.33
+++ pkgsrc/mail/mimedefang/distinfo 2023/03/03 11:19:19 1.34
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.33 2023/02/28 20:23:13 bouyer Exp $ 1$NetBSD: distinfo,v 1.34 2023/03/03 11:19:19 bouyer Exp $
2 2
3BLAKE2s (mimedefang-3.3.tar.gz) = f464307b1a34e15e9879ba3bc1622841743fa28dcb47f17f1f05747152c54311 3BLAKE2s (mimedefang-3.3.tar.gz) = f464307b1a34e15e9879ba3bc1622841743fa28dcb47f17f1f05747152c54311
4SHA512 (mimedefang-3.3.tar.gz) = f973d6bf8e5bb5043f6d255961dcf3f4f8208c7fb159694f5d62884e4dd480ab2d04cf6b71c8f48f56f368aa31b7ce54ec499503a4a3f55b9bf0696299a240ef 4SHA512 (mimedefang-3.3.tar.gz) = f973d6bf8e5bb5043f6d255961dcf3f4f8208c7fb159694f5d62884e4dd480ab2d04cf6b71c8f48f56f368aa31b7ce54ec499503a4a3f55b9bf0696299a240ef
5Size (mimedefang-3.3.tar.gz) = 495544 bytes 5Size (mimedefang-3.3.tar.gz) = 495544 bytes
6SHA1 (patch-Makefile.in) = 14d53b305bc1bb099624d02cc8bca63ab7226ace 6SHA1 (patch-Makefile.in) = 14d53b305bc1bb099624d02cc8bca63ab7226ace
7SHA1 (patch-mimedefang.pl.in) = d46c79ad616a6abc5c2791d32c678c5988ed64c9 7SHA1 (patch-mimedefang.pl.in) = d46c79ad616a6abc5c2791d32c678c5988ed64c9
8SHA1 (patch-modules_lib_Mail_MIMEDefang_MIME.pm) = 1d77a693fde1c7d883e3bca1407ced45629c97de 8SHA1 (patch-modules_lib_Mail_MIMEDefang_Actions.pm) = ca20c24f4e4888e6b21e7963b79727482bb59ff1
File Added: pkgsrc/mail/mimedefang/patches/Attic/patch-modules_lib_Mail_MIMEDefang_Actions.pm
$NetBSD: patch-modules_lib_Mail_MIMEDefang_Actions.pm,v 1.1 2023/03/03 11:19:19 bouyer Exp $
Patch from upstream (commit a6470d7) to fix issue with non-ascii filenames
(issue 74)

--- modules/lib/Mail/MIMEDefang/Actions.pm.orig	2023-03-02 15:01:50.625588453 +0100
+++ modules/lib/Mail/MIMEDefang/Actions.pm	2023-03-02 15:02:54.632130347 +0100
@@ -139,10 +139,17 @@
 
     my ($part);
 
+    my $charset = undef;
+    if (utf8::is_utf8($data)) {
+      utf8::encode($data);
+      $charset = 'utf-8';
+    }
+
     $part = MIME::Entity->build(Type => $type,
 				Top => 0,
 				'X-Mailer' => undef,
 				Encoding => $encoding,
+				Charset => $charset,
 				Data => ["$data"]);
     defined ($fname) && $part->head->mime_attr("Content-Type.name" => $fname);
     defined ($disposition) && $part->head->mime_attr("Content-Disposition" => $disposition);
File Deleted: pkgsrc/mail/mimedefang/patches/Attic/patch-modules_lib_Mail_MIMEDefang_MIME.pm