diff options
-rw-r--r-- | net/irrtoolset-nox11/Makefile | 4 | ||||
-rw-r--r-- | net/irrtoolset-nox11/distinfo | 10 | ||||
-rw-r--r-- | net/irrtoolset-nox11/patches/patch-cs | 7 | ||||
-rw-r--r-- | net/irrtoolset-nox11/patches/patch-dr | 16 | ||||
-rw-r--r-- | net/irrtoolset-nox11/patches/patch-dv | 9 |
5 files changed, 33 insertions, 13 deletions
diff --git a/net/irrtoolset-nox11/Makefile b/net/irrtoolset-nox11/Makefile index 95c53b094cd..90dd4248266 100644 --- a/net/irrtoolset-nox11/Makefile +++ b/net/irrtoolset-nox11/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2009/02/14 19:17:50 spz Exp $ +# $NetBSD: Makefile,v 1.23 2009/02/14 22:19:52 spz Exp $ # DISTNAME= IRRToolSet-4.8.5 -PKGREVISION= 12 +PKGREVISION= 13 CATEGORIES= net MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/ diff --git a/net/irrtoolset-nox11/distinfo b/net/irrtoolset-nox11/distinfo index f08754c41fb..70a70510601 100644 --- a/net/irrtoolset-nox11/distinfo +++ b/net/irrtoolset-nox11/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2009/02/14 19:17:50 spz Exp $ +$NetBSD: distinfo,v 1.21 2009/02/14 22:19:52 spz Exp $ SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b @@ -31,7 +31,7 @@ SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56 SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2 SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720 SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68 -SHA1 (patch-cs) = dbd30b057019ae78f753e0d81df8175452d0abda +SHA1 (patch-cs) = 4a1b3c295769f0e5e5e260cea86ad9185c0a3d38 SHA1 (patch-ct) = fe8a85d7bc3e3871ba67140b7bf756bcdc4d1e45 SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861 SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4 @@ -55,12 +55,14 @@ SHA1 (patch-dm) = 94c7ec10452044f2a7ff34e82ddaac28c8660ab8 SHA1 (patch-do) = 8f85b97d5067e08a07fe95cb5a7eae84e9f459e3 SHA1 (patch-dp) = 0b5ee0579aab4d112d10e619e7059bf0b5afb7f0 SHA1 (patch-dq) = 6004e46320b790ac4e1bc4488e3eb327af84299b -SHA1 (patch-dr) = 3ecae72db6ec932736456d61e2abc53e225b2a5d +SHA1 (patch-dr) = 81f847d776958c36db98bbb73321c15820eec4e8 SHA1 (patch-ds) = 1dbe3e743991a28a8e80d48be1bd5d1b890a6f42 SHA1 (patch-dt) = 19e99c706423936dba31f28840a25055440f3bd1 SHA1 (patch-du) = 602f913a53a5f274eba4725d6b3b91512fe9b5ac -SHA1 (patch-dv) = ad1d221e3e272dadde27171fbef0ae1cb23c3ed8 +SHA1 (patch-dv) = d968c6f9d63d9fd5763839bff9b540bcdcb0d679 SHA1 (patch-dw) = a77b3a6875f247db1809e66739f80bf3e82c17f9 SHA1 (patch-dx) = 32c1b30201af1c4bb58e274d29bbc6ceb04668df SHA1 (patch-dy) = 7fb4e6f1e0b41e0ce737cd8ea9bf90b05c6d45f3 SHA1 (patch-dz) = e9b7e4602cf88df8bf797b3143e91655350ae90f +SHA1 (patch-ea) = 30d1076b425c3cc7d503dbb64dfb47c11f6413a6 +SHA1 (patch-eb) = 78729952a60c29414818ed7785e99db162a9f37a diff --git a/net/irrtoolset-nox11/patches/patch-cs b/net/irrtoolset-nox11/patches/patch-cs index e62fb612327..205eb47c85f 100644 --- a/net/irrtoolset-nox11/patches/patch-cs +++ b/net/irrtoolset-nox11/patches/patch-cs @@ -1,4 +1,4 @@ -$NetBSD: patch-cs,v 1.3 2008/08/03 22:43:39 spz Exp $ +$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 @@ -56,7 +56,7 @@ $NetBSD: patch-cs,v 1.3 2008/08/03 22:43:39 spz Exp $ q = strchr(r, ')') + 1; *r = 0; r++; -@@ -1246,8 +1246,28 @@ bool CiscoConfig::printNeighbor(int impo +@@ -1246,8 +1246,31 @@ bool CiscoConfig::printNeighbor(int impo cout << " neighbor " << neighbor << " remote-as " << peerAS << "\n"; if (afi_activate && !peerGroup) { @@ -82,6 +82,9 @@ $NetBSD: patch-cs,v 1.3 2008/08/03 22:43:39 spz Exp $ + 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 } diff --git a/net/irrtoolset-nox11/patches/patch-dr b/net/irrtoolset-nox11/patches/patch-dr index 14c285b7647..66d4191b6b1 100644 --- a/net/irrtoolset-nox11/patches/patch-dr +++ b/net/irrtoolset-nox11/patches/patch-dr @@ -1,8 +1,18 @@ -$NetBSD: patch-dr,v 1.2 2009/02/14 16:17:06 spz Exp $ +$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 -@@ -128,6 +128,9 @@ In older Cisco IOS versions, +@@ -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. @@ -12,7 +22,7 @@ $NetBSD: patch-dr,v 1.2 2009/02/14 16:17:06 spz Exp $ .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 +590,7 @@ Unimplemented method for this rp_attribu +@@ -587,7 +595,7 @@ Unimplemented method for this rp_attribu .PP For more error descriptions, please see .B diff --git a/net/irrtoolset-nox11/patches/patch-dv b/net/irrtoolset-nox11/patches/patch-dv index 443692b4ace..b53bf7051d1 100644 --- a/net/irrtoolset-nox11/patches/patch-dv +++ b/net/irrtoolset-nox11/patches/patch-dv @@ -1,4 +1,4 @@ -$NetBSD: patch-dv,v 1.1 2009/02/14 16:17:06 spz Exp $ +$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 @@ -10,7 +10,7 @@ $NetBSD: patch-dv,v 1.1 2009/02/14 16:17:06 spz Exp $ bool RtConfig::supressMartians = false; int RtConfig::preferenceCeiling = 1000; -@@ -182,6 +183,9 @@ void init_and_set_options (int argc, cha +@@ -182,8 +183,14 @@ void init_and_set_options (int argc, cha IRR_COMMAND_LINE_OPTIONS, @@ -19,4 +19,9 @@ $NetBSD: patch-dv,v 1.1 2009/02/14 16:17:06 spz Exp $ + {"-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."}, |