add a fix for a list content checking problem Hagen Boehm identified

add a typo correction in a comment

4 files changed, 68 insertions, 3 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index a703f843682..8ed9be626f4 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2006/06/02 15:41:30 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/07/07 12:30:56 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.2
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.2/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index 1f39d16db63..b54810513b4 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2006/03/22 22:36:13 joerg Exp $
+$NetBSD: distinfo,v 1.9 2006/07/07 12:30:56 spz Exp $
 
 SHA1 (IRRToolSet-4.8.2.tar.gz) = f60a03cb6585503f1ef0b8b7c0a2ce7c39ce999c
 RMD160 (IRRToolSet-4.8.2.tar.gz) = 00332f7fe1144b56c93dc327126ec51aa094b6ab
@@ -60,3 +60,5 @@ SHA1 (patch-ci) = 2e0104e01b7c8beb9d9feab837520014ad6b63e4
 SHA1 (patch-cj) = 86950483f15144510fab6f46cfd36a1759eb3bb4
 SHA1 (patch-ck) = 175f93a15bdb000070b80688ab594a38af26e6f0
 SHA1 (patch-cl) = 19629aa17d557ddb0dc5cac5daecb0047f9a0a43
+SHA1 (patch-cm) = 49bac55de58404a94477d7d3eef9365af51b7d1c
+SHA1 (patch-cn) = 87cb5dd6dc401b18840a62149e276e91df469df3
diff --git a/net/irrtoolset-nox11/patches/patch-cm b/net/irrtoolset-nox11/patches/patch-cm
new file mode 100644
index 00000000000..3d336c11016
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-cm
@@ -0,0 +1,50 @@
+$NetBSD: patch-cm,v 1.1 2006/07/07 12:30:56 spz Exp $
+
+--- src/rpsl/rpsl/prefix.cc.orig	2004-07-30 12:58:14.000000000 +0200
++++ src/rpsl/rpsl/prefix.cc
+@@ -1216,10 +1216,13 @@ void MPPrefixRanges::except(MPPrefixRang
+    assign(result.begin(), result.end());
+ }
+ 
++// contains methods rewritten by spz according to hint from Hagen Boehm
+ bool MPPrefixRanges::contains(IPAddr ip) const {
+    MPPrefixRanges::const_iterator p;
+    for (p = begin(); p != end(); ++p) {
+-     if (p->ipv4 && (p->ipv4->get_ipaddr() == ip.get_ipaddr())) 
++     if (p->ipv4
++		&& p->ipv4->get_ipaddr() == ip.get_ipaddr()
++		&& p->ipv4->get_length() == ip.get_length() )
+        return true;
+    }
+    return false;
+@@ -1228,7 +1231,9 @@ bool MPPrefixRanges::contains(IPAddr ip)
+ bool MPPrefixRanges::contains(IPv6Addr ip) const {
+    MPPrefixRanges::const_iterator p;
+    for (p = begin(); p != end(); ++p) {
+-     if (p->ipv6 && (*(p->ipv6->get_ipaddr()) == *(ip.get_ipaddr())) )
++     if (p->ipv6
++		&& p->ipv6->get_ipaddr() == ip.get_ipaddr()
++		&& p->ipv6->get_length() == ip.get_length() )
+        return true;
+    }
+    return false;
+@@ -1237,9 +1242,17 @@ bool MPPrefixRanges::contains(IPv6Addr i
+ bool MPPrefixRanges::contains(MPPrefix ip) const {
+    MPPrefixRanges::const_iterator p;
+    for (p = begin(); p != end(); ++p) {
+-     if (p->ipv6 && ip.ipv6 && (*(p->ipv6->get_ipaddr()) == ip.get_ipaddr()) )
++     if (p->ipv6 && ip.ipv6
++		&& p->ipv6->get_ipaddr() == ip.ipv6->get_ipaddr()
++		&& p->ipv6->get_length() == ip.ipv6->get_length()
++		&& p->ipv6->get_m() == ip.ipv6->get_m()
++		&& p->ipv6->get_n() == ip.ipv6->get_n() )
+        return true;
+-     if (p->ipv4 && ip.ipv4 && (p->ipv4->get_ipaddr() == ip.ipv4->get_ipaddr()))
++     if (p->ipv4 && ip.ipv4
++		&& p->ipv4->get_ipaddr() == ip.ipv4->get_ipaddr()
++		&& p->ipv4->get_length() == ip.ipv4->get_length()
++		&& p->ipv4->get_m() == ip.ipv4->get_m()
++		&& p->ipv4->get_n() == ip.ipv4->get_n() )
+        return true;
+    }
+    return false;
diff --git a/net/irrtoolset-nox11/patches/patch-cn b/net/irrtoolset-nox11/patches/patch-cn
new file mode 100644
index 00000000000..c37a0fa2f7e
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-cn
@@ -0,0 +1,13 @@
+$NetBSD: patch-cn,v 1.1 2006/07/07 12:30:56 spz Exp $
+
+--- src/normalform/RadixSet.cc.orig	2004-07-30 12:58:13.000000000 +0200
++++ src/normalform/RadixSet.cc
+@@ -878,7 +878,7 @@ ostream& operator<<(ostream& o, const Ra
+       	       need_comma = true;
+       	    o << int2quad(buffer, addr) << "/" << leng << "^" << n << "-" << m;
+       	 } // end of for loop
+-      } else { // not a compressed point
++      } else { // not a compressed print
+        	 RadixSet::PrefixIterator itr(&set);
+ 	       for (bool flag = itr.first(addr, leng); flag; flag = itr.next(addr, leng)) {
+            if (need_comma)