diff options
| author | spz <spz@pkgsrc.org> | 2011-03-19 19:59:46 +0000 |
|---|---|---|
| committer | spz <spz@pkgsrc.org> | 2011-03-19 19:59:46 +0000 |
| commit | f3913a69bcd7051cd52e06db10ff4a4a8de6ddcc (patch) | |
| tree | b3216cd9bcbd037d1409034e49216f387baaf0f1 /net | |
| parent | 40df4d837571054073f9b3176c866b4750de33f8 (diff) | |
| download | pkgsrc-f3913a69bcd7051cd52e06db10ff4a4a8de6ddcc.tar.gz | |
remove obsolete irrtoolset-nox11
Diffstat (limited to 'net')
69 files changed, 1 insertions, 3018 deletions
diff --git a/net/Makefile b/net/Makefile index bfc3256c400..5ebcc77e5aa 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.872 2011/03/11 21:09:48 drochner Exp $ +# $NetBSD: Makefile,v 1.873 2011/03/19 19:59:46 spz Exp $ # COMMENT= Networking tools @@ -183,7 +183,6 @@ SUBDIR+= iplog SUBDIR+= ipv6calc SUBDIR+= ipw SUBDIR+= irrd -SUBDIR+= irrtoolset-nox11 SUBDIR+= irrtoolset5 SUBDIR+= isc-dhclient4 SUBDIR+= isc-dhcp4 diff --git a/net/irrtoolset-nox11/DESCR b/net/irrtoolset-nox11/DESCR deleted file mode 100644 index c07cf2c3166..00000000000 --- a/net/irrtoolset-nox11/DESCR +++ /dev/null @@ -1,13 +0,0 @@ -IRRToolSet is a suite of policy analysis tools to operate with -routing policies in RPSL [RFC 2622] format, registered in an -Internet Routing Registry(IRR). The main goal of the project is -to make routing information more convenient and useful for -network engineers, by providing tools for automated router configuration, -routing policies analysis, and maintenance. - -This package contains the programs RtConfig, peval and rpslcheck. -It doesn't try to build aoe and roe, which want TCL/TK (and X), nor -CIDRAdvisor, prpath and prtraceroute, which are currently broken. - -IRRToolSet started life as RAToolSet from ISI.edu, was then kept by RIPE NCC -for a while, and is currently maintained at ISC. diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile deleted file mode 100644 index c9c786f725f..00000000000 --- a/net/irrtoolset-nox11/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:27 wiz Exp $ -# - -DISTNAME= IRRToolSet-4.8.5 -PKGREVISION= 15 -CATEGORIES= net -MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/ - -MAINTAINER= spz@NetBSD.org -HOMEPAGE= http://www.isc.org/index.pl?/sw/IRRToolSet/ -COMMENT= The Internet Routing Registry Toolset - client to IRRd -LICENSE= no-commercial-use - -USE_LANGUAGES= c c++ -USE_TOOLS+= bison flex gmake perl - -INSTALLATION_DIRS= ${PKGBINDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 - -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes - -CONFIGURE_ARGS+= --without-x - -CONFIG_GUESS_OVERRIDE= config.guess src/Core/.aux/config.guess \ - src/rpsl/config.guess -CONFIG_SUB_OVERRIDE= config.sub src/Core/.aux/config.sub \ - src/rpsl/config.sub - -PKG_DESTDIR_SUPPORT=user-destdir - -.include "../../mk/bsd.pkg.mk" diff --git a/net/irrtoolset-nox11/PLIST b/net/irrtoolset-nox11/PLIST deleted file mode 100644 index 318fa58f4c5..00000000000 --- a/net/irrtoolset-nox11/PLIST +++ /dev/null @@ -1,14 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2008/03/08 11:00:35 spz Exp $ -bin/RtConfig -bin/peval -bin/rpslcheck -man/man1/CIDRAdvisor.1 -man/man1/IRRToolSet-Errors.1 -man/man1/RtConfig.1 -man/man1/aoe.1 -man/man1/peval.1 -man/man1/prpath.1 -man/man1/prtraceroute.1 -man/man1/roe.1 -man/man1/rpslcheck.1 -man/man3/librpsl.3 diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo deleted file mode 100644 index 0fe95f35838..00000000000 --- a/net/irrtoolset-nox11/distinfo +++ /dev/null @@ -1,69 +0,0 @@ -$NetBSD: distinfo,v 1.23 2009/03/15 20:10:35 spz Exp $ - -SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec -RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b -Size (IRRToolSet-4.8.5.tar.gz) = 988737 bytes -SHA1 (patch-al) = 160e671c0a7ccf3440f3574781b7f5ed5c813cb5 -SHA1 (patch-ba) = 9ad9e3ff42415f40a92d7788afe9a74f9f27c957 -SHA1 (patch-bb) = 6d917213312f1884277d8081f5223e4890e11d8d -SHA1 (patch-bc) = ece1c767df515d59f994de1981197f1869ac7928 -SHA1 (patch-bd) = f8d913316b8a65710efb38763ed97b1cb3ddef74 -SHA1 (patch-be) = 7b82dbaab51adba608ecf8632c0c3d2c347a3d5a -SHA1 (patch-bf) = a8aac51938b649b168fc71ec1012fc16878e419f -SHA1 (patch-bg) = 3a5aaf2e246b1e316890022f17c95b71935b494e -SHA1 (patch-bh) = dc415ceac169b6f6775bf749918d65536cfdfe79 -SHA1 (patch-bi) = 4913c6fe6ef65e08091399579dd3abf368217db0 -SHA1 (patch-bj) = 5a9ac2697118ed6205e6d32b54545b1c3b44be88 -SHA1 (patch-bk) = b7ae0711202ccae6ab7c930e0843fb56b071f7cf -SHA1 (patch-bl) = aad241e43a5b2d9fb41338527c5c92814bf2f45e -SHA1 (patch-bm) = 1100b3b7d68a58bf7a9d61d98339c3bba5dfb440 -SHA1 (patch-bn) = 13e7b5e1c4c676fa0c42edf08bfa47d9fe67d708 -SHA1 (patch-bo) = 3c11577df912d52361025d426a7ecc3cadfe6d79 -SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df -SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e -SHA1 (patch-br) = a4643910bdefcd9f10c991585ed2916877292dbb -SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6 -SHA1 (patch-bt) = c085380a1360074b45bad97cf068a13243828db5 -SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e -SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38 -SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e -SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56 -SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2 -SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720 -SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68 -SHA1 (patch-cs) = 4a1b3c295769f0e5e5e260cea86ad9185c0a3d38 -SHA1 (patch-ct) = fe8a85d7bc3e3871ba67140b7bf756bcdc4d1e45 -SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861 -SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4 -SHA1 (patch-cw) = 82116da916ae1c364b0188d7991cfb343305c0d7 -SHA1 (patch-cx) = 4146c1a39953e7143e085bbc3d9bfd35221562d4 -SHA1 (patch-cy) = d5761e8fec3c4c591082361ad99ba2c37178de0a -SHA1 (patch-cz) = 780811a0f962142475edff1364e20835a6c114ba -SHA1 (patch-da) = d6dbf1a503eaf8e2737bc2dfec79590ff5433930 -SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce -SHA1 (patch-dc) = b44f42f61e2c81813a0aa4b773ee1bbb6919c2a8 -SHA1 (patch-dd) = c2657b129e8dd410fa89da69a0596830c13a9860 -SHA1 (patch-de) = 0dccfc915f66c5e35ac0858ebcf5ee85767300be -SHA1 (patch-df) = 44de4b706d9259e6479c23029088f899cd091d35 -SHA1 (patch-dg) = 5f3fe95a69cdf1d3eb13b4e2a3a3fce1f4c53168 -SHA1 (patch-dh) = ce1218fe7d82e3bb5c470cd74b334400aebd1928 -SHA1 (patch-di) = 309e30d1046b1d9d20f1669441caeef5ea9078e7 -SHA1 (patch-dj) = 25258cbb8e544f0eda9ed6ac4f9f61825266bfdd -SHA1 (patch-dk) = a1632fa3030ee483c99af5ef039e494295af0b7f -SHA1 (patch-dl) = 85ab29170a0ce1f82f3058bd58b00c779684fbca -SHA1 (patch-dm) = 94c7ec10452044f2a7ff34e82ddaac28c8660ab8 -SHA1 (patch-do) = 8f85b97d5067e08a07fe95cb5a7eae84e9f459e3 -SHA1 (patch-dp) = 0b5ee0579aab4d112d10e619e7059bf0b5afb7f0 -SHA1 (patch-dq) = 6004e46320b790ac4e1bc4488e3eb327af84299b -SHA1 (patch-dr) = 81f847d776958c36db98bbb73321c15820eec4e8 -SHA1 (patch-ds) = 1dbe3e743991a28a8e80d48be1bd5d1b890a6f42 -SHA1 (patch-dt) = 19e99c706423936dba31f28840a25055440f3bd1 -SHA1 (patch-du) = 602f913a53a5f274eba4725d6b3b91512fe9b5ac -SHA1 (patch-dv) = d968c6f9d63d9fd5763839bff9b540bcdcb0d679 -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-al b/net/irrtoolset-nox11/patches/patch-al deleted file mode 100644 index 42d2b1ff8e5..00000000000 --- a/net/irrtoolset-nox11/patches/patch-al +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-al,v 1.3 2008/01/07 15:33:02 spz Exp $ - ---- src/irr/autnum.hh.orig 2007-02-09 20:46:31.000000000 +0100 -+++ src/irr/autnum.hh -@@ -395,9 +395,11 @@ public: - afi_list->merge(*tmp_afi_list); - delete list; - delete tmp_afi_list; -+ tmp_afi_list = new ItemList; - } - } - } -+ delete tmp_afi_list; - } - - FilterAction *first() { diff --git a/net/irrtoolset-nox11/patches/patch-ba b/net/irrtoolset-nox11/patches/patch-ba deleted file mode 100644 index 3482d9fc590..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ba +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ba,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/prefix.hh.orig 2004-07-30 12:58:14.000000000 +0200 -+++ src/rpsl/rpsl/prefix.hh -@@ -59,7 +59,11 @@ - #include <sys/types.h> - #include <vector> - #include <sstream> -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - typedef unsigned long long int ip_v6word_t; - diff --git a/net/irrtoolset-nox11/patches/patch-bb b/net/irrtoolset-nox11/patches/patch-bb deleted file mode 100644 index a577612df42..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bb +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bb,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/Core/util/rusage.hh.orig 2004-07-30 12:58:10.000000000 +0200 -+++ src/Core/util/rusage.hh -@@ -56,7 +56,11 @@ - #define RUSAGE_H - - #include "config.h" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - class Rusage { - private: diff --git a/net/irrtoolset-nox11/patches/patch-bc b/net/irrtoolset-nox11/patches/patch-bc deleted file mode 100644 index 0ea82054009..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bc,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/Core/util/Buffer.hh.orig 2004-07-30 12:58:10.000000000 +0200 -+++ src/Core/util/Buffer.hh -@@ -30,7 +30,11 @@ - - #include <cstdlib> - #include <cstring> -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - extern "C" { - #ifdef HAVE_MALLOC_H - #include <malloc.h> diff --git a/net/irrtoolset-nox11/patches/patch-bd b/net/irrtoolset-nox11/patches/patch-bd deleted file mode 100644 index 9bae02d4e26..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bd +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bd,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/rpsl_filter.cc.orig 2004-07-30 12:58:15.000000000 +0200 -+++ src/rpsl/rpsl/rpsl_filter.cc -@@ -52,7 +52,11 @@ - // Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU> - - #include "config.h" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - #include <cstdio> - #include "rpsl_filter.hh" - #include "rpsl_attr.hh" diff --git a/net/irrtoolset-nox11/patches/patch-be b/net/irrtoolset-nox11/patches/patch-be deleted file mode 100644 index 5f1c75e1cfb..00000000000 --- a/net/irrtoolset-nox11/patches/patch-be +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-be,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/rpsl_policy.cc.orig 2004-07-30 12:58:15.000000000 +0200 -+++ src/rpsl/rpsl/rpsl_policy.cc -@@ -55,7 +55,11 @@ - #include <cstdio> - #include "rpsl_policy.hh" - #include "rpsl_attr.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bf b/net/irrtoolset-nox11/patches/patch-bf deleted file mode 100644 index 9e3c18c46f0..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bf +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bf,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/regexp.cc.orig 2004-07-30 12:58:14.000000000 +0200 -+++ src/rpsl/rpsl/regexp.cc -@@ -56,7 +56,11 @@ - #include "regexp.hh" - #include <cstring> - #include "symbols.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bg b/net/irrtoolset-nox11/patches/patch-bg deleted file mode 100644 index 91bc2f87e91..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bg +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bg,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/rangelist.cc.orig 2004-07-30 12:58:14.000000000 +0200 -+++ src/rpsl/rpsl/rangelist.cc -@@ -53,7 +53,11 @@ - - #include "config.h" - #include "rangelist.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bh b/net/irrtoolset-nox11/patches/patch-bh deleted file mode 100644 index 440eddefa62..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bh +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bh,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/schema.cc.orig 2004-07-30 12:58:15.000000000 +0200 -+++ src/rpsl/rpsl/schema.cc -@@ -53,7 +53,11 @@ - - #include "config.h" - -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - #include <cstring> - #include <cstdio> - #include "gnu/std.h" diff --git a/net/irrtoolset-nox11/patches/patch-bi b/net/irrtoolset-nox11/patches/patch-bi deleted file mode 100644 index 31ee8087f87..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bi +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bi,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/rpsl/rpsl/object.cc.orig 2004-07-30 12:58:14.000000000 +0200 -+++ src/rpsl/rpsl/object.cc -@@ -52,7 +52,11 @@ - // Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU> - - #include "config.h" -+#if (__GNUC__ > 2) - #include <istream> -+#else -+#include <istream.h> -+#endif - #include <cstdio> - #include <sstream> - #include <fstream> diff --git a/net/irrtoolset-nox11/patches/patch-bj b/net/irrtoolset-nox11/patches/patch-bj deleted file mode 100644 index 3716eafe562..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bj +++ /dev/null @@ -1,28 +0,0 @@ -$NetBSD: patch-bj,v 1.2 2007/05/22 12:17:49 spz Exp $ - ---- ./src/Core/util/Buffer.cc.orig 2006-10-09 18:05:14.000000000 +0200 -+++ ./src/Core/util/Buffer.cc -@@ -36,7 +36,11 @@ - #include <cassert> - #include <iomanip> - #include <cctype> -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - -@@ -174,7 +178,10 @@ Buffer::uncompress() - - void Buffer::extend(unsigned long minExtend) { - assert(!callerAllocated); // !!! -- capacity = (capacity + BufferExtendIncrement) >? (size + minExtend); -+ // using deprecated g++ only operators is not that portable, -+ // use ordinary trigraph instead -+ capacity = ( (capacity + BufferExtendIncrement) > (size + minExtend) ) ? -+ (capacity + BufferExtendIncrement) : (size + minExtend); - contents = (char *)realloc(contents, capacity); - } - diff --git a/net/irrtoolset-nox11/patches/patch-bk b/net/irrtoolset-nox11/patches/patch-bk deleted file mode 100644 index 2662859a346..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bk +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bk,v 1.2 2007/05/22 12:17:49 spz Exp $ - ---- src/Core/util/rusage.cc.orig 2004-07-30 12:58:10.000000000 +0200 -+++ src/Core/util/rusage.cc -@@ -52,7 +52,11 @@ - // Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU> - - #include "config.h" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - #include "rusage.hh" - #include <iomanip> - diff --git a/net/irrtoolset-nox11/patches/patch-bl b/net/irrtoolset-nox11/patches/patch-bl deleted file mode 100644 index 0f364eaf953..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bl +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bl,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/Filter.hh.orig 2004-07-30 12:58:12.000000000 +0200 -+++ src/normalform/Filter.hh -@@ -55,7 +55,11 @@ - #define FILTER_H - - #include "config.h" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - extern "C" { - #include <sys/types.h> - } diff --git a/net/irrtoolset-nox11/patches/patch-bm b/net/irrtoolset-nox11/patches/patch-bm deleted file mode 100644 index 3175bf516a1..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bm +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bm,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/Filter.cc.orig 2004-07-30 12:58:12.000000000 +0200 -+++ src/normalform/Filter.cc -@@ -54,7 +54,11 @@ - #include "config.h" - #include "Filter.hh" - #include "util/debug.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bn b/net/irrtoolset-nox11/patches/patch-bn deleted file mode 100644 index 836315e1329..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bn +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bn,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/FilterOfASPath.cc.orig 2004-07-30 12:58:12.000000000 +0200 -+++ src/normalform/FilterOfASPath.cc -@@ -55,7 +55,11 @@ - #include "util/debug.hh" - #include "FilterOfASPath.hh" - #include <cstdio> -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bo b/net/irrtoolset-nox11/patches/patch-bo deleted file mode 100644 index c7d9c9c393b..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bo +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bo,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/FilterOfCommunity.cc.orig 2004-07-30 12:58:12.000000000 +0200 -+++ src/normalform/FilterOfCommunity.cc -@@ -55,7 +55,11 @@ - #include "config.h" - #include "FilterOfCommunity.hh" - #include "util/debug.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bp b/net/irrtoolset-nox11/patches/patch-bp deleted file mode 100644 index da43c725cde..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bp +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bp,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/SetOfIPv6Prefix.cc.orig 2004-07-30 12:58:13.000000000 +0200 -+++ src/normalform/SetOfIPv6Prefix.cc -@@ -58,7 +58,11 @@ - #include "SetOfIPv6Prefix.hh" - #include <cstdio> - #include <cassert> -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bq b/net/irrtoolset-nox11/patches/patch-bq deleted file mode 100644 index 1cbd7537559..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bq +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bq,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/SetOfPrefix.cc.orig 2004-07-30 12:58:13.000000000 +0200 -+++ src/normalform/SetOfPrefix.cc -@@ -59,7 +59,11 @@ - #include <cstdio> - #include <cassert> - #include "rpsl/prefix.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-br b/net/irrtoolset-nox11/patches/patch-br deleted file mode 100644 index e1645e5eea0..00000000000 --- a/net/irrtoolset-nox11/patches/patch-br +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-br,v 1.2 2007/09/07 21:26:31 spz Exp $ - ---- src/normalform/SetOfSymbol.cc.orig 2006-06-08 17:16:26.000000000 +0200 -+++ src/normalform/SetOfSymbol.cc -@@ -51,7 +51,11 @@ - // - // Author(s): Cengiz Alaettinoglu <cengiz@ISI.EDU> - -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - #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 --git a/net/irrtoolset-nox11/patches/patch-bs b/net/irrtoolset-nox11/patches/patch-bs deleted file mode 100644 index b104c84388e..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bs +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-bs,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/normalform/SymbolConjunct.cc.orig 2004-07-30 12:58:13.000000000 +0200 -+++ src/normalform/SymbolConjunct.cc -@@ -53,7 +53,11 @@ - - #include "config.h" - #include "SymbolConjunct.hh" -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - - using namespace std; - diff --git a/net/irrtoolset-nox11/patches/patch-bt b/net/irrtoolset-nox11/patches/patch-bt deleted file mode 100644 index aebb0cda635..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bt +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-bt,v 1.4 2007/12/31 09:15:15 spz Exp $ - ---- src/RtConfig/command.y.orig 2007-02-09 20:46:31.000000000 +0100 -+++ src/RtConfig/command.y -@@ -56,7 +56,11 @@ - - #include "config.h" - -+#if (__GNUC__ > 2) - #include <ostream> -+#else -+#include <ostream.h> -+#endif - #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-bu b/net/irrtoolset-nox11/patches/patch-bu deleted file mode 100644 index f3ff83664f7..00000000000 --- a/net/irrtoolset-nox11/patches/patch-bu +++ /dev/null @@ -1,47 +0,0 @@ -$NetBSD: patch-bu,v 1.1 2005/03/06 11:40:21 spz Exp $ - ---- src/gnug++/BitSet.cc.orig 2004-07-30 12:58:11.000000000 +0200 -+++ src/gnug++/BitSet.cc -@@ -30,7 +30,11 @@ Foundation, 59 Temple Place - Suite 330, - #include <new> - #include <builtin.h> - #include <string> -+#if (__GNUC__ > 2) - #include <sstream> -+#else -+#include <strstream.h> -+#endif - - using namespace std; - -@@ -895,8 +899,11 @@ const char* BitSettoa(const BitSet& x, c - trim(x.rep); - int wrksiz = (x.rep->len + 1) * BITSETBITS + 2; - char* fmtbase = (char *) _libgxx_fmtq.alloc(wrksiz); -- //ostrstream stream(fmtbase, wrksiz); -+#if (__GNUC__ > 2) - std::ostringstream stream(fmtbase, ios_base::out | ios_base::trunc); -+#else -+ ostrstream stream(fmtbase, wrksiz); -+#endif - - x.printon(stream, f, t, star); - stream << ends; -@@ -1043,11 +1050,17 @@ BitSet atoBitSet(const char* s, char f, - - ostream& operator<<(ostream& s, const BitSet& x) - { -+#if (__GNUC__ > 2) - ostream::sentry opfx(s); - - if (opfx) { - x.printon(s); - } -+#else -+ if (s.opfx()) { -+ x.printon(s); -+ } -+#endif - return s; - } - diff --git a/net/irrtoolset-nox11/patches/patch-cc b/net/irrtoolset-nox11/patches/patch-cc deleted file mode 100644 index 1609367355d..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cc +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cc,v 1.1 2005/08/26 08:41:46 spz Exp $ - ---- src/util/debug.hh.orig 2002-04-09 13:48:49.000000000 +0200 -+++ src/util/debug.hh -@@ -75,7 +75,11 @@ - - #include "config.h" - #ifdef DEBUG -+#if (__GNUC__ > 2) -+#include <iostream> -+#else - #include <iostream.h> -+#endif - - #define DBG_ERR 1 - #define DBG_INFO 2 diff --git a/net/irrtoolset-nox11/patches/patch-cd b/net/irrtoolset-nox11/patches/patch-cd deleted file mode 100644 index 4d03932f2ca..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cd +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-cd,v 1.1 2005/08/26 08:41:46 spz Exp $ - ---- src/Core/util/debug.hh.orig 2002-04-09 13:48:45.000000000 +0200 -+++ src/Core/util/debug.hh -@@ -75,7 +75,11 @@ - - #include "config.h" - #ifdef DEBUG -+#if (__GNUC__ > 2) -+#include <iostream> -+#else - #include <iostream.h> -+#endif - - #define DBG_ERR 1 - #define DBG_INFO 2 diff --git a/net/irrtoolset-nox11/patches/patch-co b/net/irrtoolset-nox11/patches/patch-co deleted file mode 100644 index 54aec92e587..00000000000 --- a/net/irrtoolset-nox11/patches/patch-co +++ /dev/null @@ -1,31 +0,0 @@ -$NetBSD: patch-co,v 1.2 2008/03/08 11:00:35 spz Exp $ - ---- ./src/gnug++/int.defs.h.orig 2007-02-09 22:30:25.000000000 +0100 -+++ ./src/gnug++/int.defs.h -@@ -16,7 +16,13 @@ License along with this library; if not, - Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. - */ - -+#if defined( HAVE_STDINT_H ) - #include <stdint.h> -+#elif defined( HAVE_INTTYPES_H ) -+#include <inttypes.h> -+#else -+#include <sys/types.h> -+#endif - - #ifndef _intdefs_h - #define _intdefs_h 1 -@@ -55,11 +61,6 @@ Foundation, 675 Mass Ave, Cambridge, MA - - #define HASHTABLE_TOO_CROWDED(COUNT, SIZE) ((SIZE) - ((SIZE) >> 3) <= (COUNT)) - --// Allow portable address arithmetic --#if __WORDSIZE == 64 --typedef uint64_t addr_t; --#else --typedef uint32_t addr_t; --#endif -+typedef char* addr_t; - - #endif diff --git a/net/irrtoolset-nox11/patches/patch-cp b/net/irrtoolset-nox11/patches/patch-cp deleted file mode 100644 index 6aae23fdd67..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cp +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-cp,v 1.1 2007/05/22 12:17:57 spz Exp $ - ---- ./src/rpsl/rpsl/prefix.cc.orig 2007-02-09 20:46:31.000000000 +0100 -+++ ./src/rpsl/rpsl/prefix.cc -@@ -278,7 +278,7 @@ bool PrefixRange::makeMoreSpecific(int c - default: // ^n-m - if (_m < n || _m < n) - return false; -- n = (_n >? n); -+ n = (_n > n) ? _n : n; - m = _m; - } - -@@ -705,7 +705,7 @@ bool IPv6PrefixRange::makeMoreSpecific(i - default: // ^n-m - if (_m < n || _m < n) - return false; -- n = (_n >? n); -+ n = (_n > n) ? _n : n; - m = _m; - } - diff --git a/net/irrtoolset-nox11/patches/patch-cq b/net/irrtoolset-nox11/patches/patch-cq deleted file mode 100644 index eb33f85950e..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cq +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-cq,v 1.1 2007/05/22 12:17:59 spz Exp $ - ---- ./src/Core/util/strerror.c.orig 2006-06-08 17:16:26.000000000 +0200 -+++ ./src/Core/util/strerror.c -@@ -34,6 +34,7 @@ - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. - */ - -+#include <stdio.h> - #include <string.h> - #include <errno.h> - diff --git a/net/irrtoolset-nox11/patches/patch-cr b/net/irrtoolset-nox11/patches/patch-cr deleted file mode 100644 index b7b84552a01..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cr +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-cr,v 1.1 2007/05/22 12:17:59 spz Exp $ - ---- src/re2dfa/re2dfa.c.orig 2006-06-08 17:16:26.000000000 +0200 -+++ src/re2dfa/re2dfa.c -@@ -37,6 +37,7 @@ - - #include "config.h" - #include <stdio.h> -+#include <strings.h> - #include <sys/types.h> - #include <stdlib.h> - #ifdef HAVE_MALLOC_H -@@ -171,7 +172,7 @@ typedef struct _rd_dq rd_rhead; /* Ditt - - #define RD_ALLOC_RANGE(r) { \ - (r) = (rd_range *) malloc(sizeof (rd_range)); \ -- bzero((caddr_t) (r), sizeof (rd_range)); \ -+ bzero((void *) (r), sizeof (rd_range)); \ - RDQ_INIT(&(r)->ra_arcs, (r)); \ - } - diff --git a/net/irrtoolset-nox11/patches/patch-cs b/net/irrtoolset-nox11/patches/patch-cs deleted file mode 100644 index 205eb47c85f..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cs +++ /dev/null @@ -1,92 +0,0 @@ -$NetBSD: patch-cs,v 1.4 2009/02/14 22:19:52 spz Exp $ - ---- src/RtConfig/f_cisco.cc.orig 2007-01-23 01:45:16.000000000 +0100 -+++ src/RtConfig/f_cisco.cc -@@ -746,39 +746,39 @@ void CiscoConfig::printRE(ostream &s, - - //int lineLen = strlen(out.str()); - int lineLen = out.str().length(); -+ const char *p = out.str().c_str(); -+ - if (lineLen < 240 && ! hasTilda) { -- const char *p = out.str().c_str(); - for (char *q = strchr(p, '@'); q; q = strchr(q, '@')) - *q = '('; -- s << out.str(); -+ s << p; - } else { // need to split into multiple lines - if (hasTilda) { -- const char *p = out.str().c_str(); - for (char *q = strchr(p, '@'); q; q = strchr(q, '@')) - *q = '('; - for (char *q = strchr(p, '&'); q; q = strchr(q, '&')) - *q = '@'; - } - -- char *p = strdup(out.str().c_str()); -- char *q, *r2; -+ char *q, *q2; - char *r = NULL; - int size = 0; -- for (p = strchr(p, '@'); p; p = strchr(p, '@')) { -- q = strchr(p, ')'); -- if (q - p > size) { -- r = p; -- size = q - p; -+ for (q = strchr(p, '@'); q; q = strchr(q, '@')) { -+ q2 = strchr(q, ')'); -+ if (q2 - q > size) { -+ r = q; -+ size = q2 - q; - } -- *p = '('; -- p = q; -+ *q = '('; -+ q = q2; - } - if (!r) { - s << out.str(); - cerr << "Warning: ip as-path access-list is too long for cisco to handle" << endl; - } else { -- int inc = hasTilda ? 1 : (240 - lineLen + size) >? 5; -- p = strdup(out.str().c_str()); -+ char *r2; -+ int inc = hasTilda ? 1 : -+ ( ( (240 - lineLen + size) > 5 ) ? (240 - lineLen + size) : 5 ); - q = strchr(r, ')') + 1; - *r = 0; - r++; -@@ -1246,8 +1246,31 @@ bool CiscoConfig::printNeighbor(int impo - cout << " neighbor " << neighbor << " remote-as " << peerAS << "\n"; - - if (afi_activate && !peerGroup) { -- cout << " address-family " << (AddressFamily &) *filter_afi << endl; -- cout << indent <<" neighbor " << neighbor << " activate\n"; -+ if (strcmp(filter_afi->name(),"ipv6") == 0) { -+ cout << " address-family " << "ipv4" << endl; -+ cout << indent <<" no neighbor " << neighbor << " activate\n"; -+ cout << " address-family " << "ipv6 unicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ cout << " address-family " << "ipv6 multicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ } else if (strcmp(filter_afi->name(),"ipv6.unicast") == 0) { -+ cout << " address-family " << "ipv4" << endl; -+ cout << indent <<" no neighbor " << neighbor << " activate\n"; -+ cout << " address-family " << "ipv6 unicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ } else if (strcmp(filter_afi->name(),"ipv4.multicast") == 0) { -+ cout << " address-family " << "ipv4 multicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ } else if (strcmp(filter_afi->name(),"ipv6.multicast") == 0) { -+ cout << " address-family " << "ipv4" << endl; -+ cout << indent <<" no neighbor " << neighbor << " activate\n"; -+ cout << " address-family " << "ipv6 multicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ } else if (strcmp(filter_afi->name(),"ipv4.unicast") == 0) { -+ cout << " address-family " << "ipv4 unicast" << endl; -+ cout << indent <<" neighbor " << neighbor << " activate\n"; -+ } -+ // ought to handle afi any too, but that's not just done by naming it here - } - - if (routeMapGenerated) diff --git a/net/irrtoolset-nox11/patches/patch-ct b/net/irrtoolset-nox11/patches/patch-ct deleted file mode 100644 index 6dac485a62f..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ct +++ /dev/null @@ -1,41 +0,0 @@ -$NetBSD: patch-ct,v 1.2 2009/02/14 16:17:06 spz Exp $ - ---- src/rpsl/rpsl/rptype.cc.orig 2006-06-08 17:16:26.000000000 +0200 -+++ src/rpsl/rpsl/rptype.cc -@@ -254,7 +254,7 @@ Item *RPTypeWord::typeCast(const Item * - return new ItemWORD(strdup("false")); - if (typeid(*item) == typeid(ItemASNO)) { - char buffer[64]; -- sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno); -+ asnum_string(buffer, ((ItemASNO *) item)->asno); - return new ItemWORD(strdup(buffer)); - } - -@@ -285,7 +285,7 @@ Item *RPTypeBlob::typeCast(const Item * - return new ItemBLOB(strdup("false")); - if (typeid(*item) == typeid(ItemASNO)) { - char buffer[64]; -- sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno); -+ asnum_string(buffer, ((ItemASNO *) item)->asno); - return new ItemWORD(strdup(buffer)); - } - -@@ -367,7 +367,7 @@ Item *RPTypeEnum::typeCast(const Item * - w = new ItemWORD(strdup("false")); - if (typeid(*item) == typeid(ItemASNO)) { - char buffer[64]; -- sprintf(buffer, "AS%d", ((ItemASNO *) item)->asno); -+ asnum_string(buffer, ((ItemASNO *) item)->asno); - w = new ItemWORD(strdup(buffer)); - } - -@@ -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 --git a/net/irrtoolset-nox11/patches/patch-cu b/net/irrtoolset-nox11/patches/patch-cu deleted file mode 100644 index 29a70f0c055..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cu +++ /dev/null @@ -1,14 +0,0 @@ -$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 --git a/net/irrtoolset-nox11/patches/patch-cv b/net/irrtoolset-nox11/patches/patch-cv deleted file mode 100644 index 837514b6d84..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cv +++ /dev/null @@ -1,13 +0,0 @@ -$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 --git a/net/irrtoolset-nox11/patches/patch-cw b/net/irrtoolset-nox11/patches/patch-cw deleted file mode 100644 index 223de8313d6..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cw +++ /dev/null @@ -1,25 +0,0 @@ -$NetBSD: patch-cw,v 1.2 2009/02/14 16:17:06 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 << 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 --git a/net/irrtoolset-nox11/patches/patch-cx b/net/irrtoolset-nox11/patches/patch-cx deleted file mode 100644 index 9cc1dfb42f8..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cx +++ /dev/null @@ -1,89 +0,0 @@ -$NetBSD: patch-cx,v 1.3 2009/03/15 20:10:36 spz Exp $ - ---- src/irr/irr.cc.orig 2006-10-01 13:23:32.000000000 +0200 -+++ src/irr/irr.cc -@@ -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,13 +316,20 @@ const AutNum *IRR::getAutNum(ASt as) { - AutNum *result = NULL; - - if (! AutNumCache.query(as, result)) { -- sprintf(buffer, "AS%d", as); -+ asnum_string_dot(buffer, as); // try asdotted - if (getAutNum(buffer, text, len)) { - Buffer b(text, len); - result = new AutNum(b); - AutNumCache.add(as, result); -- } else -- AutNumCache.add(as, NULL); // a negative object -+ } else { -+ asnum_string_plain(buffer, as); // try asplain before giving up -+ if (getAutNum(buffer, text, len)) { -+ Buffer b(text, len); -+ result = new AutNum(b); -+ AutNumCache.add(as, result); -+ } else -+ AutNumCache.add(as, NULL); // a negative object -+ } - } - - return result; -@@ -365,7 +376,7 @@ void IRR::getRoute(Route *&route, Prefix - char *text; - int len; - -- sprintf(buffer, "AS%d", as); -+ asnum_string_dot(buffer, as); - if (getRoute(rt->get_text(), buffer, text, len)) { - Buffer b(text, len); - route = new Route(b); -@@ -379,12 +390,18 @@ void IRR::getRoute(Route *&route, char * - char *text; - int len; - -- sprintf(buffer, "AS%d", as); -+ asnum_string_dot(buffer, as); - if (getRoute(rt, buffer, text, len)) { - Buffer b(text, len); - route = new Route(b); -- } else -- route = NULL; -+ } else { -+ asnum_string_plain(buffer, as); -+ if (getRoute(rt, buffer, text, len)) { -+ Buffer b(text, len); -+ route = new Route(b); -+ } else -+ route = NULL; -+ } - } - - const InetRtr *IRR::getInetRtr(SymID inetRtr) -@@ -419,11 +436,14 @@ 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_dot(buffer, as); // try asdotted - if (!expandAS(buffer, result)) { -- expandASCache.nullify(as); -- delete result; -- result = NULL; // A negative cache -+ asnum_string_plain(buffer, as); // that failed, try asplained -+ if (!expandAS(buffer, result)) { -+ expandASCache.nullify(as); -+ delete result; -+ result = NULL; // A negative cache -+ } - } - } - diff --git a/net/irrtoolset-nox11/patches/patch-cy b/net/irrtoolset-nox11/patches/patch-cy deleted file mode 100644 index cb7834bd28d..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cy +++ /dev/null @@ -1,22 +0,0 @@ -$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 -@@ -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; -@@ -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-cz b/net/irrtoolset-nox11/patches/patch-cz deleted file mode 100644 index 1f26cd3556f..00000000000 --- a/net/irrtoolset-nox11/patches/patch-cz +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-cz,v 1.3 2009/03/15 20:10:36 spz Exp $ - ---- src/rpsl/rpsl/rpsl_asnum.hh.orig 2009-03-15 16:45:45.000000000 +0100 -+++ src/rpsl/rpsl/rpsl_asnum.hh -@@ -0,0 +1,28 @@ -+#ifndef ASNUM_HH -+#define ASNUM_HH 1 -+ -+extern bool opt_asdot; -+ -+inline int asnum_string(char *buf, unsigned int asno) -+{ -+ if (asno > 65535 && opt_asdot) -+ return sprintf(buf, "AS%d.%d", asno>>16, asno&0xffff); -+ else -+ return sprintf(buf, "AS%d", asno); -+} -+ -+inline int asnum_string_dot(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); -+} -+ -+inline int asnum_string_plain(char *buf, unsigned int asno) -+{ -+ return sprintf(buf, "AS%d", asno); -+} -+ -+#endif -+ diff --git a/net/irrtoolset-nox11/patches/patch-da b/net/irrtoolset-nox11/patches/patch-da deleted file mode 100644 index 1d7b8fbc776..00000000000 --- a/net/irrtoolset-nox11/patches/patch-da +++ /dev/null @@ -1,51 +0,0 @@ -$NetBSD: patch-da,v 1.2 2009/02/14 16:17:06 spz Exp $ - ---- src/aoe/aoe.cc.orig 2002-04-09 13:48:46.000000000 +0200 -+++ src/aoe/aoe.cc -@@ -106,6 +106,7 @@ Rusage ru(clog, &opt_rusage); - char *opt_my_as = NULL; - char *opt_rcfile = NULL; - char *display = NULL; -+bool opt_asdot = true; - ASt myAS = 0; - - -@@ -153,6 +154,9 @@ void init_and_set_options (int argc, cha - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - // aoe specific arguments - {"-as", ARGV_STRING, (char *)NULL, (char *) &opt_my_as, - "AS number of the aut-num object to use"}, -@@ -275,7 +279,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 +666,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 +1097,7 @@ AoeApplication::AoeApplication(char *pzc - pcPolicyShowButton(NULL), - pcStatusLine(NULL) - { -- sprintf(pzcASNo, "AS%d", tASNo); -+ asnum_string(pzcASNo, tASNo); - if (!(pcIrr = IRR::newClient())) - { - usage(); diff --git a/net/irrtoolset-nox11/patches/patch-db b/net/irrtoolset-nox11/patches/patch-db deleted file mode 100644 index 8eda950e2de..00000000000 --- a/net/irrtoolset-nox11/patches/patch-db +++ /dev/null @@ -1,23 +0,0 @@ -$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); -+ printf(" %s", buf); -+ } - printf("\n"); - } - } diff --git a/net/irrtoolset-nox11/patches/patch-dc b/net/irrtoolset-nox11/patches/patch-dc deleted file mode 100644 index 024c8832ed0..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dc +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-dc,v 1.1 2007/09/07 21:26:33 spz Exp $ - ---- src/roe/schedule.cc.orig 2002-04-09 13:48:48.000000000 +0200 -+++ src/roe/schedule.cc -@@ -177,7 +177,8 @@ void Schedule::add_selected(char *select - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) { - r = routelist(atoi(s)); - -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - tcl_Eval("set ROUTE %s", r->route.get_text(buffer)); - tcl_Eval("set DATE %s", configure.date); - tcl_Eval("subst \"%s\"", configure.add_template); -@@ -190,6 +191,7 @@ void Schedule::del_selected(char *select - RouteList::Route *r; - RouteList::Route::db_as *p; - Route *route = NULL; -+ char buffer[64]; - - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) { - r = routelist(atoi(s)); -@@ -213,7 +215,8 @@ void Schedule::del_selected(char *select - // Modified by wlee@isi.edu - // if (code) - if (route) { -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - tcl_Eval("set ROUTE %s", r->route.get_text()); - tcl_Eval("set DATE %s", configure.date); - tcl_Eval("subst \"%.*s%s\"", -@@ -231,6 +234,7 @@ void Schedule::del_selected_matching_sou - RouteList::Route *r; - RouteList::Route::db_as *p; - Route *route = NULL; -+ char buffer[64]; - - for (char *s = strtok(selection, " \t"); s; s = strtok(NULL, " \t")) { - r = routelist(atoi(s)); -@@ -254,7 +258,8 @@ void Schedule::del_selected_matching_sou - - // Modified by wlee@isi.edu - if (route) { -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - tcl_Eval("set ROUTE %s", r->route.get_text()); - tcl_Eval("set DATE %s", configure.date); - tcl_Eval("subst \"%.*s%s\"", diff --git a/net/irrtoolset-nox11/patches/patch-dd b/net/irrtoolset-nox11/patches/patch-dd deleted file mode 100644 index 09e48d8bd01..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dd +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-dd,v 1.2 2009/02/14 16:17:06 spz Exp $ - ---- src/roe/route-list.cc.orig 2002-06-18 13:00:11.000000000 +0200 -+++ src/roe/route-list.cc -@@ -67,6 +67,7 @@ extern IRR *RLWhois; - - char *RouteList::format(RouteList::Route *vr) { - static char line[256]; -+ char buf[64]; - char *c; - - for (c = line; c < line + vr->indentation; ++c) -@@ -108,8 +109,10 @@ char *RouteList::format(RouteList::Route - strcat(line, " "); - - RouteList::Route::db_as* p; -- for (p = vr->db_as_l.head(); p; p = vr->db_as_l.next(p)) -- sprintf(line + strlen(line), " %s:AS%d", p->db, p->as); -+ for (p = vr->db_as_l.head(); p; p = vr->db_as_l.next(p)) { -+ asnum_string(buf, p->as); -+ sprintf(line + strlen(line), " %s:%s", p->db, buf); -+ } - - return line; - } -@@ -497,13 +500,17 @@ void RouteList::load(ASt _as) { - const PrefixRanges *registered_routes = whois->expandAS(as); - - if (!registered_routes) { -- tcl_Eval("showWarning { No object for AS%d}", as); -+ char buf[64]; -+ asnum_string(buf, as); -+ tcl_Eval("showWarning { No object for %s}", buf); - return; - } - - // Added by wlee - if (registered_routes->isEmpty()) { -- tcl_Eval("showWarning { No route for AS%d}", as); -+ char buf[64]; -+ asnum_string(buf, as); -+ tcl_Eval("showWarning { No route for %s}", buf); - return; - } - diff --git a/net/irrtoolset-nox11/patches/patch-de b/net/irrtoolset-nox11/patches/patch-de deleted file mode 100644 index dc4a109899d..00000000000 --- a/net/irrtoolset-nox11/patches/patch-de +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-de,v 1.1 2007/09/07 21:26:33 spz Exp $ - ---- src/roe/object.cc.orig 2002-04-09 13:48:48.000000000 +0200 -+++ src/roe/object.cc -@@ -107,7 +107,8 @@ void RoeObject::del(int index) { - RouteList::Route *vr = routelist(index); - - // Modified by wlee@isi.edu -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - // tcl_Eval("set AS %s", routelist.as); - tcl_Eval("set ROUTE %s", vr->route.get_text(buffer)); - tcl_Eval("set DATE %s", configure.date); -@@ -123,7 +124,8 @@ void RoeObject::add(int index) { - RouteList::Route *vr = routelist(index); - - // Modified by wlee@isi.edu -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - // tcl_Eval("set AS %s", routelist.as); - tcl_Eval("set ROUTE %s", vr->route.get_text(buffer)); - tcl_Eval("set DATE %s", configure.date); -@@ -140,7 +142,8 @@ void RoeObject::upd(int index) { - RouteList::Route *vr = routelist(index); - - // Modified by wlee@isi.edu -- tcl_Eval("set AS AS%d", routelist.as); -+ asnum_string(buffer, routelist.as); -+ tcl_Eval("set AS %s", buffer); - // tcl_Eval("set AS %s", routelist.as); - tcl_Eval("set ROUTE %s", vr->route.get_text(buffer)); - tcl_Eval("set DATE %s", configure.date); diff --git a/net/irrtoolset-nox11/patches/patch-df b/net/irrtoolset-nox11/patches/patch-df deleted file mode 100644 index 964e8ec3d85..00000000000 --- a/net/irrtoolset-nox11/patches/patch-df +++ /dev/null @@ -1,58 +0,0 @@ -$NetBSD: patch-df,v 1.2 2009/02/14 16:17:06 spz Exp $ - ---- src/prtraceroute/prtraceroute.cc.orig 2002-04-09 13:48:47.000000000 +0200 -+++ src/prtraceroute/prtraceroute.cc -@@ -103,6 +103,7 @@ - extern IRR * irr; // defined in irr.cc - - int opt_rusage = 0; -+int opt_asdot = true; - - int policy_flag = 1; - int nflag = 0; -@@ -171,6 +172,7 @@ main (int argc, char **argv, char **envp - ICMPProbeReply reply; // wait for incoming icmp's - Timer t1, t2; - int ttl, got_there = 0, unreachable = 0; -+ char buf[64]; - - printf ("prtraceroute to %s (%s), %d hops max, %d byte packets\n", - dst, dstip->getIpaddr(), max_ttl, datalen); -@@ -192,7 +194,8 @@ main (int argc, char **argv, char **envp - ipAddr *ipaddr = new ipAddr (newaddr); - if (policy_flag) { - path.addHop(ipaddr, ttl); -- printf (" [AS%d]", path.getHopAS(ttl)); -+ asnum_string(buf, path.getHopAS(ttl)); -+ printf (" [%s]", buf); - } - if (!nflag) { - printf (" %s (%s)", ipaddr->getName(), -@@ -401,6 +404,9 @@ init_and_set_options (int argc, char **a - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - // prtraceroute specific arguments - {"-g", ARGV_FUNC, (char *)gFlag, (char *)NULL, - "Gateway"}, -@@ -690,6 +696,7 @@ Path::process_policies() { - const AutNum * autnum; - - char test[80]; -+ char buf[64]; - - actiondictionary = new ActionDictionary; - -@@ -796,7 +803,8 @@ Path::process_policies() { - for (i = last_ttl; i >= 0; i--) { - if (hops[i] != NULL) { - //cout << i << " AS" << getHopAS(i) << " "; -- printf ("%3d AS%d", i, getHopAS(i)); -+ asnum_string(buf, getHopAS(i)); -+ printf ("%3d %s", i, buf); - if (nflag) // XXX, this is a global, and is bad!!! - //cout << hops[i]->ipaddr->getIpaddr(); - printf (" %-35s", hops[i]->ipaddr->getIpaddr()); diff --git a/net/irrtoolset-nox11/patches/patch-dg b/net/irrtoolset-nox11/patches/patch-dg deleted file mode 100644 index afca7a7082c..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dg +++ /dev/null @@ -1,30 +0,0 @@ -$NetBSD: patch-dg,v 1.1 2007/09/07 21:26:33 spz Exp $ - ---- src/rpsl/rpsl/symbols.hh.orig 2002-04-09 13:48:49.000000000 +0200 -+++ src/rpsl/rpsl/symbols.hh -@@ -58,6 +58,7 @@ - #include "util/Allocator.hh" - #include "gnu/SetOfSymID.hh" - #include "util/xstring.h" -+#include "rpsl/rpsl_asnum.hh" - #include <cstdio> - - typedef unsigned int ASt; -@@ -114,7 +115,7 @@ public: - } - - SymID resolvePeerAS(SymID sid, ASt peerAS) { -- char *buffer = (char *) malloc(strlen(sid) * 2); -+ char *buffer = (char *) malloc(strlen(sid) * 3); - char *head, *tail, *ptr; - int written; - ptr = buffer; -@@ -123,7 +124,7 @@ public: - tail = head + 6, head++, head = strstr(head, "PEERAS")) { - strncpy(ptr, tail, head - tail); - ptr += (head - tail); -- sprintf(ptr, "AS%d", peerAS); -+ asnum_string(ptr, peerAS); - written = strlen(ptr); - ptr += written; - } diff --git a/net/irrtoolset-nox11/patches/patch-dh b/net/irrtoolset-nox11/patches/patch-dh deleted file mode 100644 index b7f34915765..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dh +++ /dev/null @@ -1,35 +0,0 @@ -$NetBSD: patch-dh,v 1.1 2007/09/07 21:26:34 spz Exp $ - ---- src/rpsl/rpsl/rpsl.l.orig 2006-10-01 13:23:32.000000000 +0200 -+++ src/rpsl/rpsl/rpsl.l -@@ -74,7 +74,7 @@ INT [[:digit:]]+ - SINT [+-]?{INT} - REAL [+-]?{INT}?\.{INT}({WS}*E{WS}*[+-]?{INT})? - NAME [[:alpha:]]([[:alnum:]_-]*[[:alnum:]])? --ASNO AS{INT} -+ASNO AS{INT}\.{INT}|AS{INT} - ASNAME AS-[[:alnum:]_-]*[[:alnum:]] - RSNAME RS-[[:alnum:]_-]*[[:alnum:]] - RTRSNAME RTRS-[[:alnum:]_-]*[[:alnum:]] -@@ -455,7 +455,11 @@ extern void atollRA(...); - - /* The order of these rules are important */ - {ASNO} { -- yylval.i = atoi(yytext+2); -+ const char *dot = strchr(yytext,'.'); -+ if (dot) -+ yylval.i = atoi(yytext+2)<<16 | atoi(dot+1); -+ else -+ yylval.i = atoi(yytext+2); - LEXER_RETURN(TKN_ASNO); - } - -@@ -751,7 +755,7 @@ void yy_scan_object(Object *o) { - - if (rpsl_buffer) - yy_delete_buffer(rpsl_buffer); -- rpsl_buffer = yy_scan_bytes(o->contents, o->size); -+ rpsl_buffer = yy_scan_bytes(o->contents, (yy_size_t)o->size); - BEGIN(INITIAL); - } - diff --git a/net/irrtoolset-nox11/patches/patch-di b/net/irrtoolset-nox11/patches/patch-di deleted file mode 100644 index c4ba0b17df1..00000000000 --- a/net/irrtoolset-nox11/patches/patch-di +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-di,v 1.3 2009/03/15 20:10:36 spz Exp $ - ---- src/irr/birdwhoisc.cc.orig 2006-10-09 18:05:14.000000000 +0200 -+++ src/irr/birdwhoisc.cc -@@ -429,7 +429,11 @@ int BirdWhoisClient::getSourceOrigin(cha - AttrGenericIterator<ItemASNO> itrOrigin(itrObject, "origin"); - AttrGenericIterator<ItemWORD> itrSource(itrObject, "source"); - if (itrOrigin && itrSource) -- cBuffer.append("%s AS%d\n", itrSource()->word, itrOrigin()->asno); -+ { -+ char buf[64]; -+ asnum_string_dot(buf, itrOrigin()->asno); -+ cBuffer.append("%s %s\n", itrSource()->word, buf); -+ } - } - } - if (cBuffer.empty()) diff --git a/net/irrtoolset-nox11/patches/patch-dj b/net/irrtoolset-nox11/patches/patch-dj deleted file mode 100644 index 21f23f98a04..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dj +++ /dev/null @@ -1,82 +0,0 @@ -$NetBSD: patch-dj,v 1.3 2008/01/14 12:39:55 spz Exp $ - ---- src/irr/rawhoisc.cc.orig 2007-02-13 01:25:01.000000000 +0100 -+++ src/irr/rawhoisc.cc -@@ -557,26 +557,61 @@ 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) -+ delete [] set; -+ } -+ } else { -+ 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; -+ } - 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) -+ delete [] set; -+ } else { -+ 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; -+ } - return true; - } - diff --git a/net/irrtoolset-nox11/patches/patch-dk b/net/irrtoolset-nox11/patches/patch-dk deleted file mode 100644 index 83d5dbb8abe..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dk +++ /dev/null @@ -1,47 +0,0 @@ -$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 deleted file mode 100644 index 57e75ec2823..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dl +++ /dev/null @@ -1,14 +0,0 @@ -$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 diff --git a/net/irrtoolset-nox11/patches/patch-dm b/net/irrtoolset-nox11/patches/patch-dm deleted file mode 100644 index 366a6501115..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dm +++ /dev/null @@ -1,20 +0,0 @@ -$NetBSD: patch-dm,v 1.3 2009/02/14 19:17:50 spz Exp $ - ---- src/Makefile.in.orig 2006-06-08 17:16:26.000000000 +0200 -+++ src/Makefile.in -@@ -81,11 +81,11 @@ depend: - - install: - @for i in $(prefix) $(bindir) $(mandir) $(man1dir) $(man3dir) ; do \ -- test -d $$i || mkdir -p $$i; \ -+ test -d $(DESTDIR)$$i || mkdir -p $(DESTDIR)$$i; \ - done -- for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(bindir); done -- for i in ../man/man1/*; do $(INSTALL_DATA) $$i $(man1dir); done -- for i in ../man/man3/*; do $(INSTALL_DATA) $$i $(man3dir); done -+ for i in $(TOOLDIRS); do $(INSTALL_PROGRAM) $$i/$$i $(DESTDIR)$(bindir); done -+ for i in ../man/man1/*.1; do $(INSTALL_DATA) $$i $(DESTDIR)$(man1dir); done -+ for i in ../man/man3/*.3; do $(INSTALL_DATA) $$i $(DESTDIR)$(man3dir); done - - tags: - @find `pwd` -name \*.hh -or -name \*.cc -or -name \*.c -or -name \*.h -or -name \*.y -or -name \*.l | xargs etags -t diff --git a/net/irrtoolset-nox11/patches/patch-do b/net/irrtoolset-nox11/patches/patch-do deleted file mode 100644 index 5e8c9142bd7..00000000000 --- a/net/irrtoolset-nox11/patches/patch-do +++ /dev/null @@ -1,622 +0,0 @@ -$NetBSD: patch-do,v 1.1 2008/03/08 11:00:35 spz Exp $ - ---- man/man1/Errors.1.orig 2002-07-02 14:41:49.000000000 +0200 -+++ man/man1/Errors.1 -@@ -1,617 +0,0 @@ --.\"// Copyright (c) 2001,2002 RIPE NCC --.\"// --.\"// All Rights Reserved --.\"// --.\"// Permission to use, copy, modify, and distribute this software and its --.\"// documentation for any purpose and without fee is hereby granted, --.\"// provided that the above copyright notice appear in all copies and that --.\"// both that copyright notice and this permission notice appear in --.\"// supporting documentation, and that the name of the author not be --.\"// used in advertising or publicity pertaining to distribution of the --.\"// software without specific, written prior permission. --.\"// --.\"// THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING --.\"// ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS; IN NO EVENT SHALL --.\"// AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY --.\"// DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN --.\"// AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF --.\"// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. --.\"// --.\"// --.\"// Copyright (c) 1994 by the University of Southern California --.\"// and/or the International Business Machines Corporation. --.\"// All rights reserved. --.\"// --.\"// Permission to use, copy, modify, and distribute this software and --.\"// its documentation in source and binary forms for lawful --.\"// non-commercial purposes and without fee is hereby granted, provided --.\"// that the above copyright notice appear in all copies and that both --.\"// the copyright notice and this permission notice appear in supporting --.\"// documentation, and that any documentation, advertising materials, --.\"// and other materials related to such distribution and use acknowledge --.\"// that the software was developed by the University of Southern --.\"// California, Information Sciences Institute and/or the International --.\"// Business Machines Corporation. The name of the USC or IBM may not --.\"// be used to endorse or promote products derived from this software --.\"// without specific prior written permission. --.\"// --.\"// NEITHER THE UNIVERSITY OF SOUTHERN CALIFORNIA NOR INTERNATIONAL --.\"// BUSINESS MACHINES CORPORATION MAKES ANY REPRESENTATIONS ABOUT --.\"// THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE. THIS SOFTWARE IS --.\"// PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, --.\"// INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF --.\"// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND --.\"// NON-INFRINGEMENT. --.\"// --.\"// IN NO EVENT SHALL USC, IBM, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY --.\"// SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT, --.\"// TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH, --.\"// THE USE OR PERFORMANCE OF THIS SOFTWARE. --.\"// --.\"// Questions concerning this software should be directed to --.\"// info-ra@isi.edu. --.\"// --.\"// Author(s): Cengiz Alaettinoglu <cengiz@isi.edu> --.\" --.\" --.TH IRRToolSet 1 local --.SH NAME --IRRToolSet error and warning messages --.SH DESCRIPTION --.PP --The goal of this document is to clarify the possible errors you may encounter when using IRRToolSet. Some of these errors are listed on the manual pages for the tools. If you didn't find the error on the manual page of the tool you were using, please refer to this page. Some errors wuth obvious explanation are listed here for reference, but to not have any documentation. Still, if description is unclear or unsufficient, please report to irrtoolset@ripe.net. --.SH IRR communication errors --.PP --.B Command errors --.PP --.PD 0 --.P --Error: unknown irr protocol <protocol>, using irrd --.P --known protocols: irrd(rawhoisd), ripe(bird), ripe_perl --.PD 1 --.RS --.PP --The protocol specified with "-protocol" option is unknown or not supported. Use one of the known protocols to connect to IRR server. This option is case-insensitive. This is important which protocol to use, because some client/server protocols are incompatible, and you can get wrong result. Check IRR server documentation and use the protocols which are compatible with it. Please note that there are 3 protocols supported, and the rest are aliases (rawhoisd is the same as irrd and bird is the same as ripe). ripe_perl should be used with old ripe server. --.PP --.RE --.B System errors --.PP --Error: gethostbyname (<hostname>) failed. --.PP --Error: socket() failed. --.PP --Error: connect() failed. --.PP --Error: fgets() failed. --.PP --Error: fread() failed. --.PP --Error: fwrite() failed. --.PP --Connection to <host>\:<port>\ failed! --.RS --.PP --There could be several reasons for this error: host is unreachable, or some packet filtering is on and you can't send the packets, or the server may be not responding. Check your network setup and host reachability. --.PP --.RE --Warning: setsockopt SO_KEEPALIVE failed! --.RS --.PP --All protocols supported by IRRToolSet are using persistent connection to the IRR server. When the socket for IRR connection is created, SO_KEEPALIVE option is set to enable persistent connection (client has to keep checking if the destination is still alive). See setsockopt(2) manual page for details about possible failures. --.PP --.RE --.B IRR-specific errors --.PP --Error: setting source to <sources>\ failed. --.RS --.PP --One (or several) sources from <sources> list are not found on IRR server. If the source setting for IRR server failed, the source list will be default one. --Check IRR server documentation for the proper command to get the list of all available sources and default sources. This check is only implemented for irrd(rawhoisd). If you mistyped the source name, re-run the program using "-s <sources>" option. --.PP --.RE --Error: current source setting is <sources>\. --.RS --.PP --This is rather informational message, preceeded by error message about failed sources setting. It shows the source list which is used currently by the program for querying. If you want to modify this list, use "-s <sources>" option. --.PP --.RE --Warning: irrd(rawhoisd) does not yet support rtr-set expansion. --.RS --.PP --Although as-set and route-set expansion is an internal feature of irrd, rtr-set expansion is not implemented yet. In IRRToolSet it is done by external functions, but it still works. So you can safely ignore this warning, this is just a reminder to keep an eye on irrd development and update the code to use internal feature when it is implemented. --.PP --.RE --Warning: key not found error for query <last_query> --.RS --.PP --Object not found in the database for specified sources. <last_query> specifies the actual query to the server which returned to objects. The reason can be: --.PD 0 --.IP \(bu 2 --object, source or host name are mistyped and therefore object cannot be found; --.IP \(bu 2 --this is true error and you're referencing non-existent object, which is supposed to be in the database; check your objects and policy description. --.PD 1 --.PP --.RE --Warning: no byte count error for query <last_query>\. --.RS --.PP --irrd server returns the length of the reply for successful queries with "A<reply length in bytes including newlines>". The program is expecting it if query is successful. If it is not received, the warning is issued. This error can also indicate protocol/server incompatibility (for example, RIPE whois server with irrd protocol). Please check IRR server documentation for details. --.PP --.RE --Warning: no end of data line error for query <last_query>\. --.RS --.PP --After a successful query irrd server issues special "end of data" command, "C". If it is not received after <length of reply> bytes of data, the program complains. This can indicate that query was broken, or incomplete, or some other server error occured. Please check IRR server documentation for details or ask IRR server administration for help. --.PP --.RE --.SH RPSL parser errors --.B Lexer errors --.PP --Error: unknown class <yytext> --.RS --.PP --Wrong first attribute of the object. This attribute is considered RPSL class name, and determines the object type. The rest of object's attributes can have any order, but the first one should be on the first place. --.PP --.RE --Error: unknown attribute <attr> of class <class> --.RS --.PP --Wrong attribute of the object. The attribute is a string followed by ":" which describes the type of data after ":". Object consists of "attribute:value" pairs. For more information on RPSL classes, see RFC 2622. --.PP --.RE --Error: Non-ASCII character encountered --.PP --Error: unterminated string encountered --.PP --Error: octal escape sequence is out of bounds --.PP --Error: bad octal escape sequence --.PP --Warning: attribute <attr> of class <class> is now obsolete. --.RS --.PP --This attribute is described in RPSL dictionary as valid RPSL attribute, but it is now obsoleted and should not be used any longer. See RFC 2622 for more information about RPSL attributes. --.PP --.RE --.B Parser errors --.PP --Error: syntax error --.RS --.PP --String starts with non-attribute or object is incomplete. --.PP --.RE --Error: "changed: <email> <YYYYMMDD>" expected --.RS --.PP --Wrong "changed" attribute. <email> is e-mail address in RFC 822 format, <YYYYMMDD> is a date. --.PP --.RE --Error: argument to <name> should match <match> --.RS --.PP --Syntax for some RPSL attributes is defined by regular expressions. The error indicates that attribute's value didn't match the regular expression. --.PP --.RE --Error: argument to <name> should be <match> --.RS --.PP --Generic RPSL attributes have fixed syntax, and exact match is expected. --.PP --.RE --Error: argument to <name> should be blob sequence. --.RS --.PP --Indicates a syntax error in "auth" attribute specification. --.PP --.RE --Warning: unknown protocol <string>, BGP4 assumed. --.RS --.PP --Unknown protocol specified in import/export policy. Defaults to BGP4. The known protocols are listed in RFC 2622, Dictionary section. --.PP --.RE --Error: from <peering> expected. --.RS --.PP --Syntax error in "import" attribute specification. See RFC2622 for more details about "import" attribute syntax. --.RE --.PP --Error: to <peering> expected. --.RS --.PP --Syntax error in "export" attribute specification. --The syntax for "export" attribute is symmetrical for import, --with changes: from->to, accept->announce. --For more details see RFC2622. --.PP --.RE --.PP --Error: badly formed filter/action or keyword NETWORKS/ACTION missing. --.RS --.PP --Syntax error in "default" attibute specification --The syntax for "default" attribute is: --.PD 0 --.P --default: to <peering> [action <action>] --.P --[networks <filter>] --.P --For more details see RFC2622. --.PD 1 --.PP --.RE --Error: TO <peer> missing. --.RS --.PP --Syntax error in "default" attribute specification. --Please see "default" attribute syntax above. --.PP --.RE --.PP --Error: badly formed filter. --.RS --.PP --Syntax error in RPSL filter specification. --RPSL filter is an expression over AS-number, prefixes, AS-sets, range operators etc. When applying to a set of routes, it returns the resulting set of routes matched by this filter. There are several types of RPSL filters - prefix filters, AS_path filters, etc. For more details, see RFC2622. --.PP --.RE --.PP --Error: in action specification. --.RS --.PP --Syntax error in action specification. "Action" keyword specifies the action to be executed if the route is matched by the filter. The general "action" syntax is: --.PD 0 --.P --action <rp_attribute> <method> (<rp_method_arguments>); --.P --| action <rp_attribute> <operator> <argument>; --.P --For more details see RFC2622. --.PD 1 --.RE --.PP --Error: integer mask length expected. --.RS --.PP --The integer mask length is a number of bits taken by network number. --.PP --.RE --.PP --Error: MASKLEN <length> expected. --.RS --.PP --Syntax error in "ifaddr" attribute specification. --The syntax for "ifaddr" attribute is: --.PD 0 --.P --ifaddr: <ipv4-address> masklen <integer> [action <action>] --.PD 1 --.RE --.PP --Error: <ip_address> MASKLEN <length> [<action>] expected. --.RS --.PP --Syntax error in "ifaddr" specification. See "ifaddr" attribute syntax above. --.PP --.RE --.PP --Error: unknown protocol <protocol>. --.RS --.PP --Unknown protocol in peer specification. Known protocols are: --BGP4 (default), OSPF, RIP, IGRP, IS-IS, STATIC, RIPng, DVMRP, PIM-DM, PIM-SM, CBT, MOSPF. --.PP --.RE --Error: protocol <protocol> does not have option <option> --.RS --.PP --This option is not defined for this protocol in RPSL dictionary. --For defined protocols and options, please see RPSL dictionary description in RFC2622. --.PP --.RE --Error: mandatory option <option> of protocol <protocol> is missing. --.RS --.PP --The mandatory option for this protocol is missing. --For defined protocols and options, please see RPSL dictionary description in RFC2622. --.PP --.RE --.PP --Error: in peer option. --.RS --.PP --Syntax error in "peer" attribute. This attribute describes router's peering. --The syntax is: --.PD 0 --.P --<protocol> <ipv4-address> <options> --.P --| <protocol> <inet-rtr-name> <options> --.P --| <protocol> <rtr-set-name> <options> --.P --| <protocol> <peering-set-name> <options> --.P --Where: --.TP 10 --<protocol> --is any of the protocols supported by RPSL dictionary, e.g. BGP4. --.TP 10 --<ipv4-address> --is a valid IPv4 address in "dot" decimal notation, e.g. 1.1.1.1 --.TP 10 --<inet-rtr-name> --is a name of "inet-rtr" object, e.g fully qualified DNS name without trailing "." (RFC1034). It should not exceed 254 characters. --.TP 10 --<rtr-set-name> --is a name of "rtr-set" object. Consists of letters, digits, the underscore "_" and hyphen "-". Starts with "rtrs-" prefix, and the last character of a name must be a letter or a digit. --.TP 10 --<peering-set-name> --is a name of "peering-set" object.It has the same syntax as "rtr-set" object's name above, but its prefix should be "prng-". --.PD 1 --.RE --.PP --Error: missing peer ip_address. --.RS --.PP --Peer address is missing in peer specification. --.PD 0 --.P --<ipv4-address> is a valid IPv4 address in "dot" decimal notation, e.g. 1.1.1.1 --.PD 1 --.RE --.PP --Error: missing protocol name. --.RS --.PP --Protocol name is missing in peer specification. Protocol name should be a valid protocol defined in RPSL dictionary, e.g. BGP4 (see RFC2622). --.RE --.PP --Error: <as-expression> expected. --.RS --.PP --Syntax error in "aggr-bndry" attribute of "route" object. The syntax is: --.PD 0 --.P --<as-expression>. --Where: --.TP 10 --<as-expression> --is an expression over AS numbers and sets. It defines the list of ASes performing the aggregation. If this attribute is missing, the origin AS is the sole aggregation boundary. See RFC2622 for more detailed description of this attribute in "route" object. --.PD 1 --.RE --.PP --Error: OUTBOUND <as-expression> expected. --.RS --.PP --Syntax error in "aggr-mtd" attribute of "route" object. The syntax is: --.PD 0 --.P --aggr-mtd: inbound -- | outbound [<as-expression>] --.P --Where: --.TP 10 --inbound, outbound --RPSL keywords specifying the type of aggregation. See RFC2622 for more detailed description of this attribute of "route" object. --.TP 10 --<as-expression> --is an expression over as-sets and as-numbers. --.P --See RFC2622 for more detailed description of this attribute of "route" object. --.PD 1 --.RE --.PP --Error: INBOUND can not be followed by anything. --.RS --.PP --Syntax error in "aggr-mtd" attribute of "route" object. See the details above. --.PP --.RE --.PP --Error: keyword INBOUND or OUTBOUND expected. --.RS --.PP --Syntax error in "aggr-mtd" attribute of "route" object. See the details above. --.PP --.RE --Error: [at <router-exp>] [action <action>] [upon <condition>] expected. --.RS --.PP --Syntax error in "inject" attribute of route object. This attribute specifies which routers perform the aggregation and when they perform it. See RFC 2622 for more details about the meaning of this attribute. --.PD 0 --.TP 10 --<router-expr> --is an expression over router IP addresses, inet-rtr names, and rtr-set names using operators AND, OR, and EXCEPT. The binary "EXCEPT" operator is the set subtraction operator and has the same precedence as the operator AND. EXCEPT = AND NOT. --.TP 10 --<action> --defines an action to execute to modify various BGP attributes. See RFC2622 for more details on action specificatin. --.TP 10 --<condition> --is a boolean condition. The aggregate is generated if and only if this condition is true. See RFC 2622 for more details on "condition" specification. --.PD 1 --.RE --.PP --Error: [ATOMIC] [[<filter>] [PROTOCOL <protocol> <filter>] ...] expected. --.RS --.PP --Syntax error in "components" attribute of the "route" object. This attribute specifies which routes are used to form the aggregate. --.PD 0 --.TP 10 --<filter> --is RPSL filter expression over AS-number, AS-sets, route-set, prefixes, range operations, etc. --.TP 10 --<protocol> --is a routing protocol name, as defined in RPSL dictionary. --.PD 1 --See RFC 2622 for more detailed description of this attribute. --.PP --.RE --Error: invalid member --.RS --.PP --The member of the route-set should be a valid IPV4 prefix in "/" slash notation. --.PP --.RE --.B RPSL dictionary errors --.PP --These errors are also RPSL parser errors. They can be encountered if you modify RPSL dictionary, recompile and try to use the parser. --.PP --Error: invalid rp-attribute specification --.RS --.PP --Syntax error in rp-attribute specification. rp-attributes are used in RPSL dictionary specification to describe routing protocol attributes and methods. E.g. RPSL rp-attributes for BGP4 match BGP4 attributes, and their methods are actions to perform. For instance, "action aspath.prepend(AS123);" prepends the BGP AS_path attribute with AS123 for the routes matched by the filter. For more information about rp-attributes (Routing Policy attributes) and how they reflect real BGP attributes, see RFC 2622. --.PP --.RE --Error: invalid method specification for <rp-attribute> --.RS --.PP --Syntax error in rp-attribute specification, in method. See RFC 2622 for details about rp-attributes specification syntax. --.PP --.RE --Error: invalid operator specification for <rp-attribute> --.RS --.PP --Syntax error in rp-attribute specification, in operator. See RFC 2622 for details about rp-attributes specification syntax. --.PP --.RE --Error: invalid operator --.RS --.PP --Syntax error in rp-attribute specification, in operator. See RFC 2622 for details about rp-attributes specification syntax. --.PP --.RE --Error: method specification expected --.RS --.PP --Method definition in rp-attribute has wrong syntax or is incomplete. The format is <method_name>(<arguments>). --.PP --.RE --Error: invalid typedef specification --.RS --.PP --Error in "typedef" attribute. This attribute defines the data types for method arguments, which are then used with rp-attributes. See RFC 2622 for more information of "typedef" specification. --.PP --.RE --Error: empty union specification --.RS --.PP --Syntax error in union specification for type definition. The syntax is: --typedef: union <list of types to be included in union>. This error can be encountered if the list is empty. --.PP --.RE --Error: invalid type <string> --.RS --.PP --Invalid string found where the type definition keyword expected. --.PP --.RE --Error: invalid type <string>[<integer>,<integer>] --.RS --.PP --Invalid string found where the type definition keyword expected. --.PP --.RE --Error: invalid type <string>[<float>,<float>]" --.RS --.PP --Invalid string found where the type definition keyword expected. --.PP --.RE --Error: invalid type <string>, enum expected --.RS --.PP --[ <enum_list> ] should be preceeded by "enum" keyword. --.PP --.RE --Error: invalid list size --.RS --.PP --Syntax error in list specification. The syntax is: --list of <valid_type>-<valid-type> ... <valid-type>. --.PP --.RE --Error: invalid protocol option --.PP --Error: invalid protocol name --.PP --Error: in attr option specification. --.RS --.PP --Synatx error in attribute "attr" specification of "dictionary" class. The syntax is: --.PD 0 --.P --attr: <attr_name> [syntax(syntax_type),] optional/mandatory single/multiple type --.PD 1 --.PP --.RE --Error: no known syntax rule for <syntax>. --.RS --.PP --Syntax definition is not found (see rpsl/rpsl/rptype.cc); --.PP --.RE --Error: could not compile regexp <regexp>. --.RS --.PP --Requested syntax type is "regexp", but failed to compile the regular expression. --.PP --.RE --Error: attr name expected. --.RS --.PP --Syntax error in attribute "attr" specification, see syntax definition above. --.PP --.RE --Error: argument <argument> to <rp-attribute>.operator<method> should be <type>. --.RS --.PP --Wrong operatior used with this rp-attribute. Check rp-attribute specification and operators/methods (RFC 2622). --.PP --.RE --Error: wrong number of arguments to <rp.attribute>.operator<method>. --.RS --.PP --Wrong number of arguments used with rp-attribute's operator. Check rp-attribute specification and its operators/methods (RFC 2622). --.PP --.RE --Error: argument <argument> to <rp-attribute>.<method> should be <type>. --.RS --.PP --Wrong argument used with operator/method with this rp-attribute. Check rp-attribute's methods specification (RFC 2622). --.PP --.RE --Error: wrong number of arguments to <rp-attribute>.<method>. --.RS --.PP --Wrong number of arguments used with this method. Check method's specification (RFC 2622). --.PP --.RE --Error: rp-attribute <rp-attribute> does not have <method> defined. --.RS --.PP --Undefined method used with rp-attribute. Check rp-attribute's methods' specification (RFC 2622) for this rp-attribute. --.PP --.RE --.SH REFERENCES --.IP \(bu 2 --.B --RFC 2622 --"Routing Policy Specification Language (RPSL)" --ftp://ftp.ripe.net/rfc/rfc2622.txt --.IP \(bu 2 --.B --RFC 822 --"Standard for the format of ARPA INTERNET text messages" --ftp://ftp.ripe.net/rfc/rfc822.txt --.IP \(bu 2 --.B --RFC 1034 --"Domain names - concepts and facilities" --ftp://ftp.ripe.net/rfc/rfc1034.txt --.SH AUTHORS --Katie Petrusha <katie@ripe.net> diff --git a/net/irrtoolset-nox11/patches/patch-dp b/net/irrtoolset-nox11/patches/patch-dp deleted file mode 100644 index 102742847da..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dp +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-dp,v 1.2 2009/02/14 16:17:06 spz Exp $ - ---- man/man1/peval.1.orig 2006-10-01 13:23:32.000000000 +0200 -+++ man/man1/peval.1 -@@ -137,6 +137,9 @@ Do not expand anything. - Do a prior symbolic evaluation, then do the expansions and then - re-evaluate. - This may be faster for some policies. -+.IP \-asplain -+Print AS numbers as asplain, i.e. as unstructured number; -+default is to use the more human readable asdot format. - .IP -compressed - Print prefix lists using the more specific operators. - Otherwise, -@@ -199,7 +202,7 @@ Fails if couldn't evaluate the filter to - Unknown protocol! - .RS - .PP --Connection to IRR server failed. This can be caused by various reasons, please see Errors manpage, IRR Communication errors. -+Connection to IRR server failed. This can be caused by various reasons, please see IRRToolSet-Errors(1) manpage, IRR Communication errors. - .PP - .RE - ***Error: badly formed filter. -@@ -210,7 +213,7 @@ syntax error in RPSL filter specificatio - .RE - For more error descriptions, please see - .B --Errors manual page. -+IRRToolSet-Errors(1) manual page. - .SH AUTHORS - Cengiz Alaettinoglu <cengiz@isi.edu> - .PP diff --git a/net/irrtoolset-nox11/patches/patch-dq b/net/irrtoolset-nox11/patches/patch-dq deleted file mode 100644 index 5ced67cfcbf..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dq +++ /dev/null @@ -1,622 +0,0 @@ -$NetBSD: patch-dq,v 1.1 2008/03/08 11:00:35 spz Exp $ - ---- man/man1/IRRToolSet-Errors.1.orig 2008-03-08 10:03:21.000000000 +0100 -+++ man/man1/IRRToolSet-Errors.1 -@@ -0,0 +1,617 @@ -+.\"// Copyright (c) 2001,2002 RIPE NCC -+.\"// -+.\"// All Rights Reserved -+.\"// -+.\"// Permission to use, copy, modify, and distribute this software and its -+.\"// documentation for any purpose and without fee is hereby granted, -+.\"// provided that the above copyright notice appear in all copies and that -+.\"// both that copyright notice and this permission notice appear in -+.\"// supporting documentation, and that the name of the author not be -+.\"// used in advertising or publicity pertaining to distribution of the -+.\"// software without specific, written prior permission. -+.\"// -+.\"// THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING -+.\"// ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS; IN NO EVENT SHALL -+.\"// AUTHOR BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY -+.\"// DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN -+.\"// AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF -+.\"// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -+.\"// -+.\"// -+.\"// Copyright (c) 1994 by the University of Southern California -+.\"// and/or the International Business Machines Corporation. -+.\"// All rights reserved. -+.\"// -+.\"// Permission to use, copy, modify, and distribute this software and -+.\"// its documentation in source and binary forms for lawful -+.\"// non-commercial purposes and without fee is hereby granted, provided -+.\"// that the above copyright notice appear in all copies and that both -+.\"// the copyright notice and this permission notice appear in supporting -+.\"// documentation, and that any documentation, advertising materials, -+.\"// and other materials related to such distribution and use acknowledge -+.\"// that the software was developed by the University of Southern -+.\"// California, Information Sciences Institute and/or the International -+.\"// Business Machines Corporation. The name of the USC or IBM may not -+.\"// be used to endorse or promote products derived from this software -+.\"// without specific prior written permission. -+.\"// -+.\"// NEITHER THE UNIVERSITY OF SOUTHERN CALIFORNIA NOR INTERNATIONAL -+.\"// BUSINESS MACHINES CORPORATION MAKES ANY REPRESENTATIONS ABOUT -+.\"// THE SUITABILITY OF THIS SOFTWARE FOR ANY PURPOSE. THIS SOFTWARE IS -+.\"// PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, -+.\"// INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF -+.\"// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE, TITLE, AND -+.\"// NON-INFRINGEMENT. -+.\"// -+.\"// IN NO EVENT SHALL USC, IBM, OR ANY OTHER CONTRIBUTOR BE LIABLE FOR ANY -+.\"// SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES, WHETHER IN CONTRACT, -+.\"// TORT, OR OTHER FORM OF ACTION, ARISING OUT OF OR IN CONNECTION WITH, -+.\"// THE USE OR PERFORMANCE OF THIS SOFTWARE. -+.\"// -+.\"// Questions concerning this software should be directed to -+.\"// info-ra@isi.edu. -+.\"// -+.\"// Author(s): Cengiz Alaettinoglu <cengiz@isi.edu> -+.\" -+.\" -+.TH IRRToolSet-Errors 1 local -+.SH NAME -+IRRToolSet-Errors: error and warning messages -+.SH DESCRIPTION -+.PP -+The goal of this document is to clarify the possible errors you may encounter when using IRRToolSet. Some of these errors are listed on the manual pages for the tools. If you didn't find the error on the manual page of the tool you were using, please refer to this page. Some errors wuth obvious explanation are listed here for reference, but to not have any documentation. Still, if description is unclear or unsufficient, please report to irrtoolset@ripe.net. -+.SH IRR communication errors -+.PP -+.B Command errors -+.PP -+.PD 0 -+.P -+Error: unknown irr protocol <protocol>, using irrd -+.P -+known protocols: irrd(rawhoisd), ripe(bird), ripe_perl -+.PD 1 -+.RS -+.PP -+The protocol specified with "-protocol" option is unknown or not supported. Use one of the known protocols to connect to IRR server. This option is case-insensitive. This is important which protocol to use, because some client/server protocols are incompatible, and you can get wrong result. Check IRR server documentation and use the protocols which are compatible with it. Please note that there are 3 protocols supported, and the rest are aliases (rawhoisd is the same as irrd and bird is the same as ripe). ripe_perl should be used with old ripe server. -+.PP -+.RE -+.B System errors -+.PP -+Error: gethostbyname (<hostname>) failed. -+.PP -+Error: socket() failed. -+.PP -+Error: connect() failed. -+.PP -+Error: fgets() failed. -+.PP -+Error: fread() failed. -+.PP -+Error: fwrite() failed. -+.PP -+Connection to <host>\:<port>\ failed! -+.RS -+.PP -+There could be several reasons for this error: host is unreachable, or some packet filtering is on and you can't send the packets, or the server may be not responding. Check your network setup and host reachability. -+.PP -+.RE -+Warning: setsockopt SO_KEEPALIVE failed! -+.RS -+.PP -+All protocols supported by IRRToolSet are using persistent connection to the IRR server. When the socket for IRR connection is created, SO_KEEPALIVE option is set to enable persistent connection (client has to keep checking if the destination is still alive). See setsockopt(2) manual page for details about possible failures. -+.PP -+.RE -+.B IRR-specific errors -+.PP -+Error: setting source to <sources>\ failed. -+.RS -+.PP -+One (or several) sources from <sources> list are not found on IRR server. If the source setting for IRR server failed, the source list will be default one. -+Check IRR server documentation for the proper command to get the list of all available sources and default sources. This check is only implemented for irrd(rawhoisd). If you mistyped the source name, re-run the program using "-s <sources>" option. -+.PP -+.RE -+Error: current source setting is <sources>\. -+.RS -+.PP -+This is rather informational message, preceeded by error message about failed sources setting. It shows the source list which is used currently by the program for querying. If you want to modify this list, use "-s <sources>" option. -+.PP -+.RE -+Warning: irrd(rawhoisd) does not yet support rtr-set expansion. -+.RS -+.PP -+Although as-set and route-set expansion is an internal feature of irrd, rtr-set expansion is not implemented yet. In IRRToolSet it is done by external functions, but it still works. So you can safely ignore this warning, this is just a reminder to keep an eye on irrd development and update the code to use internal feature when it is implemented. -+.PP -+.RE -+Warning: key not found error for query <last_query> -+.RS -+.PP -+Object not found in the database for specified sources. <last_query> specifies the actual query to the server which returned to objects. The reason can be: -+.PD 0 -+.IP \(bu 2 -+object, source or host name are mistyped and therefore object cannot be found; -+.IP \(bu 2 -+this is true error and you're referencing non-existent object, which is supposed to be in the database; check your objects and policy description. -+.PD 1 -+.PP -+.RE -+Warning: no byte count error for query <last_query>\. -+.RS -+.PP -+irrd server returns the length of the reply for successful queries with "A<reply length in bytes including newlines>". The program is expecting it if query is successful. If it is not received, the warning is issued. This error can also indicate protocol/server incompatibility (for example, RIPE whois server with irrd protocol). Please check IRR server documentation for details. -+.PP -+.RE -+Warning: no end of data line error for query <last_query>\. -+.RS -+.PP -+After a successful query irrd server issues special "end of data" command, "C". If it is not received after <length of reply> bytes of data, the program complains. This can indicate that query was broken, or incomplete, or some other server error occured. Please check IRR server documentation for details or ask IRR server administration for help. -+.PP -+.RE -+.SH RPSL parser errors -+.B Lexer errors -+.PP -+Error: unknown class <yytext> -+.RS -+.PP -+Wrong first attribute of the object. This attribute is considered RPSL class name, and determines the object type. The rest of object's attributes can have any order, but the first one should be on the first place. -+.PP -+.RE -+Error: unknown attribute <attr> of class <class> -+.RS -+.PP -+Wrong attribute of the object. The attribute is a string followed by ":" which describes the type of data after ":". Object consists of "attribute:value" pairs. For more information on RPSL classes, see RFC 2622. -+.PP -+.RE -+Error: Non-ASCII character encountered -+.PP -+Error: unterminated string encountered -+.PP -+Error: octal escape sequence is out of bounds -+.PP -+Error: bad octal escape sequence -+.PP -+Warning: attribute <attr> of class <class> is now obsolete. -+.RS -+.PP -+This attribute is described in RPSL dictionary as valid RPSL attribute, but it is now obsoleted and should not be used any longer. See RFC 2622 for more information about RPSL attributes. -+.PP -+.RE -+.B Parser errors -+.PP -+Error: syntax error -+.RS -+.PP -+String starts with non-attribute or object is incomplete. -+.PP -+.RE -+Error: "changed: <email> <YYYYMMDD>" expected -+.RS -+.PP -+Wrong "changed" attribute. <email> is e-mail address in RFC 822 format, <YYYYMMDD> is a date. -+.PP -+.RE -+Error: argument to <name> should match <match> -+.RS -+.PP -+Syntax for some RPSL attributes is defined by regular expressions. The error indicates that attribute's value didn't match the regular expression. -+.PP -+.RE -+Error: argument to <name> should be <match> -+.RS -+.PP -+Generic RPSL attributes have fixed syntax, and exact match is expected. -+.PP -+.RE -+Error: argument to <name> should be blob sequence. -+.RS -+.PP -+Indicates a syntax error in "auth" attribute specification. -+.PP -+.RE -+Warning: unknown protocol <string>, BGP4 assumed. -+.RS -+.PP -+Unknown protocol specified in import/export policy. Defaults to BGP4. The known protocols are listed in RFC 2622, Dictionary section. -+.PP -+.RE -+Error: from <peering> expected. -+.RS -+.PP -+Syntax error in "import" attribute specification. See RFC2622 for more details about "import" attribute syntax. -+.RE -+.PP -+Error: to <peering> expected. -+.RS -+.PP -+Syntax error in "export" attribute specification. -+The syntax for "export" attribute is symmetrical for import, -+with changes: from->to, accept->announce. -+For more details see RFC2622. -+.PP -+.RE -+.PP -+Error: badly formed filter/action or keyword NETWORKS/ACTION missing. -+.RS -+.PP -+Syntax error in "default" attibute specification -+The syntax for "default" attribute is: -+.PD 0 -+.P -+default: to <peering> [action <action>] -+.P -+[networks <filter>] -+.P -+For more details see RFC2622. -+.PD 1 -+.PP -+.RE -+Error: TO <peer> missing. -+.RS -+.PP -+Syntax error in "default" attribute specification. -+Please see "default" attribute syntax above. -+.PP -+.RE -+.PP -+Error: badly formed filter. -+.RS -+.PP -+Syntax error in RPSL filter specification. -+RPSL filter is an expression over AS-number, prefixes, AS-sets, range operators etc. When applying to a set of routes, it returns the resulting set of routes matched by this filter. There are several types of RPSL filters - prefix filters, AS_path filters, etc. For more details, see RFC2622. -+.PP -+.RE -+.PP -+Error: in action specification. -+.RS -+.PP -+Syntax error in action specification. "Action" keyword specifies the action to be executed if the route is matched by the filter. The general "action" syntax is: -+.PD 0 -+.P -+action <rp_attribute> <method> (<rp_method_arguments>); -+.P -+| action <rp_attribute> <operator> <argument>; -+.P -+For more details see RFC2622. -+.PD 1 -+.RE -+.PP -+Error: integer mask length expected. -+.RS -+.PP -+The integer mask length is a number of bits taken by network number. -+.PP -+.RE -+.PP -+Error: MASKLEN <length> expected. -+.RS -+.PP -+Syntax error in "ifaddr" attribute specification. -+The syntax for "ifaddr" attribute is: -+.PD 0 -+.P -+ifaddr: <ipv4-address> masklen <integer> [action <action>] -+.PD 1 -+.RE -+.PP -+Error: <ip_address> MASKLEN <length> [<action>] expected. -+.RS -+.PP -+Syntax error in "ifaddr" specification. See "ifaddr" attribute syntax above. -+.PP -+.RE -+.PP -+Error: unknown protocol <protocol>. -+.RS -+.PP -+Unknown protocol in peer specification. Known protocols are: -+BGP4 (default), OSPF, RIP, IGRP, IS-IS, STATIC, RIPng, DVMRP, PIM-DM, PIM-SM, CBT, MOSPF. -+.PP -+.RE -+Error: protocol <protocol> does not have option <option> -+.RS -+.PP -+This option is not defined for this protocol in RPSL dictionary. -+For defined protocols and options, please see RPSL dictionary description in RFC2622. -+.PP -+.RE -+Error: mandatory option <option> of protocol <protocol> is missing. -+.RS -+.PP -+The mandatory option for this protocol is missing. -+For defined protocols and options, please see RPSL dictionary description in RFC2622. -+.PP -+.RE -+.PP -+Error: in peer option. -+.RS -+.PP -+Syntax error in "peer" attribute. This attribute describes router's peering. -+The syntax is: -+.PD 0 -+.P -+<protocol> <ipv4-address> <options> -+.P -+| <protocol> <inet-rtr-name> <options> -+.P -+| <protocol> <rtr-set-name> <options> -+.P -+| <protocol> <peering-set-name> <options> -+.P -+Where: -+.TP 10 -+<protocol> -+is any of the protocols supported by RPSL dictionary, e.g. BGP4. -+.TP 10 -+<ipv4-address> -+is a valid IPv4 address in "dot" decimal notation, e.g. 1.1.1.1 -+.TP 10 -+<inet-rtr-name> -+is a name of "inet-rtr" object, e.g fully qualified DNS name without trailing "." (RFC1034). It should not exceed 254 characters. -+.TP 10 -+<rtr-set-name> -+is a name of "rtr-set" object. Consists of letters, digits, the underscore "_" and hyphen "-". Starts with "rtrs-" prefix, and the last character of a name must be a letter or a digit. -+.TP 10 -+<peering-set-name> -+is a name of "peering-set" object.It has the same syntax as "rtr-set" object's name above, but its prefix should be "prng-". -+.PD 1 -+.RE -+.PP -+Error: missing peer ip_address. -+.RS -+.PP -+Peer address is missing in peer specification. -+.PD 0 -+.P -+<ipv4-address> is a valid IPv4 address in "dot" decimal notation, e.g. 1.1.1.1 -+.PD 1 -+.RE -+.PP -+Error: missing protocol name. -+.RS -+.PP -+Protocol name is missing in peer specification. Protocol name should be a valid protocol defined in RPSL dictionary, e.g. BGP4 (see RFC2622). -+.RE -+.PP -+Error: <as-expression> expected. -+.RS -+.PP -+Syntax error in "aggr-bndry" attribute of "route" object. The syntax is: -+.PD 0 -+.P -+<as-expression>. -+Where: -+.TP 10 -+<as-expression> -+is an expression over AS numbers and sets. It defines the list of ASes performing the aggregation. If this attribute is missing, the origin AS is the sole aggregation boundary. See RFC2622 for more detailed description of this attribute in "route" object. -+.PD 1 -+.RE -+.PP -+Error: OUTBOUND <as-expression> expected. -+.RS -+.PP -+Syntax error in "aggr-mtd" attribute of "route" object. The syntax is: -+.PD 0 -+.P -+aggr-mtd: inbound -+ | outbound [<as-expression>] -+.P -+Where: -+.TP 10 -+inbound, outbound -+RPSL keywords specifying the type of aggregation. See RFC2622 for more detailed description of this attribute of "route" object. -+.TP 10 -+<as-expression> -+is an expression over as-sets and as-numbers. -+.P -+See RFC2622 for more detailed description of this attribute of "route" object. -+.PD 1 -+.RE -+.PP -+Error: INBOUND can not be followed by anything. -+.RS -+.PP -+Syntax error in "aggr-mtd" attribute of "route" object. See the details above. -+.PP -+.RE -+.PP -+Error: keyword INBOUND or OUTBOUND expected. -+.RS -+.PP -+Syntax error in "aggr-mtd" attribute of "route" object. See the details above. -+.PP -+.RE -+Error: [at <router-exp>] [action <action>] [upon <condition>] expected. -+.RS -+.PP -+Syntax error in "inject" attribute of route object. This attribute specifies which routers perform the aggregation and when they perform it. See RFC 2622 for more details about the meaning of this attribute. -+.PD 0 -+.TP 10 -+<router-expr> -+is an expression over router IP addresses, inet-rtr names, and rtr-set names using operators AND, OR, and EXCEPT. The binary "EXCEPT" operator is the set subtraction operator and has the same precedence as the operator AND. EXCEPT = AND NOT. -+.TP 10 -+<action> -+defines an action to execute to modify various BGP attributes. See RFC2622 for more details on action specificatin. -+.TP 10 -+<condition> -+is a boolean condition. The aggregate is generated if and only if this condition is true. See RFC 2622 for more details on "condition" specification. -+.PD 1 -+.RE -+.PP -+Error: [ATOMIC] [[<filter>] [PROTOCOL <protocol> <filter>] ...] expected. -+.RS -+.PP -+Syntax error in "components" attribute of the "route" object. This attribute specifies which routes are used to form the aggregate. -+.PD 0 -+.TP 10 -+<filter> -+is RPSL filter expression over AS-number, AS-sets, route-set, prefixes, range operations, etc. -+.TP 10 -+<protocol> -+is a routing protocol name, as defined in RPSL dictionary. -+.PD 1 -+See RFC 2622 for more detailed description of this attribute. -+.PP -+.RE -+Error: invalid member -+.RS -+.PP -+The member of the route-set should be a valid IPV4 prefix in "/" slash notation. -+.PP -+.RE -+.B RPSL dictionary errors -+.PP -+These errors are also RPSL parser errors. They can be encountered if you modify RPSL dictionary, recompile and try to use the parser. -+.PP -+Error: invalid rp-attribute specification -+.RS -+.PP -+Syntax error in rp-attribute specification. rp-attributes are used in RPSL dictionary specification to describe routing protocol attributes and methods. E.g. RPSL rp-attributes for BGP4 match BGP4 attributes, and their methods are actions to perform. For instance, "action aspath.prepend(AS123);" prepends the BGP AS_path attribute with AS123 for the routes matched by the filter. For more information about rp-attributes (Routing Policy attributes) and how they reflect real BGP attributes, see RFC 2622. -+.PP -+.RE -+Error: invalid method specification for <rp-attribute> -+.RS -+.PP -+Syntax error in rp-attribute specification, in method. See RFC 2622 for details about rp-attributes specification syntax. -+.PP -+.RE -+Error: invalid operator specification for <rp-attribute> -+.RS -+.PP -+Syntax error in rp-attribute specification, in operator. See RFC 2622 for details about rp-attributes specification syntax. -+.PP -+.RE -+Error: invalid operator -+.RS -+.PP -+Syntax error in rp-attribute specification, in operator. See RFC 2622 for details about rp-attributes specification syntax. -+.PP -+.RE -+Error: method specification expected -+.RS -+.PP -+Method definition in rp-attribute has wrong syntax or is incomplete. The format is <method_name>(<arguments>). -+.PP -+.RE -+Error: invalid typedef specification -+.RS -+.PP -+Error in "typedef" attribute. This attribute defines the data types for method arguments, which are then used with rp-attributes. See RFC 2622 for more information of "typedef" specification. -+.PP -+.RE -+Error: empty union specification -+.RS -+.PP -+Syntax error in union specification for type definition. The syntax is: -+typedef: union <list of types to be included in union>. This error can be encountered if the list is empty. -+.PP -+.RE -+Error: invalid type <string> -+.RS -+.PP -+Invalid string found where the type definition keyword expected. -+.PP -+.RE -+Error: invalid type <string>[<integer>,<integer>] -+.RS -+.PP -+Invalid string found where the type definition keyword expected. -+.PP -+.RE -+Error: invalid type <string>[<float>,<float>]" -+.RS -+.PP -+Invalid string found where the type definition keyword expected. -+.PP -+.RE -+Error: invalid type <string>, enum expected -+.RS -+.PP -+[ <enum_list> ] should be preceeded by "enum" keyword. -+.PP -+.RE -+Error: invalid list size -+.RS -+.PP -+Syntax error in list specification. The syntax is: -+list of <valid_type>-<valid-type> ... <valid-type>. -+.PP -+.RE -+Error: invalid protocol option -+.PP -+Error: invalid protocol name -+.PP -+Error: in attr option specification. -+.RS -+.PP -+Synatx error in attribute "attr" specification of "dictionary" class. The syntax is: -+.PD 0 -+.P -+attr: <attr_name> [syntax(syntax_type),] optional/mandatory single/multiple type -+.PD 1 -+.PP -+.RE -+Error: no known syntax rule for <syntax>. -+.RS -+.PP -+Syntax definition is not found (see rpsl/rpsl/rptype.cc); -+.PP -+.RE -+Error: could not compile regexp <regexp>. -+.RS -+.PP -+Requested syntax type is "regexp", but failed to compile the regular expression. -+.PP -+.RE -+Error: attr name expected. -+.RS -+.PP -+Syntax error in attribute "attr" specification, see syntax definition above. -+.PP -+.RE -+Error: argument <argument> to <rp-attribute>.operator<method> should be <type>. -+.RS -+.PP -+Wrong operatior used with this rp-attribute. Check rp-attribute specification and operators/methods (RFC 2622). -+.PP -+.RE -+Error: wrong number of arguments to <rp.attribute>.operator<method>. -+.RS -+.PP -+Wrong number of arguments used with rp-attribute's operator. Check rp-attribute specification and its operators/methods (RFC 2622). -+.PP -+.RE -+Error: argument <argument> to <rp-attribute>.<method> should be <type>. -+.RS -+.PP -+Wrong argument used with operator/method with this rp-attribute. Check rp-attribute's methods specification (RFC 2622). -+.PP -+.RE -+Error: wrong number of arguments to <rp-attribute>.<method>. -+.RS -+.PP -+Wrong number of arguments used with this method. Check method's specification (RFC 2622). -+.PP -+.RE -+Error: rp-attribute <rp-attribute> does not have <method> defined. -+.RS -+.PP -+Undefined method used with rp-attribute. Check rp-attribute's methods' specification (RFC 2622) for this rp-attribute. -+.PP -+.RE -+.SH REFERENCES -+.IP \(bu 2 -+.B -+RFC 2622 -+"Routing Policy Specification Language (RPSL)" -+ftp://ftp.ripe.net/rfc/rfc2622.txt -+.IP \(bu 2 -+.B -+RFC 822 -+"Standard for the format of ARPA INTERNET text messages" -+ftp://ftp.ripe.net/rfc/rfc822.txt -+.IP \(bu 2 -+.B -+RFC 1034 -+"Domain names - concepts and facilities" -+ftp://ftp.ripe.net/rfc/rfc1034.txt -+.SH AUTHORS -+Katie Petrusha <katie@ripe.net> diff --git a/net/irrtoolset-nox11/patches/patch-dr b/net/irrtoolset-nox11/patches/patch-dr deleted file mode 100644 index 66d4191b6b1..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dr +++ /dev/null @@ -1,33 +0,0 @@ -$NetBSD: patch-dr,v 1.3 2009/02/14 22:19:52 spz Exp $ - ---- man/man1/RtConfig.1.orig 2006-10-01 13:23:32.000000000 +0200 -+++ man/man1/RtConfig.1 -@@ -123,11 +123,19 @@ database server or parsing policy object - .IP "\-config <config-format>" - Produce router configuration in <config-format> - which is either cisco (default), junos, bcc (for bay), gated or rsd. -+.IP \-no_default_afi -+Causes RtConfig not to assume that ipv4.unicast is the router's default -+address family. IPv4 peers will then have ipv4.unicast explicitly activated -+and policy will be set in ipv4.unicast address family. Useful when the router -+is configured with "no bgp default ipv4-unicast". - .IP \-no_match_ip_inbound - In older Cisco IOS versions, - in-bound route maps did not support ip access-list matches. - Use of this option causes RtConfig to use distribute-lists to overcome - this limitation. -+.IP \-asplain -+Print AS numbers as asplain, i.e. as unstructured number; -+default is to use the more human readable asdot format. - .IP \-disable_access_list_cache - RtConfig caches the access-lists (and in the future ip as-path - access-lists and route-maps) that it generates so that the same -@@ -587,7 +595,7 @@ Unimplemented method for this rp_attribu - .PP - For more error descriptions, please see - .B --Errors -+IRRToolSet-Errors - manual page. - .SH AUTHORS AND CONTRIBUTORS - Cengiz Alaettinoglu <cengiz@isi.edu> diff --git a/net/irrtoolset-nox11/patches/patch-ds b/net/irrtoolset-nox11/patches/patch-ds deleted file mode 100644 index 43716e42eab..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ds +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ds,v 1.1 2008/03/08 11:00:35 spz Exp $ - ---- man/man1/rpslcheck.1.orig 2006-06-08 17:16:26.000000000 +0200 -+++ man/man1/rpslcheck.1 -@@ -143,7 +143,7 @@ Aut-num object for <as_no> is not found - .RE - For more error descriptions, please see - .B --Errors -+IRRToolSet-Errors - manual page. - .SH AUTHORS - Cengiz Alaettinoglu <cengiz@isi.edu> diff --git a/net/irrtoolset-nox11/patches/patch-dt b/net/irrtoolset-nox11/patches/patch-dt deleted file mode 100644 index fc77d0c7c73..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dt +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-dt,v 1.1 2009/02/14 16:17:06 spz Exp $ - ---- src/roe/roe.cc.orig 2002-04-09 13:48:48.000000000 +0200 -+++ src/roe/roe.cc -@@ -99,6 +99,7 @@ char *opt_rcfile = ".roerc"; - char opt_default_rcfile[256] = ""; - char *display = NULL; - char *geometry = NULL; -+bool opt_asdot = true; - ASt myAS; - - -@@ -138,6 +139,9 @@ void init_and_set_options (int argc, cha - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - // roe specific arguments - {"-as", ARGV_STRING, (char *) NULL, (char *) &opt_my_as, - "AS number of the aut-num object to use."}, diff --git a/net/irrtoolset-nox11/patches/patch-du b/net/irrtoolset-nox11/patches/patch-du deleted file mode 100644 index bd9d3ef8198..00000000000 --- a/net/irrtoolset-nox11/patches/patch-du +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-du,v 1.1 2009/02/14 16:17:06 spz Exp $ - ---- src/peval/peval.cc.orig 2006-06-08 17:16:26.000000000 +0200 -+++ src/peval/peval.cc -@@ -98,6 +98,7 @@ Rusage ru(clog, &opt_rusage); - char *opt_prompt = "peval> "; - int opt_expand = EXPAND_ALL; - int opt_symbolic = 0; -+bool opt_asdot = true; - - const int SIZE = 8*1024; - char base[SIZE] = "peval: "; -@@ -228,6 +229,9 @@ void init_and_set_options (int argc, cha - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - // peval specific arguments - {"-symbolic", ARGV_CONSTANT, (char *)1, (char *)&opt_symbolic, - "Symbolic"}, diff --git a/net/irrtoolset-nox11/patches/patch-dv b/net/irrtoolset-nox11/patches/patch-dv deleted file mode 100644 index b53bf7051d1..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dv +++ /dev/null @@ -1,27 +0,0 @@ -$NetBSD: patch-dv,v 1.2 2009/02/14 22:19:52 spz Exp $ - ---- src/RtConfig/RtConfig.cc.orig 2006-10-01 13:23:32.000000000 +0200 -+++ src/RtConfig/RtConfig.cc -@@ -85,6 +85,7 @@ bool opt_rusage = false - Rusage ru(clog, &opt_rusage); - - char *opt_prompt = "RtConfig> "; -+bool opt_asdot = true; - - bool RtConfig::supressMartians = false; - int RtConfig::preferenceCeiling = 1000; -@@ -182,8 +183,14 @@ void init_and_set_options (int argc, cha - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - {"-config", ARGV_FUNC, (char *) &select_config_format, (char *) NULL, - "Configuration format (junos, cisco, bcc, gated or rsd)"}, -+ {"-no_default_afi", ARGV_BOOL, (char *) NULL, -+ (char *) &AddressFamily::noDefaultAfi, -+ "Do not assume the router defaults to ipv4 unicast address family."}, - {"-no_match_ip_inbound", ARGV_BOOL, - (char *) NULL, (char *) &CiscoConfig::forcedInboundMatchIP, - "Produce a match ip clause for inbound maps.\n\t\t\t\tCisco only."}, diff --git a/net/irrtoolset-nox11/patches/patch-dw b/net/irrtoolset-nox11/patches/patch-dw deleted file mode 100644 index a2a637074a2..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dw +++ /dev/null @@ -1,35 +0,0 @@ -$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 -@@ -72,6 +72,7 @@ bool opt_stats = false - bool opt_rusage = false; - char *opt_prompt = "rpslcheck> "; - bool opt_echo = false; -+bool opt_asdot = true; - char *opt_my_as = NULL; - #ifdef DEBUG - bool opt_debug_rpsl = false; -@@ -106,6 +107,9 @@ void init_and_set_options (int argc, cha - - IRR_COMMAND_LINE_OPTIONS, - -+ {"-asplain", ARGV_BOOL, (char *) NULL, (char *) &opt_asdot, -+ "print AS numbers in asplain format."}, -+ - {"-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-dx b/net/irrtoolset-nox11/patches/patch-dx deleted file mode 100644 index 2d1081e5391..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dx +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dx,v 1.1 2009/02/14 16:17:06 spz Exp $ - ---- man/man1/aoe.1.orig 2002-07-02 14:41:49.000000000 +0200 -+++ man/man1/aoe.1 -@@ -137,6 +137,9 @@ database server or parsing policy object - .RS - .IP "\-as <as-no>" - Gets aut-num object for <as-no>. -+.IP \-asplain -+Print AS numbers as asplain, i.e. as unstructured number; -+default is to use the more human readable asdot format. - .IP "-rcfile <resource filename>" - .IP "\-display <X Windows Display Specification>" - .RE diff --git a/net/irrtoolset-nox11/patches/patch-dy b/net/irrtoolset-nox11/patches/patch-dy deleted file mode 100644 index f3391a0b2fa..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dy +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dy,v 1.1 2009/02/14 16:17:07 spz Exp $ - ---- man/man1/roe.1.orig 2002-07-02 14:41:50.000000000 +0200 -+++ man/man1/roe.1 -@@ -115,6 +115,9 @@ database server or parsing policy object - .RS - .IP "\-as <as-no>" - Lists routes of <as-no>. -+.IP \-asplain -+Print AS numbers as asplain, i.e. as unstructured number; -+default is to use the more human readable asdot format. - .IP "-rcfile <resource filename>" - .IP "\-display <X Windows Display Specification>" - .IP "\-geometry <X Windows Geometry Specification>" diff --git a/net/irrtoolset-nox11/patches/patch-dz b/net/irrtoolset-nox11/patches/patch-dz deleted file mode 100644 index 7f3edf528df..00000000000 --- a/net/irrtoolset-nox11/patches/patch-dz +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-dz,v 1.1 2009/02/14 16:17:07 spz Exp $ - ---- man/man1/prtraceroute.1.orig 2002-07-02 14:41:50.000000000 +0200 -+++ man/man1/prtraceroute.1 -@@ -133,6 +133,9 @@ Consider the sources specified in the co - If an object is defined in multiple sources in <source-list>, - pmatch uses the definition first encountered in <source-list> - from left to right. -+.IP \-asplain -+Print AS numbers as asplain, i.e. as unstructured number; -+default is to use the more human readable asdot format. - .RE - .SH ENVIRONMENT VARIABLES - .RS diff --git a/net/irrtoolset-nox11/patches/patch-ea b/net/irrtoolset-nox11/patches/patch-ea deleted file mode 100644 index 83d82e4fd36..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ea +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ea,v 1.1 2009/02/17 21:04:14 spz Exp $ - ---- src/rpsl/rpsl/afi.cc.orig 2006-06-08 18:08:25.000000000 +0200 -+++ src/rpsl/rpsl/afi.cc -@@ -29,6 +29,8 @@ - - using namespace std; - -+bool AddressFamily::noDefaultAfi = false; -+ - AddressFamily::AddressFamily(void) : - afi(NULL) - { -@@ -63,7 +65,7 @@ bool AddressFamily::is_ipv6() { - } - - bool AddressFamily::is_default() { -- if (strcmp(afi, "ipv4.unicast") == 0) -+ if (strcmp(afi, "ipv4.unicast") == 0 && !AddressFamily::noDefaultAfi) - return true; - return false; - } diff --git a/net/irrtoolset-nox11/patches/patch-eb b/net/irrtoolset-nox11/patches/patch-eb deleted file mode 100644 index 8b057711cef..00000000000 --- a/net/irrtoolset-nox11/patches/patch-eb +++ /dev/null @@ -1,12 +0,0 @@ -$NetBSD: patch-eb,v 1.1 2009/02/17 21:04:14 spz Exp $ - ---- src/rpsl/rpsl/afi.hh.orig 2006-06-08 18:08:25.000000000 +0200 -+++ src/rpsl/rpsl/afi.hh -@@ -32,6 +32,7 @@ class MPPrefix; - - class AddressFamily { - public: -+ static bool noDefaultAfi; - char *afi; - - public: diff --git a/net/irrtoolset-nox11/patches/patch-ef b/net/irrtoolset-nox11/patches/patch-ef deleted file mode 100644 index a18ffcfd4cb..00000000000 --- a/net/irrtoolset-nox11/patches/patch-ef +++ /dev/null @@ -1,19 +0,0 @@ -$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); - } - |