From owner-svn-ports-all@freebsd.org Mon Sep 10 21:40:33 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C7CE5109CFAD; Mon, 10 Sep 2018 21:40:33 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7E1CD7743C; Mon, 10 Sep 2018 21:40:33 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 78EE666E2; Mon, 10 Sep 2018 21:40:33 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8ALeXht041765; Mon, 10 Sep 2018 21:40:33 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8ALeWR9041761; Mon, 10 Sep 2018 21:40:32 GMT (envelope-from crees@FreeBSD.org) Message-Id: <201809102140.w8ALeWR9041761@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Mon, 10 Sep 2018 21:40:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479484 - in head/mail/mailscanner: . files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head/mail/mailscanner: . files X-SVN-Commit-Revision: 479484 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Sep 2018 21:40:34 -0000 Author: crees Date: Mon Sep 10 21:40:32 2018 New Revision: 479484 URL: https://svnweb.freebsd.org/changeset/ports/479484 Log: 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) Modified: head/mail/mailscanner/Makefile head/mail/mailscanner/distinfo head/mail/mailscanner/files/pkg-install.in head/mail/mailscanner/pkg-plist Modified: head/mail/mailscanner/Makefile ============================================================================== --- head/mail/mailscanner/Makefile Mon Sep 10 20:29:07 2018 (r479483) +++ head/mail/mailscanner/Makefile Mon Sep 10 21:40:32 2018 (r479484) @@ -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/* \ Modified: head/mail/mailscanner/distinfo ============================================================================== --- head/mail/mailscanner/distinfo Mon Sep 10 20:29:07 2018 (r479483) +++ head/mail/mailscanner/distinfo Mon Sep 10 21:40:32 2018 (r479484) @@ -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 Modified: head/mail/mailscanner/files/pkg-install.in ============================================================================== --- head/mail/mailscanner/files/pkg-install.in Mon Sep 10 20:29:07 2018 (r479483) +++ head/mail/mailscanner/files/pkg-install.in Mon Sep 10 21:40:32 2018 (r479484) @@ -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 Modified: head/mail/mailscanner/pkg-plist ============================================================================== --- head/mail/mailscanner/pkg-plist Mon Sep 10 20:29:07 2018 (r479483) +++ head/mail/mailscanner/pkg-plist Mon Sep 10 21:40:32 2018 (r479484) @@ -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