From c127481c41893165eb9711fb34d5594f13f5d123 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Mon, 10 Sep 2018 21:40:32 +0000
Subject: [PATCH] Update to 5.1.1

Fix config file upgrade, and disconnect the .sample processing; done by
ports tree now.

Reset maintainer, as he has not responded to email for as long as I can
remember.  I have been (and still am) very grateful for his help in the past.

Approved by:	maintainer timeout (>1 year)
---
 mail/mailscanner/Makefile             | 7 +++----
 mail/mailscanner/distinfo             | 6 +++---
 mail/mailscanner/files/pkg-install.in | 5 ++---
 mail/mailscanner/pkg-plist            | 9 +++++++--
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 196c842bda87..c6347a4a32c8 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -2,13 +2,12 @@
 # $FreeBSD$
 
 PORTNAME=	MailScanner
-PORTVERSION=	5.0.3
-PORTREVISION=	1
+PORTVERSION=	5.1.1
 CATEGORIES=	mail
 MASTER_SITES=	https://s3.amazonaws.com/msv5/release/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix
 
-MAINTAINER=	kkobb@skylinecorp.com
+MAINTAINER=	crees@FreeBSD.org
 COMMENT=	Powerful virus/spam scanning framework for mail gateways
 
 LICENSE=	GPLv2
@@ -58,7 +57,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS} \
 
 CONFLICTS=	MailScanner-devel-[0-9]*
 
-PATCHLEVEL=	7
+PATCHLEVEL=	1
 
 USES=		perl5 shebangfix
 SHEBANG_GLOB=	* usr/lib/MailScanner/init/* usr/lib/MailScanner/wrapper/* \
diff --git a/mail/mailscanner/distinfo b/mail/mailscanner/distinfo
index 86050ad46b88..251b08ef6f14 100644
--- a/mail/mailscanner/distinfo
+++ b/mail/mailscanner/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1501251625
-SHA256 (MailScanner-5.0.3-7.nix.tar.gz) = e3de4f372e06001da818fbe8c540f66d3fa21543544abace7f1d805ff85ee0a8
-SIZE (MailScanner-5.0.3-7.nix.tar.gz) = 604345
+TIMESTAMP = 1536610693
+SHA256 (MailScanner-5.1.1-1.nix.tar.gz) = d49ab24270fc047baabf6491110e61508feec9de56d4b372b35f318337180541
+SIZE (MailScanner-5.1.1-1.nix.tar.gz) = 658275
diff --git a/mail/mailscanner/files/pkg-install.in b/mail/mailscanner/files/pkg-install.in
index bd6598f49845..84af0bef5d19 100644
--- a/mail/mailscanner/files/pkg-install.in
+++ b/mail/mailscanner/files/pkg-install.in
@@ -18,7 +18,7 @@ upgrade_lang_conf()
 	do
 	    if [ -f ${LANG_DIR}/languages.conf ] ; then
 		${ECHO} -n Upgrading ${LANG_DIR}/languages.conf... Please wait..
-		${PERL} ${DATADIR}/upgrade_languages_conf \
+		ms-upgrade-conf \
 			${LANG_DIR}/languages.conf \
 			${LANG_DIR}/languages.conf.sample > \
 			${LANG_DIR}/languages.conf.new.${PKGVERSION} \
@@ -38,7 +38,7 @@ upgrade_lang_conf()
 
 upgrade_mailscanner_conf()
 {
-	${PERL} ${DATADIR}/upgrade_MailScanner_conf			\
+	ms-upgrade-conf			\
 		${PKG_PREFIX}/etc/MailScanner/MailScanner.conf		\
 		${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.sample >	\
 	    ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf.new.${PKGVERSION} \
@@ -110,7 +110,6 @@ POST-INSTALL)
 	upgrade_lang_conf
 	[ -f ${PKG_PREFIX}/etc/MailScanner/MailScanner.conf ] \
 		&& upgrade_mailscanner_conf
-	initial_config
 	exit 0
 	;;
 esac
diff --git a/mail/mailscanner/pkg-plist b/mail/mailscanner/pkg-plist
index 6ff65f675bed..9fbaf67c189c 100644
--- a/mail/mailscanner/pkg-plist
+++ b/mail/mailscanner/pkg-plist
@@ -19,6 +19,7 @@
 @sample %%ETCDIR%%/spamassassin.conf.sample
 @sample %%ETCDIR%%/virus.scanners.conf.sample
 man/man8/MailScanner.8.gz
+sbin/MSMilter
 sbin/MailScanner
 sbin/mailscanner
 sbin/ms-check
@@ -32,9 +33,8 @@ sbin/ms-peek
 sbin/ms-perl-check
 sbin/ms-sa-cache
 sbin/ms-update-bad-emails
-sbin/ms-update-bad-sites
+sbin/ms-update-phishing
 sbin/ms-update-sa
-sbin/ms-update-safe-sites
 sbin/ms-update-vs
 sbin/ms-upgrade-conf
 %%DATADIR%%/perl/MailScanner.pm
@@ -52,6 +52,8 @@ sbin/ms-upgrade-conf
 %%DATADIR%%/perl/MailScanner/Log.pm
 %%DATADIR%%/perl/MailScanner/MCP.pm
 %%DATADIR%%/perl/MailScanner/MCPMessage.pm
+%%DATADIR%%/perl/MailScanner/MSDiskStore.pm
+%%DATADIR%%/perl/MailScanner/MSMail.pm
 %%DATADIR%%/perl/MailScanner/Mail.pm
 %%DATADIR%%/perl/MailScanner/Message.pm
 %%DATADIR%%/perl/MailScanner/MessageBatch.pm
@@ -502,6 +504,7 @@ sbin/ms-upgrade-conf
 @sample %%DATADIR%%/reports/sk/stored.size.message.txt.sample
 @sample %%DATADIR%%/reports/sk/stored.virus.message.txt.sample
 lib/MailScanner/init/ms-init
+lib/MailScanner/init/msmilter-init
 lib/MailScanner/wrapper/avast-wrapper
 lib/MailScanner/wrapper/avg-autoupdate
 lib/MailScanner/wrapper/avg-wrapper
@@ -514,6 +517,8 @@ lib/MailScanner/wrapper/f-secure-autoupdate
 lib/MailScanner/wrapper/f-secure-wrapper
 lib/MailScanner/wrapper/generic-autoupdate
 lib/MailScanner/wrapper/generic-wrapper
+lib/MailScanner/systemd/ms-milter
+lib/MailScanner/systemd/ms-systemd
 lib/MailScanner/wrapper/sophos-autoupdate
 lib/MailScanner/wrapper/sophos-wrapper