Pullup ticket 2096 - requested by gdt

security update for quagga-devel

- pkgsrc/net/quagga-devel/Makefile			1.4
- pkgsrc/net/quagga-devel/PLIST				1.3
- pkgsrc/net/quagga-devel/distinfo			1.5
- pkgsrc/net/quagga-devel/patches/patch-aa		removed
- pkgsrc/net/quagga-devel/patches/patch-ab		removed

   Module Name:	pkgsrc
   Committed By:	gdt
   Date:		Wed May 23 10:44:19 UTC 2007

   Modified Files:
	   pkgsrc/net/quagga-devel: Makefile PLIST distinfo
   Removed Files:
	   pkgsrc/net/quagga-devel/patches: patch-aa patch-ab

   Log Message:
   Update to 0.99.7.

       *  bgpd
             o Minor performance improvement patch
             o bug #352: IPv6/Multicast address-family config not written out
             o V. quick route flap gets mistaken for duplicate, route is then ignored
             o Bug #354: Take care to keep reads of MP_(UN)REACH_NLRI in bounds
             o Peer delete can race with reconfig leading to crash
       * zebra
             o For solaris IPv6 PtP interfaces, try to support prefixlen != 128
             o IRDP should ignore non-IPv4 addresses
             o Bug #351: Don't redistribute routes to ipv4 link-local prefixes
             o Only suppress adding a connected route to the kernel if it is
             o Fix interface metric bug on BSD
             o Retain configured IPv4 address upon removal by kernel
             o MTU change should propogate to zserv client on BSD/Solaris
       * ospfd
             o Fix bug: should exit immediately on SIGTERM if OSPF not actually running
             o Return SNMP standard neighbor state values, not quagga internal ones
             o Fix bug in 'passive-interface default' behavior
             o Bug #330: SPF must consider that nexthop-calc may fail
             o Fix regression in SPF introduced by bug#330 fixes
             o Bug #330 regression: failure to calculate routes through networks
       * ospf6d
             o Bug 322: ospf6d show ipv6 neighbour showing wrong times
             o Fix string comparison bug in ospf6_lsa_handler_name.
       * ripd
             o Fix "show ip rip status" display of time until next update
             o Fix the display of route timeout in "show ip rip".
       * ripngd
             o Fix the display of some timers.
       * general
             o Better comment explaining that GNU awk is really required.
             o de-support NetBSD 1.6, and note that FreeBSD 4 is on thin ice.
             o [PtP over ethernet] New peer flag allows much more addressing flexibility
             o [logging] Add new "log timestamp precision" command for subsecond timestamps

   # 2006-12-09: Quagga 0.99.6 Released

   Quagga 0.99.6 has been released, see the full changelog for the details. A summary of the changes:

       * bgpd
             o Bug #302, bgpd can get stuck in state Clearing
             o Implement 'debug bgp zebra' to log all messages to and from zebra.
             o Fix bug where a deleted route that was quickly re-added was being lost
             o trivial: non C99 u_int.._t should be uint.._t
             o struct peer must have bgp field valid (redistribute crash)
             o Coverity CID #64: Needless NULL check, CID #64: Deref of potentially NULL pointer.
             o CID#73, potential crash in bgp statistics if called for AFI/SAFI with emtpy table
             o Bug #302 fixes. ClearingCompleted event gets flushed, leaving peers stuck in Clearing.
             o Trivial fix of printf format/arg mismatch
             o reduce the process queue hold time to something more sensible
             o RIB statistics address space size shouldnt double count space
             o simplify peer refcounts, squash slow peer leak
             o Fix 0.99 shutdown regression, introduce Clearing and Deleted states
             o Add RIB reporting commands, show bgp ... statistics
             o Handle pcount as flags are changed, fixing pcount issues
             o Add 'show ... neighbor .... prefix-counts' command
       * ospfd
             o Consider all connected addresses when creating ospf interfaces
             o Add debug messages for a few zebra messages that had been overlooked
             o Fix bug in passive-interface default commands.
             o Stop losing subsequent default-information originate 'always' info
             o Add passive-interface default support
             o Improve some warning messages.
             o Fix assertion in DB-exchange fix, hit by ogier-db-ex-opt commit
       * isisd: Fix compiler warnings and allow v4-only compilation
       * zebra
             o Changes of nexthops of static routes didnt take effect
             o Compile fix for PF_ROUTE
       * ripd
             o bug #293: routemap set metric doesn't check for underflow correctly
             o bug #278: remove gratuitous use of mid-function declaration
       * general
             o [daemon startup] Add --dry-run/-C argument to daemons, to check config file syntax
             o Handle upgrade from SUNWzebra to Quagga for 'interface fooX:Y' commands
             o [snmp] Fix asn_build calls to pass correct variable sizes (fixes 64-bit issues)
             o [doc] Add recent NetBSD/FreeBSD versions to list of what ought to work.

       * 2006-09-17: Quagga 0.99.5 Released

	 Quagga 0.99.5 was released on the 28th of August, see the release
	 announcement (version with HTML links). A small regression in ospfd
	 was quickly reported and fixed by a user, available in CVS.
	 Additionally, the final 0.99 BGP regressions mentioned in the 0.99.5
	 announcement are believed to be fixed in CVS, see this mail to
	 quagga-dev. Testing of bgpd in CVS snapshots dated 2006-09-14 or later
         would be appreciated.

	 BGP users of 0.99 are strongly encouraged to upgrade to 0.99.5, due to
	 an important fix for an AS-Path loop-checking regression, or even a
	 CVS snapshot, to assist in testing. OSPF 0.99-CVS is believed to be
	 stable at this point.

5 files changed, 8 insertions, 36 deletions

diff --git a/net/quagga-devel/Makefile b/net/quagga-devel/Makefile
index ccfb620d45e..04ae3174461 100644
--- a/net/quagga-devel/Makefile
+++ b/net/quagga-devel/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2006/06/05 13:58:54 gdt Exp $
+# $NetBSD: Makefile,v 1.3.8.1 2007/05/23 11:59:27 ghen Exp $
 # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
 #
 
-DISTNAME=	quagga-0.99.4
+DISTNAME=	quagga-0.99.7
 CATEGORIES=	net
 MASTER_SITES=	http://www.quagga.net/download/
 
diff --git a/net/quagga-devel/PLIST b/net/quagga-devel/PLIST
index 1015e645735..e1f485dc79c 100644
--- a/net/quagga-devel/PLIST
+++ b/net/quagga-devel/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/04/06 03:20:54 jlam Exp $
+@comment $NetBSD: PLIST,v 1.2.8.1 2007/05/23 11:59:27 ghen Exp $
 include/quagga/buffer.h
 include/quagga/checksum.h
 include/quagga/command.h
@@ -29,6 +29,7 @@ include/quagga/plist.h
 include/quagga/pqueue.h
 include/quagga/prefix.h
 include/quagga/privs.h
+include/quagga/route_types.h
 include/quagga/routemap.h
 include/quagga/sigevent.h
 include/quagga/smux.h
diff --git a/net/quagga-devel/distinfo b/net/quagga-devel/distinfo
index 117c67e5aeb..a5a844a925b 100644
--- a/net/quagga-devel/distinfo
+++ b/net/quagga-devel/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2006/12/02 05:06:33 minskim Exp $
+$NetBSD: distinfo,v 1.4.4.1 2007/05/23 11:59:27 ghen Exp $
 
-SHA1 (quagga-0.99.4.tar.gz) = eb5c12c6345e7651114c704dd3c945d0c7595c10
-RMD160 (quagga-0.99.4.tar.gz) = a0818323c7dc714ed9514cf3cb8110a891b2fa5d
-Size (quagga-0.99.4.tar.gz) = 2207774 bytes
-SHA1 (patch-aa) = 1f79ffb63837c2e93204906c7ec96373154ced2e
-SHA1 (patch-ab) = e6b98d9f0ebbf8ce7ddc1ac6fc70a6da0a5a0234
+SHA1 (quagga-0.99.7.tar.gz) = da2d690275e38bb58841edc265ba3bd154b10dd2
+RMD160 (quagga-0.99.7.tar.gz) = f7ae94f2b5f4782efa7b70bd59924492618133fe
+Size (quagga-0.99.7.tar.gz) = 2350372 bytes
diff --git a/net/quagga-devel/patches/patch-aa b/net/quagga-devel/patches/patch-aa
deleted file mode 100644
index da8b54fca9d..00000000000
--- a/net/quagga-devel/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/03/23 13:51:48 joerg Exp $
-
---- ospf6d/ospf6d.h.orig	2006-03-23 13:20:11.000000000 +0000
-+++ ospf6d/ospf6d.h
-@@ -25,7 +25,6 @@
- #define OSPF6_DAEMON_VERSION    "0.9.7o"
- 
- /* global variables */
--extern int errno;
- extern struct thread_master *master;
- 
- #ifdef INRIA_IPV6
diff --git a/net/quagga-devel/patches/patch-ab b/net/quagga-devel/patches/patch-ab
deleted file mode 100644
index d55933851f5..00000000000
--- a/net/quagga-devel/patches/patch-ab
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2006/12/02 05:06:33 minskim Exp $
-
---- lib/memory.c.orig	2006-03-30 05:47:38.000000000 -0800
-+++ lib/memory.c
-@@ -21,7 +21,10 @@
-  */
- 
- #include <zebra.h>
-+/* malloc.h is generally obsolete, however GNU Libc mallinfo wants it. */
-+#if !defined(HAVE_STDLIB_H) || (defined(GNU_LINUX) && defined(HAVE_MALLINFO))
- #include <malloc.h>
-+#endif /* !HAVE_STDLIB_H || HAVE_MALLINFO */
- 
- #include "log.h"
- #include "memory.h"