From nobody Sat Jul 01 17:34:21 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QtfSZ0Yrtz4lH9K; Sat, 1 Jul 2023 17:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QtfSZ06yVz3wyq; Sat, 1 Jul 2023 17:34:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688232862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CR+3x04iAeesHIu5yU9vsJBhkX2GBFyASaazUbV8MI=; b=t6z9lytSkmFCG7ngHEnnw6BU1ty5NQNja3pemAUkP1cieDeDdaXDbCqeEft6aXQunEkZ50 HPzbrCU82E9xKr7CpK2prFvFUg2DhHrKZxaolsCPCkU/qDR7VjuxN0Z1HYgJHBfe9WNLgv fCz1uI+QDkWvDsRGLIto57g1AXEnWJluqIU99ax85rs/2xI3YUYz1vYrrfY1fYDl15/orn 5js5xHEDGCFoePuU4+icIU2/3iH78IG0j+GUbXyqaTUk2g4F5ukd3bWtpTvuzhCllfC3Ai ymgwUCtEEDtw7WIbTU6h+V7VZTCTf44GkGzpYLnFs62RPyWvcMMWwIOe8qkoLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688232862; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8CR+3x04iAeesHIu5yU9vsJBhkX2GBFyASaazUbV8MI=; b=Z2Pw0gYuY3zrVTpWBFMIe5rvvcbsaJ1sScVeTCptAC04NrJjm3FA8aF9ufFi6yUDvGIjvG KghGehsSY1VS50zbE4snlWScQ0n5eQkJZ9p6ElS1OF/MbLbkGVkY8BqXIy97n+naqYkySq 174TkVo11FNtHKz3tph6S4gxIY+LhJxOY5rxr7uyeasxxoRgnpsaCeRiml1h6vNSJHeiys DgCFeQLsmKg2K/VlyvgPBC/q9dEA5ZWy6eoFYlzdOXeALNOsyG4NWS36qyLQFdZaMyvHLk ePNaieBx6Dw91Bc6r1ELQZmBDVJOn/WD5IiFRcF7L3HPwdEG4A+mAFkMRF84jQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688232862; a=rsa-sha256; cv=none; b=iXM1sDyKtxaJyJ7Jl0fuwEMS9SzVWQS3i3MzjYiCOw8bDcExsEI5XthgVd0uzE5stM61Zb HaI2zef4N8YbL4ipThAdBfgpu8QCnE6BSAvovyCr6r3DrSvVaaMeL1lscGX5ujZGkoFo8l cw6OWVBpZPjQxPGUNAZiUN214SqC3UjslRtG2miVFkt8zkHCES5mlaN1mFpDVhExat9Kj7 lciVZDi9HOvrOzSkCGruSvAcpEGVTxXbvbfnUBEyNFprqPNCI9JHrL8/xekQ1wBT9moy8B JNdOBR7kxgeI9nCrcTIuSLoZQ0WTtIMZIaiJtNUC5yaVMjVNZ0DIVGuCW7QdQg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QtfSY6L5KzZff; Sat, 1 Jul 2023 17:34:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 361HYLQj087580; Sat, 1 Jul 2023 17:34:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HYLEp087579; Sat, 1 Jul 2023 17:34:21 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:34:21 GMT Message-Id: <202307011734.361HYLEp087579@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Danilo G. Baio" Subject: git: c284c96d117c - main - mail/spamassassin: Remove deprecated method usage in sa-update List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dbaio X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c284c96d117c97120e8b4f01efa592a4fe10596b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=c284c96d117c97120e8b4f01efa592a4fe10596b commit c284c96d117c97120e8b4f01efa592a4fe10596b Author: Danilo G. Baio AuthorDate: 2023-07-01 14:33:17 +0000 Commit: Danilo G. Baio 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))