diff options
55 files changed, 47 insertions, 1300 deletions
diff --git a/net-mgmt/irrtoolset/Makefile b/net-mgmt/irrtoolset/Makefile index eff4dfa6623e..1aedc6f8fbc8 100644 --- a/net-mgmt/irrtoolset/Makefile +++ b/net-mgmt/irrtoolset/Makefile @@ -1,32 +1,37 @@ -# New ports collection makefile for: RAToolSet +# New ports collection makefile for: IRRToolSet # Date created: May 4th 1997 # Whom: James FitzGibbon <jfitz@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= ratoolset -PORTVERSION= 3.5.8 +PORTNAME= irrtoolset +PORTVERSION= 4.7.2 CATEGORIES= net tk82 -MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/ -DISTNAME= RAToolSet-3.5.8 +MASTER_SITES= ftp://ftp.ripe.net/tools/IRRToolSet/ +DISTNAME= IRRToolSet-${PORTVERSION} MAINTAINER= oberman@es.net -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 USE_BISON= yes +USE_GMAKE= yes GNU_CONFIGURE= Yes -CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.2:${PREFIX}/include/tk8.2" \ +CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.3:${PREFIX}/include/tk8.3" \ TCL_TK_LIBRARY_DIR=${PREFIX}/lib \ - TCL_LIBRARY=${PREFIX}/lib/tcl8.2 \ - TK_LIBRARY=${PREFIX}/lib/tk8.2 \ - LD_TCL_TK_LIBS="-ltk82 -ltcl82" + TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \ + TK_LIBRARY=${PREFIX}/lib/tk8.3 \ + LD_TCL_TK_LIBS="-ltk83 -ltcl83" -MAN1= CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \ - prcheck.1 roe.1 -MAN8= prtraceroute.8 relayd.8 +MAN1= CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \ + roe.1 rpslcheck.1 prtraceroute.1 +MAN3= librpsl.3 -ALL_TARGET= depend all +post-patch: + @${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \ + ${WRKSRC}/src/irr/birdwhoisc.cc + +aLL_TARGET= depend all .include <bsd.port.mk> diff --git a/net-mgmt/irrtoolset/distinfo b/net-mgmt/irrtoolset/distinfo index bf0f43d9ff9e..8a819a1dca27 100644 --- a/net-mgmt/irrtoolset/distinfo +++ b/net-mgmt/irrtoolset/distinfo @@ -1 +1 @@ -MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38 +MD5 (IRRToolSet-4.7.2.tar.gz) = 8d4c9421247a2e3eba78c4d6506c84a8 diff --git a/net-mgmt/irrtoolset/files/patch-aa b/net-mgmt/irrtoolset/files/patch-aa deleted file mode 100644 index b4052b639c36..000000000000 --- a/net-mgmt/irrtoolset/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- src/misc/net.hh.orig Wed Jan 28 17:40:42 1998 -+++ src/misc/net.hh Sat Nov 27 18:11:23 1999 -@@ -86,12 +86,12 @@ - int bind (...); - int listen (...); - int accept (...); --int recvfrom(...); -+ssize_t recvfrom(...); - int gethostname (...); - int setsockopt (...); - int select (...); --int sendto (...); --int send (...); -+ssize_t sendto (...); -+ssize_t send (...); - int gettimeofday (...); - } - -@@ -132,7 +132,7 @@ - class Timer { - struct timeval tv; - struct timezone tz; -- init_time () { -+ void init_time () { - bzero ((char *) &tv, sizeof (struct timeval)); - ::gettimeofday (&tv, &tz); - } -@@ -256,7 +256,7 @@ - return ptr; - } - u_long getInaddr () { return hexaddr; } -- print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } -+ void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } - - Error error; - }; -@@ -331,7 +331,7 @@ - error.warn("listen"); - return error(); - } -- accept () { -+ int accept () { - //u_long addrlen; - int addrlen = sizeof (struct sockaddr); - bzero ((char *) &socknew, sizeof (socknew)); diff --git a/net-mgmt/irrtoolset/files/patch-ab b/net-mgmt/irrtoolset/files/patch-ab deleted file mode 100644 index 6566ed2b1af4..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/Route.hh.orig Sat Nov 27 18:08:21 1999 -+++ src/dbase/Route.hh Sat Nov 27 18:08:41 1999 -@@ -92,7 +92,7 @@ - clear(); - } - -- clear () { -+ void clear () { - pix = NULL; - _dontcare = 0; - } -@@ -248,7 +248,7 @@ - pref = 0; - } - -- set (Pix asn, int p) { -+ void set (Pix asn, int p) { - asno = asn; - pref = p; - } diff --git a/net-mgmt/irrtoolset/files/patch-ac b/net-mgmt/irrtoolset/files/patch-ac deleted file mode 100644 index ca2b0e1d8f1f..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ac +++ /dev/null @@ -1,208 +0,0 @@ ---- src/dbase/Node.h.orig Sat Nov 27 18:11:57 1999 -+++ src/dbase/Node.h Sat Nov 27 18:16:21 1999 -@@ -101,7 +101,7 @@ - protected: - virtual void print(ostream &os) = 0; - public: -- virtual operator== (Node &b) = 0; -+ virtual int operator== (Node &b) = 0; - virtual void InOrderPrint() = 0; - virtual void PostOrderPrint() { InOrderPrint(); } - virtual ~Node() {}; -@@ -144,7 +144,7 @@ - virtual void print(ostream &os) = 0; - - public: -- virtual Execute(Route &r) = 0; -+ virtual void Execute(Route &r) = 0; - virtual ActionNode *FindFirst(Node_t _type) = 0; - int operator< (ActionNode &b); - friend ostream &operator<<(ostream &os, ActionNode *an) { -@@ -172,7 +172,7 @@ - type = T_ANDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANDNode - && left == ((ANDNode&) b).left - && right == ((ANDNode&) b).right; -@@ -200,7 +200,7 @@ - type = T_ORNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ORNode - && left == ((ORNode&) b).left - && right == ((ORNode&) b).right; -@@ -227,7 +227,7 @@ - type = T_NotNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NotNode - && left == ((NotNode&) b).left; - } -@@ -256,7 +256,7 @@ - type = T_AssignNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_AssignNode - && val == ((AssignNode&) b).val - && left == ((AssignNode&) b).left; -@@ -281,7 +281,7 @@ - type = T_ANYNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANYNode; - } - -@@ -305,7 +305,7 @@ - type = T_ASNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASNode - && val == ((ASNode&) b).val; - } -@@ -330,7 +330,7 @@ - type = T_ASMacroNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASMacroNode - && val == ((ASMacroNode&) b).val; - } -@@ -355,7 +355,7 @@ - type = T_CommNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_CommNode - && val == ((CommNode&) b).val; - } -@@ -382,7 +382,7 @@ - cidr_root = NULL; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NetListNode - && nets == ((NetListNode&) b).nets; - } -@@ -391,7 +391,7 @@ - virtual NormalExpression *Evaluate(int expand); - virtual int match(Route &r, char dontcare); - virtual int match_exact_or_more_specific(Route &r, char dontcare); -- add(Pix pi) { nets.add(pi); } -+ void add(Pix pi) { nets.add(pi); } - }; - - ////////////////////////////// ASPathNode ////////////////////////////// -@@ -412,7 +412,7 @@ - type = T_ASPathNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - ASSERT(0); - return 0; - } -@@ -438,7 +438,7 @@ - type = T_RegisterNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_RegisterNode - && val == ((RegisterNode&) b).val; - } -@@ -460,13 +460,13 @@ - type = T_PrefNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_PrefNode - && val == ((PrefNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -492,13 +492,13 @@ - type = T_MEDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_MEDNode - && val == ((MEDNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -524,13 +524,13 @@ - type = T_DPANode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_DPANode - && val == ((DPANode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -552,12 +552,12 @@ - type = T_NoopNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NoopNode; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) - return this; -@@ -581,14 +581,14 @@ - } - virtual ~ComposeNode(); - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ComposeNode - && left == ((ComposeNode&) b).left - && right == ((ComposeNode&) b).right; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - ActionNode *r; - if (type == _type) diff --git a/net-mgmt/irrtoolset/files/patch-ad b/net-mgmt/irrtoolset/files/patch-ad deleted file mode 100644 index d0560a973b2a..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/misc/Error.hh.orig Sat Nov 27 18:17:24 1999 -+++ src/misc/Error.hh Sat Nov 27 18:17:31 1999 -@@ -378,7 +378,7 @@ - reset(); - } - -- reset() { -+ void reset() { - errno = 0; - level_ = ErrorNone; - messages_.clear(); diff --git a/net-mgmt/irrtoolset/files/patch-ae b/net-mgmt/irrtoolset/files/patch-ae deleted file mode 100644 index 8c3005236be0..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/peval/xx_lexer.y.orig Sat Nov 27 18:18:56 1999 -+++ src/peval/xx_lexer.y Sat Nov 27 18:19:07 1999 -@@ -94,7 +94,7 @@ - NULL, ERROR_TKN - }; - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net-mgmt/irrtoolset/files/patch-af b/net-mgmt/irrtoolset/files/patch-af deleted file mode 100644 index 50022888976a..000000000000 --- a/net-mgmt/irrtoolset/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- src/misc/net.cc.orig Sat Nov 27 18:20:31 1999 -+++ src/misc/net.cc Sat Nov 27 18:21:15 1999 -@@ -215,6 +215,7 @@ - init_server (p); - } - -+int - TCP::init_server (int p) { - setLocalPort (p); - bind(); diff --git a/net-mgmt/irrtoolset/files/patch-ag b/net-mgmt/irrtoolset/files/patch-ag deleted file mode 100644 index f5519df2a198..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dbase/irr_lexer.y.orig Sat Nov 27 18:22:22 1999 -+++ src/dbase/irr_lexer.y Sat Nov 27 18:22:44 1999 -@@ -73,7 +73,7 @@ - - #include <cctype> - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net-mgmt/irrtoolset/files/patch-ah b/net-mgmt/irrtoolset/files/patch-ah deleted file mode 100644 index 4278782c08ab..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ah +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/irr_parser.y.orig Sat Nov 27 18:23:53 1999 -+++ src/dbase/irr_parser.y Sat Nov 27 18:25:00 1999 -@@ -90,7 +90,7 @@ - char *error_while_expecting = NULL; - - static regexp_symbol *re_symbol; --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter); - static ASPolicy *find_or_insert_peer_as(Pix peer); - static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr); -@@ -635,7 +635,7 @@ - return(0); - } - --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter) { - Filter_Action *fap, *fap2; - diff --git a/net-mgmt/irrtoolset/files/patch-ai b/net-mgmt/irrtoolset/files/patch-ai deleted file mode 100644 index 18de9569197e..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- src/roe/roe_config.hh.orig Sat Nov 27 18:35:37 1999 -+++ src/roe/roe_config.hh Sat Nov 27 18:36:14 1999 -@@ -42,7 +42,7 @@ - - class Configure { - public: -- const int size = 12; -+ static const int size = 12; - - class DBUpdate { - public: diff --git a/net-mgmt/irrtoolset/files/patch-aj b/net-mgmt/irrtoolset/files/patch-aj deleted file mode 100644 index 6d190fb677b6..000000000000 --- a/net-mgmt/irrtoolset/files/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ ---- src/aoe/TclApp.cc.orig Sat Nov 27 18:38:25 1999 -+++ src/aoe/TclApp.cc Sat Nov 27 18:43:51 1999 -@@ -186,9 +186,9 @@ - // Call Tcl function to create a Tcl command - if (Tcl_CreateCommand(ptInterp, - pcCommand->getName(), -- TclCommand::command, -+ &TclCommand::command, - (ClientData)pcCommand, -- TclCommand::cleanUp) == NULL) return 0; -+ &TclCommand::cleanUp) == NULL) return 0; - return 1; - } - diff --git a/net-mgmt/irrtoolset/files/patch-ak b/net-mgmt/irrtoolset/files/patch-ak deleted file mode 100644 index 05060ae5f711..000000000000 --- a/net-mgmt/irrtoolset/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aoe/TclLabel.cc.orig Sat Nov 27 18:45:09 1999 -+++ src/aoe/TclLabel.cc Sat Nov 27 18:45:24 1999 -@@ -47,7 +47,7 @@ - #include "TclLabel.hh" - #include "TclApp.hh" - --TclLabel::clear(void) -+int TclLabel::clear(void) - { - TclApplication *pcApp = (TclApplication *)getExtraArgument(); - return (pcApp->evalf("%s configure -text {}", getName())); diff --git a/net-mgmt/irrtoolset/files/patch-al b/net-mgmt/irrtoolset/files/patch-al deleted file mode 100644 index 49b068f99199..000000000000 --- a/net-mgmt/irrtoolset/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/netraw.hh.orig Sat Nov 27 18:46:27 1999 -+++ src/prtraceroute/netraw.hh Sat Nov 27 18:46:49 1999 -@@ -121,7 +121,7 @@ - rawIP (int protocol = IPPROTO_RAW); - rawIP (char *hostname, int protocol = IPPROTO_RAW); - -- setIpaddresses (); // can be used for incoming packets. -+ void setIpaddresses (); // can be used for incoming packets. - - int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);} - int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);} diff --git a/net-mgmt/irrtoolset/files/patch-am b/net-mgmt/irrtoolset/files/patch-am deleted file mode 100644 index 70e7cb9572ed..000000000000 --- a/net-mgmt/irrtoolset/files/patch-am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/prtraceroute.hh.orig Sat Nov 27 18:47:35 1999 -+++ src/prtraceroute/prtraceroute.hh Sat Nov 27 18:47:45 1999 -@@ -121,7 +121,7 @@ - u_int flags; - void _add (ipAddr *ipaddr); - -- _hop () { -+ void _hop () { - ipaddr = (ipAddr *) NULL; - autnum = NULL; - route = new Route(); diff --git a/net-mgmt/irrtoolset/pkg-comment b/net-mgmt/irrtoolset/pkg-comment index 74aadb1512e4..ae8efe358649 100644 --- a/net-mgmt/irrtoolset/pkg-comment +++ b/net-mgmt/irrtoolset/pkg-comment @@ -1 +1 @@ -A suite of policy analysis tools +A suite of routing policy tools to interact with the IRR diff --git a/net-mgmt/irrtoolset/pkg-descr b/net-mgmt/irrtoolset/pkg-descr index 5129fb44e3a5..3a6f06ca3ace 100644 --- a/net-mgmt/irrtoolset/pkg-descr +++ b/net-mgmt/irrtoolset/pkg-descr @@ -13,12 +13,9 @@ CIDRAdvisor suggests safe cidr aggregates aoe autonomous system object editor -pmatch prints matching policies for destinations in aut-num objects - prpath enumerates a list of patchs between ASes and destinations prtraceroute prints route and policy information packets take to a network host -prcheck syntax checks the aut-num objects in the Internet Routing - Registry +rpslcheck sytax checks the aut-num policy for an AS. diff --git a/net-mgmt/irrtoolset/pkg-plist b/net-mgmt/irrtoolset/pkg-plist index a56f950cdc49..be6868193bc0 100644 --- a/net-mgmt/irrtoolset/pkg-plist +++ b/net-mgmt/irrtoolset/pkg-plist @@ -1,11 +1,8 @@ +bin/rpslcheck bin/peval -bin/pmatch bin/prpath bin/RtConfig bin/CIDRAdvisor -bin/prcheck -bin/irrstat bin/roe bin/aoe -bin/relayd bin/prtraceroute diff --git a/net/Makefile b/net/Makefile index 2f74cbd9743b..1e2f49eb9bb1 100644 --- a/net/Makefile +++ b/net/Makefile @@ -215,6 +215,7 @@ SUBDIR += ipv6calc SUBDIR += ipv6socket_scrub SUBDIR += ipw + SUBDIR += irrtoolset SUBDIR += isc-dhcp3 SUBDIR += isic SUBDIR += jabber @@ -482,7 +483,6 @@ SUBDIR += radreport SUBDIR += radvd SUBDIR += rancid - SUBDIR += ratoolset SUBDIR += rboot SUBDIR += rdesktop SUBDIR += rdesktop-devel diff --git a/net/irrtoolset/Makefile b/net/irrtoolset/Makefile index eff4dfa6623e..1aedc6f8fbc8 100644 --- a/net/irrtoolset/Makefile +++ b/net/irrtoolset/Makefile @@ -1,32 +1,37 @@ -# New ports collection makefile for: RAToolSet +# New ports collection makefile for: IRRToolSet # Date created: May 4th 1997 # Whom: James FitzGibbon <jfitz@FreeBSD.org> # # $FreeBSD$ # -PORTNAME= ratoolset -PORTVERSION= 3.5.8 +PORTNAME= irrtoolset +PORTVERSION= 4.7.2 CATEGORIES= net tk82 -MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/ -DISTNAME= RAToolSet-3.5.8 +MASTER_SITES= ftp://ftp.ripe.net/tools/IRRToolSet/ +DISTNAME= IRRToolSet-${PORTVERSION} MAINTAINER= oberman@es.net -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 +LIB_DEPENDS= tk83.1:${PORTSDIR}/x11-toolkits/tk83 USE_BISON= yes +USE_GMAKE= yes GNU_CONFIGURE= Yes -CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.2:${PREFIX}/include/tk8.2" \ +CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.3:${PREFIX}/include/tk8.3" \ TCL_TK_LIBRARY_DIR=${PREFIX}/lib \ - TCL_LIBRARY=${PREFIX}/lib/tcl8.2 \ - TK_LIBRARY=${PREFIX}/lib/tk8.2 \ - LD_TCL_TK_LIBS="-ltk82 -ltcl82" + TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \ + TK_LIBRARY=${PREFIX}/lib/tk8.3 \ + LD_TCL_TK_LIBS="-ltk83 -ltcl83" -MAN1= CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \ - prcheck.1 roe.1 -MAN8= prtraceroute.8 relayd.8 +MAN1= CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \ + roe.1 rpslcheck.1 prtraceroute.1 +MAN3= librpsl.3 -ALL_TARGET= depend all +post-patch: + @${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \ + ${WRKSRC}/src/irr/birdwhoisc.cc + +aLL_TARGET= depend all .include <bsd.port.mk> diff --git a/net/irrtoolset/distinfo b/net/irrtoolset/distinfo index bf0f43d9ff9e..8a819a1dca27 100644 --- a/net/irrtoolset/distinfo +++ b/net/irrtoolset/distinfo @@ -1 +1 @@ -MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38 +MD5 (IRRToolSet-4.7.2.tar.gz) = 8d4c9421247a2e3eba78c4d6506c84a8 diff --git a/net/irrtoolset/files/patch-aa b/net/irrtoolset/files/patch-aa deleted file mode 100644 index b4052b639c36..000000000000 --- a/net/irrtoolset/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- src/misc/net.hh.orig Wed Jan 28 17:40:42 1998 -+++ src/misc/net.hh Sat Nov 27 18:11:23 1999 -@@ -86,12 +86,12 @@ - int bind (...); - int listen (...); - int accept (...); --int recvfrom(...); -+ssize_t recvfrom(...); - int gethostname (...); - int setsockopt (...); - int select (...); --int sendto (...); --int send (...); -+ssize_t sendto (...); -+ssize_t send (...); - int gettimeofday (...); - } - -@@ -132,7 +132,7 @@ - class Timer { - struct timeval tv; - struct timezone tz; -- init_time () { -+ void init_time () { - bzero ((char *) &tv, sizeof (struct timeval)); - ::gettimeofday (&tv, &tz); - } -@@ -256,7 +256,7 @@ - return ptr; - } - u_long getInaddr () { return hexaddr; } -- print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } -+ void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } - - Error error; - }; -@@ -331,7 +331,7 @@ - error.warn("listen"); - return error(); - } -- accept () { -+ int accept () { - //u_long addrlen; - int addrlen = sizeof (struct sockaddr); - bzero ((char *) &socknew, sizeof (socknew)); diff --git a/net/irrtoolset/files/patch-ab b/net/irrtoolset/files/patch-ab deleted file mode 100644 index 6566ed2b1af4..000000000000 --- a/net/irrtoolset/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/Route.hh.orig Sat Nov 27 18:08:21 1999 -+++ src/dbase/Route.hh Sat Nov 27 18:08:41 1999 -@@ -92,7 +92,7 @@ - clear(); - } - -- clear () { -+ void clear () { - pix = NULL; - _dontcare = 0; - } -@@ -248,7 +248,7 @@ - pref = 0; - } - -- set (Pix asn, int p) { -+ void set (Pix asn, int p) { - asno = asn; - pref = p; - } diff --git a/net/irrtoolset/files/patch-ac b/net/irrtoolset/files/patch-ac deleted file mode 100644 index ca2b0e1d8f1f..000000000000 --- a/net/irrtoolset/files/patch-ac +++ /dev/null @@ -1,208 +0,0 @@ ---- src/dbase/Node.h.orig Sat Nov 27 18:11:57 1999 -+++ src/dbase/Node.h Sat Nov 27 18:16:21 1999 -@@ -101,7 +101,7 @@ - protected: - virtual void print(ostream &os) = 0; - public: -- virtual operator== (Node &b) = 0; -+ virtual int operator== (Node &b) = 0; - virtual void InOrderPrint() = 0; - virtual void PostOrderPrint() { InOrderPrint(); } - virtual ~Node() {}; -@@ -144,7 +144,7 @@ - virtual void print(ostream &os) = 0; - - public: -- virtual Execute(Route &r) = 0; -+ virtual void Execute(Route &r) = 0; - virtual ActionNode *FindFirst(Node_t _type) = 0; - int operator< (ActionNode &b); - friend ostream &operator<<(ostream &os, ActionNode *an) { -@@ -172,7 +172,7 @@ - type = T_ANDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANDNode - && left == ((ANDNode&) b).left - && right == ((ANDNode&) b).right; -@@ -200,7 +200,7 @@ - type = T_ORNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ORNode - && left == ((ORNode&) b).left - && right == ((ORNode&) b).right; -@@ -227,7 +227,7 @@ - type = T_NotNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NotNode - && left == ((NotNode&) b).left; - } -@@ -256,7 +256,7 @@ - type = T_AssignNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_AssignNode - && val == ((AssignNode&) b).val - && left == ((AssignNode&) b).left; -@@ -281,7 +281,7 @@ - type = T_ANYNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANYNode; - } - -@@ -305,7 +305,7 @@ - type = T_ASNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASNode - && val == ((ASNode&) b).val; - } -@@ -330,7 +330,7 @@ - type = T_ASMacroNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASMacroNode - && val == ((ASMacroNode&) b).val; - } -@@ -355,7 +355,7 @@ - type = T_CommNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_CommNode - && val == ((CommNode&) b).val; - } -@@ -382,7 +382,7 @@ - cidr_root = NULL; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NetListNode - && nets == ((NetListNode&) b).nets; - } -@@ -391,7 +391,7 @@ - virtual NormalExpression *Evaluate(int expand); - virtual int match(Route &r, char dontcare); - virtual int match_exact_or_more_specific(Route &r, char dontcare); -- add(Pix pi) { nets.add(pi); } -+ void add(Pix pi) { nets.add(pi); } - }; - - ////////////////////////////// ASPathNode ////////////////////////////// -@@ -412,7 +412,7 @@ - type = T_ASPathNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - ASSERT(0); - return 0; - } -@@ -438,7 +438,7 @@ - type = T_RegisterNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_RegisterNode - && val == ((RegisterNode&) b).val; - } -@@ -460,13 +460,13 @@ - type = T_PrefNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_PrefNode - && val == ((PrefNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -492,13 +492,13 @@ - type = T_MEDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_MEDNode - && val == ((MEDNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -524,13 +524,13 @@ - type = T_DPANode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_DPANode - && val == ((DPANode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -552,12 +552,12 @@ - type = T_NoopNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NoopNode; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) - return this; -@@ -581,14 +581,14 @@ - } - virtual ~ComposeNode(); - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ComposeNode - && left == ((ComposeNode&) b).left - && right == ((ComposeNode&) b).right; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - ActionNode *r; - if (type == _type) diff --git a/net/irrtoolset/files/patch-ad b/net/irrtoolset/files/patch-ad deleted file mode 100644 index d0560a973b2a..000000000000 --- a/net/irrtoolset/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/misc/Error.hh.orig Sat Nov 27 18:17:24 1999 -+++ src/misc/Error.hh Sat Nov 27 18:17:31 1999 -@@ -378,7 +378,7 @@ - reset(); - } - -- reset() { -+ void reset() { - errno = 0; - level_ = ErrorNone; - messages_.clear(); diff --git a/net/irrtoolset/files/patch-ae b/net/irrtoolset/files/patch-ae deleted file mode 100644 index 8c3005236be0..000000000000 --- a/net/irrtoolset/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/peval/xx_lexer.y.orig Sat Nov 27 18:18:56 1999 -+++ src/peval/xx_lexer.y Sat Nov 27 18:19:07 1999 -@@ -94,7 +94,7 @@ - NULL, ERROR_TKN - }; - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net/irrtoolset/files/patch-af b/net/irrtoolset/files/patch-af deleted file mode 100644 index 50022888976a..000000000000 --- a/net/irrtoolset/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- src/misc/net.cc.orig Sat Nov 27 18:20:31 1999 -+++ src/misc/net.cc Sat Nov 27 18:21:15 1999 -@@ -215,6 +215,7 @@ - init_server (p); - } - -+int - TCP::init_server (int p) { - setLocalPort (p); - bind(); diff --git a/net/irrtoolset/files/patch-ag b/net/irrtoolset/files/patch-ag deleted file mode 100644 index f5519df2a198..000000000000 --- a/net/irrtoolset/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dbase/irr_lexer.y.orig Sat Nov 27 18:22:22 1999 -+++ src/dbase/irr_lexer.y Sat Nov 27 18:22:44 1999 -@@ -73,7 +73,7 @@ - - #include <cctype> - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net/irrtoolset/files/patch-ah b/net/irrtoolset/files/patch-ah deleted file mode 100644 index 4278782c08ab..000000000000 --- a/net/irrtoolset/files/patch-ah +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/irr_parser.y.orig Sat Nov 27 18:23:53 1999 -+++ src/dbase/irr_parser.y Sat Nov 27 18:25:00 1999 -@@ -90,7 +90,7 @@ - char *error_while_expecting = NULL; - - static regexp_symbol *re_symbol; --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter); - static ASPolicy *find_or_insert_peer_as(Pix peer); - static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr); -@@ -635,7 +635,7 @@ - return(0); - } - --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter) { - Filter_Action *fap, *fap2; - diff --git a/net/irrtoolset/files/patch-ai b/net/irrtoolset/files/patch-ai deleted file mode 100644 index 18de9569197e..000000000000 --- a/net/irrtoolset/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- src/roe/roe_config.hh.orig Sat Nov 27 18:35:37 1999 -+++ src/roe/roe_config.hh Sat Nov 27 18:36:14 1999 -@@ -42,7 +42,7 @@ - - class Configure { - public: -- const int size = 12; -+ static const int size = 12; - - class DBUpdate { - public: diff --git a/net/irrtoolset/files/patch-aj b/net/irrtoolset/files/patch-aj deleted file mode 100644 index 6d190fb677b6..000000000000 --- a/net/irrtoolset/files/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ ---- src/aoe/TclApp.cc.orig Sat Nov 27 18:38:25 1999 -+++ src/aoe/TclApp.cc Sat Nov 27 18:43:51 1999 -@@ -186,9 +186,9 @@ - // Call Tcl function to create a Tcl command - if (Tcl_CreateCommand(ptInterp, - pcCommand->getName(), -- TclCommand::command, -+ &TclCommand::command, - (ClientData)pcCommand, -- TclCommand::cleanUp) == NULL) return 0; -+ &TclCommand::cleanUp) == NULL) return 0; - return 1; - } - diff --git a/net/irrtoolset/files/patch-ak b/net/irrtoolset/files/patch-ak deleted file mode 100644 index 05060ae5f711..000000000000 --- a/net/irrtoolset/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aoe/TclLabel.cc.orig Sat Nov 27 18:45:09 1999 -+++ src/aoe/TclLabel.cc Sat Nov 27 18:45:24 1999 -@@ -47,7 +47,7 @@ - #include "TclLabel.hh" - #include "TclApp.hh" - --TclLabel::clear(void) -+int TclLabel::clear(void) - { - TclApplication *pcApp = (TclApplication *)getExtraArgument(); - return (pcApp->evalf("%s configure -text {}", getName())); diff --git a/net/irrtoolset/files/patch-al b/net/irrtoolset/files/patch-al deleted file mode 100644 index 49b068f99199..000000000000 --- a/net/irrtoolset/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/netraw.hh.orig Sat Nov 27 18:46:27 1999 -+++ src/prtraceroute/netraw.hh Sat Nov 27 18:46:49 1999 -@@ -121,7 +121,7 @@ - rawIP (int protocol = IPPROTO_RAW); - rawIP (char *hostname, int protocol = IPPROTO_RAW); - -- setIpaddresses (); // can be used for incoming packets. -+ void setIpaddresses (); // can be used for incoming packets. - - int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);} - int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);} diff --git a/net/irrtoolset/files/patch-am b/net/irrtoolset/files/patch-am deleted file mode 100644 index 70e7cb9572ed..000000000000 --- a/net/irrtoolset/files/patch-am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/prtraceroute.hh.orig Sat Nov 27 18:47:35 1999 -+++ src/prtraceroute/prtraceroute.hh Sat Nov 27 18:47:45 1999 -@@ -121,7 +121,7 @@ - u_int flags; - void _add (ipAddr *ipaddr); - -- _hop () { -+ void _hop () { - ipaddr = (ipAddr *) NULL; - autnum = NULL; - route = new Route(); diff --git a/net/irrtoolset/pkg-comment b/net/irrtoolset/pkg-comment index 74aadb1512e4..ae8efe358649 100644 --- a/net/irrtoolset/pkg-comment +++ b/net/irrtoolset/pkg-comment @@ -1 +1 @@ -A suite of policy analysis tools +A suite of routing policy tools to interact with the IRR diff --git a/net/irrtoolset/pkg-descr b/net/irrtoolset/pkg-descr index 5129fb44e3a5..3a6f06ca3ace 100644 --- a/net/irrtoolset/pkg-descr +++ b/net/irrtoolset/pkg-descr @@ -13,12 +13,9 @@ CIDRAdvisor suggests safe cidr aggregates aoe autonomous system object editor -pmatch prints matching policies for destinations in aut-num objects - prpath enumerates a list of patchs between ASes and destinations prtraceroute prints route and policy information packets take to a network host -prcheck syntax checks the aut-num objects in the Internet Routing - Registry +rpslcheck sytax checks the aut-num policy for an AS. diff --git a/net/irrtoolset/pkg-plist b/net/irrtoolset/pkg-plist index a56f950cdc49..be6868193bc0 100644 --- a/net/irrtoolset/pkg-plist +++ b/net/irrtoolset/pkg-plist @@ -1,11 +1,8 @@ +bin/rpslcheck bin/peval -bin/pmatch bin/prpath bin/RtConfig bin/CIDRAdvisor -bin/prcheck -bin/irrstat bin/roe bin/aoe -bin/relayd bin/prtraceroute diff --git a/net/ratoolset/Makefile b/net/ratoolset/Makefile deleted file mode 100644 index eff4dfa6623e..000000000000 --- a/net/ratoolset/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# New ports collection makefile for: RAToolSet -# Date created: May 4th 1997 -# Whom: James FitzGibbon <jfitz@FreeBSD.org> -# -# $FreeBSD$ -# - -PORTNAME= ratoolset -PORTVERSION= 3.5.8 -CATEGORIES= net tk82 -MASTER_SITES= ftp://ftp.isi.edu/ra/RAToolSet/ -DISTNAME= RAToolSet-3.5.8 - -MAINTAINER= oberman@es.net - -LIB_DEPENDS= tk82.1:${PORTSDIR}/x11-toolkits/tk82 - -USE_BISON= yes -GNU_CONFIGURE= Yes -CONFIGURE_ENV= TCL_TK_INCLUDE_DIR="${PREFIX}/include/tcl8.2:${PREFIX}/include/tk8.2" \ - TCL_TK_LIBRARY_DIR=${PREFIX}/lib \ - TCL_LIBRARY=${PREFIX}/lib/tcl8.2 \ - TK_LIBRARY=${PREFIX}/lib/tk8.2 \ - LD_TCL_TK_LIBS="-ltk82 -ltcl82" - -MAN1= CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \ - prcheck.1 roe.1 -MAN8= prtraceroute.8 relayd.8 - -ALL_TARGET= depend all - -.include <bsd.port.mk> diff --git a/net/ratoolset/distinfo b/net/ratoolset/distinfo deleted file mode 100644 index bf0f43d9ff9e..000000000000 --- a/net/ratoolset/distinfo +++ /dev/null @@ -1 +0,0 @@ -MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38 diff --git a/net/ratoolset/files/patch-aa b/net/ratoolset/files/patch-aa deleted file mode 100644 index b4052b639c36..000000000000 --- a/net/ratoolset/files/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ ---- src/misc/net.hh.orig Wed Jan 28 17:40:42 1998 -+++ src/misc/net.hh Sat Nov 27 18:11:23 1999 -@@ -86,12 +86,12 @@ - int bind (...); - int listen (...); - int accept (...); --int recvfrom(...); -+ssize_t recvfrom(...); - int gethostname (...); - int setsockopt (...); - int select (...); --int sendto (...); --int send (...); -+ssize_t sendto (...); -+ssize_t send (...); - int gettimeofday (...); - } - -@@ -132,7 +132,7 @@ - class Timer { - struct timeval tv; - struct timezone tz; -- init_time () { -+ void init_time () { - bzero ((char *) &tv, sizeof (struct timeval)); - ::gettimeofday (&tv, &tz); - } -@@ -256,7 +256,7 @@ - return ptr; - } - u_long getInaddr () { return hexaddr; } -- print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } -+ void print () { printf ("%s\n%s\n0x%x\n", hostname, dottedaddr, hexaddr); } - - Error error; - }; -@@ -331,7 +331,7 @@ - error.warn("listen"); - return error(); - } -- accept () { -+ int accept () { - //u_long addrlen; - int addrlen = sizeof (struct sockaddr); - bzero ((char *) &socknew, sizeof (socknew)); diff --git a/net/ratoolset/files/patch-ab b/net/ratoolset/files/patch-ab deleted file mode 100644 index 6566ed2b1af4..000000000000 --- a/net/ratoolset/files/patch-ab +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/Route.hh.orig Sat Nov 27 18:08:21 1999 -+++ src/dbase/Route.hh Sat Nov 27 18:08:41 1999 -@@ -92,7 +92,7 @@ - clear(); - } - -- clear () { -+ void clear () { - pix = NULL; - _dontcare = 0; - } -@@ -248,7 +248,7 @@ - pref = 0; - } - -- set (Pix asn, int p) { -+ void set (Pix asn, int p) { - asno = asn; - pref = p; - } diff --git a/net/ratoolset/files/patch-ac b/net/ratoolset/files/patch-ac deleted file mode 100644 index ca2b0e1d8f1f..000000000000 --- a/net/ratoolset/files/patch-ac +++ /dev/null @@ -1,208 +0,0 @@ ---- src/dbase/Node.h.orig Sat Nov 27 18:11:57 1999 -+++ src/dbase/Node.h Sat Nov 27 18:16:21 1999 -@@ -101,7 +101,7 @@ - protected: - virtual void print(ostream &os) = 0; - public: -- virtual operator== (Node &b) = 0; -+ virtual int operator== (Node &b) = 0; - virtual void InOrderPrint() = 0; - virtual void PostOrderPrint() { InOrderPrint(); } - virtual ~Node() {}; -@@ -144,7 +144,7 @@ - virtual void print(ostream &os) = 0; - - public: -- virtual Execute(Route &r) = 0; -+ virtual void Execute(Route &r) = 0; - virtual ActionNode *FindFirst(Node_t _type) = 0; - int operator< (ActionNode &b); - friend ostream &operator<<(ostream &os, ActionNode *an) { -@@ -172,7 +172,7 @@ - type = T_ANDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANDNode - && left == ((ANDNode&) b).left - && right == ((ANDNode&) b).right; -@@ -200,7 +200,7 @@ - type = T_ORNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ORNode - && left == ((ORNode&) b).left - && right == ((ORNode&) b).right; -@@ -227,7 +227,7 @@ - type = T_NotNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NotNode - && left == ((NotNode&) b).left; - } -@@ -256,7 +256,7 @@ - type = T_AssignNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_AssignNode - && val == ((AssignNode&) b).val - && left == ((AssignNode&) b).left; -@@ -281,7 +281,7 @@ - type = T_ANYNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ANYNode; - } - -@@ -305,7 +305,7 @@ - type = T_ASNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASNode - && val == ((ASNode&) b).val; - } -@@ -330,7 +330,7 @@ - type = T_ASMacroNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ASMacroNode - && val == ((ASMacroNode&) b).val; - } -@@ -355,7 +355,7 @@ - type = T_CommNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_CommNode - && val == ((CommNode&) b).val; - } -@@ -382,7 +382,7 @@ - cidr_root = NULL; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NetListNode - && nets == ((NetListNode&) b).nets; - } -@@ -391,7 +391,7 @@ - virtual NormalExpression *Evaluate(int expand); - virtual int match(Route &r, char dontcare); - virtual int match_exact_or_more_specific(Route &r, char dontcare); -- add(Pix pi) { nets.add(pi); } -+ void add(Pix pi) { nets.add(pi); } - }; - - ////////////////////////////// ASPathNode ////////////////////////////// -@@ -412,7 +412,7 @@ - type = T_ASPathNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - ASSERT(0); - return 0; - } -@@ -438,7 +438,7 @@ - type = T_RegisterNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_RegisterNode - && val == ((RegisterNode&) b).val; - } -@@ -460,13 +460,13 @@ - type = T_PrefNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_PrefNode - && val == ((PrefNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -492,13 +492,13 @@ - type = T_MEDNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_MEDNode - && val == ((MEDNode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -524,13 +524,13 @@ - type = T_DPANode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_DPANode - && val == ((DPANode&) b).val; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) { -+ virtual void Execute(Route &r) { - } - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) -@@ -552,12 +552,12 @@ - type = T_NoopNode; - } - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_NoopNode; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - if (type == _type) - return this; -@@ -581,14 +581,14 @@ - } - virtual ~ComposeNode(); - -- virtual operator== (Node& b) { -+ virtual int operator== (Node& b) { - return b.type == T_ComposeNode - && left == ((ComposeNode&) b).left - && right == ((ComposeNode&) b).right; - } - - virtual void InOrderPrint(); -- virtual Execute(Route &r) {} -+ virtual void Execute(Route &r) {} - virtual ActionNode *FindFirst(Node_t _type) { - ActionNode *r; - if (type == _type) diff --git a/net/ratoolset/files/patch-ad b/net/ratoolset/files/patch-ad deleted file mode 100644 index d0560a973b2a..000000000000 --- a/net/ratoolset/files/patch-ad +++ /dev/null @@ -1,11 +0,0 @@ ---- src/misc/Error.hh.orig Sat Nov 27 18:17:24 1999 -+++ src/misc/Error.hh Sat Nov 27 18:17:31 1999 -@@ -378,7 +378,7 @@ - reset(); - } - -- reset() { -+ void reset() { - errno = 0; - level_ = ErrorNone; - messages_.clear(); diff --git a/net/ratoolset/files/patch-ae b/net/ratoolset/files/patch-ae deleted file mode 100644 index 8c3005236be0..000000000000 --- a/net/ratoolset/files/patch-ae +++ /dev/null @@ -1,11 +0,0 @@ ---- src/peval/xx_lexer.y.orig Sat Nov 27 18:18:56 1999 -+++ src/peval/xx_lexer.y Sat Nov 27 18:19:07 1999 -@@ -94,7 +94,7 @@ - NULL, ERROR_TKN - }; - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net/ratoolset/files/patch-af b/net/ratoolset/files/patch-af deleted file mode 100644 index 50022888976a..000000000000 --- a/net/ratoolset/files/patch-af +++ /dev/null @@ -1,10 +0,0 @@ ---- src/misc/net.cc.orig Sat Nov 27 18:20:31 1999 -+++ src/misc/net.cc Sat Nov 27 18:21:15 1999 -@@ -215,6 +215,7 @@ - init_server (p); - } - -+int - TCP::init_server (int p) { - setLocalPort (p); - bind(); diff --git a/net/ratoolset/files/patch-ag b/net/ratoolset/files/patch-ag deleted file mode 100644 index f5519df2a198..000000000000 --- a/net/ratoolset/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- src/dbase/irr_lexer.y.orig Sat Nov 27 18:22:22 1999 -+++ src/dbase/irr_lexer.y Sat Nov 27 18:22:44 1999 -@@ -73,7 +73,7 @@ - - #include <cctype> - --static inline strtoupper(char *c) { -+static inline void strtoupper(char *c) { - for (; *c; c++) - if (isascii(*c) && isalpha(*c)) - *c = toupper(*c); diff --git a/net/ratoolset/files/patch-ah b/net/ratoolset/files/patch-ah deleted file mode 100644 index 4278782c08ab..000000000000 --- a/net/ratoolset/files/patch-ah +++ /dev/null @@ -1,20 +0,0 @@ ---- src/dbase/irr_parser.y.orig Sat Nov 27 18:23:53 1999 -+++ src/dbase/irr_parser.y Sat Nov 27 18:25:00 1999 -@@ -90,7 +90,7 @@ - char *error_while_expecting = NULL; - - static regexp_symbol *re_symbol; --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter); - static ASPolicy *find_or_insert_peer_as(Pix peer); - static InterASPolicy *find_or_insert_peering(ASPolicy *p, Pix laddr, Pix raddr); -@@ -635,7 +635,7 @@ - return(0); - } - --static insert_or_update_filter_action(ListHead<Filter_Action> &l, -+static void insert_or_update_filter_action(ListHead<Filter_Action> &l, - ActionNode *action, FilterNode *filter) { - Filter_Action *fap, *fap2; - diff --git a/net/ratoolset/files/patch-ai b/net/ratoolset/files/patch-ai deleted file mode 100644 index 18de9569197e..000000000000 --- a/net/ratoolset/files/patch-ai +++ /dev/null @@ -1,11 +0,0 @@ ---- src/roe/roe_config.hh.orig Sat Nov 27 18:35:37 1999 -+++ src/roe/roe_config.hh Sat Nov 27 18:36:14 1999 -@@ -42,7 +42,7 @@ - - class Configure { - public: -- const int size = 12; -+ static const int size = 12; - - class DBUpdate { - public: diff --git a/net/ratoolset/files/patch-aj b/net/ratoolset/files/patch-aj deleted file mode 100644 index 6d190fb677b6..000000000000 --- a/net/ratoolset/files/patch-aj +++ /dev/null @@ -1,14 +0,0 @@ ---- src/aoe/TclApp.cc.orig Sat Nov 27 18:38:25 1999 -+++ src/aoe/TclApp.cc Sat Nov 27 18:43:51 1999 -@@ -186,9 +186,9 @@ - // Call Tcl function to create a Tcl command - if (Tcl_CreateCommand(ptInterp, - pcCommand->getName(), -- TclCommand::command, -+ &TclCommand::command, - (ClientData)pcCommand, -- TclCommand::cleanUp) == NULL) return 0; -+ &TclCommand::cleanUp) == NULL) return 0; - return 1; - } - diff --git a/net/ratoolset/files/patch-ak b/net/ratoolset/files/patch-ak deleted file mode 100644 index 05060ae5f711..000000000000 --- a/net/ratoolset/files/patch-ak +++ /dev/null @@ -1,11 +0,0 @@ ---- src/aoe/TclLabel.cc.orig Sat Nov 27 18:45:09 1999 -+++ src/aoe/TclLabel.cc Sat Nov 27 18:45:24 1999 -@@ -47,7 +47,7 @@ - #include "TclLabel.hh" - #include "TclApp.hh" - --TclLabel::clear(void) -+int TclLabel::clear(void) - { - TclApplication *pcApp = (TclApplication *)getExtraArgument(); - return (pcApp->evalf("%s configure -text {}", getName())); diff --git a/net/ratoolset/files/patch-al b/net/ratoolset/files/patch-al deleted file mode 100644 index 49b068f99199..000000000000 --- a/net/ratoolset/files/patch-al +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/netraw.hh.orig Sat Nov 27 18:46:27 1999 -+++ src/prtraceroute/netraw.hh Sat Nov 27 18:46:49 1999 -@@ -121,7 +121,7 @@ - rawIP (int protocol = IPPROTO_RAW); - rawIP (char *hostname, int protocol = IPPROTO_RAW); - -- setIpaddresses (); // can be used for incoming packets. -+ void setIpaddresses (); // can be used for incoming packets. - - int write (){return rawPacket::write ((char *) ip_hdr, ip_hdr->ip_len);} - int send (){return rawPacket::send ((char *) ip_hdr, ip_hdr->ip_len);} diff --git a/net/ratoolset/files/patch-am b/net/ratoolset/files/patch-am deleted file mode 100644 index 70e7cb9572ed..000000000000 --- a/net/ratoolset/files/patch-am +++ /dev/null @@ -1,11 +0,0 @@ ---- src/prtraceroute/prtraceroute.hh.orig Sat Nov 27 18:47:35 1999 -+++ src/prtraceroute/prtraceroute.hh Sat Nov 27 18:47:45 1999 -@@ -121,7 +121,7 @@ - u_int flags; - void _add (ipAddr *ipaddr); - -- _hop () { -+ void _hop () { - ipaddr = (ipAddr *) NULL; - autnum = NULL; - route = new Route(); diff --git a/net/ratoolset/pkg-comment b/net/ratoolset/pkg-comment deleted file mode 100644 index 74aadb1512e4..000000000000 --- a/net/ratoolset/pkg-comment +++ /dev/null @@ -1 +0,0 @@ -A suite of policy analysis tools diff --git a/net/ratoolset/pkg-descr b/net/ratoolset/pkg-descr deleted file mode 100644 index 5129fb44e3a5..000000000000 --- a/net/ratoolset/pkg-descr +++ /dev/null @@ -1,24 +0,0 @@ -RAToolSet is a suite of policy analysis tools. It is implemented in C++ on a -UNIX platform. It has been ported successfully to many platforms including -Sun Sparc stations running SunOS 4.1.3 or Solaris, FreeBSD, DEC Alphas -running OSF/1, and BSDI. It contains the following programs: - -RtConfig routing policies analyzer and router configuration tool - -peval a low-level policy evaluation tool - -roe route object editor - -CIDRAdvisor suggests safe cidr aggregates - -aoe autonomous system object editor - -pmatch prints matching policies for destinations in aut-num objects - -prpath enumerates a list of patchs between ASes and destinations - -prtraceroute prints route and policy information packets take to a - network host - -prcheck syntax checks the aut-num objects in the Internet Routing - Registry diff --git a/net/ratoolset/pkg-plist b/net/ratoolset/pkg-plist deleted file mode 100644 index a56f950cdc49..000000000000 --- a/net/ratoolset/pkg-plist +++ /dev/null @@ -1,11 +0,0 @@ -bin/peval -bin/pmatch -bin/prpath -bin/RtConfig -bin/CIDRAdvisor -bin/prcheck -bin/irrstat -bin/roe -bin/aoe -bin/relayd -bin/prtraceroute |