git: c284c96d117c - main - mail/spamassassin: Remove deprecated method usage in sa-update
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 01 Jul 2023 17:34:21 UTC
The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=c284c96d117c97120e8b4f01efa592a4fe10596b commit c284c96d117c97120e8b4f01efa592a4fe10596b Author: Danilo G. Baio <dbaio@FreeBSD.org> AuthorDate: 2023-07-01 14:33:17 +0000 Commit: Danilo G. Baio <dbaio@FreeBSD.org> CommitDate: 2023-07-01 17:33:36 +0000 mail/spamassassin: Remove deprecated method usage in sa-update PR: 272313 Approved by: cy (maintainer) Obtained from: https://svn.apache.org/viewvc?view=revision&revision=1910601 --- mail/spamassassin/Makefile | 2 +- mail/spamassassin/files/patch-sa-update.raw | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index f98eb2fd343f..4cc5c6a30204 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,6 +1,6 @@ PORTNAME= spamassassin PORTVERSION= 4.0.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES?= mail perl5 MASTER_SITES= https://archive.apache.org/dist/${PORTNAME}/source/ CPAN/Mail DISTNAME= Mail-SpamAssassin-${PORTVERSION} diff --git a/mail/spamassassin/files/patch-sa-update.raw b/mail/spamassassin/files/patch-sa-update.raw new file mode 100644 index 000000000000..4a3df72b29f5 --- /dev/null +++ b/mail/spamassassin/files/patch-sa-update.raw @@ -0,0 +1,12 @@ +# https://svn.apache.org/viewvc?view=revision&revision=1910601 +--- sa-update.raw.orig 2022-12-14 06:03:27 UTC ++++ sa-update.raw +@@ -1458,7 +1458,7 @@ sub do_dns_query { + next if !$rr; # no answer records, only rcode + next if $rr->type ne $rr_type; + # scalar context! +- my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdatastr; ++ my $text = $rr->UNIVERSAL::can('txtdata') ? $rr->txtdata : $rr->rdstring; + push(@result,$text) if defined $text && $text ne ''; + } + printf("DNS %s query: %s -> %s\n", $rr_type, $query, join(", ",@result))