FreeBSD Bugzilla – Attachment 24848 Details for
Bug 42391
Conversion of net/ratoolset to net/irrtoolset
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
file.diff
file.diff (text/plain), 16.34 KB, created by
Kevin Oberman
on 2002-09-03 23:30:05 UTC
(
hide
)
Description:
file.diff
Filename:
MIME Type:
Creator:
Kevin Oberman
Created:
2002-09-03 23:30:05 UTC
Size:
16.34 KB
patch
obsolete
>diff -ruN ratoolset/Makefile irrtoolset/Makefile >--- irrtoolset.old/Makefile Mon Sep 2 03:16:24 2002 >+++ irrtoolset/Makefile Tue Sep 3 14:56:45 2002 >@@ -1,31 +1,35 @@ >-# New ports collection makefile for: RAToolSet >-# Date created: May 4th 1997 >-# Whom: James FitzGibbon <jfitz@FreeBSD.org> >-# >-# $FreeBSD: ports/net/ratoolset/Makefile,v 1.17 2002/09/02 00:09:31 trevor Exp $ >+# New ports collection makefile for: IRRToolSet >+# Date created: Aug 27 2002 >+# Whom: R. Kevin Oberman <oberman@es.net> > # >+# $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-4.7.2 > > 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" >- >-MAN1= CIDRAdvisor.1 aoe.1 pmatch.1 prpath.1 RtConfig.1 peval.1 \ >- prcheck.1 roe.1 >-MAN8= prtraceroute.8 relayd.8 >+ TCL_LIBRARY=${PREFIX}/lib/tcl8.3 \ >+ TK_LIBRARY=${PREFIX}/lib/tk8.3 \ >+ LD_TCL_TK_LIBS="-ltk83 -ltcl83" >+ >+MAN1= CIDRAdvisor.1 aoe.1 prpath.1 RtConfig.1 peval.1 \ >+ roe.1 rpslcheck.1 prtraceroute.1 >+MAN3= librpsl.3 >+ >+post-patch: >+ @${SED} -i.orig -e 's|#include <malloc.h>|/* #include <malloc.h> */|' \ >+ ${WRKSRC}/src/irr/birdwhoisc.cc > > ALL_TARGET= depend all > >diff -ruN irrtoolset.old/distinfo irrtoolset/distinfo >--- irrtoolset.old/distinfo Fri Dec 10 13:22:25 1999 >+++ irrtoolset/distinfo Tue Aug 27 14:04:33 2002 >@@ -1 +1 @@ >-MD5 (RAToolSet-3.5.8.tar.gz) = 4c7a04539a878ba3bcc5a6de3d12ac38 >+MD5 (IRRToolSet-4.7.2.tar.gz) = 8d4c9421247a2e3eba78c4d6506c84a8 >diff -ruN irrtoolset.old/files/patch-aa irrtoolset/files/patch-aa >--- irrtoolset.old/files/patch-aa Fri Dec 10 13:22:26 1999 >+++ irrtoolset/files/patch-aa Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ab irrtoolset/files/patch-ab >--- irrtoolset.old/files/patch-ab Fri Dec 10 13:22:26 1999 >+++ irrtoolset/files/patch-ab Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ac irrtoolset/files/patch-ac >--- irrtoolset.old/files/patch-ac Fri Dec 10 13:22:27 1999 >+++ irrtoolset/files/patch-ac Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ad irrtoolset/files/patch-ad >--- irrtoolset.old/files/patch-ad Fri Dec 10 13:22:27 1999 >+++ irrtoolset/files/patch-ad Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ae irrtoolset/files/patch-ae >--- irrtoolset.old/files/patch-ae Fri Dec 10 13:22:27 1999 >+++ irrtoolset/files/patch-ae Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-af irrtoolset/files/patch-af >--- irrtoolset.old/files/patch-af Fri Dec 10 13:22:27 1999 >+++ irrtoolset/files/patch-af Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ag irrtoolset/files/patch-ag >--- irrtoolset.old/files/patch-ag Fri Dec 10 13:22:28 1999 >+++ irrtoolset/files/patch-ag Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ah irrtoolset/files/patch-ah >--- irrtoolset.old/files/patch-ah Fri Dec 10 13:22:28 1999 >+++ irrtoolset/files/patch-ah Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ai irrtoolset/files/patch-ai >--- irrtoolset.old/files/patch-ai Fri Dec 10 13:22:28 1999 >+++ irrtoolset/files/patch-ai Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-aj irrtoolset/files/patch-aj >--- irrtoolset.old/files/patch-aj Fri Dec 10 13:22:28 1999 >+++ irrtoolset/files/patch-aj Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-ak irrtoolset/files/patch-ak >--- irrtoolset.old/files/patch-ak Fri Dec 10 13:22:29 1999 >+++ irrtoolset/files/patch-ak Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-al irrtoolset/files/patch-al >--- irrtoolset.old/files/patch-al Fri Dec 10 13:22:29 1999 >+++ irrtoolset/files/patch-al Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/files/patch-am irrtoolset/files/patch-am >--- irrtoolset.old/files/patch-am Fri Dec 10 13:22:29 1999 >+++ irrtoolset/files/patch-am Wed Dec 31 16:00:00 1969 >@@ -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 -ruN irrtoolset.old/pkg-comment irrtoolset/pkg-comment >--- irrtoolset.old/pkg-comment Sat Jun 26 12:01:29 1999 >+++ irrtoolset/pkg-comment Tue Aug 27 17:05:20 2002 >@@ -1 +1 @@ >-A suite of policy analysis tools >+A suite of routing policy tools to interact with the IRR >diff -ruN irrtoolset.old/pkg-descr irrtoolset/pkg-descr >--- irrtoolset.old/pkg-descr Sat Feb 7 19:01:24 1998 >+++ irrtoolset/pkg-descr Tue Aug 27 17:03:22 2002 >@@ -13,12 +13,9 @@ > > 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 -ruN irrtoolset.old/pkg-plist irrtoolset/pkg-plist >--- irrtoolset.old/pkg-plist Fri Dec 10 13:22:32 1999 >+++ irrtoolset/pkg-plist Tue Sep 3 15:12:13 2002 >@@ -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
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 42391
: 24848