rpslcheck and RtConfig bring their own parsers for autnums (and treat them as

int), fix for extended autnum asdot format.

4 files changed, 38 insertions, 5 deletions

diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile
index 90dd4248266..ec48cd46889 100644
--- a/net/irrtoolset-nox11/Makefile
+++ b/net/irrtoolset-nox11/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.23 2009/02/14 22:19:52 spz Exp $
+# $NetBSD: Makefile,v 1.24 2009/02/15 10:45:02 spz Exp $
 #
 
 DISTNAME=		IRRToolSet-4.8.5
-PKGREVISION=	13
+PKGREVISION=	14
 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 70a70510601..2a69cf82480 100644
--- a/net/irrtoolset-nox11/distinfo
+++ b/net/irrtoolset-nox11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.21 2009/02/14 22:19:52 spz Exp $
+$NetBSD: distinfo,v 1.22 2009/02/15 10:45:02 spz Exp $
 
 SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
 RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
@@ -60,9 +60,10 @@ SHA1 (patch-ds) = 1dbe3e743991a28a8e80d48be1bd5d1b890a6f42
 SHA1 (patch-dt) = 19e99c706423936dba31f28840a25055440f3bd1
 SHA1 (patch-du) = 602f913a53a5f274eba4725d6b3b91512fe9b5ac
 SHA1 (patch-dv) = d968c6f9d63d9fd5763839bff9b540bcdcb0d679
-SHA1 (patch-dw) = a77b3a6875f247db1809e66739f80bf3e82c17f9
+SHA1 (patch-dw) = 7db76f90df8262a70f467f8463b591e45426cb02
 SHA1 (patch-dx) = 32c1b30201af1c4bb58e274d29bbc6ceb04668df
 SHA1 (patch-dy) = 7fb4e6f1e0b41e0ce737cd8ea9bf90b05c6d45f3
 SHA1 (patch-dz) = e9b7e4602cf88df8bf797b3143e91655350ae90f
 SHA1 (patch-ea) = 30d1076b425c3cc7d503dbb64dfb47c11f6413a6
 SHA1 (patch-eb) = 78729952a60c29414818ed7785e99db162a9f37a
+SHA1 (patch-ef) = 8aea679d6d5b0506d81b8f76a2c4113a362b6cf7
diff --git a/net/irrtoolset-nox11/patches/patch-dw b/net/irrtoolset-nox11/patches/patch-dw
index f9e86e96c63..a2a637074a2 100644
--- a/net/irrtoolset-nox11/patches/patch-dw
+++ b/net/irrtoolset-nox11/patches/patch-dw
@@ -1,4 +1,4 @@
-$NetBSD: patch-dw,v 1.1 2009/02/14 16:17:06 spz Exp $
+$NetBSD: patch-dw,v 1.2 2009/02/15 10:45:02 spz Exp $
 
 --- src/rpslcheck/rpslcheck.cc.orig	2007-02-09 20:46:31.000000000 +0100
 +++ src/rpslcheck/rpslcheck.cc
@@ -20,3 +20,16 @@ $NetBSD: patch-dw,v 1.1 2009/02/14 16:17:06 spz Exp $
       {"-rusage", ARGV_BOOL, (char *) NULL,           (char *) &opt_rusage,
        "On termination print resource usage"},
       {"-stats", ARGV_BOOL, (char *) NULL,            (char *) &opt_stats,
+@@ -163,7 +167,11 @@ main(int argc, char **argv, char **envp)
+    
+    while (opt_my_as || cin ) {
+        if (opt_my_as) {
+-	  myAS = atoi(opt_my_as + 2);
++          const char *dot = strchr(opt_my_as,'.');
++          if (dot)
++             myAS = atoi(opt_my_as + 2)<<16 | atoi(dot+1);
++          else
++	     myAS = atoi(opt_my_as + 2);
+ 	  const AutNum *autnum = irr->getAutNum(myAS);
+           if (!autnum)	{
+           	std::cerr << "Error: no object for AS " << myAS << std::endl;
diff --git a/net/irrtoolset-nox11/patches/patch-ef b/net/irrtoolset-nox11/patches/patch-ef
new file mode 100644
index 00000000000..a18ffcfd4cb
--- /dev/null
+++ b/net/irrtoolset-nox11/patches/patch-ef
@@ -0,0 +1,19 @@
+$NetBSD: patch-ef,v 1.1 2009/02/15 10:45:02 spz Exp $
+
+--- src/RtConfig/command.l.orig	2006-06-08 17:16:26.000000000 +0200
++++ src/RtConfig/command.l
+@@ -205,8 +205,12 @@ int yywrap () {
+ }
+ 
+ 
+-<USEFUL_LINE>[Aa][Ss][0-9]+ {
+-   yylval.as = atoi(yytext+2);
++<USEFUL_LINE>[Aa][Ss]([0-9]+|[0-9]+\.[0-9]+) {
++   const char *dot = strchr(yytext,'.');
++   if (dot)
++      yylval.as = atoi(yytext+2)<<16 | atoi(dot+1);
++   else
++      yylval.as = atoi(yytext+2);
+    LEXER_RETURN(TKN_ASNUM);
+ }
+