r64719 - in /trunk/libnetaddr-ip-perl/debian: changelog patches/spamassasin.patch

periapt-guest at users.alioth.debian.org periapt-guest at users.alioth.debian.org
Sun Nov 7 20:39:55 UTC 2010


Author: periapt-guest
Date: Sun Nov  7 20:39:36 2010
New Revision: 64719

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64719
Log:
Integrated patch from paul at city-fan.org

Modified:
    trunk/libnetaddr-ip-perl/debian/changelog
    trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch

Modified: trunk/libnetaddr-ip-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetaddr-ip-perl/debian/changelog?rev=64719&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/changelog (original)
+++ trunk/libnetaddr-ip-perl/debian/changelog Sun Nov  7 20:39:36 2010
@@ -3,6 +3,7 @@
   * Forwarding patch upstream for further investigation (cf. #517361) 
   * Added patch for spamassasin issues (cf. #601601)
     - Added Noah Meyerhans' test.pl as a test script
+    - Integrated patch from paul at city-fan.org
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 07 Nov 2010 16:23:25 +0000
 

Modified: trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch?rev=64719&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch (original)
+++ trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch Sun Nov  7 20:39:36 2010
@@ -1,6 +1,6 @@
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=601601
 Bug: http://rt.cpan.org/Public/Bug/Display.html?id=62521
-Author: Noah Meyerhans <noahm at debian.org>
+Author: Noah Meyerhans <noahm at debian.org>, paul at city-fan.org
 Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
 Last-Update: 2010-11-07
 Subject: Issues with spamassasin traced to NetAddr::IP
@@ -46,3 +46,31 @@
 +is($b, '0:0:0:0:0:0:0:1/128', 'IPv6 loopback address');
 +ok(!$converted->contains($b), "Is $b contained within $converted? " );
 +
+--- a/Lite/Lite.pm
++++ b/Lite/Lite.pm
+@@ -740,7 +740,7 @@
+ 	if ($mval == 128) {			# cidr 128
+ 	  $mask = Ones;
+ 	}
+-	elsif ($ip =~ /^\d+\.\d+\.\d+\.\d+$/) {	# corner case of ipV4 with new6
++	elsif (index($ip,':') < 0) {	# corner case of ipV4 with new6
+ 	  $mask = shiftleft(Ones,32 -$mval);
+ 	}
+ 	elsif ($mask < 128) {			# small cidr
+--- a/Lite/t/bug62521.t
++++ b/Lite/t/bug62521.t
+@@ -1,5 +1,5 @@
+ 
+-BEGIN { $| = 1; print "1..2\n"; }
++BEGIN { $| = 1; print "1..3\n"; }
+ END {print "not ok 1\n" unless $loaded;}
+ 
+ $loaded = 1;
+@@ -21,3 +21,7 @@
+ print "exp $exp\ngot ", $ip, "\nnot "
+ 	unless $ip eq $exp;
+ &ok;
++$ip = new6 NetAddr::IP::Lite('127/8');
++print "exp $exp\ngot ", $ip, "\nnot "
++	unless $ip eq $exp;
++&ok;




More information about the Pkg-perl-cvs-commits mailing list