You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jm...@apache.org on 2006/10/25 18:17:19 UTC
svn commit: r467702 - in /spamassassin/trunk: INSTALL Makefile.PL
debian/control lib/Mail/SpamAssassin/Util/DependencyInfo.pm spamassassin.spec
Author: jm
Date: Wed Oct 25 09:17:18 2006
New Revision: 467702
URL: http://svn.apache.org/viewvc?view=rev&rev=467702
Log:
bug 5115: make Net::DNS a required module; so many good rules require it that we should try to make it the default
Modified:
spamassassin/trunk/INSTALL
spamassassin/trunk/Makefile.PL
spamassassin/trunk/debian/control
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/trunk/spamassassin.spec
Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?view=diff&rev=467702&r1=467701&r2=467702
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Wed Oct 25 09:17:18 2006
@@ -207,6 +207,17 @@
Debian: apt-get install libhtml-parser-perl
Gentoo: emerge dev-perl/HTML-Parser
+ - Net::DNS (from CPAN)
+
+ Used for all DNS-based tests (SBL, XBL, SpamCop, DSBL, etc.),
+ perform MX checks, used when manually reporting spam to SpamCop,
+ and used by sa-update to gather version information.
+
+ You need to make sure the Net::DNS version is sufficiently up-to-date:
+
+ - version 0.34 or higher on Unix systems
+ - version 0.46 or higher on Windows systems
+
Optional Modules
----------------
@@ -235,20 +246,6 @@
There seems to be a bug in libdb 4.1.25, which is
distributed by default on some versions of Linux. See
http://wiki.apache.org/spamassassin/DbFileSleepBug for details.
-
-
- - Net::DNS (from CPAN)
-
- Used for all DNS-based tests (SBL, XBL, SpamCop, DSBL, etc.),
- perform MX checks, used when manually reporting spam to SpamCop,
- and used by sa-update to gather version information. Recommended.
-
- If this is installed and you are using network tests of any variety
- (which is the default), then you need to make sure the Net::DNS
- version is sufficiently up-to-date:
-
- - version 0.34 or higher on Unix systems
- - version 0.46 or higher on Windows systems
- Net::SMTP (from CPAN)
Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?view=diff&rev=467702&r1=467701&r2=467702
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Wed Oct 25 09:17:18 2006
@@ -208,6 +208,7 @@
'Pod::Usage' => 1.10, # all versions prior to this do seem to be buggy
'HTML::Parser' => 3.43, # the HTML code is based on this parser, older versions have utf-8 bugs
'Text::Wrap' => 98.112902, # this version is shipped with 5.005_03, the oldest version known to work
+ 'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
'Sys::Hostname' => 0,
'Time::Local' => 0,
'Errno' => 0,
Modified: spamassassin/trunk/debian/control
URL: http://svn.apache.org/viewvc/spamassassin/trunk/debian/control?view=diff&rev=467702&r1=467701&r2=467702
==============================================================================
--- spamassassin/trunk/debian/control (original)
+++ spamassassin/trunk/debian/control Wed Oct 25 09:17:18 2006
@@ -7,8 +7,8 @@
Package: spamassassin
Architecture: any
-Depends: ${perl:Depends}, ${shlibs:Depends}, libdigest-sha1-perl, libhtml-parser-perl (>= 3.24), libstorable-perl | perl (>= 5.8.0)
-Recommends: libnet-dns-perl, libmail-spf-query-perl
+Depends: ${perl:Depends}, ${shlibs:Depends}, libdigest-sha1-perl, libhtml-parser-perl (>= 3.24), libnet-dns-perl | perl (>= 5.8.0)
+Recommends: libmail-spf-query-perl
Suggests: razor (>= 2.40), pyzor, libtime-hires-perl
Provides: spamassassin, spamc
Description: Spam detector and markup engine
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?view=diff&rev=467702&r1=467701&r2=467702
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Wed Oct 25 09:17:18 2006
@@ -40,6 +40,18 @@
'desc' => 'HTML is used for an ever-increasing amount of email so this dependency
is unavoidable. Run "perldoc -q html" for additional information.',
},
+{
+ module => 'Net::DNS',
+ version => ($^O =~ /^(mswin|dos|os2)/oi ? '0.46' : '0.34'),
+ desc => 'Used for all DNS-based tests (SBL, XBL, SpamCop, DSBL, etc.),
+ perform MX checks, and is also used when manually reporting spam to
+ SpamCop.
+
+ You need to make sure the Net::DNS version is sufficiently up-to-date:
+
+ - version 0.34 or higher on Unix systems
+ - version 0.46 or higher on Windows systems',
+},
);
my @OPTIONAL_MODULES = (
@@ -55,20 +67,6 @@
desc => 'Used to store data on-disk, for the Bayes-style logic and
auto-whitelist. *Much* more efficient than the other standard Perl
database packages. Strongly recommended.',
-},
-{
- module => 'Net::DNS',
- version => ($^O =~ /^(mswin|dos|os2)/oi ? '0.46' : '0.34'),
- desc => 'Used for all DNS-based tests (SBL, XBL, SpamCop, DSBL, etc.),
- perform MX checks, and is also used when manually reporting spam to
- SpamCop. Recommended.
-
- If this is installed and you are using network tests of any variety
- (which is the default), then you need to make sure the Net::DNS
- version is sufficiently up-to-date:
-
- - version 0.34 or higher on Unix systems
- - version 0.46 or higher on Windows systems',
},
{
module => 'Net::SMTP',
Modified: spamassassin/trunk/spamassassin.spec
URL: http://svn.apache.org/viewvc/spamassassin/trunk/spamassassin.spec?view=diff&rev=467702&r1=467701&r2=467702
==============================================================================
--- spamassassin/trunk/spamassassin.spec (original)
+++ spamassassin/trunk/spamassassin.spec Wed Oct 25 09:17:18 2006
@@ -64,8 +64,8 @@
%package -n perl-Mail-SpamAssassin
Summary: %{pdir}::%{pnam} -- SpamAssassin e-mail filter Perl modules
Summary(pl): %{pdir}::%{pnam} -- modu³y Perla filtru poczty SpamAssassin
-Requires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
-BuildRequires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1)
+Requires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1) perl(Net::DNS)
+BuildRequires: perl >= 5.6.1 perl(HTML::Parser) perl(Digest::SHA1) perl(Net::DNS)
Group: Development/Libraries
%description -n perl-Mail-SpamAssassin