diff options
| author | Florian Smeets <flo@FreeBSD.org> | 2019-08-22 20:00:06 +0000 |
|---|---|---|
| committer | Florian Smeets <flo@FreeBSD.org> | 2019-08-22 20:00:06 +0000 |
| commit | f9fee822d59adbda140a81d5b3f979536196dab0 (patch) | |
| tree | 9afc54426cfedce5814049ddd1ab915251910b4b /security/amavisd-new | |
| parent | 24b45f5a4c9f0905e6463f3bea0e9d8bef0b4036 (diff) | |
| download | ports-f9fee822d59adbda140a81d5b3f979536196dab0.tar.gz ports-f9fee822d59adbda140a81d5b3f979536196dab0.zip | |
Update to 2.12.0
amavisd-new moved to https://gitlab.com/amavis/amavis/ and was renamed to
amavis. I'm keeping the portname for now, but will likely rename it in a
second step.
Tested by: Herbert J. Skuhra <herbert@gojira.at>
Notes
Notes:
svn path=/head/; revision=509623
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 9 | ||||
| -rw-r--r-- | security/amavisd-new/distinfo | 6 | ||||
| -rw-r--r-- | security/amavisd-new/files/patch-amavisd | 27 | ||||
| -rw-r--r-- | security/amavisd-new/pkg-plist | 1 |
4 files changed, 8 insertions, 35 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index f13f3e587962..9530cb1e0034 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,13 +1,11 @@ # $FreeBSD$ PORTNAME= amavisd-new -PORTVERSION= 2.11.1 -PORTREVISION= 1 +PORTVERSION= 2.12.0 PORTEPOCH= 1 CATEGORIES= security -MASTER_SITES= http://www.ijs.si/software/amavisd/ \ - http://mirrors.catpipe.net/amavisd-new/ \ - http://mirror.mainloop.se/amavisd/ +MASTER_SITES= https://gitlab.com/amavis/amavis/-/archive/v${PORTVERSION}/ +DISTNAME= amavis-v${PORTVERSION} MAINTAINER= flo@FreeBSD.org COMMENT= Mail scanner interface between mailer and content checkers @@ -25,6 +23,7 @@ RUN_DEPENDS= p5-Unix-Syslog>=0:sysutils/p5-Unix-Syslog \ USES= perl5 shebangfix tar:bz2 USE_PERL5= run + SHEBANG_FILES= amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl \ amavisd-snmp-subagent amavisd diff --git a/security/amavisd-new/distinfo b/security/amavisd-new/distinfo index 928efa6288fd..4250eaad3504 100644 --- a/security/amavisd-new/distinfo +++ b/security/amavisd-new/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1539372344 -SHA256 (amavisd-new-2.11.1.tar.bz2) = 91e5dbe55354abcca14cedb26cbfa221866d2f897b0a7180b6dabea0bb948ad8 -SIZE (amavisd-new-2.11.1.tar.bz2) = 875204 +TIMESTAMP = 1566144032 +SHA256 (amavis-v2.12.0.tar.bz2) = 0ea5d3ace8388c0b92d867f096f4b4015cc8f6cc34c5c15b7be0b1ecd65b5292 +SIZE (amavis-v2.12.0.tar.bz2) = 873702 diff --git a/security/amavisd-new/files/patch-amavisd b/security/amavisd-new/files/patch-amavisd deleted file mode 100644 index d965f6a8976e..000000000000 --- a/security/amavisd-new/files/patch-amavisd +++ /dev/null @@ -1,27 +0,0 @@ ---- amavisd.orig 2019-01-14 21:47:08 UTC -+++ amavisd -@@ -22814,6 +22814,7 @@ sub process_smtp_request($$$$) { - } - # load policy banks from the 'client_ipaddr_policy' lookup - Amavis::load_policy_bank($_,$msginfo) for @bank_names_cl; -+ $msginfo->originating(c('originating')); - - $msginfo->client_addr($cl_ip); # ADDR - $msginfo->client_port($cl_port); # PORT -@@ -28857,7 +28857,7 @@ sub run_av(@) { - my $f = $bare_fnames->[$k]; my $multi = 0; - if ($one_at_a_time) { # glob templates may be substrings anywhere - local($1); @query_expanded = @query_template; # start afresh -- s{ ( {} (?: / \* )? | \* ) } -+ s{ ( \{\} (?: / \* )? | \* ) } - { $1 eq '{}' ? "$tempdir/parts" - : $1 eq '{}/*' ? ($multi=1,"$tempdir/parts/$f") - : $1 eq '*' ? ($multi=1,$f) : $1 -@@ -34357,6 +34358,7 @@ sub collect_some_dkim_info($) { - $sig_ind++; - } - Amavis::load_policy_bank($_,$msginfo) for @bank_names; -+ $msginfo->originating(c('originating')); - $msginfo->dkim_signatures_valid(\@signatures_valid) if @signatures_valid; - # if (ll(5) && $sig_ind > 0) { - # # show which header fields are covered by which signature diff --git a/security/amavisd-new/pkg-plist b/security/amavisd-new/pkg-plist index 87ce6b80ff24..a2d4f2e6e72d 100644 --- a/security/amavisd-new/pkg-plist +++ b/security/amavisd-new/pkg-plist @@ -23,6 +23,7 @@ %%PORTDOCS%%%%DOCSDIR%%/README.postfix %%PORTDOCS%%%%DOCSDIR%%/README.postfix.html %%PORTDOCS%%%%DOCSDIR%%/README.protocol +%%PORTDOCS%%%%DOCSDIR%%/README.rspamd %%PORTDOCS%%%%DOCSDIR%%/README.sendmail %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual %%PORTDOCS%%%%DOCSDIR%%/README.sendmail-dual.old |