pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/net/irrtoolset-nox11 make configure-option --enable-de...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/942161b59a73
branches:  trunk
changeset: 498574:942161b59a73
user:      spz <spz%pkgsrc.org@localhost>
date:      Fri Aug 26 08:41:46 2005 +0000

description:
make configure-option --enable-debug compile
make RtConfig -config junos work
fix a bug regarding Cisco export filters in RtConfig

diffstat:

 net/irrtoolset-nox11/Makefile         |    8 +-
 net/irrtoolset-nox11/distinfo         |   19 +-
 net/irrtoolset-nox11/patches/patch-ak |   14 +-
 net/irrtoolset-nox11/patches/patch-bt |   26 +-
 net/irrtoolset-nox11/patches/patch-bw |   13 +
 net/irrtoolset-nox11/patches/patch-bx |   36 +
 net/irrtoolset-nox11/patches/patch-by |   17 +
 net/irrtoolset-nox11/patches/patch-bz |  724 ++++++++++++++++++++++++++++++++++
 net/irrtoolset-nox11/patches/patch-ca |   87 ++++
 net/irrtoolset-nox11/patches/patch-cb |   13 +
 net/irrtoolset-nox11/patches/patch-cc |   16 +
 net/irrtoolset-nox11/patches/patch-cd |   16 +
 net/irrtoolset-nox11/patches/patch-cf |  191 ++++++++
 net/irrtoolset-nox11/patches/patch-cg |  233 ++++++++++
 net/irrtoolset-nox11/patches/patch-ch |  301 ++++++++++++++
 net/irrtoolset-nox11/patches/patch-ci |   91 ++++
 net/irrtoolset-nox11/patches/patch-cj |   50 ++
 17 files changed, 1846 insertions(+), 9 deletions(-)

diffs (truncated from 1978 to 300 lines):

diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/Makefile
--- a/net/irrtoolset-nox11/Makefile     Fri Aug 26 08:33:17 2005 +0000
+++ b/net/irrtoolset-nox11/Makefile     Fri Aug 26 08:41:46 2005 +0000
@@ -1,18 +1,20 @@
-# $NetBSD: Makefile,v 1.3 2005/06/21 05:25:45 spz Exp $
+# $NetBSD: Makefile,v 1.4 2005/08/26 08:41:46 spz Exp $
 #
 
 DISTNAME=              IRRToolSet-4.8.2
+PKGREVISION=   1
 CATEGORIES=            net
-MASTER_SITES=          ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.2/
+MASTER_SITES=  ftp://ftp.isc.org/isc/IRRToolSet/IRRToolSet-4.8.2/
 
 MAINTAINER=            spz%NetBSD.org@localhost
 HOMEPAGE=              http://www.isc.org/index.pl?/sw/IRRToolSet/
 COMMENT=               The Internet Routing Registry Toolset - client to IRRd
+
 LICENSE=               no-commercial-use
 
 USE_PKGLOCALEDIR=      yes
 GNU_CONFIGURE=         yes
 
-CONFIGURE_ARGS+=        --without-x
+CONFIGURE_ARGS+=       --without-x
 
 .include "../../mk/bsd.pkg.mk"
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/distinfo
--- a/net/irrtoolset-nox11/distinfo     Fri Aug 26 08:33:17 2005 +0000
+++ b/net/irrtoolset-nox11/distinfo     Fri Aug 26 08:41:46 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2005/05/25 13:13:30 wiz Exp $
+$NetBSD: distinfo,v 1.6 2005/08/26 08:41:46 spz Exp $
 
 SHA1 (IRRToolSet-4.8.2.tar.gz) = f60a03cb6585503f1ef0b8b7c0a2ce7c39ce999c
 RMD160 (IRRToolSet-4.8.2.tar.gz) = 00332f7fe1144b56c93dc327126ec51aa094b6ab
@@ -13,7 +13,7 @@
 SHA1 (patch-ah) = 8641120cfd49797d4fd2fca53a7f11f04c8fb5b4
 SHA1 (patch-ai) = ec16a78eb24c0a78846bfa370ca11fba09b60f0c
 SHA1 (patch-aj) = bdd8215f482ea203a3387345640b87b421fbfe82
-SHA1 (patch-ak) = 4a47bfdb462b2ec0beaa8dce028be569bc1d4e1e
+SHA1 (patch-ak) = 1646dc6f95abb477779fc396d04f5456292b8af7
 SHA1 (patch-al) = 83ee86276245a4431f963d8b6db8feb04598a5ad
 SHA1 (patch-am) = ae4d07005d20275a3b6a683ba04e5fc8aa84292d
 SHA1 (patch-an) = 19e899a3bf0bab28e5a9322e6001f59643ffe897
@@ -48,6 +48,19 @@
 SHA1 (patch-bq) = 17523090fd787ce7f585060d49c92b0b1e64430e
 SHA1 (patch-br) = 72e7b86a31851a437dff832206c8d96f263a6b15
 SHA1 (patch-bs) = ff8b504a8b8aedb49bdc27bffc50f58c5878c5c6
-SHA1 (patch-bt) = 878e6723901f2f7e02416a2a7bbee0f2f4605af8
+SHA1 (patch-bt) = 1597f361bc791c41bfb770cfb07b31432e34c779
 SHA1 (patch-bu) = ea10d9cafc9032bd9f50ea6b81cab58779f6890e
 SHA1 (patch-bv) = d0584058eaddce6a03a7b90e5f44997d70afc51d
+SHA1 (patch-bw) = 647544abdbc27886946a37d4f7d7cfb461addc1e
+SHA1 (patch-bx) = 8923f6d3f267b415468b31a3bbd8eb62f821d4a6
+SHA1 (patch-by) = 25af58ff132815c580edfc3dd6b4d1a9b2a464e4
+SHA1 (patch-bz) = 336c6714f3573e93ef2705f15094811dbf177bfc
+SHA1 (patch-ca) = 2285b293abb2c43b12b0aa43c19524f559131fba
+SHA1 (patch-cb) = a3ab7b8c11d913b25f795f59767c884e3a9605a0
+SHA1 (patch-cc) = 3c9395751b58cff9cfc808c91b04a6548f2daf38
+SHA1 (patch-cd) = 8ddbb605d40988378875de80390b09203c61212e
+SHA1 (patch-cf) = 3ec8166b3282364b082bcec666ad79f51ffb8e74
+SHA1 (patch-cg) = 0df548f8a560044b5eaeaaac1b25beadd4850ff0
+SHA1 (patch-ch) = 40ee868bdb7ecb73cb279e5e9f1ff546ab4a4ffe
+SHA1 (patch-ci) = 2e0104e01b7c8beb9d9feab837520014ad6b63e4
+SHA1 (patch-cj) = 86950483f15144510fab6f46cfd36a1759eb3bb4
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-ak
--- a/net/irrtoolset-nox11/patches/patch-ak     Fri Aug 26 08:33:17 2005 +0000
+++ b/net/irrtoolset-nox11/patches/patch-ak     Fri Aug 26 08:41:46 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.1.1.1 2005/02/28 12:37:30 spz Exp $
+$NetBSD: patch-ak,v 1.2 2005/08/26 08:41:46 spz Exp $
 
 --- src/Core/util/List.hh.orig 2004-07-30 12:58:10.000000000 +0200
 +++ src/Core/util/List.hh
@@ -11,7 +11,7 @@
        T* operator-> () const { return (T*)const_ListIterator<T>::operator->(); }
        ListIterator& operator++ () { // prefix ++
                const_ListIterator<T>::operator++();
-@@ -185,9 +185,9 @@ public:
+@@ -185,17 +185,17 @@ public:
  
        const_ListSearchIterator& operator++ () { // prefix ++
                for (const_ListIterator<T>::operator++();
@@ -23,6 +23,16 @@
                }
                return *this;
        }
+       const_ListSearchIterator& operator-- () { // prefix --
+               for (const_ListIterator<T>::operator--();
+-                   ptr_!=(ListNode*)list_;
++                   const_ListIterator<T>::ptr_!=(ListNode*)const_ListIterator<T>::list_;
+                    const_ListIterator<T>::operator--()) {
+-                      if (((T*)ptr_)->isKey(key_)) break;
++                      if (((T*)const_ListIterator<T>::ptr_)->isKey(key_)) break;
+               }
+               return *this;
+       }
 @@ -212,7 +212,7 @@ public:
                : const_ListSearchIterator<T, Key>(k, l, p?p:(ListNode*)&l) {}
        
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-bt
--- a/net/irrtoolset-nox11/patches/patch-bt     Fri Aug 26 08:33:17 2005 +0000
+++ b/net/irrtoolset-nox11/patches/patch-bt     Fri Aug 26 08:41:46 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: patch-bt,v 1.1 2005/03/06 11:40:21 spz Exp $
+$NetBSD: patch-bt,v 1.2 2005/08/26 08:41:46 spz Exp $
 
 --- src/RtConfig/command.y.orig        2004-07-30 12:58:11.000000000 +0200
 +++ src/RtConfig/command.y
@@ -14,3 +14,27 @@
  #include <cstring>
  #include <cstdlib>
  #include <cctype>
+@@ -174,7 +178,7 @@ input_line: import_line
+ | pkt_filter_line
+ | outbound_pkt_filter_line
+ | cisco_map_name_line
+-//| junos_policy_name_line
++| junos_policy_name_line
+ | cisco_map_inc_line
+ | cisco_map_start_line
+ | cisco_access_list_no_line
+@@ -333,14 +337,12 @@ cisco_map_name_line: KW_SET KW_CISCO_MAP
+                  << CiscoConfig::mapNameFormat << "'" << std::endl;
+ }
+ ;
+-/*
+ junos_policy_name_line: KW_SET KW_JUNOS_POLICY_NAME '=' TKN_STR {
+    strcpy(JunosConfig::mapNameFormat, $4);
+    Trace(TR_INPUT) << "RtConfig: junos_policy_name '"
+                  << JunosConfig::mapNameFormat << "'" << endl;
+ }
+ ;
+-*/
+ cisco_map_inc_line: KW_SET KW_CISCO_MAP_INC '=' TKN_INT {
+    CiscoConfig::mapIncrements = $4;
+    Trace(TR_INPUT) << "RtConfig: cisco_map_increment_by '" 
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-bw
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-bw     Fri Aug 26 08:41:46 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-bw,v 1.1 2005/08/26 08:41:46 spz Exp $
+
+--- src/RtConfig/f_cisco.cc.orig       2004-07-30 12:58:11.000000000 +0200
++++ src/RtConfig/f_cisco.cc
+@@ -1879,7 +1879,7 @@ void CiscoConfig::exportGroup(ASt asno, 
+      sprintf(mapName, mapNameFormat, asno, mapCount++);
+      for (fa = common_list->head(); fa && !last; fa = common_list->next(fa)) {
+        ne = NormalExpression::evaluate(new FilterAFI((ItemAFI *) afi->dup(), fa->filter), ~0);
+-       last = print(ne, fa->action, IMPORT, (ItemAFI *) afi);;
++       last = print(ne, fa->action, EXPORT, (ItemAFI *) afi);;
+        delete ne;
+      }
+    }
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-bx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-bx     Fri Aug 26 08:41:46 2005 +0000
@@ -0,0 +1,36 @@
+$NetBSD: patch-bx,v 1.1 2005/08/26 08:41:46 spz Exp $
+
+--- src/RtConfig/RtConfig.cc.orig      2004-07-30 12:58:10.000000000 +0200
++++ src/RtConfig/RtConfig.cc
+@@ -111,8 +111,8 @@ typedef struct {
+ } config_format_type;
+ 
+ CiscoConfig ciscoConfig;
+-/*
+ JunosConfig junosConfig;
++/*
+ GatedConfig gatedConfig;
+ RSdConfig   rsdConfig;
+ BccConfig bccConfig;
+@@ -122,7 +122,7 @@ config_format_type config_formats[] = {
+ //   { "rsd",         &rsdConfig },
+ //   { "gated",       &gatedConfig },
+    { "cisco",       &ciscoConfig },
+-//   { "junos",       &junosConfig },
++   { "junos",       &junosConfig },
+ //   { "bcc",       &bccConfig },
+    //   { "rsd",         rsd_process_line },
+    { "", 0 }
+@@ -214,11 +214,9 @@ void init_and_set_options (int argc, cha
+      {"-cisco_empty_lists", ARGV_BOOL, 
+       (char *) NULL, (char *) &CiscoConfig::emptyLists,
+       "Generate access lists for ANY and NOT ANY prefix filters.\n\t\t\t\tCisco only."},
+-     
+-/*     {"-junos_no_compress_acls", ARGV_BOOL, 
++     {"-junos_no_compress_acls", ARGV_BOOL, 
+       (char *) NULL, (char *) &JunosConfig::compressAcls,
+       "Do not combine multiple route-filter lines into a single line whenever possible.\n\t\t\t\tJunos only."},
+-*/
+      {(char *) NULL, ARGV_END, (char *) NULL, (char *) NULL,
+       (char *) NULL}
+    };
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-by
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-by     Fri Aug 26 08:41:46 2005 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-by,v 1.1 2005/08/26 08:41:46 spz Exp $
+
+--- src/RtConfig/Makefile.in.orig      2004-07-16 18:41:50.000000000 +0200
++++ src/RtConfig/Makefile.in
+@@ -6,9 +6,9 @@ GOAL   = RtConfig
+ #SRCS   = RtConfig.cc command.y.cc command.l.cc f_bcc.cc f_cisco.cc f_gated.cc f_rsd.cc f_junos.cc
+ #HFILES = RtConfig.hh command.y.hh command.l.hh f_bcc.hh f_cisco.hh f_gated.hh f_rsd.hh f_junos.hh
+ 
+-OBJS   = RtConfig.o  command.y.o  command.l.o  f_cisco.o  
+-SRCS   = RtConfig.cc command.y.cc command.l.cc f_cisco.cc
+-HFILES = RtConfig.hh command.y.hh command.l.hh f_cisco.hh
++OBJS   = RtConfig.o  command.y.o  command.l.o  f_cisco.o  f_junos.o
++SRCS   = RtConfig.cc command.y.cc command.l.cc f_cisco.cc f_junos.cc
++HFILES = RtConfig.hh command.y.hh command.l.hh f_cisco.hh f_junos.hh
+ 
+ 
+ OTHERS = command.l command.y
diff -r 2add8fd0165b -r 942161b59a73 net/irrtoolset-nox11/patches/patch-bz
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/net/irrtoolset-nox11/patches/patch-bz     Fri Aug 26 08:41:46 2005 +0000
@@ -0,0 +1,724 @@
+$NetBSD: patch-bz,v 1.1 2005/08/26 08:41:46 spz Exp $
+
+--- src/RtConfig/f_junos.cc.orig       2003-07-24 13:20:48.000000000 +0200
++++ src/RtConfig/f_junos.cc
+@@ -53,10 +53,9 @@
+ 
+ #include "config.h"
+ #include <cstring>
+-#include <iostream.h>
+-#include <strstream.h>
+-#include <iomanip.h>
+-#include <strstream.h>
++#include <iostream>
++#include <sstream>
++#include <iomanip>
+ #include <cctype>
+ #include "normalform/NE.hh"
+ #include "irr/irr.hh"
+@@ -66,6 +65,8 @@
+ #include "f_junos.hh"
+ #include "rpsl/schema.hh"
+ 
++using namespace std;
++
+ #define DBG_JUNOS 7
+ #define EXPORT 0
+ #define IMPORT 1
+@@ -85,12 +86,14 @@ bool JunosConfig::exportStatics = false;
+ 
+ //////////////////////////// caches ////////////////////////////////
+ 
++// most of these are already defined in f_cisco.cc
+ //AccessListManager<regexp_nf>         aspathMgr;
+ //AccessListManager<SetOfPrefix>       prefixMgr(100);
+-//AccessListManager<SetOfPrefix>       pktFilterMgr(100);
++//AccessListManager<SetOfIPv6Prefix>   ipv6prefixMgr(100);
+ //AccessListManager<FilterOfCommunity> communityMgr;
++AccessListManager<CommunitySet>                communityMgr2;
++//AccessListManager<SetOfPrefix>       pktFilterMgr(100);
+ 
+-AccessListManager<CommunitySet> communityMgr2;
+ 
+ void JunosConfig::printMartians() {
+    static int done = 0;
+@@ -101,21 +104,21 @@ void JunosConfig::printMartians() {
+    done = 1;
+ 
+    // print martians
+-   char *martians = " 
+-            route-filter 127.0.0.0/8 orlonger reject;
+-            route-filter 10.0.0.0/8 orlonger reject;
+-            route-filter 172.16.0.0/12 orlonger reject;
+-            route-filter 192.168.0.0/16 orlonger reject;
+-            route-filter 192.0.2.0/24 orlonger reject;
+-            route-filter 128.0.0.0/16 orlonger reject;
+-            route-filter 191.255.0.0/16 orlonger reject;
+-            route-filter 192.0.0.0/24 orlonger reject;
+-            route-filter 223.255.255.0/24 orlonger reject;
+-            route-filter 224.0.0.0/3 orlonger reject;
+-            route-filter 169.254.0.0/16 orlonger reject;
+-            route-filter 0.0.0.0/0 upto /31 next policy;
+-            route-filter 0.0.0.0/0 upto /32 reject;
+-";
++   char *martians =
++            "route-filter 127.0.0.0/8 orlonger reject;\n"
++            "route-filter 10.0.0.0/8 orlonger reject;\n"
++            "route-filter 172.16.0.0/12 orlonger reject;\n"
++            "route-filter 192.168.0.0/16 orlonger reject;\n"
++            "route-filter 192.0.2.0/24 orlonger reject;\n"
++            "route-filter 128.0.0.0/16 orlonger reject;\n"
++            "route-filter 191.255.0.0/16 orlonger reject;\n"
++            "route-filter 192.0.0.0/24 orlonger reject;\n"
++            "route-filter 223.255.255.0/24 orlonger reject;\n"
++            "route-filter 224.0.0.0/3 orlonger reject;\n"
++            "route-filter 169.254.0.0/16 orlonger reject;\n"
++            "route-filter 0.0.0.0/0 upto /31 next policy;\n"
++            "route-filter 0.0.0.0/0 upto /32 reject;\n"
++   ;
+    
+    cout << "   policy-statement supress-martians {\n"



Home | Main Index | Thread Index | Old Index