You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by km...@apache.org on 2011/05/30 18:58:30 UTC
svn commit: r1129254 - in /spamassassin/trunk: META.yml Makefile.PL
build/jenkins/run_build lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Author: kmcgrail
Date: Mon May 30 16:58:30 2011
New Revision: 1129254
URL: http://svn.apache.org/viewvc?rev=1129254&view=rev
Log:
Using extreme silliness, we have NetAddr::IP working with JMs 5.8.6 perl - reverting to requiring 4.010 and trying a jenkins build on solaris1
Modified:
spamassassin/trunk/META.yml
spamassassin/trunk/Makefile.PL
spamassassin/trunk/build/jenkins/run_build
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
Modified: spamassassin/trunk/META.yml
URL: http://svn.apache.org/viewvc/spamassassin/trunk/META.yml?rev=1129254&r1=1129253&r2=1129254&view=diff
==============================================================================
--- spamassassin/trunk/META.yml (original)
+++ spamassassin/trunk/META.yml Mon May 30 16:58:30 2011
@@ -19,7 +19,7 @@ requires:
HTML::Parser: 3.43
Mail::DKIM: 0.31
Net::DNS: 0.34
- NetAddr::IP: 4.000
+ NetAddr::IP: 4.010
Pod::Usage: 1.1
Sys::Hostname: 0
Time::HiRes: 0
Modified: spamassassin/trunk/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1129254&r1=1129253&r2=1129254&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Mon May 30 16:58:30 2011
@@ -186,7 +186,7 @@ my %makefile = (
'IO::Zlib' => 1.04, # for sa-update
'Mail::DKIM' => 0.31,
'Net::DNS' => (RUNNING_ON_WINDOWS ? 0.46 : 0.34), # bugs in older revs
- 'NetAddr::IP' => 4.000,
+ 'NetAddr::IP' => 4.010,
'Sys::Hostname' => 0,
'Time::HiRes' => 0,
'Time::Local' => 0,
Modified: spamassassin/trunk/build/jenkins/run_build
URL: http://svn.apache.org/viewvc/spamassassin/trunk/build/jenkins/run_build?rev=1129254&r1=1129253&r2=1129254&view=diff
==============================================================================
--- spamassassin/trunk/build/jenkins/run_build (original)
+++ spamassassin/trunk/build/jenkins/run_build Mon May 30 16:58:30 2011
@@ -13,7 +13,7 @@ mkdir artifacts testxml
PATH=/export/home/jm/tools/perl586/bin:/usr/ccs/bin:/sbin:/usr/sbin:/etc:/usr/etc:/usr/local/bin:/usr/bin/mh:/export/home/jm/bin:/sbin:/usr/sbin:/etc:/usr/etc:/usr/local/bin:/usr/bin/mh:/export/home/jm/bin:/sbin:/usr/sbin:/etc:/usr/etc:/usr/local/bin:/usr/bin/mh:/usr/bin:/opt/sfw/bin:/opt/SUNWspro/bin:/usr/ucb/
export PATH
-#INSTALL NETADDR USING JM's PERL
+#INSTALL NETADDR USING JM's PERL USING COMPLETE SILLINESS
#echo "o conf makepl_arg PREFIX=/export/home/hudson/tools/sa_perl\ninstall NetAddr::IP" | cpan
#cd /tmp/1
#curl -o netaddr.tar.gz http://www.peregrinehw.com/downloads/SpamAssassin/NetAddr-IP-4.044.tar.gz
@@ -23,11 +23,8 @@ export PATH
#cd NetAddr-IP-4.044/
#perl Makefile.PL PREFIX=/export/home/hudson/tools/sa_perl
#make test && make install
-
-
-perl -I /export/home/hudson/tools/sa_perl/lib/site_perl/ -e 'if (require NetAddr::IP) { print "NetAddr::IP Version is: $NetAddr::IP::VERSION\n"; exit 0;} else {exit 1;}'
-
-exit
+#perl -I /export/home/hudson/tools/sa_perl/lib/site_perl/ -e 'if (require NetAddr::IP) { print "NetAddr::IP Version is: $NetAddr::IP::VERSION\n"; exit 0;} else {exit 1;}'
+#exit
perl -I /export/home/hudson/tools/sa_perl/lib/site_perl/ Makefile.PL < /dev/null
# SOLARIS1 SLAVE w/Infra installing modules for us in a separate dir.
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1129254&r1=1129253&r2=1129254&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Mon May 30 16:58:30 2011
@@ -73,7 +73,7 @@ $have_sha1 ? {
},
{
'module' => 'NetAddr::IP',
- 'version' => '4.000',
+ 'version' => '4.010',
'desc' => "Used in determining which DNS tests are to be done for each of
the header's received fields, used by AWL plugin for extracting network
address from an IPv6 addresses (and from IPv4 address on nondefault mask),