Date: Thu, 14 Dec 2017 15:57:15 +0000 (UTC) From: Steve Wills <swills@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456304 - in head/mail/mimedefang: . files Message-ID: <201712141557.vBEFvFP8046916@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: swills Date: Thu Dec 14 15:57:15 2017 New Revision: 456304 URL: https://svnweb.freebsd.org/changeset/ports/456304 Log: mail/mimedefang: update to 2.83 PR: 223417 Submitted by: m.tsatsenko@gmail.com (maintainer) Modified: head/mail/mimedefang/Makefile head/mail/mimedefang/distinfo head/mail/mimedefang/files/patch-Makefile.in head/mail/mimedefang/files/patch-examples__init-script.in head/mail/mimedefang/files/pkg-message.in Modified: head/mail/mimedefang/Makefile ============================================================================== --- head/mail/mimedefang/Makefile Thu Dec 14 15:28:30 2017 (r456303) +++ head/mail/mimedefang/Makefile Thu Dec 14 15:57:15 2017 (r456304) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= mimedefang -PORTVERSION= 2.78 -PORTREVISION= 2 +PORTVERSION= 2.83 CATEGORIES= mail MASTER_SITES= http://www.mimedefang.org/static/ \ http://fossies.org/linux/misc/ @@ -26,7 +25,6 @@ OPTIONS_DEFAULT= CLAMAV CLAMAV_DESC= Enable Clamav USES= perl5 shebangfix -SHEBANG_FILES= script/mimedefang-util perl_OLD_CMD= perl GNU_CONFIGURE= yes @@ -55,22 +53,15 @@ CONFIG_FILES= mimedefang-filter sa-mimedefang.cf mimed .include <bsd.port.options.mk> -.if !exists( /usr/include/libmilter/mfapi.h ) -BUILD_DEPENDS+= ${LOCALBASE}/include/libmilter/mfapi.h:mail/libmilter -.endif +.include "${PORTSDIR}/mail/sendmail/bsd.milter.mk" -.if exists( ${LOCALBASE}/include/libmilter/mfapi.h ) +.if defined(WITH_SENDMAIL_PORT) CONFIGURE_ARGS+= --with-milterinc=${LOCALBASE}/include --with-milterlib=${LOCALBASE}/lib .endif -.if defined (MIMEDEFANG_DISABLE_CLAMAV) || ! ${PORT_OPTIONS:MCLAMAV} -CONFIGURE_ARGS+= --disable-antivirus \ - --disable-clamav \ - --disable-clamd -.else -BUILD_DEPENDS+= clamscan:security/clamav -RUN_DEPENDS+= clamscan:security/clamav -.endif +CLAMAV_BUILD_DEPENDS+= clamscan:security/clamav +CLAMAV_RUN_DEPENDS+= clamscan:security/clamav +CLAMAV_CONFIGURE_ENABLE+= antivirus clamav clamd post-patch: @${REINPLACE_CMD} -e '/fgrep -e/d' ${WRKSRC}/configure @@ -91,4 +82,5 @@ post-install: @cd ${WRKSRC}/examples/ && ${INSTALL_DATA} stream-by-domain-filter \ suggested-minimum-filter-for-windows-clients README ${STAGEDIR}${EXAMPLESDIR}/ .endif + .include <bsd.port.mk> Modified: head/mail/mimedefang/distinfo ============================================================================== --- head/mail/mimedefang/distinfo Thu Dec 14 15:28:30 2017 (r456303) +++ head/mail/mimedefang/distinfo Thu Dec 14 15:57:15 2017 (r456304) @@ -1,2 +1,3 @@ -SHA256 (mimedefang-2.78.tar.gz) = 8c363063fa6937826f8647e47fc3e5ef999ccb90110e0cb64befdd45cda8372c -SIZE (mimedefang-2.78.tar.gz) = 364501 +TIMESTAMP = 1509788754 +SHA256 (mimedefang-2.83.tar.gz) = e92ae6afc09991d5398fd6a0b9d6fd7ff391d9ab9f7722f935926b87c3619068 +SIZE (mimedefang-2.83.tar.gz) = 371389 Modified: head/mail/mimedefang/files/patch-Makefile.in ============================================================================== --- head/mail/mimedefang/files/patch-Makefile.in Thu Dec 14 15:28:30 2017 (r456303) +++ head/mail/mimedefang/files/patch-Makefile.in Thu Dec 14 15:57:15 2017 (r456304) @@ -1,6 +1,6 @@ ---- Makefile.in.orig 2012-01-20 15:20:32 UTC +--- Makefile.in.orig 2016-09-29 20:20:27 UTC +++ Makefile.in -@@ -156,14 +156,14 @@ install-redhat: install +@@ -157,14 +157,14 @@ install-redhat: install install: all $(INSTALL) -m 755 -d $(DESTDIR)${CONFDIR} @@ -19,7 +19,7 @@ test ! -d $(DESTDIR)$(SPOOLDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(SPOOLDIR) > /dev/null 2>&1 || true; \ test ! -d $(DESTDIR)$(QDIR) && $(INSTALL) -m 750 -o $(DEFANGUSER) -d $(DESTDIR)$(QDIR) > /dev/null 2>&1 || true; \ fi \ -@@ -185,11 +185,7 @@ install: all +@@ -186,11 +186,7 @@ install: all -test ! -d $(DESTDIR)$(SPOOLDIR) && mkdir -p $(DESTDIR)$(SPOOLDIR) && chmod 750 $(DESTDIR)$(SPOOLDIR) || true -test ! -d $(DESTDIR)$(QDIR) && mkdir -p $(DESTDIR)$(QDIR) && chmod 750 $(DESTDIR)$(QDIR) || true @@ -32,7 +32,7 @@ $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) mimedefang-multiplexor $(DESTDIR)$(prefix)/bin/mimedefang-multiplexor $(INSTALL) -m 755 $(INSTALL_STRIP_FLAG) md-mx-ctrl $(DESTDIR)$(prefix)/bin/md-mx-ctrl -@@ -210,11 +206,7 @@ install: all +@@ -211,11 +207,7 @@ install: all $(INSTALL) -m 644 mimedefang-protocol.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-protocol.7 $(INSTALL) -m 644 mimedefang-notify.7 $(DESTDIR)$(MANDIR)/man7/mimedefang-notify.7 if test "$(HAVE_SPAM_ASSASSIN)" = "yes" ; then \ Modified: head/mail/mimedefang/files/patch-examples__init-script.in ============================================================================== --- head/mail/mimedefang/files/patch-examples__init-script.in Thu Dec 14 15:28:30 2017 (r456303) +++ head/mail/mimedefang/files/patch-examples__init-script.in Thu Dec 14 15:57:15 2017 (r456304) @@ -1,6 +1,6 @@ ---- examples/init-script.in.orig 2012-01-20 15:24:01 UTC +--- examples/init-script.in.orig 2017-09-07 17:52:24 UTC +++ examples/init-script.in -@@ -39,6 +39,12 @@ export LC_ALL +@@ -41,6 +41,12 @@ export LC_ALL # The socket used by mimedefang to communicate with sendmail # SOCKET=$SPOOLDIR/mimedefang.sock @@ -13,21 +13,21 @@ # Run the multiplexor and filters as this user, not root. RECOMMENDED MX_USER=@DEFANGUSER@ -@@ -136,11 +142,11 @@ MX_MAXIMUM=10 +@@ -138,11 +144,11 @@ MX_MAXIMUM=10 - # Limit slave processes' resident-set size to this many kilobytes. Default + # Limit worker processes' resident-set size to this many kilobytes. Default # is unlimited. -# MX_MAX_RSS=10000 +MX_MAX_RSS=100000 - # Limit total size of slave processes' memory space to this many kilobytes. + # Limit total size of worker processes' memory space to this many kilobytes. # Default is unlimited. -# MX_MAX_AS=30000 +MX_MAX_AS=300000 # If you want to use the "notification" facility, set the appropriate port. # See the mimedefang-notify man page for details. -@@ -187,7 +193,7 @@ then +@@ -189,7 +195,7 @@ then . /etc/rc.subr name=$prog @@ -36,7 +36,7 @@ # default to not enabled, enable in rc.conf eval $rcvar=\${$rcvar:-NO} -@@ -197,6 +203,7 @@ then +@@ -199,6 +205,7 @@ then procname=$PROGDIR/$prog-multiplexor start_cmd="start_it" stop_cmd="stop_it" @@ -44,7 +44,7 @@ sig_reload="INT" reread_cmd="reread_it" # provide both "reload", the FreeBSD default, with a direct signal to -@@ -207,6 +214,8 @@ fi +@@ -209,6 +216,8 @@ fi # Make sure required vars are set SOCKET=${SOCKET:=$SPOOLDIR/$prog.sock} MX_SOCKET=${MX_SOCKET:=$SPOOLDIR/$prog-multiplexor.sock} @@ -53,7 +53,7 @@ start_it() { if test -r $PID ; then -@@ -292,6 +301,29 @@ start_it() { +@@ -294,6 +303,29 @@ start_it() { kill `cat $MXPID` return 1 fi @@ -83,7 +83,7 @@ return 0 } -@@ -327,7 +359,7 @@ stop_it() { +@@ -329,7 +361,7 @@ stop_it() { rm -f $MX_SOCKET > /dev/null 2>&1 rm -f $SOCKET > /dev/null 2>&1 @@ -92,7 +92,7 @@ printf "Waiting for daemons to exit." WAITPID="" test -f $PID && WAITPID=`cat $PID` -@@ -379,6 +411,12 @@ reread_it() { +@@ -381,6 +413,12 @@ reread_it() { fi } Modified: head/mail/mimedefang/files/pkg-message.in ============================================================================== --- head/mail/mimedefang/files/pkg-message.in Thu Dec 14 15:28:30 2017 (r456303) +++ head/mail/mimedefang/files/pkg-message.in Thu Dec 14 15:57:15 2017 (r456304) @@ -16,5 +16,3 @@ Also, you can install some anti-virus software to chec Open source AV package with automatic virus definition updates security/f-prot F-Prot Antivirus for BSD Workstations - security/vscan - Evaluation version of a DOS/Windows/Linux file virus scanner
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201712141557.vBEFvFP8046916>