[pkgsrc/trunk]: pkgsrc/net/zebra Changes 0.95:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/817496f830eb
branches:  trunk
changeset: 498059:817496f830eb
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu Aug 11 11:14:06 2005 +0000

description:
Changes 0.95:

* Changes in zebra
** IRDP support is added.

* Changes in ripd
** Set receive UDP socket buffer to large value.

* Changes in ospfd
** Fix problem of OpenBSD-3.4 IP header length treatment.

* Changes in ospf6d
** Area support is added.

* Changes in bgpd
** Old commands are removed

"show ipv6 summary"
"show ipv6 mbgp summary"
** New ospf6d implementation is introduced.  This is rewrite of whole
   ospf6d code to make it far much better than old code.

* Changes in vtysh
** Many bugs and problems are fixed.  All of user of vtysh should
   update to zebra-0.95.

diffstat:

 net/zebra/Makefile         |  26 +++++++++++-------------
 net/zebra/distinfo         |  15 ++++++-------
 net/zebra/patches/patch-ab |   8 +++---
 net/zebra/patches/patch-af |   8 +++---
 net/zebra/patches/patch-ag |  47 +++++++++++++++++++++++++++++++--------------
 net/zebra/patches/patch-ai |  20 -------------------
 6 files changed, 59 insertions(+), 65 deletions(-)

diffs (193 lines):

diff -r 3e47d3574f50 -r 817496f830eb net/zebra/Makefile
--- a/net/zebra/Makefile        Thu Aug 11 08:48:04 2005 +0000
+++ b/net/zebra/Makefile        Thu Aug 11 11:14:06 2005 +0000
@@ -1,43 +1,41 @@
-# $NetBSD: Makefile,v 1.67 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2005/08/11 11:14:06 adam 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.94
-PKGREVISION=   2
+DISTNAME=      zebra-0.95
 CATEGORIES=    net
-MASTER_SITES=  ftp://ftp.zebra.org/pub/zebra/
-DISTFILES=     ${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=  ftp://ftp.zebra.org/pub/zebra/ \
+               ftp://ftp.ripe.net/mirrors/sites/ftp.zebra.org/pub/zebra/ \
+               ftp://ftp.sunet.se/pub/network/zebra/
 
 MAINTAINER=    itojun%itojun.org@localhost
 HOMEPAGE=      http://www.zebra.org/
 COMMENT=       Free multithreaded routing daemon software
 
-.include "../../mk/bsd.prefs.mk"
+USE_PKGINSTALL=                yes
+GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --infodir=${PREFIX}/${INFO_DIR}
 
-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
 
 CONFLICTS+=            quagga-[0-9]*
 
 PLIST_SRC=             # empty
 
-INFO_FILES=    zebra.info
+INFO_FILES=            zebra.info
 
 BUILD_DEFS+=           USE_ZEBRA_VTYSH
 
+.include "../../mk/bsd.prefs.mk"
+
 .if defined(USE_ZEBRA_VTYSH) && ${USE_ZEBRA_VTYSH} == "YES"
 USE_GNU_READLINE=      # uses rl_pending_input
 .  include "../../devel/readline/buildlink3.mk"
diff -r 3e47d3574f50 -r 817496f830eb net/zebra/distinfo
--- a/net/zebra/distinfo        Thu Aug 11 08:48:04 2005 +0000
+++ b/net/zebra/distinfo        Thu Aug 11 11:14:06 2005 +0000
@@ -1,15 +1,14 @@
-$NetBSD: distinfo,v 1.13 2005/02/24 12:14:08 agc Exp $
+$NetBSD: distinfo,v 1.14 2005/08/11 11:14:06 adam Exp $
 
-SHA1 (zebra-0.94.tar.gz) = 793a6036bddd18a362a94ccd3e15062b5b7e7a17
-RMD160 (zebra-0.94.tar.gz) = 7e8964e8899ac999943522e7a62a90125b28a593
-Size (zebra-0.94.tar.gz) = 1319836 bytes
+SHA1 (zebra-0.95.tar.gz) = 9e1cc85ba0c48a85ba24d3c3da623f43514a432a
+RMD160 (zebra-0.95.tar.gz) = e9ec551afcb5f1135158ae9ac3499fdebb691739
+Size (zebra-0.95.tar.gz) = 1379369 bytes
 SHA1 (patch-aa) = 689404752d3d793d9d2620303d6f3355f43e38cd
-SHA1 (patch-ab) = 6725c6034adaf5580186f46b7cd9e15c4de66db2
+SHA1 (patch-ab) = 7c907a3c17c34c4c1b8f6df82b479878723e5499
 SHA1 (patch-ac) = ce7d3d09b54b75f481de8a03e1f527df819f09a4
 SHA1 (patch-ad) = fb20a6b64a9e07dd94bd62b01e4b2f17a437d840
 SHA1 (patch-ae) = bad18eda9b4ffd4cc22666b26573858e7de84a7d
-SHA1 (patch-af) = d045b85bfc8f8d5f6894e2333b0a799661997f90
-SHA1 (patch-ag) = e71caad1776f6e1ae4ded93df330fbcd0cf42eb1
+SHA1 (patch-af) = 626f4caae8911a99b827134da444b722a73d2001
+SHA1 (patch-ag) = de7372c1db0f82691870c944df6ade6c3afaf63a
 SHA1 (patch-ah) = bd356b89afa623c9e2da5636c5a5b76be0b74fd4
-SHA1 (patch-ai) = c926dc2fbdf19e038fffc8a18ff91cb1f93e13ba
 SHA1 (patch-aj) = 03919029326d9dd94d2d9502299f1d2709e4a871
diff -r 3e47d3574f50 -r 817496f830eb net/zebra/patches/patch-ab
--- a/net/zebra/patches/patch-ab        Thu Aug 11 08:48:04 2005 +0000
+++ b/net/zebra/patches/patch-ab        Thu Aug 11 11:14:06 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2002/08/25 21:50:21 jlam Exp $
+$NetBSD: patch-ab,v 1.6 2005/08/11 11:14:06 adam Exp $
 
---- 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 @@
+--- ospf6d/Makefile.am.orig    2004-12-11 02:01:08.000000000 +0000
++++ ospf6d/Makefile.am
+@@ -36,15 +36,17 @@ sysconf_DATA = ospf6d.conf.sample
  
  EXTRA_DIST = $(sysconf_DATA)
  
diff -r 3e47d3574f50 -r 817496f830eb net/zebra/patches/patch-af
--- a/net/zebra/patches/patch-af        Thu Aug 11 08:48:04 2005 +0000
+++ b/net/zebra/patches/patch-af        Thu Aug 11 11:14:06 2005 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-af,v 1.4 2002/08/25 21:50:23 jlam Exp $
+$NetBSD: patch-af,v 1.5 2005/08/11 11:14:06 adam Exp $
 
---- 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 @@
+--- zebra/Makefile.am.orig     2004-04-28 16:05:31.000000000 +0000
++++ zebra/Makefile.am
+@@ -44,15 +44,17 @@ EXTRA_DIST = $(sysconf_DATA) if_ioctl.c 
  #client : client_main.o ../lib/libzebra.a
  #     $(CC) -g -o client client_main.o ../lib/libzebra.a $(LIBS) $(LIB_IPV6)
  
diff -r 3e47d3574f50 -r 817496f830eb net/zebra/patches/patch-ag
--- a/net/zebra/patches/patch-ag        Thu Aug 11 08:48:04 2005 +0000
+++ b/net/zebra/patches/patch-ag        Thu Aug 11 11:14:06 2005 +0000
@@ -1,16 +1,33 @@
-$NetBSD: patch-ag,v 1.5 2003/12/29 21:59:01 heas Exp $
+$NetBSD: patch-ag,v 1.6 2005/08/11 11:14:06 adam Exp $
 
---- 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,,VTY shell)
--       AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs))
-+       AC_CHECK_LIB(termcap, tputs, ,
-+              AC_CHECK_LIB(tinfo, tputs, ,
-+              AC_CHECK_LIB(curses, tputs, ,
-+              AC_CHECK_LIB(ncurses, 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.])
+--- configure.ac.orig  2005-01-25 17:29:49.000000000 +0000
++++ configure.ac
+@@ -211,6 +211,7 @@ case "$host" in
+       AC_CHECK_LIB(kvm, main)
+   ;;
+ esac
++AM_CONDITIONAL([VTY_OPT], [test "${enable_vtysh}" = yes])
+ 
+ dnl ---------------------
+ dnl Integrated VTY option
+@@ -219,8 +220,10 @@ case "${enable_vtysh}" in
+   "yes")
+     VTYSH="vtysh";
+     AC_DEFINE(VTYSH,,VTY shell)
+-    AC_CHECK_LIB(tinfo, tputs, , AC_CHECK_LIB(ncurses, tputs, ,
+-                 AC_CHECK_LIB(termcap, tputs)))
++    AC_CHECK_LIB(termcap, tputs, ,
++      AC_CHECK_LIB(tinfo, tputs, ,
++      AC_CHECK_LIB(curses, tputs, ,
++      AC_CHECK_LIB(ncurses, 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.])
+@@ -501,6 +504,7 @@ else
+       AC_MSG_RESULT(Linux IPv6)
+    fi
+ fi
++AM_CONDITIONAL([V6_OPT], [test "${enable_ipv6}" = yes])
+ 
+ if test "$zebra_cv_linux_ipv6" = "yes";then
+    AC_DEFINE(HAVE_IPV6)
diff -r 3e47d3574f50 -r 817496f830eb net/zebra/patches/patch-ai
--- a/net/zebra/patches/patch-ai        Thu Aug 11 08:48:04 2005 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-$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