From 36c3e7ac8eea47e1385f134881bc5b1511ef080f Mon Sep 17 00:00:00 2001
From: Marcel Telka <marcel@telka.sk>
Date: Sun, 31 Mar 2024 09:35:27 +0200
Subject: [PATCH] perl/Mail-SpamAssassin: update to 4.0.1
---
components/perl/Mail-SpamAssassin/pkg5 | 12 +-
components/perl/Mail-SpamAssassin/Makefile | 8
/dev/null | 214 -----------------------------------
components/perl/Mail-SpamAssassin/test/results-all.master | 12 +
components/perl/Mail-SpamAssassin/Mail-SpamAssassin-GENFRAG.p5m | 1
components/perl/Mail-SpamAssassin/manifests/sample-manifest.p5m | 17 ++
components/perl/Mail-SpamAssassin/patches/02-dnsbl_subtests-run_net_tests.patch | 14 +-
components/perl/Mail-SpamAssassin/patches/01-no-MaxMind.patch | 12 +-
components/perl/Mail-SpamAssassin/Mail-SpamAssassin-PERLVER.p5m | 14 ++
9 files changed, 59 insertions(+), 245 deletions(-)
diff --git a/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-GENFRAG.p5m b/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-GENFRAG.p5m
index 92186d5..6d29d41 100644
--- a/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-GENFRAG.p5m
+++ b/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-GENFRAG.p5m
@@ -26,6 +26,7 @@
file path=etc/mail/spamassassin/v342.pre
file path=etc/mail/spamassassin/v343.pre
file path=etc/mail/spamassassin/v400.pre
+file path=etc/mail/spamassassin/v401.pre
file path=lib/svc/manifest/network/spamassassin.xml
file path=lib/svc/method/spamassassin
file path=usr/share/spamassassin/languages
diff --git a/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-PERLVER.p5m b/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-PERLVER.p5m
index 53c020b..4d53138 100644
--- a/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-PERLVER.p5m
+++ b/components/perl/Mail-SpamAssassin/Mail-SpamAssassin-PERLVER.p5m
@@ -115,6 +115,11 @@
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Plugin::VBounce.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Plugin::WelcomeListSubject.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::PluginHandler.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Client.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest::Pieces.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest::StripHtml.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::RegistryBoundaries.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::SQLBasedAddrList.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::SubProcBackChannel.3perl
@@ -222,6 +227,11 @@
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Plugin/WLBLEval.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Plugin/WelcomeListSubject.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/PluginHandler.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Client.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest/Pieces.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest/StripHtml.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/RegistryBoundaries.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Reporter.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/SQLBasedAddrList.pm
@@ -254,12 +264,12 @@
depend type=require fmri=pkg:/library/perl-5/io-string-$(PLV)
depend type=require fmri=pkg:/library/perl-5/ip-country-$(PLV)
depend type=require fmri=pkg:/library/perl-5/ip-country-db_file-$(PLV)
-depend type=require fmri=pkg:/library/perl-5/libwww-perl-$(PLV)
+depend type=require fmri=pkg:/library/perl-5/lwp-protocol-https-$(PLV)
depend type=require fmri=pkg:/library/perl-5/mail-dkim-$(PLV)@0.37
depend type=require fmri=pkg:/library/perl-5/mail-dmarc-$(PLV)
depend type=require fmri=pkg:/library/perl-5/mail-spf-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-cidr-lite-$(PLV)
-depend type=require fmri=pkg:/library/perl-5/net-dns-$(PLV)@0.69
+depend type=require fmri=pkg:/library/perl-5/net-dns-$(PLV)@1.1
depend type=require fmri=pkg:/library/perl-5/net-libidn-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-libidn2-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-patricia-$(PLV)@1.16
diff --git a/components/perl/Mail-SpamAssassin/Makefile b/components/perl/Mail-SpamAssassin/Makefile
index 3542906..9c91a3b 100644
--- a/components/perl/Mail-SpamAssassin/Makefile
+++ b/components/perl/Mail-SpamAssassin/Makefile
@@ -15,17 +15,15 @@
#
BUILD_STYLE = makemaker
-USE_COMMON_TEST_MASTER = no
include ../../../make-rules/shared-macros.mk
COMPONENT_PERL_MODULE = Mail::SpamAssassin
-HUMAN_VERSION = 4.0.0
-COMPONENT_REVISION = 1
+HUMAN_VERSION = 4.0.1
COMPONENT_SUMMARY = Mail::SpamAssassin - Spam detector and markup engine
COMPONENT_CPAN_AUTHOR = SIDNEY
COMPONENT_ARCHIVE_HASH = \
- sha256:65979da7d103e3c37563f23a1a24f470090afb33664348968a00bf3d09a84f36
+ sha256:5c6bb222e18405f1a276816d04e1ffc5cc90785e1265714b4506c2b541d6d5e5
COMPONENT_LICENSE = Apache-2.0
COMPONENT_LICENSE_FILE = LICENSE
@@ -64,7 +62,7 @@
PERL_REQUIRED_PACKAGES += library/perl-5/io-string
PERL_REQUIRED_PACKAGES += library/perl-5/ip-country
PERL_REQUIRED_PACKAGES += library/perl-5/ip-country-db_file
-PERL_REQUIRED_PACKAGES += library/perl-5/libwww-perl
+PERL_REQUIRED_PACKAGES += library/perl-5/lwp-protocol-https
PERL_REQUIRED_PACKAGES += library/perl-5/mail-dkim
PERL_REQUIRED_PACKAGES += library/perl-5/mail-dmarc
PERL_REQUIRED_PACKAGES += library/perl-5/mail-spf
diff --git a/components/perl/Mail-SpamAssassin/manifests/sample-manifest.p5m b/components/perl/Mail-SpamAssassin/manifests/sample-manifest.p5m
index a1a8b96..0512d1f 100644
--- a/components/perl/Mail-SpamAssassin/manifests/sample-manifest.p5m
+++ b/components/perl/Mail-SpamAssassin/manifests/sample-manifest.p5m
@@ -10,7 +10,7 @@
#
#
-# Copyright 2023 <contributor>
+# Copyright 2024 <contributor>
#
set name=pkg.fmri value=pkg:/$(COMPONENT_FMRI)-$(PLV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
@@ -34,6 +34,7 @@
file path=etc/mail/spamassassin/v342.pre
file path=etc/mail/spamassassin/v343.pre
file path=etc/mail/spamassassin/v400.pre
+file path=etc/mail/spamassassin/v401.pre
file path=lib/svc/manifest/network/spamassassin.xml
file path=lib/svc/method/spamassassin
file path=usr/perl5/$(PERLVER)/bin/sa-awl
@@ -128,6 +129,11 @@
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Plugin::VBounce.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Plugin::WelcomeListSubject.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::PluginHandler.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Client.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest::Pieces.3perl
+file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::Pyzor::Digest::StripHtml.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::RegistryBoundaries.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::SQLBasedAddrList.3perl
file path=usr/perl5/$(PERLVER)/man/man3perl/Mail::SpamAssassin::SubProcBackChannel.3perl
@@ -235,6 +241,11 @@
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Plugin/WLBLEval.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Plugin/WelcomeListSubject.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/PluginHandler.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Client.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest/Pieces.pm
+file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Pyzor/Digest/StripHtml.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/RegistryBoundaries.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/Reporter.pm
file path=usr/perl5/vendor_perl/$(PERLVER)/Mail/SpamAssassin/SQLBasedAddrList.pm
@@ -270,12 +281,12 @@
depend type=require fmri=pkg:/library/perl-5/io-string-$(PLV)
depend type=require fmri=pkg:/library/perl-5/ip-country-$(PLV)
depend type=require fmri=pkg:/library/perl-5/ip-country-db_file-$(PLV)
-depend type=require fmri=pkg:/library/perl-5/libwww-perl-$(PLV)
+depend type=require fmri=pkg:/library/perl-5/lwp-protocol-https-$(PLV)
depend type=require fmri=pkg:/library/perl-5/mail-dkim-$(PLV)@0.37
depend type=require fmri=pkg:/library/perl-5/mail-dmarc-$(PLV)
depend type=require fmri=pkg:/library/perl-5/mail-spf-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-cidr-lite-$(PLV)
-depend type=require fmri=pkg:/library/perl-5/net-dns-$(PLV)@0.69
+depend type=require fmri=pkg:/library/perl-5/net-dns-$(PLV)@1.1
depend type=require fmri=pkg:/library/perl-5/net-libidn-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-libidn2-$(PLV)
depend type=require fmri=pkg:/library/perl-5/net-patricia-$(PLV)@1.16
diff --git a/components/perl/Mail-SpamAssassin/patches/01-no-MaxMind.patch b/components/perl/Mail-SpamAssassin/patches/01-no-MaxMind.patch
index d2ca41a..c497dd5 100644
--- a/components/perl/Mail-SpamAssassin/patches/01-no-MaxMind.patch
+++ b/components/perl/Mail-SpamAssassin/patches/01-no-MaxMind.patch
@@ -1,9 +1,9 @@
These modules are deprecated.
We do not have libmaxminddb.
---- Mail-SpamAssassin-4.0.0/Makefile.PL.orig
-+++ Mail-SpamAssassin-4.0.0/Makefile.PL
-@@ -374,8 +374,6 @@
+--- Mail-SpamAssassin-4.0.1/Makefile.PL.orig
++++ Mail-SpamAssassin-4.0.1/Makefile.PL
+@@ -373,8 +373,6 @@
'Net::LibIDN2' => 0,
'Net::LibIDN' => 0,
'Mail::SPF' => 0,
@@ -12,9 +12,9 @@
'Geo::IP' => 0,
'IP::Country::DB_File' => 0,
'IP::Country::Fast' => 0,
---- Mail-SpamAssassin-4.0.0/META.json.orig
-+++ Mail-SpamAssassin-4.0.0/META.json
-@@ -53,8 +53,6 @@
+--- Mail-SpamAssassin-4.0.1/META.json.orig
++++ Mail-SpamAssassin-4.0.1/META.json
+@@ -52,8 +52,6 @@
"Mail::DKIM" : "0.37",
"Mail::DMARC" : "0",
"Mail::SPF" : "0",
diff --git a/components/perl/Mail-SpamAssassin/patches/02-dnsbl_subtests-run_net_tests.patch b/components/perl/Mail-SpamAssassin/patches/02-dnsbl_subtests-run_net_tests.patch
index 1cf8eed..dfbaa4f 100644
--- a/components/perl/Mail-SpamAssassin/patches/02-dnsbl_subtests-run_net_tests.patch
+++ b/components/perl/Mail-SpamAssassin/patches/02-dnsbl_subtests-run_net_tests.patch
@@ -1,10 +1,10 @@
---- Mail-SpamAssassin-4.0.0/t/dnsbl_subtests.t.orig
-+++ Mail-SpamAssassin-4.0.0/t/dnsbl_subtests.t
-@@ -15,6 +15,7 @@
- use Errno qw(EADDRINUSE EACCES);
-
- use constant HAS_NET_DNS_NAMESERVER => eval { require Net::DNS::Nameserver; };
+--- Mail-SpamAssassin-4.0.1/t/dnsbl_subtests.t.orig
++++ Mail-SpamAssassin-4.0.1/t/dnsbl_subtests.t
+@@ -20,6 +20,7 @@
+ use constant HAS_NET_DNS_START_SERVER => eval { Net::DNS::Nameserver->can('start_server'); };
+ use constant HAS_NET_DNS_STOP_SERVER => eval { Net::DNS::Nameserver->can('stop_server'); };
+ use constant HAS_BAD_WINDOWS_NET_DNS => $RUNNING_ON_WINDOWS && HAS_NET_DNS_START_SERVER;
+plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
plan skip_all => "Net::DNS::Nameserver in unavailable on this system" unless (HAS_NET_DNS_NAMESERVER);
+ plan skip_all => "Tests don't work on Windows with recent versions of Net::DNS" if (HAS_BAD_WINDOWS_NET_DNS);
plan tests => 46;
-
diff --git a/components/perl/Mail-SpamAssassin/pkg5 b/components/perl/Mail-SpamAssassin/pkg5
index 6afcaf8..6523c5d 100644
--- a/components/perl/Mail-SpamAssassin/pkg5
+++ b/components/perl/Mail-SpamAssassin/pkg5
@@ -40,9 +40,9 @@
"library/perl-5/ip-country-db_file-534",
"library/perl-5/ip-country-db_file-536",
"library/perl-5/ip-country-db_file-538",
- "library/perl-5/libwww-perl-534",
- "library/perl-5/libwww-perl-536",
- "library/perl-5/libwww-perl-538",
+ "library/perl-5/lwp-protocol-https-534",
+ "library/perl-5/lwp-protocol-https-536",
+ "library/perl-5/lwp-protocol-https-538",
"library/perl-5/mail-dkim-534",
"library/perl-5/mail-dkim-536",
"library/perl-5/mail-dkim-538",
@@ -82,10 +82,10 @@
"system/library"
],
"fmris": [
+ "library/perl-5/mail-spamassassin",
"library/perl-5/mail-spamassassin-534",
"library/perl-5/mail-spamassassin-536",
- "library/perl-5/mail-spamassassin-538",
- "library/perl-5/mail-spamassassin"
+ "library/perl-5/mail-spamassassin-538"
],
"name": "Mail-SpamAssassin"
-}
\ No newline at end of file
+}
diff --git a/components/perl/Mail-SpamAssassin/test/results-5.36.master b/components/perl/Mail-SpamAssassin/test/results-5.36.master
deleted file mode 100644
index a3d1d9c..0000000
--- a/components/perl/Mail-SpamAssassin/test/results-5.36.master
+++ /dev/null
@@ -1,213 +0,0 @@
-t/all_modules.t ................... ok
-t/basic_lint.t .................... ok
-t/basic_lint_net.t ................ skipped: Net tests disabled
-t/basic_lint_without_sandbox.t .... ok
-t/basic_meta.t .................... ok
-t/basic_meta2.t ................... ok
-t/basic_obj_api.t ................. ok
-t/html_colors.t ................... ok
-t/html_obfu.t ..................... ok
-t/html_utf8.t ..................... ok
-t/mimeheader.t .................... ok
-t/mimeparse.t ..................... ok
-t/uri.t ........................... ok
-t/uri_html.t ...................... ok
-t/uri_list.t ...................... ok
-t/uri_saferedirect.t .............. ok
-t/uri_text.t ...................... ok
-t/uribl.t ......................... skipped: Net tests disabled
-t/uribl_all_types.t ............... skipped: Net tests disabled
-t/uribl_domains_only.t ............ skipped: Net tests disabled
-t/uribl_ips_only.t ................ skipped: Net tests disabled
-t/urilocalbl.t .................... skipped: Net tests disabled
-t/get_all_headers.t ............... ok
-t/get_headers.t ................... ok
-t/header.t ........................ ok
-t/header_utf8.t ................... ok
-t/regexp_named_capture.t .......... ok
-t/regexp_valid.t .................. ok
-t/askdns.t ........................ skipped: Net tests disabled
-t/dnsbl.t ......................... skipped: Net tests disabled
-t/dnsbl_sc_meta.t ................. skipped: Net tests disabled
-t/dnsbl_subtests.t ................ skipped: Net tests disabled
-t/shortcircuit_before_dns.t ....... skipped: Net tests disabled
-t/rule_multiple.t ................. ok
-t/rule_names.t .................... skipped: This test requires 'run_rule_name_tests' set to 'y'.
-t/rule_types.t .................... ok
-t/extracttext.t ................... ok
-t/spamd_prefork_stress.t .......... skipped: Spamd prefork stress tests disabled
-t/spamd_prefork_stress_2.t ........ skipped: Spamd prefork stress tests disabled
-t/arc.t ........................... skipped: Net tests disabled
-t/authres.t ....................... ok
-t/autolearn.t ..................... ok
-t/autolearn_force.t ............... ok
-t/autolearn_force_fail.t .......... ok
-t/bayesbdb.t ...................... skipped: BerkeleyDB is unavailable
-t/bayesdbm.t ...................... ok
-t/bayesdbm_flock.t ................ ok
-t/bayessdbm.t ..................... ok
-t/bayessdbm_seen_delete.t ......... ok
-t/bayessql.t ...................... ok
-t/blacklist_autolearn.t ........... ok
-t/blocklist_autolearn.t ........... ok
-t/body_mod.t ...................... ok
-t/body_str.t ...................... ok
-t/check_implemented.t ............. ok
-t/cidrs.t ......................... ok
-t/config_errs.t ................... skipped: This script does not work yet. There are (a) lots of failures and (b) the 'plan' line means all tests are effectively ignored from 'make test'.
-t/config_text.t ................... ok
-t/config_tree_recurse.t ........... ok
-t/cpp_comments_in_spamc.t ......... ok
-t/cross_user_config_leak.t ........ ok
-t/date.t .......................... ok
-t/db_awl_path.t ................... ok
-t/db_awl_path_welcome_block.t ..... ok
-t/db_awl_perms.t .................. ok
-t/db_awl_perms_welcome_block.t .... ok
-t/db_based_welcomelist.t .......... ok
-t/db_based_welcomelist_ips.t ...... ok
-t/db_based_whitelist.t ............ ok
-t/db_based_whitelist_ips.t ........ ok
-t/dcc.t ........................... skipped: Net tests disabled
-t/debug.t ......................... ok
-t/decodeshorturl.t ................ skipped: Net tests disabled
-t/desc_wrap.t ..................... ok
-t/dkim.t .......................... skipped: Net tests disabled
-t/dmarc.t ......................... skipped: Net tests disabled
-t/enable_compat.t ................. ok
-t/freemail.t ...................... ok
-t/freemail_welcome_block.t ........ ok
-t/fromnamespoof.t ................. ok
-t/gtube.t ......................... ok
-t/hashbl.t ........................ skipped: Net tests disabled
-t/idn_dots.t ...................... ok
-t/if_can.t ........................ ok
-t/if_else.t ....................... ok
-t/ifversion.t ..................... ok
-t/ip_addrs.t ...................... ok
-t/lang_lint.t ..................... ok
-t/lang_pl_tests.t ................. skipped: pl tests disabled
-t/line_endings.t .................. ok
-t/lint_nocreate_prefs.t ........... ok
-t/local_tests_only.t .............. ok
-t/memory_cycles.t ................. ok
-t/metadata.t ...................... ok
-t/missing_hb_separator.t .......... ok
-t/mkrules.t ....................... ok
-t/mkrules_else.t .................. ok
-t/nonspam.t ....................... ok
-t/olevbmacro.t .................... ok
-t/originating_ip_hdr.t ............ ok
-t/pdfinfo.t ....................... ok
-t/perlcritic.t .................... skipped: This test requires Test::Perl::Critic
-t/phishing.t ...................... ok
-t/plugin.t ........................ ok
-t/plugin_file.t ................... ok
-t/plugin_priorities.t ............. ok
-t/podchecker.t .................... ok
-t/prefs_include.t ................. ok
-t/priorities.t .................... ok
-t/priorities_welcome_block.t ...... ok
-t/pyzor.t ......................... skipped: Net tests disabled
-t/razor2.t ........................ skipped: Net tests disabled
-t/rcvd_parser.t ................... ok
-t/re_base_extraction.t ............ ok
-t/recips.t ........................ ok
-t/recreate.t ...................... ok
-t/recursion.t ..................... ok
-t/relative_scores.t ............... ok
-t/relaycountry.t .................. ok
-t/report_safe.t ................... ok
-t/reportheader.t .................. ok
-t/reportheader_8bit.t ............. ok
-t/reuse.t ......................... skipped: no mass check
-t/root_spamd.t .................... skipped: root tests disabled
-t/root_spamd_tell.t ............... skipped: root tests disabled
-t/root_spamd_tell_paranoid.t ...... skipped: root tests disabled
-t/root_spamd_tell_x.t ............. skipped: root tests disabled
-t/root_spamd_tell_x_paranoid.t .... skipped: root tests disabled
-t/root_spamd_u.t .................. skipped: root tests disabled
-t/root_spamd_u_dcc.t .............. skipped: root tests disabled
-t/root_spamd_virtual.t ............ skipped: root tests disabled
-t/root_spamd_x.t .................. skipped: root tests disabled
-t/root_spamd_x_paranoid.t ......... skipped: root tests disabled
-t/root_spamd_x_u.t ................ skipped: root tests disabled
-t/sa_awl.t ........................ ok
-t/sa_awl_welcome_block.t .......... ok
-t/sa_check_spamd.t ................ ok
-t/sa_compile.t .................... ok
-t/sha1.t .......................... ok
-t/shortcircuit.t .................. ok
-t/spam.t .......................... ok
-t/spamc.t ......................... ok
-t/spamc_B.t ....................... ok
-t/spamc_bug6176.t ................. ok
-t/spamc_c.t ....................... ok
-t/spamc_c_stdout_closed.t ......... ok
-t/spamc_cf.t ...................... ok
-t/spamc_E.t ....................... ok
-t/spamc_H.t ....................... skipped: Net tests disabled
-t/spamc_headers.t ................. ok
-t/spamc_l.t ....................... ok
-t/spamc_optC.t .................... ok
-t/spamc_optL.t .................... ok
-t/spamc_x_e.t ..................... ok
-t/spamc_x_E_R.t ................... ok
-t/spamc_y.t ....................... ok
-t/spamc_z.t ....................... ok
-t/spamd.t ......................... ok
-t/spamd_allow_user_rules.t ........ ok
-t/spamd_client.t .................. ok
-t/spamd_hup.t ..................... ok
-t/spamd_kill_restart.t ............ ok
-t/spamd_kill_restart_rr.t ......... ok
-t/spamd_ldap.t .................... skipped: LDAP tests disabled
-t/spamd_maxchildren.t ............. ok
-t/spamd_maxsize.t ................. ok
-t/spamd_parallel.t ................ ok
-t/spamd_plugin.t .................. ok
-t/spamd_port.t .................... ok
-t/spamd_prefork_stress_3.t ........ skipped: Spamd prefork stress tests disabled
-t/spamd_prefork_stress_4.t ........ skipped: Spamd prefork stress tests disabled
-t/spamd_protocol_10.t ............. ok
-t/spamd_report.t .................. ok
-t/spamd_report_ifspam.t ........... ok
-t/spamd_sql_prefs.t ............... skipped: SQL Pref tests disabled
-t/spamd_ssl.t ..................... ok
-t/spamd_ssl_accept_fail.t ......... ok
-t/spamd_ssl_z.t ................... ok
-t/spamd_stop.t .................... ok
-t/spamd_symbols.t ................. ok
-t/spamd_syslog.t .................. ok
-t/spamd_unix.t .................... ok
-t/spamd_unix_and_tcp.t ............ ok
-t/spamd_user_rules_leak.t ......... ok
-t/spamd_utf8.t .................... ok
-t/spamd_welcomelist_leak.t ........ ok
-t/spamd_whitelist_leak.t .......... ok
-t/spf.t ........................... skipped: Net tests disabled
-t/spf_welcome_block.t ............. skipped: Net tests disabled
-t/sql_based_welcomelist.t ......... ok
-t/sql_based_whitelist.t ........... ok
-t/stop_always_matching_regexps.t .. ok
-t/strip2.t ........................ ok
-t/strip_no_subject.t .............. ok
-t/stripmarkup.t ................... ok
-t/tainted_msg.t ................... ok
-t/text_bad_ctype.t ................ ok
-t/timeout.t ....................... ok
-t/trust_path.t .................... ok
-t/utf8.t .......................... ok
-t/util_wrap.t ..................... ok
-t/welcomelist_addrs.t ............. ok
-t/welcomelist_from.t .............. ok
-t/welcomelist_subject.t ........... ok
-t/welcomelist_to.t ................ ok
-t/whitelist_addrs.t ............... ok
-t/whitelist_from.t ................ ok
-t/whitelist_subject.t ............. ok
-t/whitelist_to.t .................. ok
-t/wlbl_uri.t ...................... ok
-All tests successful.
-Files=210, Tests=3764
-Result: PASS
diff --git a/components/perl/Mail-SpamAssassin/test/results-5.38.master b/components/perl/Mail-SpamAssassin/test/results-5.38.master
deleted file mode 100644
index 4b865fc..0000000
--- a/components/perl/Mail-SpamAssassin/test/results-5.38.master
+++ /dev/null
@@ -1,214 +0,0 @@
-t/all_modules.t ................... ok
-Locale 'zh_CN.GB18030' is unsupported, and may crash the interpreter.
-t/basic_lint.t .................... ok
-t/basic_lint_net.t ................ skipped: Net tests disabled
-t/basic_lint_without_sandbox.t .... ok
-t/basic_meta.t .................... ok
-t/basic_meta2.t ................... ok
-t/basic_obj_api.t ................. ok
-t/html_colors.t ................... ok
-t/html_obfu.t ..................... ok
-t/html_utf8.t ..................... ok
-t/mimeheader.t .................... ok
-t/mimeparse.t ..................... ok
-t/uri.t ........................... ok
-t/uri_html.t ...................... ok
-t/uri_list.t ...................... ok
-t/uri_saferedirect.t .............. ok
-t/uri_text.t ...................... ok
-t/uribl.t ......................... skipped: Net tests disabled
-t/uribl_all_types.t ............... skipped: Net tests disabled
-t/uribl_domains_only.t ............ skipped: Net tests disabled
-t/uribl_ips_only.t ................ skipped: Net tests disabled
-t/urilocalbl.t .................... skipped: Net tests disabled
-t/get_all_headers.t ............... ok
-t/get_headers.t ................... ok
-t/header.t ........................ ok
-t/header_utf8.t ................... ok
-t/regexp_named_capture.t .......... ok
-t/regexp_valid.t .................. ok
-t/askdns.t ........................ skipped: Net tests disabled
-t/dnsbl.t ......................... skipped: Net tests disabled
-t/dnsbl_sc_meta.t ................. skipped: Net tests disabled
-t/dnsbl_subtests.t ................ skipped: Net tests disabled
-t/shortcircuit_before_dns.t ....... skipped: Net tests disabled
-t/rule_multiple.t ................. ok
-t/rule_names.t .................... skipped: This test requires 'run_rule_name_tests' set to 'y'.
-t/rule_types.t .................... ok
-t/extracttext.t ................... ok
-t/spamd_prefork_stress.t .......... skipped: Spamd prefork stress tests disabled
-t/spamd_prefork_stress_2.t ........ skipped: Spamd prefork stress tests disabled
-t/arc.t ........................... skipped: Net tests disabled
-t/authres.t ....................... ok
-t/autolearn.t ..................... ok
-t/autolearn_force.t ............... ok
-t/autolearn_force_fail.t .......... ok
-t/bayesbdb.t ...................... skipped: BerkeleyDB is unavailable
-t/bayesdbm.t ...................... ok
-t/bayesdbm_flock.t ................ ok
-t/bayessdbm.t ..................... ok
-t/bayessdbm_seen_delete.t ......... ok
-t/bayessql.t ...................... ok
-t/blacklist_autolearn.t ........... ok
-t/blocklist_autolearn.t ........... ok
-t/body_mod.t ...................... ok
-t/body_str.t ...................... ok
-t/check_implemented.t ............. ok
-t/cidrs.t ......................... ok
-t/config_errs.t ................... skipped: This script does not work yet. There are (a) lots of failures and (b) the 'plan' line means all tests are effectively ignored from 'make test'.
-t/config_text.t ................... ok
-t/config_tree_recurse.t ........... ok
-t/cpp_comments_in_spamc.t ......... ok
-t/cross_user_config_leak.t ........ ok
-t/date.t .......................... ok
-t/db_awl_path.t ................... ok
-t/db_awl_path_welcome_block.t ..... ok
-t/db_awl_perms.t .................. ok
-t/db_awl_perms_welcome_block.t .... ok
-t/db_based_welcomelist.t .......... ok
-t/db_based_welcomelist_ips.t ...... ok
-t/db_based_whitelist.t ............ ok
-t/db_based_whitelist_ips.t ........ ok
-t/dcc.t ........................... skipped: Net tests disabled
-t/debug.t ......................... ok
-t/decodeshorturl.t ................ skipped: Net tests disabled
-t/desc_wrap.t ..................... ok
-t/dkim.t .......................... skipped: Net tests disabled
-t/dmarc.t ......................... skipped: Net tests disabled
-t/enable_compat.t ................. ok
-t/freemail.t ...................... ok
-t/freemail_welcome_block.t ........ ok
-t/fromnamespoof.t ................. ok
-t/gtube.t ......................... ok
-t/hashbl.t ........................ skipped: Net tests disabled
-t/idn_dots.t ...................... ok
-t/if_can.t ........................ ok
-t/if_else.t ....................... ok
-t/ifversion.t ..................... ok
-t/ip_addrs.t ...................... ok
-t/lang_lint.t ..................... ok
-t/lang_pl_tests.t ................. skipped: pl tests disabled
-t/line_endings.t .................. ok
-t/lint_nocreate_prefs.t ........... ok
-t/local_tests_only.t .............. ok
-t/memory_cycles.t ................. ok
-t/metadata.t ...................... ok
-t/missing_hb_separator.t .......... ok
-t/mkrules.t ....................... ok
-t/mkrules_else.t .................. ok
-t/nonspam.t ....................... ok
-t/olevbmacro.t .................... ok
-t/originating_ip_hdr.t ............ ok
-t/pdfinfo.t ....................... ok
-t/perlcritic.t .................... skipped: This test requires Test::Perl::Critic
-t/phishing.t ...................... ok
-t/plugin.t ........................ ok
-t/plugin_file.t ................... ok
-t/plugin_priorities.t ............. ok
-t/podchecker.t .................... ok
-t/prefs_include.t ................. ok
-t/priorities.t .................... ok
-t/priorities_welcome_block.t ...... ok
-t/pyzor.t ......................... skipped: Net tests disabled
-t/razor2.t ........................ skipped: Net tests disabled
-t/rcvd_parser.t ................... ok
-t/re_base_extraction.t ............ ok
-t/recips.t ........................ ok
-t/recreate.t ...................... ok
-t/recursion.t ..................... ok
-t/relative_scores.t ............... ok
-t/relaycountry.t .................. ok
-t/report_safe.t ................... ok
-t/reportheader.t .................. ok
-t/reportheader_8bit.t ............. ok
-t/reuse.t ......................... skipped: no mass check
-t/root_spamd.t .................... skipped: root tests disabled
-t/root_spamd_tell.t ............... skipped: root tests disabled
-t/root_spamd_tell_paranoid.t ...... skipped: root tests disabled
-t/root_spamd_tell_x.t ............. skipped: root tests disabled
-t/root_spamd_tell_x_paranoid.t .... skipped: root tests disabled
-t/root_spamd_u.t .................. skipped: root tests disabled
-t/root_spamd_u_dcc.t .............. skipped: root tests disabled
-t/root_spamd_virtual.t ............ skipped: root tests disabled
-t/root_spamd_x.t .................. skipped: root tests disabled
-t/root_spamd_x_paranoid.t ......... skipped: root tests disabled
-t/root_spamd_x_u.t ................ skipped: root tests disabled
-t/sa_awl.t ........................ ok
-t/sa_awl_welcome_block.t .......... ok
-t/sa_check_spamd.t ................ ok
-t/sa_compile.t .................... ok
-t/sha1.t .......................... ok
-t/shortcircuit.t .................. ok
-t/spam.t .......................... ok
-t/spamc.t ......................... ok
-t/spamc_B.t ....................... ok
-t/spamc_bug6176.t ................. ok
-t/spamc_c.t ....................... ok
-t/spamc_c_stdout_closed.t ......... ok
-t/spamc_cf.t ...................... ok
-t/spamc_E.t ....................... ok
-t/spamc_H.t ....................... skipped: Net tests disabled
-t/spamc_headers.t ................. ok
-t/spamc_l.t ....................... ok
-t/spamc_optC.t .................... ok
-t/spamc_optL.t .................... ok
-t/spamc_x_e.t ..................... ok
-t/spamc_x_E_R.t ................... ok
-t/spamc_y.t ....................... ok
-t/spamc_z.t ....................... ok
-t/spamd.t ......................... ok
-t/spamd_allow_user_rules.t ........ ok
-t/spamd_client.t .................. ok
-t/spamd_hup.t ..................... ok
-t/spamd_kill_restart.t ............ ok
-t/spamd_kill_restart_rr.t ......... ok
-t/spamd_ldap.t .................... skipped: LDAP tests disabled
-t/spamd_maxchildren.t ............. ok
-t/spamd_maxsize.t ................. ok
-t/spamd_parallel.t ................ ok
-t/spamd_plugin.t .................. ok
-t/spamd_port.t .................... ok
-t/spamd_prefork_stress_3.t ........ skipped: Spamd prefork stress tests disabled
-t/spamd_prefork_stress_4.t ........ skipped: Spamd prefork stress tests disabled
-t/spamd_protocol_10.t ............. ok
-t/spamd_report.t .................. ok
-t/spamd_report_ifspam.t ........... ok
-t/spamd_sql_prefs.t ............... skipped: SQL Pref tests disabled
-t/spamd_ssl.t ..................... ok
-t/spamd_ssl_accept_fail.t ......... ok
-t/spamd_ssl_z.t ................... ok
-t/spamd_stop.t .................... ok
-t/spamd_symbols.t ................. ok
-t/spamd_syslog.t .................. ok
-t/spamd_unix.t .................... ok
-t/spamd_unix_and_tcp.t ............ ok
-t/spamd_user_rules_leak.t ......... ok
-t/spamd_utf8.t .................... ok
-t/spamd_welcomelist_leak.t ........ ok
-t/spamd_whitelist_leak.t .......... ok
-t/spf.t ........................... skipped: Net tests disabled
-t/spf_welcome_block.t ............. skipped: Net tests disabled
-t/sql_based_welcomelist.t ......... ok
-t/sql_based_whitelist.t ........... ok
-t/stop_always_matching_regexps.t .. ok
-t/strip2.t ........................ ok
-t/strip_no_subject.t .............. ok
-t/stripmarkup.t ................... ok
-t/tainted_msg.t ................... ok
-t/text_bad_ctype.t ................ ok
-t/timeout.t ....................... ok
-t/trust_path.t .................... ok
-t/utf8.t .......................... ok
-t/util_wrap.t ..................... ok
-t/welcomelist_addrs.t ............. ok
-t/welcomelist_from.t .............. ok
-t/welcomelist_subject.t ........... ok
-t/welcomelist_to.t ................ ok
-t/whitelist_addrs.t ............... ok
-t/whitelist_from.t ................ ok
-t/whitelist_subject.t ............. ok
-t/whitelist_to.t .................. ok
-t/wlbl_uri.t ...................... ok
-All tests successful.
-Files=210, Tests=3764
-Result: PASS
diff --git a/components/perl/Mail-SpamAssassin/test/results-5.34.master b/components/perl/Mail-SpamAssassin/test/results-all.master
similarity index 94%
rename from components/perl/Mail-SpamAssassin/test/results-5.34.master
rename to components/perl/Mail-SpamAssassin/test/results-all.master
index a3d1d9c..295375f 100644
--- a/components/perl/Mail-SpamAssassin/test/results-5.34.master
+++ b/components/perl/Mail-SpamAssassin/test/results-all.master
@@ -1,6 +1,7 @@
t/all_modules.t ................... ok
t/basic_lint.t .................... ok
t/basic_lint_net.t ................ skipped: Net tests disabled
+t/basic_lint_without_plugins.t .... ok
t/basic_lint_without_sandbox.t .... ok
t/basic_meta.t .................... ok
t/basic_meta2.t ................... ok
@@ -8,6 +9,7 @@
t/html_colors.t ................... ok
t/html_obfu.t ..................... ok
t/html_utf8.t ..................... ok
+t/html_visibility.t ............... ok
t/mimeheader.t .................... ok
t/mimeparse.t ..................... ok
t/uri.t ........................... ok
@@ -19,6 +21,7 @@
t/uribl_all_types.t ............... skipped: Net tests disabled
t/uribl_domains_only.t ............ skipped: Net tests disabled
t/uribl_ips_only.t ................ skipped: Net tests disabled
+t/uridetail.t ..................... ok
t/urilocalbl.t .................... skipped: Net tests disabled
t/get_all_headers.t ............... ok
t/get_headers.t ................... ok
@@ -30,6 +33,7 @@
t/dnsbl.t ......................... skipped: Net tests disabled
t/dnsbl_sc_meta.t ................. skipped: Net tests disabled
t/dnsbl_subtests.t ................ skipped: Net tests disabled
+t/dnsplatform.t ................... skipped: Net tests disabled
t/shortcircuit_before_dns.t ....... skipped: Net tests disabled
t/rule_multiple.t ................. ok
t/rule_names.t .................... skipped: This test requires 'run_rule_name_tests' set to 'y'.
@@ -134,8 +138,12 @@
t/root_spamd_x_u.t ................ skipped: root tests disabled
t/sa_awl.t ........................ ok
t/sa_awl_welcome_block.t .......... ok
+Failed to create connection to spamd daemon: Connection refused
t/sa_check_spamd.t ................ ok
t/sa_compile.t .................... ok
+t/sa_txrep.t ...................... ok
+t/sa_txrep_sql.t .................. skipped: Net tests disabled
+t/sa_txrep_welcomelist_out.t ...... skipped: Net tests disabled
t/sha1.t .......................... ok
t/shortcircuit.t .................. ok
t/spam.t .......................... ok
@@ -172,7 +180,7 @@
t/spamd_protocol_10.t ............. ok
t/spamd_report.t .................. ok
t/spamd_report_ifspam.t ........... ok
-t/spamd_sql_prefs.t ............... skipped: SQL Pref tests disabled
+t/spamd_sql_prefs.t ............... ok
t/spamd_ssl.t ..................... ok
t/spamd_ssl_accept_fail.t ......... ok
t/spamd_ssl_z.t ................... ok
@@ -209,5 +217,5 @@
t/whitelist_to.t .................. ok
t/wlbl_uri.t ...................... ok
All tests successful.
-Files=210, Tests=3764
+Files=217, Tests=3844
Result: PASS
--
Gitblit v1.9.3