From 1f6ae58961ab08e0a0f294ce8ae2d501bd7143b3 Mon Sep 17 00:00:00 2001
From: spz <spz@pkgsrc.org>
Date: Sat, 3 Nov 2018 11:41:30 +0000
Subject: Update to amavisd-new-2.11.1, upstream release notes:

- removed a trailing dot element from @INC, as a workaround for a perl
  vulnerability CVE-2016-1238;

- amavis-services: bumping up syslog level from LOG_NOTICE to LOG_ERR
  for a message "PID <pid> went away", and removed redundant newlines
  from some log messages;

- safe_decode() and safe_decode_utf8(): avoid warning messages
    "Use of uninitialized value in subroutine entry"
  in Encode::MIME::Header when the $check argument is undefined;

- @sa_userconf_maps has been extended to allow loading of per-recipient
  (or per- policy bank, or global) SpamAssassin configuration set from
  LDAP. For consistency with SQL a @sa_userconf_maps entry prefixed with
  'ldap:' will load SpamAssassin configuration set using the
  load_scoreonly_ldap() method;  a patch by Atanas Karashenski;

- add some Sanesecurity.Foxhole false positives to the default
  list @virus_name_to_spam_score_maps;

- updated some comments;

+++
also add a patch to make it run with perl 5.28 without complaints
about regex syntax
---
 mail/amavisd-new/Makefile              |  8 ++++----
 mail/amavisd-new/distinfo              | 11 ++++++-----
 mail/amavisd-new/patches/patch-amavisd | 15 +++++++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 mail/amavisd-new/patches/patch-amavisd

(limited to 'mail')

diff --git a/mail/amavisd-new/Makefile b/mail/amavisd-new/Makefile
index 77e8c89071b..230ed40e6f9 100644
--- a/mail/amavisd-new/Makefile
+++ b/mail/amavisd-new/Makefile
@@ -1,22 +1,22 @@
-# $NetBSD: Makefile,v 1.22 2018/08/22 09:45:23 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2018/11/03 11:41:30 spz Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
-PKGREVISION=	1
+#PKGREVISION=	1
 CATEGORIES=	mail security
 MASTER_SITES=	https://www.ijs.si/software/amavisd/
 MASTER_SITES+=	http://mirrors.catpipe.net/amavisd-new/
 MASTER_SITES+=	http://mirror.mainloop.se/amavisd/
 MASTER_SITES+=	http://mirror.cedratnet.com/amavisd-new/
 MASTER_SITES+=	http://mirror.omroep.nl/amavisd-new/
-EXTRACT_SUFX=	.tar.xz
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	spz@NetBSD.org
 HOMEPAGE=	https://www.ijs.si/software/amavisd/
 COMMENT=	Daemonized interface between MTA and content checkers
 LICENSE=	gnu-gpl-v2
 
-VERSION=	2.11.0
+VERSION=	2.11.1
 PATCHLEVEL=	# empty
 
 DEPENDS+=	p5-Archive-Zip>=1.14:../../archivers/p5-Archive-Zip
diff --git a/mail/amavisd-new/distinfo b/mail/amavisd-new/distinfo
index 62b0ad1b00b..42884c4658f 100644
--- a/mail/amavisd-new/distinfo
+++ b/mail/amavisd-new/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.7 2016/09/14 18:20:30 spz Exp $
+$NetBSD: distinfo,v 1.8 2018/11/03 11:41:30 spz Exp $
 
-SHA1 (amavisd-new-2.11.0.tar.xz) = 4ca973c50d0cc1dceb859119ac9d3b193ecce359
-RMD160 (amavisd-new-2.11.0.tar.xz) = cd06768a530fb86371f171e16b7f8c13c019b525
-SHA512 (amavisd-new-2.11.0.tar.xz) = a33292c976abf54db9475392069658c926e7a6f11a4970bbe353b34b3343388bc83b40eda4729f8efa735a3a6e23fd1ed83487f6f7ccf1e9f0903220e6d26957
-Size (amavisd-new-2.11.0.tar.xz) = 780548 bytes
+SHA1 (amavisd-new-2.11.1.tar.bz2) = 3e74ca29978b2563f8612faca4309f1ca566f6a0
+RMD160 (amavisd-new-2.11.1.tar.bz2) = d8f3f35df53eedf60e6af64bea96c72dc353007b
+SHA512 (amavisd-new-2.11.1.tar.bz2) = 06180a4efa777af2f91781ba6e3ea302041c5dd721981d960bab24cecb160c17df8a927e95df9dd7ee5ba64004b8edd3c6c0c5ef7f96fd702d1d84e4a856ea83
+Size (amavisd-new-2.11.1.tar.bz2) = 875204 bytes
 SHA1 (patch-aa) = 3be1325acb060370960fc0fb27d87bc360861320
+SHA1 (patch-amavisd) = c7829d112a5a3dc2dadd309e8a67c23b2f3cc647
diff --git a/mail/amavisd-new/patches/patch-amavisd b/mail/amavisd-new/patches/patch-amavisd
new file mode 100644
index 00000000000..ed34f5fe0e2
--- /dev/null
+++ b/mail/amavisd-new/patches/patch-amavisd
@@ -0,0 +1,15 @@
+$NetBSD: patch-amavisd,v 1.1 2018/11/03 11:41:30 spz Exp $
+
+fix a 'Unescaped left brace in regex'
+
+--- amavisd.orig	2018-10-09 12:41:10.000000000 +0000
++++ amavisd
+@@ -28856,7 +28856,7 @@ sub run_av(@) {
+         my $f = $bare_fnames->[$k];  my $multi = 0;
+         if ($one_at_a_time) {  # glob templates may be substrings anywhere
+           local($1);  @query_expanded = @query_template;  # start afresh
+-          s{ ( {} (?: / \* )? | \* ) }
++          s{ ( \{\} (?: / \* )? | \* ) }
+            { $1 eq '{}'   ? "$tempdir/parts"
+            : $1 eq '{}/*' ? ($multi=1,"$tempdir/parts/$f")
+            : $1 eq '*'    ? ($multi=1,$f)  : $1
-- 
cgit v1.2.3