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

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


Author: periapt-guest
Date: Sun Nov  7 20:24:34 2010
New Revision: 64718

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=64718
Log:
* Added patch for spamassasin issues (cf. #601601)
  - Added Noah Meyerhans' test.pl as a test script

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

Modified: trunk/libnetaddr-ip-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetaddr-ip-perl/debian/changelog?rev=64718&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/changelog (original)
+++ trunk/libnetaddr-ip-perl/debian/changelog Sun Nov  7 20:24:34 2010
@@ -1,6 +1,8 @@
 libnetaddr-ip-perl (4.035+dfsg-3) UNRELEASED; urgency=low
 
   * Forwarding patch upstream for further investigation (cf. #517361) 
+  * Added patch for spamassasin issues (cf. #601601)
+    - Added Noah Meyerhans' test.pl as a test script
 
  -- Nicholas Bamber <nicholas at periapt.co.uk>  Sun, 07 Nov 2010 16:23:25 +0000
 

Modified: trunk/libnetaddr-ip-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libnetaddr-ip-perl/debian/patches/series?rev=64718&op=diff
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/series (original)
+++ trunk/libnetaddr-ip-perl/debian/patches/series Sun Nov  7 20:24:34 2010
@@ -1,3 +1,4 @@
 lite_makefile.patch
 spelling.patch
 autosplit.patch
+spamassasin.patch

Added: 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=64718&op=file
==============================================================================
--- trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch (added)
+++ trunk/libnetaddr-ip-perl/debian/patches/spamassasin.patch Sun Nov  7 20:24:34 2010
@@ -1,0 +1,48 @@
+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>
+Reviewed-by: Nicholas Bamber <nicholas at periapt.co.uk>
+Last-Update: 2010-11-07
+Subject: Issues with spamassasin traced to NetAddr::IP
+ * Noah Meyerhans supplied a test for the bug for 4.034 version.
+--- /dev/null
++++ b/t/noahs_test.t
+@@ -0,0 +1,38 @@
++#!/usr/bin/perl
++use Test::More tests=>4;
++use NetAddr::IP;
++
++sub _convert_ipv4_cidr_to_ipv6 {
++  my ($cidr) = @_;
++
++  # only do this for IPv4 addresses
++  return undef unless ($cidr =~ /^\d+[.\/]/);
++
++  if ($cidr !~ /\//) {      # no mask
++    return NetAddr::IP->new6("::ffff:".$cidr);
++  }
++
++  # else we have a CIDR mask specified. use new6() to do this
++  #
++  my $ip6 = ""+(NetAddr::IP->new6($cidr));
++  # 127.0.0.1 -> 0:0:0:0:0:0:7F00:0001/128
++  # 127/8 -> 0:0:0:0:0:0:7F00:0/104
++
++  # now, move that from 0:0:0:0:0:0: space to 0:0:0:0:0:ffff: space
++  if (!defined $ip6 || $ip6 !~ /^0:0:0:0:0:0:(.*)$/) {
++    warn "oops! unparseable IPv6 address for $cidr: $ip6";
++    return undef;
++  }
++
++  return NetAddr::IP->new6("::ffff:$1");
++}
++
++my $a = NetAddr::IP->new('127.0.0.0/8');
++my $b = NetAddr::IP->new('::1');
++my $converted = _convert_ipv4_cidr_to_ipv6($a);
++
++is($a, '127.0.0.0/8', "Loopback network");
++is($converted, '0:0:0:0:0:FFFF:7F00:0/104', 'converted to v6 mapped');
++is($b, '0:0:0:0:0:0:0:1/128', 'IPv6 loopback address');
++ok(!$converted->contains($b), "Is $b contained within $converted? " );
++




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