svn commit: r491309 - in /spamassassin/trunk: INSTALL sa-update.raw

[fe...@apache.org]

Author: felicity
Date: Sat Dec 30 12:50:33 2006
New Revision: 491309

URL: http://svn.apache.org/viewvc?view=rev&rev=491309
Log:
bug 5003: make the third-party modules used by sa-update required

Modified:
    spamassassin/trunk/INSTALL
    spamassassin/trunk/sa-update.raw

Modified: spamassassin/trunk/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/INSTALL?view=diff&rev=491309&r1=491308&r2=491309
==============================================================================
--- spamassassin/trunk/INSTALL (original)
+++ spamassassin/trunk/INSTALL Sat Dec 30 12:50:33 2006
@@ -218,6 +218,25 @@
       - version 0.34 or higher on Unix systems
       - version 0.46 or higher on Windows systems
 
+  - LWP (aka libwww-perl) (from CPAN)
+
+    This set of modules will include both the LWP::UserAgent and
+    HTTP::Date modules, used by sa-update to retrieve update archives.
+
+  - HTTP::Date (from CPAN)
+
+    Used by sa-update to deal with certain Date requests.
+
+  - IO::Zlib (from CPAN)
+
+    Used by sa-update to uncompress update archives.
+    Version 1.04 or later is required.
+
+  - Archive::Tar (from CPAN)
+
+    Used by sa-update to expand update archives.
+    Version 1.23 or later is required.
+
 
 Optional Modules
 ----------------
@@ -330,23 +349,6 @@
     user configuration data, Bayes storage, or other storage, you will need
     to have these installed; both the basic DBI module and the driver for
     your database.
-
-
-  - LWP (from CPAN)
-
-    Used by sa-update to retrieve update archives.
-
-
-  - IO::Zlib (from CPAN)
-
-    Used by sa-update to uncompress update archives.
-    Version 1.04 or later is required.
-
-
-  - Archive::Tar (from CPAN)
-
-    Used by sa-update to expand update archives.
-    Version 1.23 or later is required.
 
 
   - Encode::Detect (from CPAN)

Modified: spamassassin/trunk/sa-update.raw
URL: http://svn.apache.org/viewvc/spamassassin/trunk/sa-update.raw?view=diff&rev=491309&r1=491308&r2=491309
==============================================================================
--- spamassassin/trunk/sa-update.raw (original)
+++ spamassassin/trunk/sa-update.raw Sat Dec 30 12:50:33 2006
@@ -73,12 +73,11 @@
 }
 
 # These are the non-standard required modules
-# Use the evals to avoid the annoying RPM requirement check
-eval { use Net::DNS; };
-eval { use LWP::UserAgent; };
-eval { use HTTP::Date qw(time2str); };
-eval { use Archive::Tar 1.23; };
-eval { use IO::Zlib 1.04; };
+use Net::DNS;
+use LWP::UserAgent;
+use HTTP::Date qw(time2str);
+use Archive::Tar 1.23;
+use IO::Zlib 1.04;
 
 # These should already be available
 use Mail::SpamAssassin;