upgrade to 0.90.

New RIB code provides multiple nexthop for a prefix.
Equal cost multipath works on GNU/Linux.
Communication between protocol daemon and zebra is changed to UNIX domain socket.
BGP trap MIB works.
BGP route selection is improved and various option is provided.
New OSPF packet read method.

PLEASE UPDATE WHOLE SUITE including zebra, bgpd, ripd, ripngd,
ospfd, ospf6d when you update from previous version. Zebra protocol
is changed so there may be some protocol mismatch when you don't
update everything.

5 files changed, 22 insertions, 18 deletions

diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index f34e6ef914b..fb15f633321 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.28 2000/12/26 14:32:30 itojun Exp $
+# $NetBSD: Makefile,v 1.29 2001/01/11 05:34:16 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.89a
+DISTNAME=	zebra-0.90
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
 # you might need debugging, it's a developer release !
@@ -18,7 +18,6 @@ BUILD_DEPENDS+=	autoreconf:../../devel/autoconf
 
 # libedit does not work due to missing functions.
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
-BROKEN=		"possible security issue"
 DEPENDS+=	readline-*:../../devel/readline
 CONFIGURE_ARGS+=--enable-vtysh
 CONFIGURE_ENV+=	LIBS=-L${LOCALBASE}/lib CPPFLAGS=-I${LOCALBASE}/include
diff --git a/net/zebra/files/md5 b/net/zebra/files/md5
index 4c4ce6a6e7e..fa09c9dc1c7 100644
--- a/net/zebra/files/md5
+++ b/net/zebra/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.19 2000/10/29 15:35:36 itojun Exp $
+$NetBSD: md5,v 1.20 2001/01/11 05:34:16 itojun Exp $
 
-MD5 (zebra-0.89a.tar.gz) = a132708d41c460a8cd54577b3b0cff27
+MD5 (zebra-0.90.tar.gz) = 47267d23dd90eaa089f66771ed167069
diff --git a/net/zebra/files/patch-sum b/net/zebra/files/patch-sum
index ae8381546ef..990995bd6ef 100644
--- a/net/zebra/files/patch-sum
+++ b/net/zebra/files/patch-sum
@@ -1,9 +1,9 @@
-$NetBSD: patch-sum,v 1.6 2000/10/13 15:13:54 itojun Exp $
+$NetBSD: patch-sum,v 1.7 2001/01/11 05:34:16 itojun Exp $
 
 MD5 (patch-aa) = 60249b54ad575e635365d27d4b1dc422
 MD5 (patch-ab) = 5ef249301cffb83c38d3e3c5f3bd6ddf
 MD5 (patch-ac) = 961be716df1d9495c1782859f1af783d
 MD5 (patch-ad) = 9a390dc0a8b8d8864eb7d2b219796742
 MD5 (patch-ae) = 50fc4fa9b9758a14e873080b015fc935
-MD5 (patch-af) = 1cda9baf2b79130ad73ad6e1ead070bb
-MD5 (patch-ag) = 4f97c5e9c11198db74953b1797c8a8a8
+MD5 (patch-af) = efcfd68267d9678f65db06e50f6ef125
+MD5 (patch-ag) = b892cb683d65f762bf61785c84620fb4
diff --git a/net/zebra/patches/patch-af b/net/zebra/patches/patch-af
index 56884d6e5db..8db65252a52 100644
--- a/net/zebra/patches/patch-af
+++ b/net/zebra/patches/patch-af
@@ -1,9 +1,9 @@
-$NetBSD: patch-af,v 1.1 2000/08/24 01:25:47 kim Exp $
+$NetBSD: patch-af,v 1.2 2001/01/11 05:34:16 itojun Exp $
 
---- zebra/Makefile.am.orig	Thu Aug 17 04:28:47 2000
-+++ zebra/Makefile.am	Wed Aug 23 16:25:31 2000
+--- 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)/\"
+ DEFS = @DEFS@ -DSYSCONFDIR=\"$(sysconfdir)/\" -DMULTIPATH_NUM=@MULTIPATH_NUM@
  INSTALL_SDATA=@INSTALL@ -m 600
  
 +sysconfdatadir=$(datadir)/examples/zebra
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
index b06b2b6e51b..fbf7c905b02 100644
--- a/net/zebra/patches/patch-ag
+++ b/net/zebra/patches/patch-ag
@@ -1,8 +1,13 @@
-$NetBSD: patch-ag,v 1.2 2000/10/13 15:13:54 itojun Exp $
---- configure.in.orig	Wed Sep 27 19:02:51 2000
-+++ configure.in	Sat Oct 14 00:02:09 2000
-@@ -155,3 +155,3 @@
+$NetBSD: patch-ag,v 1.3 2001/01/11 05:34:16 itojun Exp $
+
+--- configure.in.orig	Wed Jan 10 20:01:41 2001
++++ configure.in	Thu Jan 11 13:57:58 2001
+@@ -193,7 +193,7 @@
+ case "${enable_vtysh}" in
+   "yes") VTYSH="vtysh";
           AC_DEFINE(VTYSH)
--         AC_CHECK_LIB(ncurses, tputs)
-+         AC_CHECK_LIB(curses, tputs)
+-	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
++	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(curses, tputs))
           AC_CHECK_LIB(readline, main)
+          if test $ac_cv_lib_readline_main = no; then
+            AC_MSG_ERROR([vtysh needs libreadline but was not found on your system.])