From owner-svn-ports-all@freebsd.org Mon Feb 8 17:01:30 2021 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id AEC665399DF; Mon, 8 Feb 2021 17:01:30 +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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4DZC3Z4bzJz4WTv; Mon, 8 Feb 2021 17:01:30 +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 916E31B212; Mon, 8 Feb 2021 17:01:30 +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 118H1UtC087580; Mon, 8 Feb 2021 17:01:30 GMT (envelope-from crees@FreeBSD.org) Received: (from crees@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 118H1TWx087570; Mon, 8 Feb 2021 17:01:29 GMT (envelope-from crees@FreeBSD.org) Message-Id: <202102081701.118H1TWx087570@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: crees set sender to crees@FreeBSD.org using -f From: Chris Rees Date: Mon, 8 Feb 2021 17:01:29 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r564727 - in head: . mail/mailscanner mail/mailscanner/files X-SVN-Group: ports-head X-SVN-Commit-Author: crees X-SVN-Commit-Paths: in head: . mail/mailscanner mail/mailscanner/files X-SVN-Commit-Revision: 564727 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.34 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, 08 Feb 2021 17:01:30 -0000 Author: crees Date: Mon Feb 8 17:01:28 2021 New Revision: 564727 URL: https://svnweb.freebsd.org/changeset/ports/564727 Log: Update to 5.4.3-3 Several changes in virus detection code Output to stdout/stderr when running in foreground mode ... and much more: https://raw.githubusercontent.com/MailScanner/v5/3c2329/changelog Deleted: head/mail/mailscanner/files/CHANGES.port Modified: head/UPDATING head/mail/mailscanner/Makefile head/mail/mailscanner/distinfo head/mail/mailscanner/files/mailscanner.in head/mail/mailscanner/files/mta.in head/mail/mailscanner/files/pkg-message.in head/mail/mailscanner/pkg-plist Modified: head/UPDATING ============================================================================== --- head/UPDATING Mon Feb 8 16:52:01 2021 (r564726) +++ head/UPDATING Mon Feb 8 17:01:28 2021 (r564727) @@ -5,6 +5,14 @@ they are unavoidable. You should get into the habit of checking this file for changes each time you update your ports collection, before attempting any port upgrades. +20210208: + AFFECTS: users of mail/mailscanner + AUTHOR: crees@FreeBSD.org + + The clamavmodule has finally been removed after a long deprecation + period. Please remove all references to it in your mailscanner.conf as + it will now count as a syntax error and may stop MailScanner starting! + 20210204: AFFECTS: users of www/unit AUTHOR: osa@FreeBSD.org Modified: head/mail/mailscanner/Makefile ============================================================================== --- head/mail/mailscanner/Makefile Mon Feb 8 16:52:01 2021 (r564726) +++ head/mail/mailscanner/Makefile Mon Feb 8 17:01:28 2021 (r564727) @@ -2,11 +2,10 @@ # $FreeBSD$ PORTNAME= MailScanner -PORTVERSION= 5.1.2 -PORTREVISION= 3 +DISTVERSION= 5.3.4-3 +DISTVERSIONSUFFIX= .nix CATEGORIES= mail -MASTER_SITES= https://s3.amazonaws.com/msv5/release/ -DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix +MASTER_SITES= https://github.com/MailScanner/v5/releases/download/${DISTVERSION}/ MAINTAINER= crees@FreeBSD.org COMMENT= Powerful virus/spam scanning framework for mail gateways @@ -58,13 +57,11 @@ RUN_DEPENDS:= ${BUILD_DEPENDS} \ CONFLICTS= MailScanner-devel-[0-9]* -PATCHLEVEL= 1 - USES= perl5 shebangfix SHEBANG_GLOB= * usr/lib/MailScanner/init/* usr/lib/MailScanner/wrapper/* \ usr/sbin/* usr/share/MailScanner/perl/MailScanner/* -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} +WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION:C,-[0-9]+,,} SUB_FILES= MailScanner.8 pkg-message pkg-install SUB_LIST= DATADIR=${DATADIR} \ PERL=${PERL} \ @@ -128,7 +125,8 @@ USE_RC_SUBR= mailscanner mta post-patch: ${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \ - ${WRKSRC}/usr/lib/MailScanner/wrapper/*-wrapper + ${WRKSRC}/usr/lib/MailScanner/wrapper/bitdefender-wrapper \ + ${WRKSRC}/usr/lib/MailScanner/wrapper/clamav-wrapper do-build: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ @@ -162,7 +160,7 @@ do-build: do-install: (cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}/${PREFIX}/sbin) - ${LN} -sf ${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner + ${RLN} ${STAGEDIR}${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner ${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner \ ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d \ ${STAGEDIR}${PREFIX}/etc/MailScanner/rules Modified: head/mail/mailscanner/distinfo ============================================================================== --- head/mail/mailscanner/distinfo Mon Feb 8 16:52:01 2021 (r564726) +++ head/mail/mailscanner/distinfo Mon Feb 8 17:01:28 2021 (r564727) @@ -1,3 +1,3 @@ -TIMESTAMP = 1540495845 -SHA256 (MailScanner-5.1.2-1.nix.tar.gz) = 086406f8631d5293c533f904ef9ed3de1864df1f1ce6bbbc6f5572d2f6644c1a -SIZE (MailScanner-5.1.2-1.nix.tar.gz) = 663063 +TIMESTAMP = 1612803181 +SHA256 (MailScanner-5.3.4-3.nix.tar.gz) = bd8b211a4292a4e2a089cb2312dea00e32da3c55af507017c93a1ce8f2ffe505 +SIZE (MailScanner-5.3.4-3.nix.tar.gz) = 661889 Modified: head/mail/mailscanner/files/mailscanner.in ============================================================================== --- head/mail/mailscanner/files/mailscanner.in Mon Feb 8 16:52:01 2021 (r564726) +++ head/mail/mailscanner/files/mailscanner.in Mon Feb 8 17:01:28 2021 (r564727) @@ -1,5 +1,7 @@ #!/bin/sh +# $FreeBSD$ + # PROVIDE: mailscanner # REQUIRE: mta # KEYWORD: shutdown @@ -20,10 +22,11 @@ name="mailscanner" rcvar=mailscanner_enable +desc="Virus and spam filter" load_rc_config $name -: ${mailscanner_enable="NO"} +: ${mailscanner_enable:="NO"} required_files=${mailscanner_configfile:-"%%PREFIX%%/etc/MailScanner/MailScanner.conf"} pidfile=${mailscanner_pidfile:-"/var/run/MailScanner.pid"} Modified: head/mail/mailscanner/files/mta.in ============================================================================== --- head/mail/mailscanner/files/mta.in Mon Feb 8 16:52:01 2021 (r564726) +++ head/mail/mailscanner/files/mta.in Mon Feb 8 17:01:28 2021 (r564727) @@ -1,5 +1,7 @@ #!/bin/sh # +# $FreeBSD$ +# # mta - start multiple MTA instances, e.g. for MailScanner # PROVIDE: mta mail @@ -62,13 +64,14 @@ PATH=$PATH:/sbin:/usr/sbin; export PATH name="mta" rcvar=mta_enable +desc="MailScanner MTA start script" _mta_rc_script="%%PREFIX%%/etc/rc.d/mta" load_rc_config $name -: ${mta_enable="NO"} -: ${mta_type="sendmail"} +: ${mta_enable:=NO} +: ${mta_type:=sendmail} case "${mta_type}" in @@ -100,10 +103,10 @@ if [ -n "${2}" -o -n "$profile" ]; then export profile if [ "x${mta_profiles}" != "x" ]; then eval mta_configfile=\${mta_${profile}_configfile} - [ "x${mta_configfile}" = "x" ] && { + if [ -z "${mta_configfile}" ]; then echo "You must define a configuration file (mta_${profile}_configfile)" exit 1 - } + fi eval mta_enable=\${mta_${profile}_enable:-YES} eval mta_flags=\${mta_${profile}_flags:-${mta_flags}} eval mta_configfile=\${mta_${profile}_configfile:-${mta_configfile}} Modified: head/mail/mailscanner/files/pkg-message.in ============================================================================== --- head/mail/mailscanner/files/pkg-message.in Mon Feb 8 16:52:01 2021 (r564726) +++ head/mail/mailscanner/files/pkg-message.in Mon Feb 8 17:01:28 2021 (r564727) @@ -1,11 +1,6 @@ [ { type: install message: <