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>

9 files changed, 196 insertions, 31 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index baad9973184..4b76454e0a7 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2007/09/07 21:26:31 spz Exp $
+# $NetBSD: Makefile,v 1.13 2007/12/31 09:15:14 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=		net
 MASTER_SITES=	ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo
index d09df8d389d..d08ff8e31d7 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2007/09/07 21:26:31 spz Exp $
+$NetBSD: distinfo,v 1.12 2007/12/31 09:15:14 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -22,9 +22,8 @@ SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df
 SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e
 SHA1 (patch-br) = a4643910bdefcd9f10c991585ed2916877292dbb
 SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6
-SHA1 (patch-bt) = 878e6723901f2f7e02416a2a7bbee0f2f4605af8
+SHA1 (patch-bt) = c085380a1360074b45bad97cf068a13243828db5
 SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
-SHA1 (patch-bv) = d0584058eaddce6a03a7b90e5f44997d70afc51d
 SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38
 SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e
 SHA1 (patch-co) = 763958aa8d82f98d26091ea1f82bdce40026c943
@@ -36,8 +35,8 @@ SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb
 SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861
 SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4
 SHA1 (patch-cw) = 9cc60fdf9566a74d810d7d5d36cd44b3ecbfba14
-SHA1 (patch-cx) = 15945605065068af655ebf697691a82f4c027583
-SHA1 (patch-cy) = 4c1371c1f68af34cebffcc93e91065b119b30c42
+SHA1 (patch-cx) = 102a37b057b9a86bb509578d8c46601f068cd760
+SHA1 (patch-cy) = d5761e8fec3c4c591082361ad99ba2c37178de0a
 SHA1 (patch-cz) = 8df488621dbe452720fca277ca60c852a9b55433
 SHA1 (patch-da) = 7269e4e29288a5a2e4d5d33bb17b067b14ff007d
 SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce
@@ -48,3 +47,6 @@ SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74
 SHA1 (patch-dg) = 5f3fe95a69cdf1d3eb13b4e2a3a3fce1f4c53168
 SHA1 (patch-dh) = ce1218fe7d82e3bb5c470cd74b334400aebd1928
 SHA1 (patch-di) = ab0fa75329575141844ff55698a21060c2b62e43
+SHA1 (patch-dj) = d4a06b1672f481a889756c15feb2155dd6d5d123
+SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f
+SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca
diff --git a/net/irrtoolset-nox11/patches/patch-bt b/net/irrtoolset-nox11/patches/patch-bt
index 49811c10ca8..aebb0cda635 100644
--- a/net/irrtoolset-nox11/patches/patch-bt
+++ b/net/irrtoolset-nox11/patches/patch-bt
@@ -1,6 +1,6 @@
-$NetBSD: patch-bt,v 1.3 2007/05/22 12:17:49 spz Exp $
+$NetBSD: patch-bt,v 1.4 2007/12/31 09:15:15 spz Exp $
 
---- src/RtConfig/command.y.orig	2004-07-30 12:58:11.000000000 +0200
+--- src/RtConfig/command.y.orig	2007-02-09 20:46:31.000000000 +0100
 +++ src/RtConfig/command.y
 @@ -56,7 +56,11 @@
  
@@ -14,3 +14,12 @@ $NetBSD: patch-bt,v 1.3 2007/05/22 12:17:49 spz Exp $
  #include <cstring>
  #include <cstdlib>
  #include <cctype>
+@@ -383,6 +387,8 @@ cisco_access_list_no_line: KW_SET KW_CIS
+       pktFilterMgr.setNextID($4);
+       aspathMgr.setNextID($4);
+       prefixMgr.setNextID($4);
++      ipv6prefixMgr.setNextID($4);
++      ipv6pktFilterMgr.setNextID($4);
+    }
+    Trace(TR_INPUT) << "RtConfig: cisco_pktfilter_access_list_no '"
+ 		   << $4 << "'" << std::endl;
diff --git a/net/irrtoolset-nox11/patches/patch-bv b/net/irrtoolset-nox11/patches/patch-bv
deleted file mode 100644
index 11187d88a47..00000000000
--- a/net/irrtoolset-nox11/patches/patch-bv
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-bv,v 1.1 2005/03/06 11:40:21 spz Exp $
-
---- src/RtConfig/command.y.cc.orig	2004-07-30 12:58:11.000000000 +0200
-+++ src/RtConfig/command.y.cc
-@@ -114,7 +114,11 @@
- 
- #include "config.h"
- 
-+#if (__GNUC__ > 2)
- #include <ostream>
-+#else
-+#include <ostream.h>
-+#endif
- #include <cstring>
- #include <cstdlib>
- #include <cctype>
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);
diff --git a/net/irrtoolset-nox11/patches/patch-cy b/net/irrtoolset-nox11/patches/patch-cy
index 10b13b0afbd..cb7834bd28d 100644
--- a/net/irrtoolset-nox11/patches/patch-cy
+++ b/net/irrtoolset-nox11/patches/patch-cy
@@ -1,4 +1,4 @@
-$NetBSD: patch-cy,v 1.1 2007/09/07 21:26:32 spz Exp $
+$NetBSD: patch-cy,v 1.2 2007/12/31 09:15:15 spz Exp $
 
 --- src/irr/irr.hh.orig	2006-06-08 17:16:26.000000000 +0200
 +++ src/irr/irr.hh
@@ -10,3 +10,13 @@ $NetBSD: patch-cy,v 1.1 2007/09/07 21:26:32 spz Exp $
  #include "classes.hh"
  
  class AutNum;
+@@ -192,6 +193,9 @@ protected:
+    bool         isIndirectMember(Object *o, 
+ 			   AttrGenericIterator<ItemWORD> &mbrs_by_ref);
+ 
++   // next method is used by RAWhoisClient to query the SetCache
++   bool queryCache(SymID setID, Set *&set);
++
+ private:
+    static void initCache(char *objectText, int objectLength, char *clss);
+ };
diff --git a/net/irrtoolset-nox11/patches/patch-dj b/net/irrtoolset-nox11/patches/patch-dj
new file mode 100644
index 00000000000..b7d79f7d45b
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dj
@@ -0,0 +1,88 @@
+$NetBSD: patch-dj,v 1.1 2007/12/31 09:15:15 spz Exp $
+
+--- src/irr/rawhoisc.cc.orig	2007-02-13 01:25:01.000000000 +0100
++++ src/irr/rawhoisc.cc
+@@ -517,7 +517,7 @@ bool RAWhoisClient::getAutNum(char *as, 
+ }
+ 
+ bool RAWhoisClient::getSet(SymID sname, char *clss, char *&text, int &len) {
+-   len = QueryResponse(text, "!m%s,%s", clss, sname);
++   len = QueryResponse(text, "!i%s,1", sname);
+    return len;
+ }
+ 
+@@ -557,26 +557,58 @@ bool RAWhoisClient::expandAS(char *as,  
+ }
+ 
+ bool RAWhoisClient::expandASSet(SymID asset, SetOfUInt *result) {
+-  char *response;
+-  if (!QueryResponse(response, "!i%s,1", asset)) return false;
+-  for (char *word = strtok(response, " \t\n"); 
+-       word; 
+-       word = strtok(NULL, " \t\n"))
+-    result->add(atoi(word+2));
+-  if (response)
+-     delete [] response;
++  Set *set = NULL;
++
++  if (queryCache(asset, set)) {
++    AttrGenericIterator<Item> itr(set, "members");
++    for (Item *pt = itr.first(); pt; pt = itr.next())
++      if (typeid(*pt) == typeid(ItemASNAME)) { // ASNAME (aka as-set)
++        const SetOfUInt *tmp = IRR::expandASSet(((ItemASNAME *)pt)->name);
++        if (tmp)
++          *result |= *(SetOfUInt *) tmp;
++      } else if (typeid(*pt) == typeid(ItemASNO)) {
++         result->add(((ItemASNO *)pt)->asno);
++      } else {
++        cerr << "WARNING: irrd/rawhoisd cannot resolve as-set " << asset << "!";
++        cerr << "Unknown element found in as-set definition!\n";
++      }
++    if (set != NULL) free (set);
++  } else {
++    char *text;
++    int  len;
++    if (getSet(asset, "as-set", text, len)) {
++      for (char *word = strtok(text, " \t\n"); word; word = strtok(NULL, "\t\n"))
++        result->add(atoi(word+2));
++    }
++    if (text != NULL) free(text);
++  }
++
+   return true;
+ }
+ 
+ bool RAWhoisClient::expandRSSet(SymID rsset, MPPrefixRanges *result) {
+-  char *response;
+-  if (!QueryResponse(response, "!i%s,1", rsset)) return false;
+-  for (char *word = strtok(response, " \t\n"); 
+-       word; 
+-       word = strtok(NULL, " \t\n"))
+-    result->push_back(MPPrefix(word));
+-  if (response)
+-     delete [] response;
++  Set *set = NULL;
++
++  if (queryCache(rsset, set)) {
++    AttrGenericIterator<Item> itr(set, "members");
++    for (Item *pt = itr.first(); pt; pt = itr.next()) {
++      expandItem(pt, result);
++    }
++    AttrGenericIterator<Item> itr1(set, "mp-members");
++    for (Item *pt = itr1.first(); pt; pt = itr1.next()) {
++      expandItem(pt, result);
++    }
++    if (set != NULL) free (set);
++  } else {
++    char *text;
++    int  len;
++    if (getSet(rsset, "route-set", text, len)) {
++      for (char *word = strtok(text, " \t\n"); word; word = strtok(NULL, "\t\n"))
++        result->push_back(MPPrefix(word));
++    }
++    if (text != NULL) free(text);
++  }
++
+   return true;
+ }
+ 
diff --git a/net/irrtoolset-nox11/patches/patch-dk b/net/irrtoolset-nox11/patches/patch-dk
new file mode 100644
index 00000000000..83d5dbb8abe
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dk
@@ -0,0 +1,47 @@
+$NetBSD: patch-dk,v 1.1 2007/12/31 09:15:15 spz Exp $
+
+--- src/RtConfig/f_junos.cc.orig	2006-10-01 13:23:32.000000000 +0200
++++ src/RtConfig/f_junos.cc
+@@ -811,6 +811,9 @@ int JunosConfig::print(NormalExpression 
+ 
+    Debug(Channel(DBG_JUNOS) << "# ne: " << *ne << "\n");
+ 
++   if (ne->is_any() != NEITHER)
++      cerr << "Warning: filter matches ANY/NOT ANY" << endl;
++
+    if (ne->isEmpty()) 
+       return last;
+ 
+@@ -916,11 +919,13 @@ bool JunosConfig::printNeighbor(int impo
+       setMEDtoIGP = false;
+    }
+ 
++#ifdef notdef
+    if (afi_activate) {
+ 	  cout << "            family " << (AddressFamily &) *filter_afi << " { "<< endl;
+ 	  cout << "                any;" << endl;
+ 	  cout << "            } " << endl;
+    }
++#endif
+ 
+    cout << "         }\n"
+ 	<< "      }\n"
+@@ -1019,7 +1024,9 @@ void JunosConfig::importP(ASt asno, MPPr
+       return;
+     }
+ 
++#ifdef notdef
+    int preAclID = prefixMgr.lastID();
++#endif
+    // get matching import attributes
+    AutNumSelector<AttrImport> itr(autnum, "import", 
+ 				  NULL, peerAS, peer_addr, addr);
+@@ -1074,7 +1081,7 @@ void JunosConfig::importP(ASt asno, MPPr
+ 
+    ItemAFI *peer_afi = new ItemAFI(peer_addr->get_afi());
+ 
+-   printNeighbor(IMPORT, asno, peerAS, peer_addr->get_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list);
++   printNeighbor(IMPORT, asno, peerAS, peer_addr->get_ip_text(), false, (ItemAFI *) peer_afi, (ItemAFI *) afi_list);
+ }
+ 
+ void JunosConfig::static2bgp(ASt asno, MPPrefix *addr) {
diff --git a/net/irrtoolset-nox11/patches/patch-dl b/net/irrtoolset-nox11/patches/patch-dl
new file mode 100644
index 00000000000..57e75ec2823
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-dl
@@ -0,0 +1,14 @@
+$NetBSD: patch-dl,v 1.1 2007/12/31 09:15:15 spz Exp $
+
+--- src/RtConfig/f_cisco.hh.orig	2006-06-08 17:16:26.000000000 +0200
++++ src/RtConfig/f_cisco.hh
+@@ -236,7 +236,9 @@ public:
+ 
+ extern AccessListManager<regexp_nf>         aspathMgr;
+ extern AccessListManager<SetOfPrefix>       prefixMgr;
++extern AccessListManager<SetOfIPv6Prefix>   ipv6prefixMgr;
+ extern AccessListManager<SetOfPrefix>       pktFilterMgr;
++extern AccessListManager<SetOfIPv6Prefix>   ipv6pktFilterMgr;
+ extern AccessListManager<FilterOfCommunity> communityMgr;
+ 
+ #endif   // F_CISCO_H