Upgrade zebra to 0.94.

11 files changed, 114 insertions, 49 deletions

diff --git a/net/zebra/DESCR b/net/zebra/DESCR
index 2627a76611c..b6d1ce2f69a 100644
--- a/net/zebra/DESCR
+++ b/net/zebra/DESCR
@@ -14,3 +14,5 @@ architecture.
 
 If you want to build with IPv6 support, install with:
 	# make USE_INET6=YES install
+If you want to build vtysh, the Zebra integrated shell, install with:
+	# make USE_ZEBRA_VTYSH=YES insatll
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 989a4d6005b..53b9c81ad40 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.59 2003/11/18 16:34:13 wiz Exp $
+# $NetBSD: Makefile,v 1.60 2003/12/29 21:59:01 heas 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.93b
+DISTNAME=	zebra-0.94
 PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.zebra.org/pub/zebra/
@@ -14,11 +14,21 @@ COMMENT=	Free multithreaded routing daemon software
 
 .include "../../mk/bsd.prefs.mk"
 
-AUTOMAKE_REQD=		1.4
+AUTOMAKE_REQD=		1.8
 USE_BUILDLINK2=		# defined
 GNU_CONFIGURE=		# defined
 PKG_SYSCONFSUBDIR?=	zebra
+USE_PKGINSTALL=		YES
+EGDIR=		${PREFIX}/share/examples/zebra
+CONF_FILES=	${EGDIR}/bgpd.conf.sample ${PKG_SYSCONFDIR}/bgpd.conf \
+		${EGDIR}/ospfd.conf.sample ${PKG_SYSCONFDIR}/ospfd.conf \
+		${EGDIR}/ripd.conf.sample ${PKG_SYSCONFDIR}/ripd.conf \
+		${EGDIR}/zebra.conf.sample ${PKG_SYSCONFDIR}/zebra.conf
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--infodir=${PREFIX}/${INFO_DIR}
+# with optimization, the timer/scheduler (esp. for MRT dump rotation) appears
+# to have problems.
+CFLAGS=	-O0
 # you might need debugging, it's a developer release !
 #CFLAGS+=	-g
 
@@ -28,22 +38,31 @@ PLIST_SRC=		# empty
 
 INFO_FILES=	zebra.info
 
+BUILD_DEFS+=		USE_ZEBRA_VTYSH
+
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 USE_GNU_READLINE=	# uses rl_pending_input
 .  include "../../devel/readline/buildlink2.mk"
-CONFIGURE_ARGS+=	--enable-vtysh
 PLIST_SRC+=		${PKGDIR}/PLIST.vtysh
+CONFIGURE_ARGS+=	--enable-vtysh
+CONF_FILES+=		${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf
 .else
 CONFIGURE_ARGS+=	--disable-vtysh
 .endif
 
 USE_GMAKE=		# defined
+USE_MAKEINFO=		# defined
+.include "../../devel/readline/buildlink2.mk"
 
 BUILD_DEFS+=		USE_INET6
 
-.if defined(USE_INET6) && ${USE_INET6} == YES
+.if defined(USE_INET6) && ${USE_INET6} == "YES"
 PLIST_SRC+=		${PKGDIR}/PLIST.v6
+CONFIGURE_ARGS+=	--enable-ipv6
+CONF_FILES+=	${EGDIR}/ospf6d.conf.sample ${PKG_SYSCONFDIR}/ospf6d.conf \
+		${EGDIR}/ripngd.conf.sample ${PKG_SYSCONFDIR}/ripngd.conf
 .else
+CONFIGURE_ARGS+=	--disable-ipv6
 CONFIGURE_ARGS+=	--disable-ospf6d
 CONFIGURE_ARGS+=	--disable-ripngd
 .endif
diff --git a/net/zebra/PLIST b/net/zebra/PLIST
index 036c4ca38a4..77f4b9f2b3c 100644
--- a/net/zebra/PLIST
+++ b/net/zebra/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.5 2003/08/04 14:45:26 seb Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/29 21:59:01 heas Exp $
 info/zebra.info
-man/man1/vtysh.1
 man/man8/bgpd.8
 man/man8/ospfd.8
 man/man8/ripd.8
@@ -14,8 +13,4 @@ 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/PLIST.v6 b/net/zebra/PLIST.v6
index bd3255cfa7a..212e2bafe1c 100644
--- a/net/zebra/PLIST.v6
+++ b/net/zebra/PLIST.v6
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.v6,v 1.1 2001/10/31 23:13:40 zuntum Exp $
+@comment $NetBSD: PLIST.v6,v 1.2 2003/12/29 21:59:01 heas Exp $
 man/man8/ospf6d.8
 man/man8/ripngd.8
 sbin/ospf6d
diff --git a/net/zebra/PLIST.vtysh b/net/zebra/PLIST.vtysh
index 8ba688f6379..b1b1acbe1c7 100644
--- a/net/zebra/PLIST.vtysh
+++ b/net/zebra/PLIST.vtysh
@@ -1,2 +1,4 @@
-@comment $NetBSD: PLIST.vtysh,v 1.1 2001/10/31 23:13:40 zuntum Exp $
+@comment $NetBSD: PLIST.vtysh,v 1.2 2003/12/29 21:59:01 heas Exp $
+man/man1/vtysh.1
 bin/vtysh
+share/examples/zebra/vtysh.conf.sample
diff --git a/net/zebra/distinfo b/net/zebra/distinfo
index af2b8326405..2b16691e108 100644
--- a/net/zebra/distinfo
+++ b/net/zebra/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.11 2003/11/18 16:34:13 wiz Exp $
+$NetBSD: distinfo,v 1.12 2003/12/29 21:59:01 heas Exp $
 
-SHA1 (zebra-0.93b.tar.gz) = bcaafd4a064ba7aa1d60b3a6144eb778f8ae237a
-Size (zebra-0.93b.tar.gz) = 1340359 bytes
+SHA1 (zebra-0.94.tar.gz) = 793a6036bddd18a362a94ccd3e15062b5b7e7a17
+Size (zebra-0.94.tar.gz) = 1319836 bytes
 SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
 SHA1 (patch-ab) = 6725c6034adaf5580186f46b7cd9e15c4de66db2
-SHA1 (patch-ac) = f6c10cd468cd89228202876de49981e664378cc7
+SHA1 (patch-ac) = ce7d3d09b54b75f481de8a03e1f527df819f09a4
 SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
 SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
 SHA1 (patch-af) = d045b85bfc8f8d5f6894e2333b0a799661997f90
-SHA1 (patch-ag) = 62b5e4f28c1d13cb1f9c772250529aefe0511f90
-SHA1 (patch-ah) = 31383b2529bb1d8b42ade582f1c4352e9ccab1d1
+SHA1 (patch-ag) = e71caad1776f6e1ae4ded93df330fbcd0cf42eb1
+SHA1 (patch-ah) = bd356b89afa623c9e2da5636c5a5b76be0b74fd4
+SHA1 (patch-ai) = c926dc2fbdf19e038fffc8a18ff91cb1f93e13ba
+SHA1 (patch-aj) = 03919029326d9dd94d2d9502299f1d2709e4a871
diff --git a/net/zebra/patches/patch-ac b/net/zebra/patches/patch-ac
index bd970951890..f1190b96ac2 100644
--- a/net/zebra/patches/patch-ac
+++ b/net/zebra/patches/patch-ac
@@ -1,10 +1,10 @@
-$NetBSD: patch-ac,v 1.3 2002/08/25 21:50:22 jlam Exp $
+$NetBSD: patch-ac,v 1.4 2003/12/29 21:59:01 heas Exp $
 
---- ospfd/Makefile.am.orig	Wed Jun 19 04:06:08 2002
-+++ ospfd/Makefile.am	Wed Jul 10 08:34:31 2002
+--- ospfd/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ ospfd/Makefile.am	2003-12-21 02:06:15.000000000 +0000
 @@ -30,15 +30,17 @@
  
- EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt
+ EXTRA_DIST = $(sysconf_DATA) OSPF-MIB.txt OSPF-TRAP-MIB.txt ChangeLog.opaque.txt
  
 +sysconfdatadir=$(datadir)/examples/zebra
 +
diff --git a/net/zebra/patches/patch-ag b/net/zebra/patches/patch-ag
index ad13789d55a..1d8fb19b7e6 100644
--- a/net/zebra/patches/patch-ag
+++ b/net/zebra/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.4 2001/05/28 21:02:28 jlam Exp $
+$NetBSD: patch-ag,v 1.5 2003/12/29 21:59:01 heas Exp $
 
---- configure.in.orig	Fri Jan 19 18:26:13 2001
-+++ configure.in	Mon May 28 16:27:43 2001
-@@ -185,7 +185,10 @@
+--- configure.ac.orig	2003-12-21 02:10:57.000000000 +0000
++++ configure.ac	2003-12-21 02:08:46.000000000 +0000
+@@ -200,7 +200,10 @@
  case "${enable_vtysh}" in
    "yes") VTYSH="vtysh";
-          AC_DEFINE(VTYSH)
+          AC_DEFINE(VTYSH,,VTY shell)
 -	 AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
 +	 AC_CHECK_LIB(termcap, tputs, ,
 +		AC_CHECK_LIB(tinfo, tputs, ,
diff --git a/net/zebra/patches/patch-ah b/net/zebra/patches/patch-ah
index b1a0854cd20..64c5c176702 100644
--- a/net/zebra/patches/patch-ah
+++ b/net/zebra/patches/patch-ah
@@ -1,25 +1,19 @@
-$NetBSD: patch-ah,v 1.1 2003/11/18 16:34:13 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2003/12/29 21:59:01 heas Exp $
 
---- lib/vty.c.orig	Sun Aug 18 16:49:50 2002
-+++ lib/vty.c
-@@ -1138,13 +1138,16 @@ vty_telnet_option (struct vty *vty, unsi
-       break;
-     case SE: 
-       {
--	char *buffer = (char *)vty->sb_buffer->head->data;
--	int length = vty->sb_buffer->length;
-+	char *buffer;
-+	int length;
+--- doc/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ doc/Makefile.am	2003-12-22 04:18:26.000000000 +0000
+@@ -6,7 +6,13 @@
+ 	ipv6.texi kernel.texi main.texi ospf6d.texi ospfd.texi overview.texi \
+ 	protocol.texi ripd.texi ripngd.texi routemap.texi snmp.texi vtysh.texi
  
--	if (buffer == NULL)
-+	if (!vty->iac_sb_in_progress)
- 	  return 0;
+-man_MANS = vtysh.1 bgpd.8 ospf6d.8 ospfd.8 ripd.8 ripngd.8 zebra.8
++if V6_OPT
++V6_MANS = ospf6d.8 ripngd.8
++endif
++if VTY_OPT
++VTY_MANS = vtysh.1
++endif
++man_MANS = bgpd.8 ospfd.8 ripd.8 zebra.8 $(V6_MANS) $(VTY_MANS)
  
--	if (!vty->iac_sb_in_progress)
-+	buffer = (char *)vty->sb_buffer->head->data;
-+	length = vty->sb_buffer->length;
-+
-+	if (buffer == NULL)
- 	  return 0;
+ EXTRA_DIST = BGP-TypeCode draft-zebra-00.ms draft-zebra-00.txt $(man_MANS) 
  
- 	if (buffer[0] == '\0')
diff --git a/net/zebra/patches/patch-ai b/net/zebra/patches/patch-ai
new file mode 100644
index 00000000000..529c2b028e0
--- /dev/null
+++ b/net/zebra/patches/patch-ai
@@ -0,0 +1,20 @@
+$NetBSD: patch-ai,v 1.1 2003/12/29 21:59:01 heas Exp $
+
+--- configure.ac.orig	2003-12-22 03:44:07.000000000 +0000
++++ configure.ac	2003-12-22 04:13:39.000000000 +0000
+@@ -216,6 +216,7 @@
+   "no" ) VTYSH="";;
+   *    ) ;;
+ esac
++AM_CONDITIONAL([VTY_OPT], [test "${enable_vtysh}" = yes])
+ 
+ dnl ----------
+ dnl PAM module
+@@ -511,6 +512,7 @@
+   AC_MSG_RESULT(IPv4 only)
+ fi
+ fi
++AM_CONDITIONAL([V6_OPT], [test "${enable_ipv6}" = yes])
+ 
+ dnl --------------------
+ dnl Daemon disable check
diff --git a/net/zebra/patches/patch-aj b/net/zebra/patches/patch-aj
new file mode 100644
index 00000000000..d6c51a0b73d
--- /dev/null
+++ b/net/zebra/patches/patch-aj
@@ -0,0 +1,31 @@
+$NetBSD: patch-aj,v 1.1 2003/12/29 21:59:01 heas Exp $
+
+--- vtysh/Makefile.am.orig	2003-11-04 18:00:42.000000000 +0000
++++ vtysh/Makefile.am	2003-12-24 19:40:34.000000000 +0000
+@@ -12,6 +12,7 @@
+ vtysh_LDADD = ../lib/libzebra.a
+ 
+ sysconf_DATA = vtysh.conf.sample
++INSTALL_SDATA=@INSTALL@ -m 600
+ 
+ EXTRA_DIST = extract.pl vtysh.conf.sample
+ 
+@@ -20,3 +21,18 @@
+ 
+ rebuild:
+ 	./extract.pl ../zebra/*.c ../ripd/*.c ../ripngd/*.c ../ospfd/*.c ../ospf6d/*.c ../bgpd/*.c ../lib/keychain.c ../lib/routemap.c ../lib/filter.c ../lib/plist.c ../lib/distribute.c > vtysh_cmd.c
++
++sysconfdatadir=$(datadir)/examples/zebra
++
++install-sysconfDATA: $(sysconf_DATA)
++	@$(NORMAL_INSTALL)
++	$(mkinstalldirs) $(DESTDIR)$(sysconfdatadir)
++	@list='$(sysconf_DATA)'; for p in $$list; do \
++	  if test -f $(srcdir)/$$p; then \
++	    echo " $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $(srcdir)/$$p $(DESTDIR)$(sysconfdatadir)/$$p; \
++	  else if test -f $$p; then \
++	    echo " $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p"; \
++	    $(INSTALL_SDATA) $$p $(DESTDIR)$(sysconfdatadir)/$$p; \
++	  fi; fi; \
++	done