sneaking in an update for a quite leafy package :)

- remove patches/patch-bv since if you use gmake it's for a generated file,
  even if the original tar contains it (and the diff grows rather large due
  to differing yacc versions)
- add irrd-cache-usage-patch by Hagen Boehm <hboehm@brutus.NIC.DTAG.DE>
- add JunOS @RtConfig import patch by Stan Barber <sob@academ.com>
- add IPv6 ACL list numbers patch by Timo Koehler <tkoehler@acm.org>

1 files changed, 16 insertions, 5 deletions

diff --git a/net/irrtoolset-nox11/patches/patch-cx b/net/irrtoolset-nox11/patches/patch-cx
index b79016ef63b..695a8ef9aea 100644
--- a/net/irrtoolset-nox11/patches/patch-cx
+++ b/net/irrtoolset-nox11/patches/patch-cx
@@ -1,8 +1,19 @@
-$NetBSD: patch-cx,v 1.1 2007/09/07 21:26:32 spz Exp $
+$NetBSD: patch-cx,v 1.2 2007/12/31 09:15:15 spz Exp $
 
 --- src/irr/irr.cc.orig	2006-10-01 13:23:32.000000000 +0200
 +++ src/irr/irr.cc
-@@ -312,7 +312,7 @@ const AutNum *IRR::getAutNum(ASt as) {
+@@ -210,6 +210,10 @@ Cache<ASt,   MPPrefixRanges *> expandASC
+ Cache<SymID, MPPrefixRanges *> expandRSSetCache;
+ Cache<SymID, MPPrefixRanges *> expandRtrSetCache;
+ 
++bool IRR::queryCache(SymID setID, Set *&set) {
++   return (SetCache.query(setID, set));
++}
++
+ void IRR::initCache(char *objectText, int objectLength, char *clss) {
+    Buffer b(objectText, objectLength);
+    Set *o = new Set(b);
+@@ -312,7 +316,7 @@ const AutNum *IRR::getAutNum(ASt as) {
     AutNum *result = NULL;
  
     if (! AutNumCache.query(as, result)) {
@@ -11,7 +22,7 @@ $NetBSD: patch-cx,v 1.1 2007/09/07 21:26:32 spz Exp $
        if (getAutNum(buffer, text, len)) {
  	 Buffer b(text, len);
  	 result = new AutNum(b);
-@@ -365,7 +365,7 @@ void IRR::getRoute(Route *&route, Prefix
+@@ -365,7 +369,7 @@ void IRR::getRoute(Route *&route, Prefix
     char *text;
     int  len;
  
@@ -20,7 +31,7 @@ $NetBSD: patch-cx,v 1.1 2007/09/07 21:26:32 spz Exp $
     if (getRoute(rt->get_text(), buffer, text, len)) {
        Buffer b(text, len);
        route = new Route(b);
-@@ -379,7 +379,7 @@ void IRR::getRoute(Route *&route, char *
+@@ -379,7 +383,7 @@ void IRR::getRoute(Route *&route, char *
    char *text;
    int  len;
  
@@ -29,7 +40,7 @@ $NetBSD: patch-cx,v 1.1 2007/09/07 21:26:32 spz Exp $
    if (getRoute(rt, buffer, text, len)) {
       Buffer b(text, len);
       route = new Route(b);
-@@ -419,7 +419,7 @@ const MPPrefixRanges *IRR::expandAS(ASt 
+@@ -419,7 +423,7 @@ const MPPrefixRanges *IRR::expandAS(ASt 
        // we insert the set to the cache before expanding
        // this is needed to avoid recursion if sets are recursively defined
        expandASCache.add(as, result);