Mailing List Archive

Author: sidney
Date: Tue Mar 12 11:26:06 2024
New Revision: 1916250

URL: http://svn.apache.org/viewvc?rev=1916250&view=rev
Log:
bug 8227 - Revert addition of DNS test run durimg build

Modified:
spamassassin/trunk/Makefile.PL
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm

Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1916250&r1=1916249&r2=1916250&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Tue Mar 12 11:26:06 2024
@@ -335,15 +335,6 @@ if (Mail::SpamAssassin::Util::Dependency
exit 0;
}

-if (Mail::SpamAssassin::Util::DependencyInfo::test_network_dns() != 0) {
- # If Net::DNS is already installed this checks if this system succeeds on DNS
- # queries to some of our test records. Testing here and aborting on failure
- # prevents having many test failure reports on CPAN test machines with poorly configured networks
- # while also preventing Spamassassin from being installed on such systems.
- # To force installation without adequate DNS, don't install Net::DNS in the first place.
- exit 0;
-}
-
foreach my $file (@FILES_THAT_MUST_EXIST) {
open (TOUCH, ">>$file") or die "cannot touch '$file'";
close TOUCH;

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1916250&r1=1916249&r2=1916250&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Tue Mar 12 11:26:06 2024
@@ -758,23 +758,4 @@ sub try_module {
}
}

-sub test_network_dns {
- # This allows CPAN testing to abort early on inadequate networks
- # If Net::DNS is not installed yet, this will get caught later in tests anyway
- eval { require Net::DNS ; Net::DNS->VERSION("1.10"); 1 } || return 0;
- my $test_failed = 0;
- my $res = Net::DNS::Resolver->new();
- foreach my $testname (@NETWORK_TESTS) {
- my $reply = $res->send($testname->{name}, $testname->{type}, "IN");
- if ( !($reply && (scalar($reply->answer) >= $testname->{min_answers})) ) {
- print "\n", ("*" x 75), "\n";
- printf("NOTE: DNS test failed, expected %d answers, for %s %s, reply received was:\n%s\n",
- $testname->{min_answers}, $testname->{name}, $testname->{type}, $reply?($reply->string):'undef');
- $test_failed++;
- }
- }
- print "\nCorrect the network DNS configuration before installing SpamAssassin\n", ("*" x 75), "\n" if $test_failed;
- return $test_failed;
-}
-
1;