Index: branches/2018Q4/mail/mailscanner/Makefile =================================================================== --- branches/2018Q4/mail/mailscanner/Makefile (revision 482989) +++ branches/2018Q4/mail/mailscanner/Makefile (revision 482990) @@ -1,200 +1,201 @@ # Created by: Jan-Peter Koopmann # $FreeBSD$ PORTNAME= MailScanner PORTVERSION= 5.1.1 +PORTREVISION= 1 CATEGORIES= mail MASTER_SITES= https://s3.amazonaws.com/msv5/release/ DISTNAME= ${PORTNAME}-${PORTVERSION}-${PATCHLEVEL}.nix MAINTAINER= crees@FreeBSD.org COMMENT= Powerful virus/spam scanning framework for mail gateways LICENSE= GPLv2 BUILD_DEPENDS= \ p5-IO-stringy>=0:devel/p5-IO-stringy \ p5-DBI>=0:databases/p5-DBI \ p5-Mail-Tools>=0:mail/p5-Mail-Tools \ p5-HTML-Tagset>=0:www/p5-HTML-Tagset \ p5-HTML-Parser>=0:www/p5-HTML-Parser \ p5-MIME-Tools>=0:mail/p5-MIME-Tools \ p5-Convert-TNEF>=0:converters/p5-Convert-TNEF \ p5-Convert-BinHex>=0:converters/p5-Convert-BinHex \ p5-Net-CIDR>=0:net-mgmt/p5-Net-CIDR \ p5-Net-Ident>=0:net/p5-Net-Ident \ p5-Archive-Zip>=0:archivers/p5-Archive-Zip \ p5-DBD-SQLite>=0:databases/p5-DBD-SQLite \ p5-DBI>=0:databases/p5-DBI \ p5-TimeDate>=0:devel/p5-TimeDate \ p5-Filesys-Df>=0:sysutils/p5-Filesys-Df \ p5-Sys-Hostname-Long>=0:sysutils/p5-Sys-Hostname-Long \ p5-OLE-Storage_Lite>=0:devel/p5-OLE-Storage_Lite \ p5-Sys-SigAction>=0:devel/p5-Sys-SigAction \ p5-Inline>=0:devel/p5-Inline \ p5-Inline-C>=0:devel/p5-Inline-C \ p5-Mail-IMAPClient>=0:mail/p5-Mail-IMAPClient \ p5-Mail-SPF>=0:mail/p5-Mail-SPF \ p5-Net-CIDR-Lite>=0:net/p5-Net-CIDR-Lite \ p5-Net-DNS-Resolver-Programmable>=0:dns/p5-Net-DNS-Resolver-Programmable \ p5-Net-IP>=0:net-mgmt/p5-Net-IP \ p5-Parse-RecDescent>=0:devel/p5-Parse-RecDescent \ p5-Test-Manifest>=0:devel/p5-Test-Manifest \ p5-URI>=0:net/p5-URI \ p5-IO-String>=0:devel/p5-IO-String \ p5-Business-ISBN>=0:misc/p5-Business-ISBN \ p5-Business-ISBN-Data>=0:misc/p5-Business-ISBN-Data \ p5-Data-Dump>=0:devel/p5-Data-Dump \ p5-Digest-SHA1>=0:security/p5-Digest-SHA1 \ p5-File-ShareDir>=0:devel/p5-File-ShareDir \ p5-IP-Country>=0:net/p5-IP-Country \ curl:ftp/curl RUN_DEPENDS:= ${BUILD_DEPENDS} \ bash:shells/bash \ tnef:converters/tnef \ wget:ftp/wget 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} SUB_FILES= MailScanner.8 pkg-message pkg-install SUB_LIST= DATADIR=${DATADIR} \ PERL=${PERL} \ PKGVERSION=${PKGVERSION} \ PORTVERSION=${PORTVERSION} \ ETC_FILES="${ETC_FILES}" \ MCP_FILES="${MCP_FILES}" OPTIONS_DEFINE= SPAMASSASSIN CLAMAV CLAMAVMODULE DOCS SPAMASSASSIN_DESC= Install SpamAssassin CLAMAV_DESC= Install ClamAV CLAMAVMODULE_DESC= Install ClamAV Module OPTIONS_DEFAULT= SPAMASSASSIN CLAMAV .include .if ${PORT_OPTIONS:MSPAMASSASSIN} RUN_DEPENDS+= spamassassin:mail/spamassassin PLIST_SUB+= SPAMASSASSIN="" .else PLIST_SUB+= SPAMASSASSIN="@comment " .endif .if ${PORT_OPTIONS:MCLAMAV} RUN_DEPENDS+= clamscan:security/clamav .endif .if ${PORT_OPTIONS:MCLAMAVMODULE} RUN_DEPENDS+= p5-Mail-ClamAV>=0:mail/p5-Mail-ClamAV .endif .if ${PORT_OPTIONS:MCLAMAV} || ${PORT_OPTIONS:MCLAMAVMODULE} RUN_DEPENDS+= unrar:archivers/unrar \ zoo:archivers/zoo \ unarj:archivers/unarj \ unace:archivers/unace \ lha:archivers/lha .endif # backwards compatibility .if defined(NO_SPAMASSASSIN_SYMLINK) WITHOUT_SPAMASSASSIN_SYMLINK=${NO_SPAMASSASSIN_SYMLINK} .endif .if defined(WITHOUT_SPAMASSASSIN_SYMLINK) || ! ${PORT_OPTIONS:MSPAMASSASSIN} PLIST_SUB+= SPAMASSASSIN_SYMLINK="@comment " SUB_LIST+= WITHOUT_SPAMASSASSIN_SYMLINK=yes .else PLIST_SUB+= SPAMASSASSIN_SYMLINK="" SUB_LIST+= WITHOUT_SPAMASSASSIN_SYMLINK=no .endif DOC_FILES= README ETC_FILES= MailScanner.conf filename.rules.conf \ archives.filename.rules.conf archives.filetype.rules.conf \ filetype.rules.conf spam.assassin.prefs.conf \ spam.lists.conf virus.scanners.conf \ phishing.safe.sites.conf \ phishing.bad.sites.conf \ country.domains.conf MCP_FILES= mcp.spamassassin.conf \ 10_example.cf USE_RC_SUBR= mailscanner mta post-patch: ${REINPLACE_CMD} -e 's,\$$(mktemp),$$(mktemp -t tmp),' \ ${WRKSRC}/usr/lib/MailScanner/wrapper/*-wrapper do-build: @${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} \ -e 's,/usr/bin/bash,${LOCALBASE}/bin/bash,g' \ -e 's,/bin/sed,/usr/bin/sed,g' \ -e 's,/etc/init.d/mailscanner,${LOCALBASE}/etc/rc.d/mailscanner,g' \ -e 's,/etc/mail/,${LOCALBASE}/etc/mail/,g' \ -e 's,/usr/share/MailScanner,${DATADIR},g' \ -e 's,/usr/lib/MailScanner/reports,${DATADIR}/reports,g' \ -e 's,/etc/MailScanner,${PREFIX}/etc/MailScanner,g' \ -e 's,/usr/sbin/ms-,${PREFIX}/sbin/ms-,g' \ -e 's,/usr/lib/MailScanner,${PREFIX}/lib/MailScanner,g' \ -e 's,/usr/bin/clamscan,${LOCALBASE}/bin/clamscan,g' \ -e 's,/usr/bin/sa-compile,${LOCALBASE}/bin/sa-compile,g' \ -e 's,/usr/bin/sa-update,${LOCALBASE}/bin/sa-update,g' \ -e 's,/usr/bin/unzip,${UNZIP_CMD},g' \ -e 's,/usr/bin/wget,${LOCALBASE}/bin/wget,g' \ -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,g' \ -e 's,/usr/bin/unrar,${LOCALBASE}/bin/unrar,g' \ -e 's,/bin/gunzip,/usr/bin/gunzip,g' \ -e 's,/etc/mail/spamassassin,${LOCALBASE}/etc/mail/spamassassin,g' \ -e 's,/tmp/clamd.socket,/var/run/clamav/clamd.sock,g' \ -e 's,/usr/local/share/clamav,/var/db/clamav,g' \ -e 's,/bin/false,/usr/bin/false,' @${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' \ ${WRKSRC}/usr/lib/${PORTNAME}/wrapper/* @${FIND} ${WRKSRC} \( -name "*.bak" -or -name "*.orig" \) -delete do-install: (cd ${WRKSRC}/usr/sbin && ${COPYTREE_BIN} . ${STAGEDIR}/${PREFIX}/sbin) ${LN} -sf ${PREFIX}/sbin/MailScanner ${STAGEDIR}${PREFIX}/sbin/mailscanner ${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner \ ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d \ ${STAGEDIR}${PREFIX}/etc/MailScanner/rules (cd ${WRKSRC}/etc/MailScanner && ${FIND} . -type f -depth 1 -exec \ ${INSTALL_DATA} {} \ ${STAGEDIR}${PREFIX}/etc/MailScanner/{}.sample \;) cd ${WRKSRC}/etc/MailScanner/rules \ && ${INSTALL_DATA} EXAMPLES README \ ${STAGEDIR}${PREFIX}/etc/MailScanner/rules .for RULES in spam.whitelist.rules bounce.rules max.message.size.rules ${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/rules/${RULES} \ ${STAGEDIR}${PREFIX}/etc/MailScanner/rules/${RULES}.sample .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/mcp .for FILE in ${MCP_FILES} ${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/mcp/${FILE} \ ${STAGEDIR}${PREFIX}/etc/MailScanner/mcp/${FILE}.sample .endfor ${MKDIR} ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d ${INSTALL_DATA} ${WRKSRC}/etc/MailScanner/conf.d/README \ ${STAGEDIR}${PREFIX}/etc/MailScanner/conf.d/README (cd ${WRKSRC}/usr/share/MailScanner && ${COPYTREE_SHARE} . \ ${STAGEDIR}${DATADIR}) for f in ${STAGEDIR}${DATADIR}/reports/*/*; do \ ${MV} $${f} $${f}.sample; \ done ${MKDIR} ${STAGEDIR}${PREFIX}/lib (cd ${WRKSRC}/usr/lib/MailScanner && ${COPYTREE_BIN} . \ ${STAGEDIR}${PREFIX}/lib/MailScanner) cd ${WRKDIR} && \ ${INSTALL_MAN} ${PORTNAME}.8 ${STAGEDIR}${PREFIX}/man/man8 .include Index: branches/2018Q4/mail/mailscanner/files/patch-cf1c302 =================================================================== --- branches/2018Q4/mail/mailscanner/files/patch-cf1c302 (nonexistent) +++ branches/2018Q4/mail/mailscanner/files/patch-cf1c302 (revision 482990) @@ -0,0 +1,35 @@ +diff --git a/usr/lib/MailScanner/wrapper/clamav-wrapper b/usr/lib/MailScanner/wrapper/clamav-wrapper +index 210482b..7a5dca4 100644 +--- usr/lib/MailScanner/wrapper/clamav-wrapper ++++ usr/lib/MailScanner/wrapper/clamav-wrapper +@@ -24,6 +24,9 @@ + # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + # + ++#OS Name ++OSType=`/usr/bin/env uname -s` ++ + # this passed from the CLI + # ./scanner-wrapper /path/to/av/bin /thing/to/scan + ClamScan=$1/bin/clamscan +@@ -144,7 +147,11 @@ fi + [ -d ${IWD} ] || mkdir -p ${IWD} + + # create our working tmp directory in the base tmp directory +-TempDir=`mktemp -d --tmpdir=${IWD}` ++if [ "${OSType}" = "FreeBSD" ]; then ++ TempDir=`TMPDIR=${IWD} mktemp -d` ++else ++ TempDir=`mktemp -d --tmpdir=${IWD}` ++fi + + # In case we get interupted.... + trap "rm -rf ${TempDir}" EXIT +@@ -179,4 +186,4 @@ if [ -d ${TempDir} ]; then + rm -rf ${TempDir} + fi + +-exit $retval +\ No newline at end of file ++exit $retval + Property changes on: branches/2018Q4/mail/mailscanner/files/patch-cf1c302 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property