From nobody Sat Jul 1 17:38:23 2023 X-Original-To: dev-commits-ports-all@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 4QtfYC25vvz4lJxK; Sat, 1 Jul 2023 17:38:23 +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 4QtfYC1hYzz3xrP; Sat, 1 Jul 2023 17:38:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688233103; 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=wvQRTs6vxv5LHZk/grAF37vwBhf57a353VSzqOirK8M=; b=R8d2hur4h3FBXbfOMOxIODafJA9nOZJHoedW+0AtrCszvEiRjaTRF+RMWBG2J8t7kuWGXV Eh4zueY1MlzpTaodppfKUApkdbaWIu8Ree+sVtbZxzRPibncrF/7PrBkMQZgQI7nDSwt2O Cd8QsCtcBEVirRzY6l52oTtYKRNAwIfZNpmszo//3Sra997rQJs5OKmHlpIisxJTFtcw0y ZIBKnITzIbrbSCEVzs+FXc7300s8wAM8XYj1IseE7++g6pluLES1D9/n+DQAAZ2JNJUGkp NGxN2c/NGjstSv78NiFuTTUT+Tl54J+HSGbRdnOOKxdnWvRIEh5WuL791+KKuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688233103; 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=wvQRTs6vxv5LHZk/grAF37vwBhf57a353VSzqOirK8M=; b=ZV8hSPeQW1EGxxNXGnaRwedEgkhc3Kk0x0uCQiGQHoBtuGD1h44mSQrYK2feaVtezRCaM1 Z51ADb2UvZKAidM4kbr+RVOwZaXVN8fXCoy/uHi763RV8i7nRhiUTw8XJ9BvsB2PPvYW0U pLPSjhWID7OnWQ9CNoj4Z5NJlW+IxNHQUI8XvaAMleK0Q3j+SBcZ+Q3UVIHz3Dxx2j+Rwq ao8iBMlpXDoEMGzoekIwfVkL4pJ+hNrtZU/TE1/vhsId9vz1b9SQR+ZRArFuQ+g53rloHj ftGSmJC7LfI0nxoGvnZ1oqdztO7fdK72iW/Y0t/wH2rhnrSyq3pEmddRFW9yVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688233103; a=rsa-sha256; cv=none; b=M3pLqM3G3LWbnRPuOymN300CUfUROJMfjVWPoR9S3W06Z/dNsIKh5oo1lTFMZmqo2xGnbh 5dPGCsxq0OlPU2owsd3cJGdiM6jUEQK2Ud2t/n5CjmGfkgv8+cem4h2w+Li7y4BBgBQUN3 ob16VDSEuSpuXqRrRxkqDR5tHvFf6lX5H5vEm6YO5PjwdZgCIvTwzOxXMYSG1jFjjac1cE gctREnT0Q1wVE/J4ETDMWrkyzrLj+YkNsPaM1FdKCsw1fru5F0d7f8U+/8aB7Akus11ijs kZVsSOPCfjcOYa+dezPJ3N6Hyx4LSnOuc9xWzqp24S33kJx2C5AIRa4gL1anXw== 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 4QtfYC0lJkzZW5; Sat, 1 Jul 2023 17:38:23 +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 361HcNeE088286; Sat, 1 Jul 2023 17:38:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 361HcNVq088285; Sat, 1 Jul 2023 17:38:23 GMT (envelope-from git) Date: Sat, 1 Jul 2023 17:38:23 GMT Message-Id: <202307011738.361HcNVq088285@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: "Danilo G. Baio" Subject: git: a4a6e4be184e - 2023Q3 - mail/spamassassin: Remove deprecated method usage in sa-update List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: a4a6e4be184e51b4d9cc39168033560a16cd8b69 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by dbaio: URL: https://cgit.FreeBSD.org/ports/commit/?id=a4a6e4be184e51b4d9cc39168033560a16cd8b69 commit a4a6e4be184e51b4d9cc39168033560a16cd8b69 Author: Danilo G. Baio AuthorDate: 2023-07-01 14:33:17 +0000 Commit: Danilo G. Baio CommitDate: 2023-07-01 17:37:31 +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 (cherry picked from commit c284c96d117c97120e8b4f01efa592a4fe10596b) --- 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))