Sun Aug 3 22:43:39 2008 UTC ()
fix for IOS address-family syntax
suggested by Daryl Collins <daryl@internode.com.au> (but revamped and expanded)


(spz)
diff -r1.18 -r1.19 pkgsrc/net/irrtoolset-nox11/Makefile
diff -r1.17 -r1.18 pkgsrc/net/irrtoolset-nox11/distinfo
diff -r1.2 -r1.3 pkgsrc/net/irrtoolset-nox11/patches/patch-cs
cvs diff -r1.18 -r1.19 pkgsrc/net/irrtoolset-nox11/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/net/irrtoolset-nox11/Attic/Makefile 2008/03/08 11:00:35 1.18
+++ pkgsrc/net/irrtoolset-nox11/Attic/Makefile 2008/08/03 22:43:39 1.19
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.18 2008/03/08 11:00:35 spz Exp $ 1# $NetBSD: Makefile,v 1.19 2008/08/03 22:43:39 spz Exp $
2# 2#
3 3
4DISTNAME= IRRToolSet-4.8.5 4DISTNAME= IRRToolSet-4.8.5
5PKGREVISION= 8 5PKGREVISION= 9
6CATEGORIES= net 6CATEGORIES= net
7MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/ 7MASTER_SITES= ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.5/
8 8
9MAINTAINER= spz@NetBSD.org 9MAINTAINER= spz@NetBSD.org
10HOMEPAGE= http://www.isc.org/index.pl?/sw/IRRToolSet/ 10HOMEPAGE= http://www.isc.org/index.pl?/sw/IRRToolSet/
11COMMENT= The Internet Routing Registry Toolset - client to IRRd 11COMMENT= The Internet Routing Registry Toolset - client to IRRd
12 12
13USE_LANGUAGES= c c++ 13USE_LANGUAGES= c c++
14USE_TOOLS+= bison flex gmake perl 14USE_TOOLS+= bison flex gmake perl
15 15
16INSTALLATION_DIRS= ${PKGBINDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3 16INSTALLATION_DIRS= ${PKGBINDIR} ${PKGMANDIR}/man1 ${PKGMANDIR}/man3
17 17
18LICENSE= no-commercial-use 18LICENSE= no-commercial-use
cvs diff -r1.17 -r1.18 pkgsrc/net/irrtoolset-nox11/Attic/distinfo (expand / switch to unified diff)

--- pkgsrc/net/irrtoolset-nox11/Attic/distinfo 2008/03/08 11:00:35 1.17
+++ pkgsrc/net/irrtoolset-nox11/Attic/distinfo 2008/08/03 22:43:39 1.18
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: distinfo,v 1.17 2008/03/08 11:00:35 spz Exp $ 1$NetBSD: distinfo,v 1.18 2008/08/03 22:43:39 spz Exp $
2 2
3SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec 3SHA1 (IRRToolSet-4.8.5.tar.gz) = 0a22daef3c5c04b5bce929e420233885c44662ec
4RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b 4RMD160 (IRRToolSet-4.8.5.tar.gz) = 3f6a291a1c33c2725325ebc51ab8306e7a1e743b
5Size (IRRToolSet-4.8.5.tar.gz) = 988737 bytes 5Size (IRRToolSet-4.8.5.tar.gz) = 988737 bytes
6SHA1 (patch-al) = 160e671c0a7ccf3440f3574781b7f5ed5c813cb5 6SHA1 (patch-al) = 160e671c0a7ccf3440f3574781b7f5ed5c813cb5
7SHA1 (patch-ba) = 9ad9e3ff42415f40a92d7788afe9a74f9f27c957 7SHA1 (patch-ba) = 9ad9e3ff42415f40a92d7788afe9a74f9f27c957
8SHA1 (patch-bb) = 6d917213312f1884277d8081f5223e4890e11d8d 8SHA1 (patch-bb) = 6d917213312f1884277d8081f5223e4890e11d8d
9SHA1 (patch-bc) = ece1c767df515d59f994de1981197f1869ac7928 9SHA1 (patch-bc) = ece1c767df515d59f994de1981197f1869ac7928
10SHA1 (patch-bd) = f8d913316b8a65710efb38763ed97b1cb3ddef74 10SHA1 (patch-bd) = f8d913316b8a65710efb38763ed97b1cb3ddef74
11SHA1 (patch-be) = 7b82dbaab51adba608ecf8632c0c3d2c347a3d5a 11SHA1 (patch-be) = 7b82dbaab51adba608ecf8632c0c3d2c347a3d5a
12SHA1 (patch-bf) = a8aac51938b649b168fc71ec1012fc16878e419f 12SHA1 (patch-bf) = a8aac51938b649b168fc71ec1012fc16878e419f
13SHA1 (patch-bg) = 3a5aaf2e246b1e316890022f17c95b71935b494e 13SHA1 (patch-bg) = 3a5aaf2e246b1e316890022f17c95b71935b494e
14SHA1 (patch-bh) = dc415ceac169b6f6775bf749918d65536cfdfe79 14SHA1 (patch-bh) = dc415ceac169b6f6775bf749918d65536cfdfe79
@@ -21,27 +21,27 @@ SHA1 (patch-bn) = 13e7b5e1c4c676fa0c42ed @@ -21,27 +21,27 @@ SHA1 (patch-bn) = 13e7b5e1c4c676fa0c42ed
21SHA1 (patch-bo) = 3c11577df912d52361025d426a7ecc3cadfe6d79 21SHA1 (patch-bo) = 3c11577df912d52361025d426a7ecc3cadfe6d79
22SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df 22SHA1 (patch-bp) = 5944c48114743a2771f3044beb84d767abe538df
23SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e 23SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e
24SHA1 (patch-br) = a4643910bdefcd9f10c991585ed2916877292dbb 24SHA1 (patch-br) = a4643910bdefcd9f10c991585ed2916877292dbb
25SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6 25SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6
26SHA1 (patch-bt) = c085380a1360074b45bad97cf068a13243828db5 26SHA1 (patch-bt) = c085380a1360074b45bad97cf068a13243828db5
27SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e 27SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
28SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38 28SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38
29SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e 29SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e
30SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56 30SHA1 (patch-co) = 4f0ec7f20e1d0db1221fbe9463d7daf7e4babe56
31SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2 31SHA1 (patch-cp) = 0a43934c17d418e29588ef2ffb77ea1957133fc2
32SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720 32SHA1 (patch-cq) = 20ea8d36fe141481ed0b1cca3843ec7a16ff8720
33SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68 33SHA1 (patch-cr) = 8d90446f2760ed3dfd13cf7666b6978251ce6a68
34SHA1 (patch-cs) = 3ee12f885b44b15b2de7d7e95fda830654482443 34SHA1 (patch-cs) = dbd30b057019ae78f753e0d81df8175452d0abda
35SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb 35SHA1 (patch-ct) = 52dd5f46a91bf313627b9975f186aede822dc7eb
36SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861 36SHA1 (patch-cu) = 712496a2856bf03f7e60d3867e30d3f738829861
37SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4 37SHA1 (patch-cv) = 678a36afcd35d1a24242157a23127ff5ad6dd8c4
38SHA1 (patch-cw) = 9cc60fdf9566a74d810d7d5d36cd44b3ecbfba14 38SHA1 (patch-cw) = 9cc60fdf9566a74d810d7d5d36cd44b3ecbfba14
39SHA1 (patch-cx) = 102a37b057b9a86bb509578d8c46601f068cd760 39SHA1 (patch-cx) = 102a37b057b9a86bb509578d8c46601f068cd760
40SHA1 (patch-cy) = d5761e8fec3c4c591082361ad99ba2c37178de0a 40SHA1 (patch-cy) = d5761e8fec3c4c591082361ad99ba2c37178de0a
41SHA1 (patch-cz) = 8df488621dbe452720fca277ca60c852a9b55433 41SHA1 (patch-cz) = 8df488621dbe452720fca277ca60c852a9b55433
42SHA1 (patch-da) = 7269e4e29288a5a2e4d5d33bb17b067b14ff007d 42SHA1 (patch-da) = 7269e4e29288a5a2e4d5d33bb17b067b14ff007d
43SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce 43SHA1 (patch-db) = 8d82cc3825185c19441266f8d4a6860965a250ce
44SHA1 (patch-dc) = b44f42f61e2c81813a0aa4b773ee1bbb6919c2a8 44SHA1 (patch-dc) = b44f42f61e2c81813a0aa4b773ee1bbb6919c2a8
45SHA1 (patch-dd) = dc5ceed77ee5e0a871bc8ea75a5059297e5ec3e9 45SHA1 (patch-dd) = dc5ceed77ee5e0a871bc8ea75a5059297e5ec3e9
46SHA1 (patch-de) = 0dccfc915f66c5e35ac0858ebcf5ee85767300be 46SHA1 (patch-de) = 0dccfc915f66c5e35ac0858ebcf5ee85767300be
47SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74 47SHA1 (patch-df) = 176d2186b72c40334190d5635677104241c06e74
cvs diff -r1.2 -r1.3 pkgsrc/net/irrtoolset-nox11/patches/Attic/patch-cs (expand / switch to unified diff)

--- pkgsrc/net/irrtoolset-nox11/patches/Attic/patch-cs 2008/03/08 11:00:35 1.2
+++ pkgsrc/net/irrtoolset-nox11/patches/Attic/patch-cs 2008/08/03 22:43:39 1.3
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1$NetBSD: patch-cs,v 1.2 2008/03/08 11:00:35 spz Exp $ 1$NetBSD: patch-cs,v 1.3 2008/08/03 22:43:39 spz Exp $
2 2
3--- src/RtConfig/f_cisco.cc.orig 2007-01-23 01:45:16.000000000 +0100 3--- src/RtConfig/f_cisco.cc.orig 2007-01-23 01:45:16.000000000 +0100
4+++ src/RtConfig/f_cisco.cc 4+++ src/RtConfig/f_cisco.cc
5@@ -746,39 +746,39 @@ void CiscoConfig::printRE(ostream &s,  5@@ -746,39 +746,39 @@ void CiscoConfig::printRE(ostream &s,
6  6
7 //int lineLen = strlen(out.str()); 7 //int lineLen = strlen(out.str());
8 int lineLen = out.str().length(); 8 int lineLen = out.str().length();
9+ const char *p = out.str().c_str(); 9+ const char *p = out.str().c_str();
10+ 10+
11 if (lineLen < 240 && ! hasTilda) { 11 if (lineLen < 240 && ! hasTilda) {
12- const char *p = out.str().c_str(); 12- const char *p = out.str().c_str();
13 for (char *q = strchr(p, '@'); q; q = strchr(q, '@')) 13 for (char *q = strchr(p, '@'); q; q = strchr(q, '@'))
14 *q = '('; 14 *q = '(';
@@ -46,13 +46,44 @@ $NetBSD: patch-cs,v 1.2 2008/03/08 11:00 @@ -46,13 +46,44 @@ $NetBSD: patch-cs,v 1.2 2008/03/08 11:00
46 } 46 }
47 if (!r) { 47 if (!r) {
48 s << out.str(); 48 s << out.str();
49 cerr << "Warning: ip as-path access-list is too long for cisco to handle" << endl; 49 cerr << "Warning: ip as-path access-list is too long for cisco to handle" << endl;
50 } else { 50 } else {
51- int inc = hasTilda ? 1 : (240 - lineLen + size) >? 5; 51- int inc = hasTilda ? 1 : (240 - lineLen + size) >? 5;
52- p = strdup(out.str().c_str()); 52- p = strdup(out.str().c_str());
53+ char *r2; 53+ char *r2;
54+ int inc = hasTilda ? 1 :  54+ int inc = hasTilda ? 1 :
55+ ( ( (240 - lineLen + size) > 5 ) ? (240 - lineLen + size) : 5 ); 55+ ( ( (240 - lineLen + size) > 5 ) ? (240 - lineLen + size) : 5 );
56 q = strchr(r, ')') + 1; 56 q = strchr(r, ')') + 1;
57 *r = 0; 57 *r = 0;
58 r++; 58 r++;
 59@@ -1246,8 +1246,28 @@ bool CiscoConfig::printNeighbor(int impo
 60 cout << " neighbor " << neighbor << " remote-as " << peerAS << "\n";
 61
 62 if (afi_activate && !peerGroup) {
 63- cout << " address-family " << (AddressFamily &) *filter_afi << endl;
 64- cout << indent <<" neighbor " << neighbor << " activate\n";
 65+ if (strcmp(filter_afi->name(),"ipv6") == 0) {
 66+ cout << " address-family " << "ipv4" << endl;
 67+ cout << indent <<" no neighbor " << neighbor << " activate\n";
 68+ cout << " address-family " << "ipv6 unicast" << endl;
 69+ cout << indent <<" neighbor " << neighbor << " activate\n";
 70+ cout << " address-family " << "ipv6 multicast" << endl;
 71+ cout << indent <<" neighbor " << neighbor << " activate\n";
 72+ } else if (strcmp(filter_afi->name(),"ipv6.unicast") == 0) {
 73+ cout << " address-family " << "ipv4" << endl;
 74+ cout << indent <<" no neighbor " << neighbor << " activate\n";
 75+ cout << " address-family " << "ipv6 unicast" << endl;
 76+ cout << indent <<" neighbor " << neighbor << " activate\n";
 77+ } else if (strcmp(filter_afi->name(),"ipv4.multicast") == 0) {
 78+ cout << " address-family " << "ipv4 multicast" << endl;
 79+ cout << indent <<" neighbor " << neighbor << " activate\n";
 80+ } else if (strcmp(filter_afi->name(),"ipv6.multicast") == 0) {
 81+ cout << " address-family " << "ipv4" << endl;
 82+ cout << indent <<" no neighbor " << neighbor << " activate\n";
 83+ cout << " address-family " << "ipv6 multicast" << endl;
 84+ cout << indent <<" neighbor " << neighbor << " activate\n";
 85+ }
 86+ // ought to handle afi any too, but that's not just done by naming it here
 87 }
 88
 89 if (routeMapGenerated)