upgrade to 0.93a (it is a leaf package, so it should be okay)

0.93a
+ Fix host_name to host_triplet.
+ Ohara's crush fix for ospf6d.
0.93
+ New config of BGP.
+ Crush problem ospfd which reported on Zebra ML is fixed.
+ KDD R&D Laboratories, Inc. OSPF Opaque LSA and TE LSA.

9 files changed, 52 insertions, 84 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index baa33af01df..f140469c558 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.50 2002/03/18 20:41:43 wiz Exp $
+# $NetBSD: Makefile,v 1.51 2002/07/09 23:48:17 itojun Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	zebra-0.92a
+DISTNAME=	zebra-0.93a
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 820de18b3b8..63402e69dd2 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/02/18 15:14:37 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/07/09 23:48:17 itojun Exp $
 @unexec ${INSTALL_INFO} --delete %D/info/zebra.info %D/info/dir
 info/zebra.info
 @exec   ${INSTALL_INFO}          %D/info/zebra.info %D/info/dir
@@ -16,4 +16,8 @@ share/examples/zebra/bgpd.conf.sample2
 share/examples/zebra/ospfd.conf.sample
 share/examples/zebra/ripd.conf.sample
 share/examples/zebra/zebra.conf.sample
+info/zebra.info-1
+info/zebra.info-2
+info/zebra.info-3
+info/zebra.info-4
 @dirrm share/examples/zebra
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index d9c1d8d13e8..10e433fee55 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.6 2001/08/20 07:12:27 itojun Exp $
+$NetBSD: distinfo,v 1.7 2002/07/09 23:48:17 itojun Exp $
 
-SHA1 (zebra-0.92a.tar.gz) = 7dc3813dfe3c3a70f298cdbb0abefcb4663682d7
-Size (zebra-0.92a.tar.gz) = 1155814 bytes
-SHA1 (patch-aa) = ee8100984152dc69237b53977d63c506095cdfd2
-SHA1 (patch-ab) = 415ee0d3c18240165bfabc77d9fa6ff4c2e7ac34
-SHA1 (patch-ac) = 4bdc7ded7d39702529f774b8a809d33898c5559e
-SHA1 (patch-ad) = 7a9a1daa024b9efacefb3c469bc86dbbc36af47c
-SHA1 (patch-ae) = 0d255facaacd0521d9e5fe31698c1f7f5d4c7f61
-SHA1 (patch-af) = b3b879e8932196a8e3e9f6fe92815a817223aceb
+SHA1 (zebra-0.93a.tar.gz) = aa9d307a53adcd6e9b76003f230c4cd79eefba6b
+Size (zebra-0.93a.tar.gz) = 1335141 bytes
+SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
+SHA1 (patch-ab) = 6725c6034adaf5580186f46b7cd9e15c4de66db2
+SHA1 (patch-ac) = f6c10cd468cd89228202876de49981e664378cc7
+SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
+SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
+SHA1 (patch-af) = d045b85bfc8f8d5f6894e2333b0a799661997f90
 SHA1 (patch-ag) = 62b5e4f28c1d13cb1f9c772250529aefe0511f90
diff --git a/net/zebra/patches/patch-aa b/net/zebra/patches/patch-aa
index edcdfc43e5f..b551330b5b8 100644
--- a/net/zebra/patches/patch-aa
+++ b/net/zebra/patches/patch-aa
@@ -1,18 +1,13 @@
-$NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
+$NetBSD: patch-aa,v 1.6 2002/07/09 23:48:17 itojun Exp $
 
---- bgpd/Makefile.am.orig	Thu Aug 17 04:27:58 2000
-+++ bgpd/Makefile.am	Wed Aug 23 16:19:15 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- bgpd/Makefile.am.orig	Wed Jun 19 04:05:04 2002
++++ bgpd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) BGP4-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libbgp.a
- sbin_PROGRAMS = bgpd
- #noinst_PROGRAMS = bgp_btoa
-@@ -36,14 +38,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-aa,v 1.5 2000/08/24 01:25:38 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ab b/net/zebra/patches/patch-ab
index 28c972e950d..3ec6ea09da5 100644
--- a/net/zebra/patches/patch-ab
+++ b/net/zebra/patches/patch-ab
@@ -1,18 +1,13 @@
-$NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
+$NetBSD: patch-ab,v 1.4 2002/07/09 23:48:18 itojun Exp $
 
---- ospf6d/Makefile.am.orig	Thu Aug 17 04:27:37 2000
-+++ ospf6d/Makefile.am	Wed Aug 23 16:21:19 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospf6d/Makefile.am.orig	Sat Jun 29 15:20:39 2002
++++ ospf6d/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -34,15 +34,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libospf6.a
- sbin_PROGRAMS = ospf6d
- 
-@@ -33,14 +35,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ab,v 1.3 2000/08/24 01:25:42 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index 05d0735c369..ed7ac1f1cae 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,18 +1,13 @@
-$NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
+$NetBSD: patch-ac,v 1.2 2002/07/09 23:48:18 itojun Exp $
 
---- ospfd/Makefile.am.orig	Thu Aug 17 04:27:22 2000
-+++ ospfd/Makefile.am	Wed Aug 23 16:22:52 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ospfd/Makefile.am.orig	Wed Jun 19 04:06:08 2002
++++ ospfd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -30,15 +30,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libospf.a
- sbin_PROGRAMS = ospfd
- 
-@@ -30,14 +32,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ac,v 1.1 2000/08/24 01:25:44 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ad b/net/zebra/patches/patch-ad
index e70ec8d7424..62c0f104d4a 100644
--- a/net/zebra/patches/patch-ad
+++ b/net/zebra/patches/patch-ad
@@ -1,18 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
+$NetBSD: patch-ad,v 1.2 2002/07/09 23:48:18 itojun Exp $
 
---- ripd/Makefile.am.orig	Thu Aug 17 04:26:57 2000
-+++ ripd/Makefile.am	Wed Aug 23 16:23:48 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripd/Makefile.am.orig	Wed Jun 19 04:06:18 2002
++++ ripd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA) RIPv2-MIB.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = librip.a
- sbin_PROGRAMS = ripd
- 
-@@ -25,14 +27,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ad,v 1.1 2000/08/24 01:25:45 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-ae b/net/zebra/patches/patch-ae
index fef09c4fde5..a1f5cb01d11 100644
--- a/net/zebra/patches/patch-ae
+++ b/net/zebra/patches/patch-ae
@@ -1,18 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
+$NetBSD: patch-ae,v 1.2 2002/07/09 23:48:18 itojun Exp $
 
---- ripngd/Makefile.am.orig	Thu Aug 17 04:27:11 2000
-+++ ripngd/Makefile.am	Wed Aug 23 16:24:39 2000
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\"
- INSTALL_SDATA=@INSTALL@ -m 600
+--- ripngd/Makefile.am.orig	Wed Jun 19 04:06:33 2002
++++ ripngd/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -23,15 +23,17 @@
+ 
+ EXTRA_DIST = $(sysconf_DATA)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- noinst_LIBRARIES = libripng.a
- sbin_PROGRAMS = ripngd
- 
-@@ -25,14 +27,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-ae,v 1.1 2000/08/24 01:25:46 kim Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
- 
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 8db65252a52..0fc176c3952 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,18 +1,13 @@
-$NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
+$NetBSD: patch-af,v 1.3 2002/07/09 23:48:18 itojun Exp $
 
---- zebra/Makefile.am.orig	Wed Jan 10 10:11:11 2001
-+++ zebra/Makefile.am	Thu Jan 11 13:57:23 2001
-@@ -4,6 +4,8 @@
- DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
- INSTALL_SDATA=@INSTALL@ -m 600
+--- zebra/Makefile.am.orig	Wed Jun 19 08:17:32 2002
++++ zebra/Makefile.am	Wed Jul 10 08:34:31 2002
+@@ -43,15 +43,17 @@
+ #client : client_main.o ../lib/libzebra.a
+ #	$(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
- LIB_IPV6 = @LIB_IPV6@
- 
- ipforward = @IPFORWARD@
-@@ -50,14 +52,14 @@
- 
  install-sysconfDATA: $(sysconf_DATA)
  	@$(NORMAL_INSTALL)
 -	$(mkinstalldirs) $(DESTDIR)$(sysconfdir)
@@ -30,4 +25,3 @@ $NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
 +	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
  	  fi; fi; \
  	done
-