Re: UPDATE: mail/mimedefang
OK — Antoine > On 18 Jan 2023, at 09:40, Giovanni Bechis wrote: > > Hi, > bugfix update to 3.3 version. > Ok ? > Cheers > Giovanni > > Index: Makefile > === > RCS file: /cvs/ports/mail/mimedefang/Makefile,v > retrieving revision 1.61 > diff -u -p -r1.61 Makefile > --- Makefile24 Oct 2022 16:29:22 -1.61 > +++ Makefile18 Jan 2023 07:52:28 - > @@ -1,6 +1,6 @@ > COMMENT=mailfilter to identify and mark spam > > -DISTNAME=mimedefang-3.2 > +DISTNAME=mimedefang-3.3 > > CATEGORIES=mail > > Index: distinfo > === > RCS file: /cvs/ports/mail/mimedefang/distinfo,v > retrieving revision 1.24 > diff -u -p -r1.24 distinfo > --- distinfo24 Oct 2022 16:29:22 -1.24 > +++ distinfo18 Jan 2023 07:52:28 - > @@ -1,2 +1,2 @@ > -SHA256 (mimedefang-3.2.tar.gz) = 7Rgn2ZCVe0EyUtUo7Q0JxjeBRt9WlTkKyD3B59vZpKY= > -SIZE (mimedefang-3.2.tar.gz) = 494702 > +SHA256 (mimedefang-3.3.tar.gz) = r5CeLDt3eDG+mJ+erw05WoWvnVS0pp6Qa7x+Kqu9E00= > +SIZE (mimedefang-3.3.tar.gz) = 495544
UPDATE: mail/mimedefang
Hi, bugfix update to 3.3 version. Ok ? Cheers Giovanni Index: Makefile === RCS file: /cvs/ports/mail/mimedefang/Makefile,v retrieving revision 1.61 diff -u -p -r1.61 Makefile --- Makefile24 Oct 2022 16:29:22 - 1.61 +++ Makefile18 Jan 2023 07:52:28 - @@ -1,6 +1,6 @@ COMMENT= mailfilter to identify and mark spam -DISTNAME= mimedefang-3.2 +DISTNAME= mimedefang-3.3 CATEGORIES=mail Index: distinfo === RCS file: /cvs/ports/mail/mimedefang/distinfo,v retrieving revision 1.24 diff -u -p -r1.24 distinfo --- distinfo24 Oct 2022 16:29:22 - 1.24 +++ distinfo18 Jan 2023 07:52:28 - @@ -1,2 +1,2 @@ -SHA256 (mimedefang-3.2.tar.gz) = 7Rgn2ZCVe0EyUtUo7Q0JxjeBRt9WlTkKyD3B59vZpKY= -SIZE (mimedefang-3.2.tar.gz) = 494702 +SHA256 (mimedefang-3.3.tar.gz) = r5CeLDt3eDG+mJ+erw05WoWvnVS0pp6Qa7x+Kqu9E00= +SIZE (mimedefang-3.3.tar.gz) = 495544 signature.asc Description: PGP signature
Re: UPDATE: mail/mimedefang
On Fri, Dec 17, 2021 at 06:23:54PM +0100, Giovanni Bechis wrote:
> Hi,
> update to the (just released) latest version.
> ok ? Comments ?
>Cheers
> Giovanni
You're fast :-)
One nitpick below then OK
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mimedefang/Makefile,v
> retrieving revision 1.54
> diff -u -p -r1.54 Makefile
> --- Makefile 29 Aug 2021 10:32:01 - 1.54
> +++ Makefile 17 Dec 2021 17:15:44 -
> @@ -2,8 +2,7 @@
>
> COMMENT= mailfilter to identify and mark spam
>
> -DISTNAME=mimedefang-2.85
> -REVISION=1
> +DISTNAME=mimedefang-2.86
>
> CATEGORIES= mail
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/mimedefang/distinfo,v
> retrieving revision 1.20
> diff -u -p -r1.20 distinfo
> --- distinfo 27 Aug 2021 15:58:30 - 1.20
> +++ distinfo 17 Dec 2021 17:15:44 -
> @@ -1,2 +1,2 @@
> -SHA256 (mimedefang-2.85.tar.gz) =
> JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
> -SIZE (mimedefang-2.85.tar.gz) = 499350
> +SHA256 (mimedefang-2.86.tar.gz) =
> jumgOXy+pEftJS3uEouqR6PWs7KpYgkx+cXOzKAyGiM=
> +SIZE (mimedefang-2.86.tar.gz) = 501484
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/mail/mimedefang/pkg/PLIST,v
> retrieving revision 1.14
> diff -u -p -r1.14 PLIST
> --- pkg/PLIST 4 Sep 2018 12:46:15 - 1.14
> +++ pkg/PLIST 17 Dec 2021 17:15:44 -
> @@ -1,9 +1,11 @@
> @comment $OpenBSD: PLIST,v 1.14 2018/09/04 12:46:15 espie Exp $
> -@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to
> QUARANTINEDIR
Please keep this where it was.
> @newgroup _mdefang:570
> @newuser _mdefang:570:_mdefang:daemon:MIMEDefang
> User:/var/spool/MD-Quarantine:/sbin/nologin
> +@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to
> QUARANTINEDIR
> @extraunexec rm -rf /var/spool/MIMEDefang/*
> @extraunexec rm -rf /var/spool/MD-Quarantine/*
> +@rcscript ${RCDIR}/mimedefang
> +@rcscript ${RCDIR}/mimedefang_multiplexor
> @bin bin/md-mx-ctrl
> @bin bin/mimedefang
> @bin bin/mimedefang-multiplexor
> @@ -38,10 +40,5 @@ share/examples/mimedefang/mail/sa-mimede
> @mode 0750
> @owner _mdefang
> @group _mdefang
> -@sample /var/spool/MIMEDefang/
> @sample /var/spool/MD-Quarantine/
> -@mode
> -@owner
> -@group
> -@rcscript ${RCDIR}/mimedefang
> -@rcscript ${RCDIR}/mimedefang_multiplexor
> +@sample /var/spool/MIMEDefang/
--
Antoine
UPDATE: mail/mimedefang
Hi,
update to the (just released) latest version.
ok ? Comments ?
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.54
diff -u -p -r1.54 Makefile
--- Makefile29 Aug 2021 10:32:01 - 1.54
+++ Makefile17 Dec 2021 17:15:44 -
@@ -2,8 +2,7 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.85
-REVISION= 1
+DISTNAME= mimedefang-2.86
CATEGORIES=mail
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo27 Aug 2021 15:58:30 - 1.20
+++ distinfo17 Dec 2021 17:15:44 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.85.tar.gz) = JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
-SIZE (mimedefang-2.85.tar.gz) = 499350
+SHA256 (mimedefang-2.86.tar.gz) = jumgOXy+pEftJS3uEouqR6PWs7KpYgkx+cXOzKAyGiM=
+SIZE (mimedefang-2.86.tar.gz) = 501484
Index: pkg/PLIST
===
RCS file: /cvs/ports/mail/mimedefang/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST 4 Sep 2018 12:46:15 - 1.14
+++ pkg/PLIST 17 Dec 2021 17:15:44 -
@@ -1,9 +1,11 @@
@comment $OpenBSD: PLIST,v 1.14 2018/09/04 12:46:15 espie Exp $
-@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to
QUARANTINEDIR
@newgroup _mdefang:570
@newuser _mdefang:570:_mdefang:daemon:MIMEDefang
User:/var/spool/MD-Quarantine:/sbin/nologin
+@comment non-volatile homedir needed for sa-learn(1), MD sets user_dir to
QUARANTINEDIR
@extraunexec rm -rf /var/spool/MIMEDefang/*
@extraunexec rm -rf /var/spool/MD-Quarantine/*
+@rcscript ${RCDIR}/mimedefang
+@rcscript ${RCDIR}/mimedefang_multiplexor
@bin bin/md-mx-ctrl
@bin bin/mimedefang
@bin bin/mimedefang-multiplexor
@@ -38,10 +40,5 @@ share/examples/mimedefang/mail/sa-mimede
@mode 0750
@owner _mdefang
@group _mdefang
-@sample /var/spool/MIMEDefang/
@sample /var/spool/MD-Quarantine/
-@mode
-@owner
-@group
-@rcscript ${RCDIR}/mimedefang
-@rcscript ${RCDIR}/mimedefang_multiplexor
+@sample /var/spool/MIMEDefang/
signature.asc
Description: PGP signature
Re: WIP update: mail/mimedefang
On Wed, Aug 25, 2021 at 11:14:28AM +0200, Giovanni Bechis wrote:
> On Tue, Aug 03, 2021 at 11:16:50PM +0200, Giovanni Bechis wrote:
> > Hi,
> > MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
> > released soon, now looking for testers.
> > Full changelog at
> > https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog
> >
>
> MIMEDefang 2.85 has been released, updated diff follows.
OK aja
> Cheers
> Giovanni
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/mimedefang/Makefile,v
> retrieving revision 1.51
> diff -u -p -r1.51 Makefile
> --- Makefile 12 Jul 2019 20:47:30 - 1.51
> +++ Makefile 25 Aug 2021 08:31:33 -
> @@ -2,12 +2,11 @@
>
> COMMENT= mailfilter to identify and mark spam
>
> -DISTNAME=mimedefang-2.84
> +DISTNAME=mimedefang-2.85
> CATEGORIES= mail
> -REVISION=0
>
> -HOMEPAGE=http://www.mimedefang.org/
> -MASTER_SITES=${HOMEPAGE}static/
> +HOMEPAGE=https://www.mimedefang.org/
> +MASTER_SITES=${HOMEPAGE}releases/
>
> MAINTAINER= Antoine Jacoutot
>
> @@ -17,10 +16,10 @@ PERMIT_PACKAGE= Yes
> WANTLIB += c m milter perl pthread
>
> BUILD_DEPENDS= ${RUN_DEPENDS}
> -RUN_DEPENDS= devel/p5-IO-stringy \
> - mail/p5-Mail-Tools \
> +RUN_DEPENDS= mail/p5-Mail-Tools \
> mail/p5-MIME-tools \
> security/p5-Digest-SHA1 \
> + security/p5-Crypt-OpenSSL-Random \
> sysutils/p5-Unix-Syslog
>
> # useful optional dependencies
> @@ -36,7 +35,10 @@ CONFIGURE_ARGS=--with-user=_mdefang \
> --disable-anti-virus \
> --enable-poll
>
> -NO_TEST= Yes
> +TEST_DEPENDS=devel/p5-Test-Class \
> + devel/p5-Test-Most
> +
> +TEST_TARGET= test
>
> FAKE_FLAGS= sysconfdir=${PREFIX}/share/examples/mimedefang
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/mimedefang/distinfo,v
> retrieving revision 1.19
> diff -u -p -r1.19 distinfo
> --- distinfo 29 Mar 2018 20:52:15 - 1.19
> +++ distinfo 25 Aug 2021 08:31:33 -
> @@ -1,2 +1,2 @@
> -SHA256 (mimedefang-2.84.tar.gz) =
> bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
> -SIZE (mimedefang-2.84.tar.gz) = 371596
> +SHA256 (mimedefang-2.85.tar.gz) =
> JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
> +SIZE (mimedefang-2.85.tar.gz) = 499350
> Index: patches/patch-examples_mimedefang-filter-openbsd-ports
> ===
> RCS file:
> /cvs/ports/mail/mimedefang/patches/patch-examples_mimedefang-filter-openbsd-ports,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-examples_mimedefang-filter-openbsd-ports
> --- patches/patch-examples_mimedefang-filter-openbsd-ports31 Oct 2017
> 07:34:01 - 1.7
> +++ patches/patch-examples_mimedefang-filter-openbsd-ports25 Aug 2021
> 08:31:33 -
> @@ -13,7 +13,7 @@ Index: examples/mimedefang-filter-openbs
> #
> # This program may be distributed under the terms of the GNU General
> @@ -20,7 +17,7 @@
> - # MIMEDefang policy. A good example would be 'defang-ad...@mydomain.com'
> + # MIMEDefang policy.A good example would be 'defang-ad...@mydomain.com'
> #***
> $AdminAddress = 'postmaster@localhost';
> -$AdminName = "MIMEDefang Administrator's Full Name";
> @@ -22,7 +22,7 @@ Index: examples/mimedefang-filter-openbs
> #***
> # Set the e-mail address from which MIMEDefang quarantine warnings and
> @@ -28,7 +25,7 @@ $AdminName = "MIMEDefang Administrator's Full Name";
> - # 'mimedef...@mydomain.com'. Make sure to have an alias for this
> + # 'mimedef...@mydomain.com'.Make sure to have an alias for this
> # address if you want replies to it to work.
> #***
> -$DaemonAddress = 'mimedefang@localhost';
> @@ -43,50 +43,7 @@ Index: examples/mimedefang-filter-openbs
> # Set various stupid things your mail client does below.
> #***
>
> -@@ -137,6 +140,8 @@ sub filter_begin {
> - if ($FoundVirus) {
> - md_graphdefang_log('virus', $VirusName, $RelayAddr);
> - md_syslog('warning', "Discarding because of virus $VirusName");
> -+# Uncomment to copy the message to quarantine before discarding it.
> -+# action_quarantine_entire_message();
> - return action_discard();
> - }
> -
> -@@ -180,10 +185,11 @@ sub filter {
> - return action_bounce("MIME type message/partial not accepted here");
> - }
> -
> --if (filter_bad_filename($entity)) {
> --md_graphdefang_log('bad_filename', $fname, $type);
> --return action_drop_with_warning("An attachment named $fname
Re: WIP update: mail/mimedefang
On Tue, Aug 03, 2021 at 11:16:50PM +0200, Giovanni Bechis wrote:
> Hi,
> MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
> released soon, now looking for testers.
> Full changelog at
> https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog
>
MIMEDefang 2.85 has been released, updated diff follows.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile12 Jul 2019 20:47:30 - 1.51
+++ Makefile25 Aug 2021 08:31:33 -
@@ -2,12 +2,11 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.84
+DISTNAME= mimedefang-2.85
CATEGORIES=mail
-REVISION= 0
-HOMEPAGE= http://www.mimedefang.org/
-MASTER_SITES= ${HOMEPAGE}static/
+HOMEPAGE= https://www.mimedefang.org/
+MASTER_SITES= ${HOMEPAGE}releases/
MAINTAINER=Antoine Jacoutot
@@ -17,10 +16,10 @@ PERMIT_PACKAGE= Yes
WANTLIB += c m milter perl pthread
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/p5-IO-stringy \
- mail/p5-Mail-Tools \
+RUN_DEPENDS= mail/p5-Mail-Tools \
mail/p5-MIME-tools \
security/p5-Digest-SHA1 \
+ security/p5-Crypt-OpenSSL-Random \
sysutils/p5-Unix-Syslog
# useful optional dependencies
@@ -36,7 +35,10 @@ CONFIGURE_ARGS= --with-user=_mdefang \
--disable-anti-virus \
--enable-poll
-NO_TEST= Yes
+TEST_DEPENDS= devel/p5-Test-Class \
+ devel/p5-Test-Most
+
+TEST_TARGET= test
FAKE_FLAGS=sysconfdir=${PREFIX}/share/examples/mimedefang
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo29 Mar 2018 20:52:15 - 1.19
+++ distinfo25 Aug 2021 08:31:33 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.84.tar.gz) = bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
-SIZE (mimedefang-2.84.tar.gz) = 371596
+SHA256 (mimedefang-2.85.tar.gz) = JA6VIHfnrJzBRWjzJSqGG4UHD6yCl0lTY9Tc1+HBt4Y=
+SIZE (mimedefang-2.85.tar.gz) = 499350
Index: patches/patch-examples_mimedefang-filter-openbsd-ports
===
RCS file:
/cvs/ports/mail/mimedefang/patches/patch-examples_mimedefang-filter-openbsd-ports,v
retrieving revision 1.7
diff -u -p -r1.7 patch-examples_mimedefang-filter-openbsd-ports
--- patches/patch-examples_mimedefang-filter-openbsd-ports 31 Oct 2017
07:34:01 - 1.7
+++ patches/patch-examples_mimedefang-filter-openbsd-ports 25 Aug 2021
08:31:33 -
@@ -13,7 +13,7 @@ Index: examples/mimedefang-filter-openbs
#
# This program may be distributed under the terms of the GNU General
@@ -20,7 +17,7 @@
- # MIMEDefang policy. A good example would be 'defang-ad...@mydomain.com'
+ # MIMEDefang policy.A good example would be 'defang-ad...@mydomain.com'
#***
$AdminAddress = 'postmaster@localhost';
-$AdminName = "MIMEDefang Administrator's Full Name";
@@ -22,7 +22,7 @@ Index: examples/mimedefang-filter-openbs
#***
# Set the e-mail address from which MIMEDefang quarantine warnings and
@@ -28,7 +25,7 @@ $AdminName = "MIMEDefang Administrator's Full Name";
- # 'mimedef...@mydomain.com'. Make sure to have an alias for this
+ # 'mimedef...@mydomain.com'.Make sure to have an alias for this
# address if you want replies to it to work.
#***
-$DaemonAddress = 'mimedefang@localhost';
@@ -43,50 +43,7 @@ Index: examples/mimedefang-filter-openbs
# Set various stupid things your mail client does below.
#***
-@@ -137,6 +140,8 @@ sub filter_begin {
- if ($FoundVirus) {
- md_graphdefang_log('virus', $VirusName, $RelayAddr);
- md_syslog('warning', "Discarding because of virus $VirusName");
-+ # Uncomment to copy the message to quarantine before discarding it.
-+ # action_quarantine_entire_message();
- return action_discard();
- }
-
-@@ -180,10 +185,11 @@ sub filter {
- return action_bounce("MIME type message/partial not accepted here");
- }
-
--if (filter_bad_filename($entity)) {
--md_graphdefang_log('bad_filename', $fname, $type);
-- return action_drop_with_warning("An attachment named $fname was removed
from this document as it\nconstituted a security hazard. If you require this
document, please contact\nthe sender and arrange an alternate means of
receiving it.\n");
--}
-+# Uncomment to enable bad extension filtering for MIME messages.
-+#if
WIP update: mail/mimedefang
Hi,
MIMEDefang 2.85-rc1 has been released last week and 2.85 will be
released soon, now looking for testers.
Full changelog at
https://github.com/The-McGrail-Foundation/MIMEDefang/blob/2.85-rc1/Changelog
Cheers & Thanks
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile12 Jul 2019 20:47:30 - 1.51
+++ Makefile3 Aug 2021 21:10:13 -
@@ -2,12 +2,12 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.84
+DISTNAME= MIMEDefang-2.85-rc1
+PKGNAME= ${DISTNAME:L}
CATEGORIES=mail
-REVISION= 0
-HOMEPAGE= http://www.mimedefang.org/
-MASTER_SITES= ${HOMEPAGE}static/
+HOMEPAGE= https://www.mimedefang.org/
+MASTER_SITES= ${HOMEPAGE}releases/
MAINTAINER=Antoine Jacoutot
@@ -17,10 +17,10 @@ PERMIT_PACKAGE= Yes
WANTLIB += c m milter perl pthread
BUILD_DEPENDS= ${RUN_DEPENDS}
-RUN_DEPENDS= devel/p5-IO-stringy \
- mail/p5-Mail-Tools \
+RUN_DEPENDS= mail/p5-Mail-Tools \
mail/p5-MIME-tools \
security/p5-Digest-SHA1 \
+ security/p5-Crypt-OpenSSL-Random \
sysutils/p5-Unix-Syslog
# useful optional dependencies
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.19
diff -u -p -r1.19 distinfo
--- distinfo29 Mar 2018 20:52:15 - 1.19
+++ distinfo3 Aug 2021 21:10:13 -
@@ -1,2 +1,2 @@
-SHA256 (mimedefang-2.84.tar.gz) = bRUxxwqQH83fnLmJ1Ii+r3isDMFtEb65gbmSABRsSEg=
-SIZE (mimedefang-2.84.tar.gz) = 371596
+SHA256 (MIMEDefang-2.85-rc1.tar.gz) =
E0VSQqSwIF9O1Puerfzjsj6KLMBbG07z4Pr12AS6LoQ=
+SIZE (MIMEDefang-2.85-rc1.tar.gz) = 371038
signature.asc
Description: PGP signature
UPDATE: mail/mimedefang
Hi all,
- update to 2.71
- switch to pkg-readmes
- add rcscripts
Comments, feedback and/or OK's more than welcome.
Cheers,
Okan
Index: Makefile
===
RCS file: /home/open/anoncvs/cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile19 Nov 2010 07:23:07 - 1.14
+++ Makefile27 Nov 2010 18:45:04 -
@@ -2,8 +2,7 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.67
-REVISION = 0
+DISTNAME= mimedefang-2.71
CATEGORIES=mail
HOMEPAGE= http://www.mimedefang.org/
@@ -19,7 +18,8 @@ PERMIT_DISTFILES_FTP= Yes
WANTLIB= c m perl pthread util milter
-RUN_DEPENDS= mail/p5-MIME-tools \
+RUN_DEPENDS= archivers/p5-Archive-Zip \
+ mail/p5-MIME-tools \
security/p5-Digest-SHA1 \
www/p5-HTML-Parser \
sysutils/p5-Unix-Syslog
@@ -33,16 +33,11 @@ CONFIGURE_ARGS= --with-user=_mdefang \
USE_GROFF =Yes
NO_REGRESS=Yes
-post-build:
- ${SUBST_CMD} -c ${FILESDIR}/rc.mimedefang ${WRKSRC}/rc.mimedefang
-
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mimedefang
${INSTALL_DATA}
${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients \
${PREFIX}/share/examples/mimedefang/mimedefang-filter
${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf \
${PREFIX}/share/examples/mimedefang/sa-mimedefang.cf
- ${INSTALL_SCRIPT} ${WRKSRC}/rc.mimedefang \
- ${PREFIX}/share/examples/mimedefang/
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/open/anoncvs/cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo10 Sep 2009 12:13:06 - 1.7
+++ distinfo25 Nov 2010 00:06:02 -
@@ -1,5 +1,5 @@
-MD5 (mimedefang-2.67.tar.gz) = 0fZ7wDtBSEy5rlL7DdTSSw==
-RMD160 (mimedefang-2.67.tar.gz) = ahERn66dnUdi++JTbZH8oZ2WEjw=
-SHA1 (mimedefang-2.67.tar.gz) = iBBcj/poNA/K7A4AAMBjYY5nDQs=
-SHA256 (mimedefang-2.67.tar.gz) = 4n8/CE8rQ2Yi+b7kcIapBdS2bihXs8vP7HHLpmTPOus=
-SIZE (mimedefang-2.67.tar.gz) = 338779
+MD5 (mimedefang-2.71.tar.gz) = pf85BRsPuQITUuGl8LAfcg==
+RMD160 (mimedefang-2.71.tar.gz) = Se3AHwSGmZLNvrvpwvlBIBPZE6E=
+SHA1 (mimedefang-2.71.tar.gz) = uzqPlrwKtr0Hd33NpAoleEdc3wQ=
+SHA256 (mimedefang-2.71.tar.gz) = 50O/UGtoEQzA7R+liHSTcjMLJRsqqCdjd+HOw/sFHmg=
+SIZE (mimedefang-2.71.tar.gz) = 343211
Index: files/rc.mimedefang
===
RCS file: files/rc.mimedefang
diff -N files/rc.mimedefang
--- files/rc.mimedefang 12 Dec 2009 15:38:07 - 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,31 +0,0 @@
-# $OpenBSD: rc.mimedefang,v 1.5 2009/12/12 15:38:07 ajacoutot Exp $
-
-mimedefang=${TRUEPREFIX}/bin/mimedefang
-multiplexor=${TRUEPREFIX}/bin/mimedefang-multiplexor
-
-if [ -x $mimedefang -a -x $multiplexor ]; then
- MAX_SLAVES=16
- MIN_SLAVES=2
- BUSY_TIMEOUT=720
- IDLE_TIMEOUT=300
- WAIT_START=10
- MX_QUEUE_SIZE=10
- MX_QUEUE_TIMEOUT=30
-
- install -d -o _mdefang /var/run/mdefang
-
- echo -n mimedefang-multiplexor
- $multiplexor -U _mdefang -l \
- -x $MAX_SLAVES -m $MIN_SLAVES -b $BUSY_TIMEOUT \
- -i $IDLE_TIMEOUT -w $WAIT_START -q $MX_QUEUE_SIZE \
- -Q $MX_QUEUE_TIMEOUT \
- -p /var/run/mdefang/multiplexor.pid \
- -s /var/run/mdefang/multiplexor.socket
-
- echo -n mimedefang
- $mimedefang -U _mdefang -r -s -t \
- -p /var/run/mdefang/mimedefang.socket \
- -m /var/run/mdefang/multiplexor.socket
-
- sleep 3 # for socket creation
-fi
Index: pkg/MESSAGE
===
RCS file: pkg/MESSAGE
diff -N pkg/MESSAGE
--- pkg/MESSAGE 2 Nov 2007 22:40:03 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-To finish installation you should add following line to
-your .mc files:
-
-INPUT_MAIL_FILTER(`mimedefang', \
- `S=unix:/var/run/mdefang/mimedefang.socket, \
- F=T, T=S:360s;R:360s;E:15m')dnl
-
-If you wish to start up mimedefang automatically during system
-startup, add the following lines to /etc/rc.local:
-
-if [ -f ${SYSCONFDIR}/rc.mimedefang ]; then
- . ${SYSCONFDIR}/rc.mimedefang
-fi
Index: pkg/PLIST
===
RCS file: /home/open/anoncvs/cvs/ports/mail/mimedefang/pkg/PLIST,v
retrieving revision 1.6
diff -u -p -r1.6 PLIST
--- pkg/PLIST 21 Oct 2008 23:28:14 - 1.6
+++ pkg/PLIST 27 Nov 2010 18:46:33 -
@@ -16,16 +16,15 @@ bin/watch-multiple-mimedefangs.tcl
@man man/man8/mimedefang.pl.8
@man man/man8/watch-mimedefang.8
@man man/man8/watch-multiple-mimedefangs.8
update: mail/mimedefang
- uptdate to 2.63
- fix pasto in files/rc.mimedefang, plus a tweak or two
- variable substitution
- removes pkg/UNMESSAGE
- other minor fixes and improvements
- take maintanier
many thanks to sthen@ for his suggestions and tweaks.
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile27 Sep 2007 07:42:09 - 1.6
+++ Makefile4 Oct 2007 17:33:37 -
@@ -2,12 +2,13 @@
COMMENT= mailfilter to identify and mark spam
-DISTNAME= mimedefang-2.62
-PKGNAME= ${DISTNAME}p1
-CATEGORIES=mail perl5
+DISTNAME= mimedefang-2.63
+CATEGORIES=mail
HOMEPAGE= http://www.mimedefang.org/
+MAINTAINER=Okan Demirmen [EMAIL PROTECTED]
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
@@ -28,13 +29,17 @@
NO_REGRESS=Yes
+post-build:
+ @sed -e 's,%LOCALBASE%,${LOCALBASE},g' ${FILESDIR}/rc.mimedefang \
+${WRKSRC}/rc.mimedefang
+
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mimedefang
${INSTALL_DATA}
${WRKSRC}/examples/suggested-minimum-filter-for-windows-clients \
${PREFIX}/share/examples/mimedefang/mimedefang-filter
${INSTALL_DATA} ${WRKSRC}/SpamAssassin/spamassassin.cf \
${PREFIX}/share/examples/mimedefang/sa-mimedefang.cf
- ${INSTALL_SCRIPT} ${FILESDIR}/rc.mimedefang \
+ ${INSTALL_SCRIPT} ${WRKSRC}/rc.mimedefang \
${PREFIX}/share/examples/mimedefang/
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo27 Jul 2007 21:57:29 - 1.3
+++ distinfo4 Oct 2007 17:33:37 -
@@ -1,5 +1,5 @@
-MD5 (mimedefang-2.62.tar.gz) = KwQKd+k6uROoOqpFqUpUqQ==
-RMD160 (mimedefang-2.62.tar.gz) = omroGACb+ldPZ6uyFyzH9/tdViE=
-SHA1 (mimedefang-2.62.tar.gz) = Ow48Z9p+h2t1oxBL/bMbHGj5YC8=
-SHA256 (mimedefang-2.62.tar.gz) = lfzCtD9rbePgNJ6X3bSZQCTdUhV7KFwxOA8ameI0hhE=
-SIZE (mimedefang-2.62.tar.gz) = 329774
+MD5 (mimedefang-2.63.tar.gz) = spEa5x7BpiUWixOEMvkZuw==
+RMD160 (mimedefang-2.63.tar.gz) = BtnNCTrXcqgJ65SM0FNM841ZL8g=
+SHA1 (mimedefang-2.63.tar.gz) = 5upg+2NhP/UMRleKSVZBRhBbJCw=
+SHA256 (mimedefang-2.63.tar.gz) = NnS38YeGLSFXY00tV/Pua03TBfJubv6z3sxoTTSheiM=
+SIZE (mimedefang-2.63.tar.gz) = 328357
Index: files/rc.mimedefang
===
RCS file: /cvs/ports/mail/mimedefang/files/rc.mimedefang,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 rc.mimedefang
--- files/rc.mimedefang 19 Oct 2006 01:06:22 - 1.1.1.1
+++ files/rc.mimedefang 4 Oct 2007 17:33:37 -
@@ -1,30 +1,31 @@
# $OpenBSD: rc.mimedefang,v 1.1.1.1 2006/10/19 01:06:22 alek Exp $
-mimedefang=/usr/local/bin/mimedefang
-multiplexor=/usr/local/bin/mimedefang-multiplexor
-
-if [ -x $mimedefang -a -x $multiplexor ]; then
- MAX_SLAVES=16
- MIN_SLAVES=2
- BUSY_TIMEOUT=720
- IDLE_TIMEOUT=300
- WAIT_START=10
- MX_QUEUE_SIZE=10
- MX_QUEUE_TIMEOUT=30
+mimedefang=%LOCALBASE%/bin/mimedefang
+multiplexor=%LOCALBASE%/bin/mimedefang-multiplexor
- echo -n mimedefang-multiplexor
+if [ -x $mimedefang -a -x $multiplexor ]; then
+ MAX_SLAVES=16
+ MIN_SLAVES=2
+ BUSY_TIMEOUT=720
+ IDLE_TIMEOUT=300
+ WAIT_START=10
+ MX_QUEUE_SIZE=10
+ MX_QUEUE_TIMEOUT=30
+ install -d -o
Re: UPDATE: mail/mimedefang
On Mon, Apr 09, 2007 at 06:58:08PM +0200, Matthias Kilian wrote:
On Mon, Apr 09, 2007 at 06:44:36PM +0200, Matthias Kilian wrote:
Huh? We've mfapi.h right in /usr/include/libmilter, and the port
builds fine without the above line.
Also, you need milter in the WANTLIB; the configure script fails
to detect your shared libmilter, but it gets linked in. Looks mostly
harmless, but please double-check this.
Thanks for the input... fixed.
I also forgot to mention that I changed the COMMENT line because marking
spam is only one of the many functions mimedefang has (which DESCR does
a nice job of describing).
-ME
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile29 Oct 2006 18:34:25 - 1.2
+++ Makefile9 Apr 2007 17:26:21 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2006/10/29 18:34:25 steven Exp $
-COMMENT= mailfilter to identify and mark spam
+COMMENT= framework for filtering e-mail
-DISTNAME= mimedefang-2.57
-PKGNAME= ${DISTNAME}p0
+DISTNAME= mimedefang-2.61
+PKGNAME= ${DISTNAME}
CATEGORIES=mail perl5
HOMEPAGE= http://www.mimedefang.org/
@@ -13,17 +13,50 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m perl pthread util
+WANTLIB= c m perl pthread util milter
MASTER_SITES= ${HOMEPAGE}static/
-RUN_DEPENDS= :p5-MIME-tools-*:mail/p5-MIME-tools \
- :p5-Digest-SHA1-*:security/p5-Digest-SHA1
+RUN_DEPENDS= :p5-Archive-Zip-*:archivers/p5-Archive-Zip \
+ :p5-MIME-tools-*:mail/p5-MIME-tools \
+ :p5-Mail-Tools-*:mail/p5-Mail-Tools \
+ :p5-HTML-Parser-*:www/p5-HTML-Parser \
+ :p5-IO-stringy-*:devel/p5-IO-stringy \
+ :p5-Digest-SHA1-*:security/p5-Digest-SHA1 \
+ :p5-Unix-Syslog-*:sysutils/p5-Unix-Syslog
+
BUILD_DEPENDS= ${RUN_DEPENDS}
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-user=_mdefang \
- --disable-anti-virus
+CONFIGURE_ARGS=--with-user=_mdefang
+
+FLAVORS= clamd
+FLAVOR?=
+
+.if ${FLAVOR:L:Mclamd}
+CONFIGURE_ARGS+= --disable-antivir \
+ --disable-vexira \
+ --disable-uvscan \
+ --disable-bdc \
+ --disable-sweep \
+ --disable-trend \
+ --disable-AvpLinux \
+ --disable-kavscanner \
+ --disable-aveclient \
+ --disable-fsav \
+ --disable-clamav \
+ --disable-csav \
+ --disable-fprot \
+ --disable-sophie \
+ --disable-nvcc \
+ --disable-trophie
+
+BUILD_DEPENDS+=::security/clamav
+RUN_DEPENDS+= ::security/clamav
+MESSAGE= ${PKGDIR}/MESSAGE-clamd
+.else
+CONFIGURE_ARGS+= --disable-anti-virus
+.endif
NO_REGRESS=Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Apr 2007 16:20:02 - 1.2
+++ distinfo9 Apr 2007 17:26:21 -
@@ -1,5 +1,5 @@
-MD5 (mimedefang-2.57.tar.gz) = 5Vsi3aVMSjtS4fvrkTWwzw==
-RMD160 (mimedefang-2.57.tar.gz) = CBbMOXwtZVIAdgnm1byXKEId670=
-SHA1 (mimedefang-2.57.tar.gz) = hSBwlwCKBqXN4cDmx2Jw73GaV2k=
-SHA256 (mimedefang-2.57.tar.gz) = 3GlYCg9Zx0W8RAqdHwlEbpSVuBpoHKslyBdxJWaFNDU=
-SIZE (mimedefang-2.57.tar.gz) = 316909
+MD5 (mimedefang-2.61.tar.gz) = PaLWh6QL2O0u9LHbOl6oYw==
+RMD160 (mimedefang-2.61.tar.gz) = mCVl+1XwglruYxFY07as09ijs+E=
+SHA1 (mimedefang-2.61.tar.gz) = +2S29/9X4JXEj84IchGx1nITqMs=
+SHA256 (mimedefang-2.61.tar.gz) = mjygmy2L9AQBqr8Dygyyt4u/BYNmQjjgVo5n9FJsH7M=
+SIZE (mimedefang-2.61.tar.gz) = 326722
Index: pkg/MESSAGE
===
RCS file: /cvs/ports/mail/mimedefang/pkg/MESSAGE,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 MESSAGE
--- pkg/MESSAGE 19 Oct 2006 01:06:22 - 1.1.1.1
+++ pkg/MESSAGE 9 Apr 2007 17:26:21 -
@@ -5,6 +5,9 @@ INPUT_MAIL_FILTER(`mimedefang', \
`S=unix:/var/run/mdefang/mimedefang.socket, \
F=T, T=S:360s;R:360s;E:15m')dnl
+If you with to use mimedefang with SpamAssassin, you should
+install the p5-Mail-SpamAssassin package, too.
+
If you wish to start up mimedefang automatically during system
startup, add following lines to /etc/rc.local:
Index: pkg/MESSAGE-clamd
===
RCS file: pkg/MESSAGE-clamd
diff -N pkg/MESSAGE-clamd
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/MESSAGE-clamd 9 Apr 2007
Re: UPDATE: mail/mimedefang
Mike Erdely wrote: On Mon, Apr 09, 2007 at 06:58:08PM +0200, Matthias Kilian wrote: On Mon, Apr 09, 2007 at 06:44:36PM +0200, Matthias Kilian wrote: Huh? We've mfapi.h right in /usr/include/libmilter, and the port builds fine without the above line. Also, you need milter in the WANTLIB; the configure script fails to detect your shared libmilter, but it gets linked in. Looks mostly harmless, but please double-check this. Thanks for the input... fixed. I also forgot to mention that I changed the COMMENT line because marking spam is only one of the many functions mimedefang has (which DESCR does a nice job of describing). I've not checked it under OpenBSD, but the patch attached to the following message is needed to run clamd 0.90.1 with mimedefang. http://lurker.clamav.net/message/20070217.094625.aaecd605.en.html -- Matthieu Herrb
Re: UPDATE: mail/mimedefang
On Mon, Apr 09, 2007 at 07:48:25PM +0200, Matthieu Herrb wrote: I've not checked it under OpenBSD, but the patch attached to the following message is needed to run clamd 0.90.1 with mimedefang. http://lurker.clamav.net/message/20070217.094625.aaecd605.en.html I just ran the following tests with mimedefang-2.61 and clamav-0.90.1: 1. Sent message with PDF attached - delivered fine. 2. Sent message with virus-free zipfile attached - delivered fine. 3. Sent message with eicar infected zipfile attached - Quarantined at the server. In looking at the linked patch, it's referring to using mimedefang with the clamav command line and not the clamd daemon. The flavor I added was to use clamd, so the patch would not apply. -ME
Re: UPDATE: mail/mimedefang
Mike Erdely wrote: On Mon, Apr 09, 2007 at 07:48:25PM +0200, Matthieu Herrb wrote: I've not checked it under OpenBSD, but the patch attached to the following message is needed to run clamd 0.90.1 with mimedefang. http://lurker.clamav.net/message/20070217.094625.aaecd605.en.html I just ran the following tests with mimedefang-2.61 and clamav-0.90.1: 1. Sent message with PDF attached - delivered fine. 2. Sent message with virus-free zipfile attached - delivered fine. 3. Sent message with eicar infected zipfile attached - Quarantined at the server. In looking at the linked patch, it's referring to using mimedefang with the clamav command line and not the clamd daemon. The flavor I added was to use clamd, so the patch would not apply. On my (solaris) mail server at work, it happens that clamd returns an error while parsing bad pdf or zip files, so mimedefangs falls back to running clamav directly, in which case the patch applies afaict. -- Matthieu Herrb
Re: UPDATE: mail/mimedefang
On Mon, Apr 09, 2007 at 08:32:02PM +0200, Matthieu Herrb wrote:
On my (solaris) mail server at work, it happens that clamd returns an
error while parsing bad pdf or zip files, so mimedefangs falls back to
running clamav directly, in which case the patch applies afaict.
Thanks. I've changed the FLAVOR to clamav and removed the
--disable-clamav CONFIGURE_ARG for the clamav flavor (so mimedefang can
use both clamd and clamav. I also applied the patch.
-ME
Index: Makefile
===
RCS file: /cvs/ports/mail/mimedefang/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile29 Oct 2006 18:34:25 - 1.2
+++ Makefile9 Apr 2007 18:54:43 -
@@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.2 2006/10/29 18:34:25 steven Exp $
-COMMENT= mailfilter to identify and mark spam
+COMMENT= framework for filtering e-mail
-DISTNAME= mimedefang-2.57
-PKGNAME= ${DISTNAME}p0
+DISTNAME= mimedefang-2.61
+PKGNAME= ${DISTNAME}
CATEGORIES=mail perl5
HOMEPAGE= http://www.mimedefang.org/
@@ -13,17 +13,49 @@ PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP=Yes
PERMIT_DISTFILES_CDROM=Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= c m perl pthread util
+WANTLIB= c m perl pthread util milter
MASTER_SITES= ${HOMEPAGE}static/
-RUN_DEPENDS= :p5-MIME-tools-*:mail/p5-MIME-tools \
- :p5-Digest-SHA1-*:security/p5-Digest-SHA1
+RUN_DEPENDS= :p5-Archive-Zip-*:archivers/p5-Archive-Zip \
+ :p5-MIME-tools-*:mail/p5-MIME-tools \
+ :p5-Mail-Tools-*:mail/p5-Mail-Tools \
+ :p5-HTML-Parser-*:www/p5-HTML-Parser \
+ :p5-IO-stringy-*:devel/p5-IO-stringy \
+ :p5-Digest-SHA1-*:security/p5-Digest-SHA1 \
+ :p5-Unix-Syslog-*:sysutils/p5-Unix-Syslog
+
BUILD_DEPENDS= ${RUN_DEPENDS}
CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-user=_mdefang \
- --disable-anti-virus
+CONFIGURE_ARGS=--with-user=_mdefang
+
+FLAVORS= clamav
+FLAVOR?=
+
+.if ${FLAVOR:L:Mclamav}
+CONFIGURE_ARGS+= --disable-antivir \
+ --disable-vexira \
+ --disable-uvscan \
+ --disable-bdc \
+ --disable-sweep \
+ --disable-trend \
+ --disable-AvpLinux \
+ --disable-kavscanner \
+ --disable-aveclient \
+ --disable-fsav \
+ --disable-csav \
+ --disable-fprot \
+ --disable-sophie \
+ --disable-nvcc \
+ --disable-trophie
+
+BUILD_DEPENDS+=::security/clamav
+RUN_DEPENDS+= ::security/clamav
+MESSAGE= ${PKGDIR}/MESSAGE-clamav
+.else
+CONFIGURE_ARGS+= --disable-anti-virus
+.endif
NO_REGRESS=Yes
Index: distinfo
===
RCS file: /cvs/ports/mail/mimedefang/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Apr 2007 16:20:02 - 1.2
+++ distinfo9 Apr 2007 18:54:43 -
@@ -1,5 +1,5 @@
-MD5 (mimedefang-2.57.tar.gz) = 5Vsi3aVMSjtS4fvrkTWwzw==
-RMD160 (mimedefang-2.57.tar.gz) = CBbMOXwtZVIAdgnm1byXKEId670=
-SHA1 (mimedefang-2.57.tar.gz) = hSBwlwCKBqXN4cDmx2Jw73GaV2k=
-SHA256 (mimedefang-2.57.tar.gz) = 3GlYCg9Zx0W8RAqdHwlEbpSVuBpoHKslyBdxJWaFNDU=
-SIZE (mimedefang-2.57.tar.gz) = 316909
+MD5 (mimedefang-2.61.tar.gz) = PaLWh6QL2O0u9LHbOl6oYw==
+RMD160 (mimedefang-2.61.tar.gz) = mCVl+1XwglruYxFY07as09ijs+E=
+SHA1 (mimedefang-2.61.tar.gz) = +2S29/9X4JXEj84IchGx1nITqMs=
+SHA256 (mimedefang-2.61.tar.gz) = mjygmy2L9AQBqr8Dygyyt4u/BYNmQjjgVo5n9FJsH7M=
+SIZE (mimedefang-2.61.tar.gz) = 326722
Index: patches/patch-mimedefang_pl_in
===
RCS file: patches/patch-mimedefang_pl_in
diff -N patches/patch-mimedefang_pl_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-mimedefang_pl_in 9 Apr 2007 18:54:43 -
@@ -0,0 +1,47 @@
+$OpenBSD$
+--- mimedefang.pl.in.orig Mon Apr 9 14:01:37 2007
mimedefang.pl.in Mon Apr 9 14:04:27 2007
+@@ -3669,7 +3669,7 @@ sub entity_contains_virus_clamav ($) {
+
+ # Run clamscan
+ my($code, $category, $action) =
+- run_virus_scanner($Features{'Virus:CLAMAV'} . --mbox --stdout
--disable-summary --infected $path 21);
++ run_virus_scanner($Features{'Virus:CLAMAV'} . --stdout
--disable-summary --infected $path 21);
+ if ($action ne 'proceed') {
+ return (wantarray ? ($code, $category, $action) : $code);
+ }
+@@ -3693,7 +3693,7 @@ sub message_contains_virus_clamav () {
+
+ # Run clamscan
+ my($code, $category, $action) =
+- run_virus_scanner($Features{'Virus:CLAMAV'} . -r --mbox --stdout
