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 -0000 1.51
> +++ Makefile 25 Aug 2021 08:31:33 -0000
> @@ -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 <ajacoutot@openbsd.org>
>
> @@ -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 -0000 1.19
> +++ distinfo 25 Aug 2021 08:31:33 -0000
> @@ -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 -0000 1.7
> +++ patches/patch-examples_mimedefang-filter-openbsd-ports 25 Aug 2021 08:31:33 -0000
> @@ -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-admin@mydomain.com'
> + # MIMEDefang policy. A good example would be 'defang-admin@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";
> - # 'mimedefang@mydomain.com'. Make sure to have an alias for this
> + # 'mimedefang@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 (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");
> -+# }
> -
> - return action_accept();
> - }
> -@@ -209,11 +215,12 @@ sub filter_multipart {
> -
> - return if message_rejected(); # Avoid unnecessary work
> -
> -- if (filter_bad_filename($entity)) {
> -- md_graphdefang_log('bad_filename', $fname, $type);
> -- action_notify_administrator("A MULTIPART attachment of type $type, named $fname was dropped.\n");
> -- return action_drop_with_warning("An attachment of type $type, 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 multipart messages.
> -+# if (filter_bad_filename($entity)) {
> -+# md_graphdefang_log('bad_filename', $fname, $type);
> -+# action_notify_administrator("A MULTIPART attachment of type $type, named $fname was dropped.\n");
> -+# return action_drop_with_warning("An attachment of type $type, 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");
> -+# }
> -
> - # Block message/partial parts
> - if (lc($type) eq "message/partial") {
> -@@ -260,6 +267,9 @@ sub filter_end {
> +@@ -259,6 +262,9 @@ sub filter_end {
> # No sense doing any extra work
> return if message_rejected();
>
> @@ -95,8 +52,8 @@ Index: examples/mimedefang-filter-openbs
> +
> # Spam checks if SpamAssassin is installed
> if ($Features{"SpamAssassin"}) {
> - if (-s "./INPUTMSG" < 100*1024) {
> -@@ -314,7 +324,40 @@ sub filter_end {
> + if (-s "./INPUTMSG" < 100*1024) {
> +@@ -328,7 +334,40 @@ sub filter_end {
> # by marginal software. Your call.
>
> # action_rebuild();
--
Antoine
No comments:
Post a Comment