commit perl-Net-Netmask

14 Dec 2006

Hello community,

here is the log from the commit of package perl-Net-Netmask
checked in at Thu Dec 14 02:04:45 CET 2006.

--------

--- perl-Net-Netmask/perl-Net-Netmask.changes	2006-10-19 17:06:58.000000000 +0200
+++ /mounts/work_src_done/STABLE/perl-Net-Netmask/perl-Net-Netmask.changes	2006-12-13 13:05:49.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Dec 13 12:01:37 CET 2006 - anicka@suse.cz
+
+- update to 1.9015
+  * Fix bug: cidrs2inverse wouldn't notice /32-sized leftovers.
+
+-------------------------------------------------------------------

Old:
----
  Net-Netmask-1.9014.tar.bz2

New:
----
  Net-Netmask-1.9015.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perl-Net-Netmask.spec ++++++
--- /var/tmp/diff_new_pack.yRqxSD/_old	2006-12-14 02:04:16.000000000 +0100
+++ /var/tmp/diff_new_pack.yRqxSD/_new	2006-12-14 02:04:16.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package perl-Net-Netmask (Version 1.9014)
+# spec file for package perl-Net-Netmask (Version 1.9015)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,7 +11,7 @@
 # norootforbuild
 
 Name:           perl-Net-Netmask
-Version:        1.9014
+Version:        1.9015
 Release:        1
 Provides:       perl_nm
 Obsoletes:      perl_nm
@@ -57,6 +57,9 @@
 /var/adm/perl-modules/%{name}
 
 %changelog -n perl-Net-Netmask
+* Wed Dec 13 2006 - anicka@suse.cz
+- update to 1.9015
+  * Fix bug: cidrs2inverse wouldn't notice /32-sized leftovers.
 * Thu Oct 19 2006 - anicka@suse.cz
 - update to 1.9014
   * Fix bug: cidrs2inverse wouldn't notice /32-sized holes.

++++++ Net-Netmask-1.9014.tar.bz2 -> Net-Netmask-1.9015.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Net-Netmask-1.9014/CHANGELOG new/Net-Netmask-1.9015/CHANGELOG
--- old/Net-Netmask-1.9014/CHANGELOG	2006-10-14 05:13:38.000000000 +0200
+++ new/Net-Netmask-1.9015/CHANGELOG	2006-11-30 23:06:09.000000000 +0100
@@ -1,5 +1,9 @@
+= 2006/11/30 1.9015
 
-= 2006/10/13 1.9004
+Fix bug # 22662 reported by grjones at gmail: cidrs2inverse
+wouldn't notice /32-sized leftovers.
+
+= 2006/10/13 1.9014
 
 Fix bug # 22085 reported by grjones at gmail: cidrs2inverse
 wouldn't notice /32-sized holes.
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Net-Netmask-1.9014/META.yml new/Net-Netmask-1.9015/META.yml
--- old/Net-Netmask-1.9014/META.yml	2006-10-14 05:20:46.000000000 +0200
+++ new/Net-Netmask-1.9015/META.yml	2006-11-30 23:06:29.000000000 +0100
@@ -1,7 +1,7 @@
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         Net-Netmask
-version:      1.9014
+version:      1.9015
 version_from: Netmask.pm
 installdirs:  site
 requires:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Net-Netmask-1.9014/Netmask.pm new/Net-Netmask-1.9015/Netmask.pm
--- old/Net-Netmask-1.9014/Netmask.pm	2006-10-14 05:12:21.000000000 +0200
+++ new/Net-Netmask-1.9015/Netmask.pm	2006-11-30 23:03:06.000000000 +0100
@@ -3,7 +3,7 @@
 package Net::Netmask;
 
 use vars qw($VERSION);
-$VERSION = 1.9014;
+$VERSION = 1.9015;
 
 require Exporter;
 @ISA = qw(Exporter);
@@ -518,7 +518,7 @@
 	my $last = $first + $outer->size() -1;
 	shift(@cidrs) while $cidrs[0] && $cidrs[0]->{IBASE} + $cidrs[0]->size < $first;
 	my @r;
-	while (@cidrs && $first < $last) {
+	while (@cidrs && $first <= $last) {
 		if ($first < $cidrs[0]->{IBASE}) {
 			if ($last <= $cidrs[0]->{IBASE}-1) {
 				return (@r, irange2cidrlist($first, $last));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/Net-Netmask-1.9014/t/netmasks.t new/Net-Netmask-1.9015/t/netmasks.t
--- old/Net-Netmask-1.9014/t/netmasks.t	2006-10-14 05:11:02.000000000 +0200
+++ new/Net-Netmask-1.9015/t/netmasks.t	2006-11-30 23:05:03.000000000 +0100
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -I. -w
 
-print "1..277\n";
+print "1..282\n";
 
 use Net::Netmask;
 use Net::Netmask qw(sameblock cmpblocks);
@@ -574,3 +574,63 @@
 	}
 	$test++;
 }
+
+{
+	my $obj1 = new2 Net::Netmask ('1.0.0.4/32');
+	my $obj2 = new2 Net::Netmask ('1.0.0.0/8');
+	my @leftover = cidrs2inverse($obj1, $obj2);
+	if (@leftover) {
+		print "not ok $test # leftover = @leftover\n";
+	} else {
+		print "ok $test\n";
+	}
+	$test++;
+}
+
+{
+	my $obj1 = new2 Net::Netmask ('1.0.0.4/32');
+	my $obj2 = new2 Net::Netmask ('1.0.0.4/32');
+	my @leftover = cidrs2inverse($obj1, $obj2);
+	if (@leftover) {
+		print "not ok $test # leftover2 = @leftover\n";
+	} else {
+		print "ok $test\n";
+	}
+	$test++;
+}
+
+{
+	my $obj1 = new2 Net::Netmask ('1.0.0.4/32');
+	my $obj2 = new2 Net::Netmask ('1.0.0.6/32');
+	my @leftover = cidrs2inverse($obj1, $obj2);
+	if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') {
+		print "ok $test\n";
+	} else {
+		print "not ok $test # leftover3 = @leftover\n";
+	}
+	$test++;
+}
+
+{
+	my $obj1 = new2 Net::Netmask ('1.0.0.4/31');
+	my $obj2 = new2 Net::Netmask ('1.0.0.5/32');
+	my @leftover = cidrs2inverse($obj1, $obj2);
+	if (@leftover == 1 && "$leftover[0]" eq '1.0.0.4/32') {
+		print "ok $test\n";
+	} else {
+		print "not ok $test # leftover3 = @leftover\n";
+	}
+	$test++;
+}
+
+{
+	my $obj1 = new2 Net::Netmask ('1.0.0.4/31');
+	my $obj2 = new2 Net::Netmask ('1.0.0.4/32');
+	my @leftover = cidrs2inverse($obj1, $obj2);
+	if (@leftover == 1 && "$leftover[0]" eq '1.0.0.5/32') {
+		print "ok $test\n";
+	} else {
+		print "not ok $test # leftover3 = @leftover\n";
+	}
+	$test++;
+}


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠suse.de

tags

participants (1)