[pkgsrc/trunk]: pkgsrc/net/irrtoolset-nox11 patches irrtoolset to handle exte...

[spz <spz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dde85a0d9557
branches:  trunk
changeset: 533067:dde85a0d9557
user:      spz <spz%pkgsrc.org@localhost>
date:      Fri Sep 07 21:26:31 2007 +0000

description:
patches irrtoolset to handle extended autnums
most changes supplied by mlelstv%NetBSD.org@localhost (Michael van Elst)
patch to src/rpsl/rpsl/rptype.cc supplied by he%NetBSD.org@localhost (Havard Eidnes)

also fixes PR pkg/36807

diffstat:

 net/irrtoolset-nox11/Makefile         |   4 +-
 net/irrtoolset-nox11/distinfo         |  20 ++++++++++++-
 net/irrtoolset-nox11/patches/patch-br |  13 +++++++-
 net/irrtoolset-nox11/patches/patch-ct |  14 +++++++++
 net/irrtoolset-nox11/patches/patch-cu |  14 +++++++++
 net/irrtoolset-nox11/patches/patch-cv |  13 +++++++++
 net/irrtoolset-nox11/patches/patch-cw |  25 +++++++++++++++++
 net/irrtoolset-nox11/patches/patch-cx |  40 ++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-cy |  12 ++++++++
 net/irrtoolset-nox11/patches/patch-cz |  18 ++++++++++++
 net/irrtoolset-nox11/patches/patch-da |  33 +++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-db |  23 ++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dc |  50 +++++++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dd |  45 +++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-de |  34 +++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-df |  40 ++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dg |  30 +++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-dh |  35 ++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-di |  17 +++++++++++
 19 files changed, 474 insertions(+), 6 deletions(-)

diffs (truncated from 584 to 300 lines):

diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/Makefile
--- a/net/irrtoolset-nox11/Makefile     Fri Sep 07 21:22:31 2007 +0000
+++ b/net/irrtoolset-nox11/Makefile     Fri Sep 07 21:26:31 2007 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/06/20 06:24:11 spz Exp $
+# $NetBSD: Makefile,v 1.12 2007/09/07 21:26:31 spz Exp $
 #
 
 DISTNAME=              IRRToolSet-4.8.5
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=            net
 MASTER_SITES=  ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
 
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/distinfo
--- a/net/irrtoolset-nox11/distinfo     Fri Sep 07 21:22:31 2007 +0000
+++ b/net/irrtoolset-nox11/distinfo     Fri Sep 07 21:26:31 2007 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2007/05/22 12:18:24 spz Exp $
+$NetBSD: distinfo,v 1.11 2007/09/07 21:26:31 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -20,7 +20,7 @@
 SHA1 (patch-bo) = 3c11577df912d52361025d426a7ecc3cadfe6d79
 SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df
 SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e
-SHA1 (patch-br) = 72e7b86a31851a437dff832206c8d96f263a6b15
+SHA1 (patch-br) = a4643910bdefcd9f10c991585ed2916877292dbb
 SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6
 SHA1 (patch-bt) = 878e6723901f2f7e02416a2a7bbee0f2f4605af8
 SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
@@ -32,3 +32,19 @@
 SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720
 SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68
 SHA1 (patch-cs) = 433a1286d7483139d59ed25ac458b4a159fb17e3
+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-cz) = 8df488621dbe452720fca277ca60c852a9b55433
+SHA1 (patch-da) = 7269e4e29288a5a2e4d5d33bb17b067b14ff007d
+SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce
+SHA1 (patch-dc) = b44f42f61e2c81813a0aa4b773ee1bbb6919c2a8
+SHA1 (patch-dd) = dc5ceed77ee5e0a871bc8ea75a5059297e5ec3e9
+SHA1 (patch-de) = 0dccfc915f66c5e35ac0858ebcf5ee85767300be
+SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74
+SHA1 (patch-dg) = 5f3fe95a69cdf1d3eb13b4e2a3a3fce1f4c53168
+SHA1 (patch-dh) = ce1218fe7d82e3bb5c470cd74b334400aebd1928
+SHA1 (patch-di) = ab0fa75329575141844ff55698a21060c2b62e43
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-br
--- a/net/irrtoolset-nox11/patches/patch-br     Fri Sep 07 21:22:31 2007 +0000
+++ b/net/irrtoolset-nox11/patches/patch-br     Fri Sep 07 21:26:31 2007 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-br,v 1.1 2005/03/06 11:40:21 spz Exp $
+$NetBSD: patch-br,v 1.2 2007/09/07 21:26:31 spz Exp $
 
---- src/normalform/SetOfSymbol.cc.orig 2004-07-30 12:58:13.000000000 +0200
+--- src/normalform/SetOfSymbol.cc.orig 2006-06-08 17:16:26.000000000 +0200
 +++ src/normalform/SetOfSymbol.cc
 @@ -51,7 +51,11 @@
  //
@@ -14,3 +14,12 @@
  #include <cstdio>
  #include <cassert>
  #include "config.h"
+@@ -271,7 +275,7 @@ void SetOfSymbol::operator =  (const Set
+ 
+ void SetOfSymbol::add(ASt as) {
+    char buffer[64];
+-   sprintf(buffer, "AS%d", as);
++   asnum_string(buffer, as);
+    add(symbols.symID(buffer));
+ }
+ 
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-ct
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-ct     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-ct,v 1.1 2007/09/07 21:26:31 spz Exp $
+
+--- src/rpsl/rpsl/rptype.cc.orig       2006-06-08 17:16:26.000000000 +0200
++++ src/rpsl/rpsl/rptype.cc
+@@ -388,8 +388,7 @@ bool RPTypeBoolean::validate(const Item 
+ ////////////////////////////// RPTypeASNumber ////////////////////
+ 
+ bool RPTypeASNumber::validate(const Item *item) const {
+-   return ((typeid(*item) == typeid(ItemASNO))
+-         && ((ItemASNO *) item)->asno <= 65535);
++   return ((typeid(*item) == typeid(ItemASNO)));
+ }
+ 
+ ////////////////////////////// RPTypeIPv4Address ////////////////////
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cu
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cu     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-cu,v 1.1 2007/09/07 21:26:32 spz Exp $
+
+--- src/rpsl/rpsl/rpsl_item.hh.orig    2007-02-09 20:46:31.000000000 +0100
++++ src/rpsl/rpsl/rpsl_item.hh
+@@ -127,6 +127,9 @@ public:
+        && asno <= ((ItemASNO&) b).asno;
+    }
+    virtual Buffer *bufferize(Buffer *buf = NULL, bool lcase = false) const;
++   virtual const char *sprint(char *buf) {
++        asnum_string(buf, asno);
++   }
+ #ifdef DEBUG
+    virtual const char *className(void) const {
+       return "ItemASNO";
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cv
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cv     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-cv,v 1.1 2007/09/07 21:26:32 spz Exp $
+
+--- src/rpsl/rpsl/rpsl.y.orig  2006-06-08 17:16:26.000000000 +0200
++++ src/rpsl/rpsl/rpsl.y
+@@ -755,7 +755,7 @@ tkn_word: TKN_WORD {
+ }
+ | TKN_ASNO {
+    char buffer[64];
+-   sprintf(buffer, "AS%d", $1);
++   asnum_string(buffer, $1);
+    $$ = strdup(buffer);
+ }
+ | TKN_ASNAME {
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cw
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cw     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,25 @@
+$NetBSD: patch-cw,v 1.1 2007/09/07 21:26:32 spz Exp $
+
+--- src/rpsl/rpsl/rpsl_item.cc.orig    2006-06-08 17:16:26.000000000 +0200
++++ src/rpsl/rpsl/rpsl_item.cc
+@@ -67,14 +67,18 @@ ostream &Item::print(ostream &out) const
+ }
+ 
+ ostream &ItemASNO::print(ostream &out) const {
+-   out << "AS" << asno;
++   char buffer[64];
++   asnum_string(buffer, asno);
++   out << "AS" << buffer;
+    return out;
+ }
+ 
+ Buffer *ItemASNO::bufferize(Buffer *buf, bool lcase) const {
++   char buffer[64];
++   asnum_string(buffer, asno);
+    if (!buf)
+       buf = new Buffer;
+-   buf->appendf("as%d", asno);
++   buf->appendf(buffer);
+    return buf;
+ }
+ 
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cx     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,40 @@
+$NetBSD: patch-cx,v 1.1 2007/09/07 21:26:32 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) {
+    AutNum *result = NULL;
+ 
+    if (! AutNumCache.query(as, result)) {
+-      sprintf(buffer, "AS%d", as);
++      asnum_string(buffer, as);
+       if (getAutNum(buffer, text, len)) {
+        Buffer b(text, len);
+        result = new AutNum(b);
+@@ -365,7 +365,7 @@ void IRR::getRoute(Route *&route, Prefix
+    char *text;
+    int  len;
+ 
+-   sprintf(buffer, "AS%d", as);
++   asnum_string(buffer, as);
+    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 *
+   char *text;
+   int  len;
+ 
+-  sprintf(buffer, "AS%d", as);
++  asnum_string(buffer, as);
+   if (getRoute(rt, buffer, text, len)) {
+      Buffer b(text, len);
+      route = new Route(b);
+@@ -419,7 +419,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);
+-      sprintf(buffer, "AS%d", as);
++      asnum_string(buffer, as);
+       if (!expandAS(buffer, result)) {
+    expandASCache.nullify(as);
+   delete result;
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cy
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cy     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,12 @@
+$NetBSD: patch-cy,v 1.1 2007/09/07 21:26:32 spz Exp $
+
+--- src/irr/irr.hh.orig        2006-06-08 17:16:26.000000000 +0200
++++ src/irr/irr.hh
+@@ -59,6 +59,7 @@
+ #include "gnug++/SetOfUInt.hh"
+ #include "gnu/prefixranges.hh"
+ #include "rpsl/prefix.hh"
++#include "rpsl/rpsl_asnum.hh"
+ #include "classes.hh"
+ 
+ class AutNum;
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-cz
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-cz     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,18 @@
+$NetBSD: patch-cz,v 1.1 2007/09/07 21:26:32 spz Exp $
+
+--- src/rpsl/rpsl/rpsl_asnum.hh.orig   2007-09-07 22:05:27.000000000 +0200
++++ src/rpsl/rpsl/rpsl_asnum.hh
+@@ -0,0 +1,13 @@
++#ifndef ASNUM_HH
++#define ASNUM_HH 1
++
++inline int asnum_string(char *buf, unsigned int asno)
++{
++   if (asno > 65535)
++      return sprintf(buf, "AS%d.%d", asno>>16, asno&0xffff);
++   else
++      return sprintf(buf, "AS%d", asno);
++}
++
++#endif
++
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-da
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-da     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,33 @@
+$NetBSD: patch-da,v 1.1 2007/09/07 21:26:33 spz Exp $
+
+--- src/aoe/aoe.cc.orig        2002-04-09 13:48:46.000000000 +0200
++++ src/aoe/aoe.cc
+@@ -275,7 +275,7 @@ TclList &operator<<(TclList &tl, List<AS
+       pcASPeer;
+       pcASPeer = lh.next(pcASPeer))
+       {
+-      sprintf(pzcASPeerNo, "AS%d", pcASPeer->getNo());
++      asnum_string(pzcASPeerNo, pcASPeer->getNo());
+       switch (pcASPeer->getType())
+        {
+        case dASPeerFromIRR:
+@@ -662,8 +662,8 @@ int ListPeer::command(int argc, char *ar
+    ASt tPeerAS      = pcApp->getASPeerNo(iPeerASIndex);
+    
+    char pzcMyAS[16], pzcPeerAS[16];
+-   sprintf(pzcMyAS, "AS%d", tMyAS);
+-   sprintf(pzcPeerAS, "AS%d", tPeerAS);
++   asnum_string(pzcMyAS, tMyAS);
++   asnum_string(pzcPeerAS, tPeerAS);
+ 
+    // Setup $PeerAS properly
+    if (!pcApp->evalf("set PeerAS %s", pzcPeerAS)) return TCL_ERROR;
+@@ -1093,7 +1093,7 @@ AoeApplication::AoeApplication(char *pzc
+    pcPolicyShowButton(NULL),
+    pcStatusLine(NULL)
+ {
+-  sprintf(pzcASNo, "AS%d", tASNo);
++  asnum_string(pzcASNo, tASNo);
+   if (!(pcIrr = IRR::newClient()))
+     {
+     usage();
diff -r d102759de47c -r dde85a0d9557 net/irrtoolset-nox11/patches/patch-db
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-db     Fri Sep 07 21:26:31 2007 +0000
@@ -0,0 +1,23 @@
+$NetBSD: patch-db,v 1.1 2007/09/07 21:26:33 spz Exp $
+
+--- src/aoe/bgp_aspath.cc.orig 2002-04-09 13:48:46.000000000 +0200
++++ src/aoe/bgp_aspath.cc
+@@ -110,11 +110,15 @@ void BgpASPath::print(void)
+       pcFirstAndLastAS; 
+       pcFirstAndLastAS = cFirstAndLastASes.next(pcFirstAndLastAS))
+       {
+-      printf("AS%d --", pcFirstAndLastAS->getFirst());
++      char buf[64];
++        asnum_string(buf, pcFirstAndLastAS->getFirst());
++        printf("%s --", buf);
+       for (int i = pcFirstAndLastAS->getLast().first(); 
+          i >= 0; 
+-         i = pcFirstAndLastAS->getLast().next(i))
+-       printf(" AS%d", i); 
++         i = pcFirstAndLastAS->getLast().next(i)) {
++           asnum_string(buf, i);