- Update to 0.99.6

PR:		ports/106640
Submitted by:	Boris Kovalenko <boris@tagnet.ru> (maintainer)

6 files changed, 25 insertions, 85 deletions

diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 4b863650ecf5..cfd729a19d0a 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	quagga
-PORTVERSION=	0.99.5
-PORTREVISION=	1
+PORTVERSION=	0.99.6
 CATEGORIES=	net ipv6
 MASTER_SITES=	http://quagga.net/download/ \
 		http://www.ru.quagga.net/download/ \
@@ -116,7 +115,7 @@ LIB_DEPENDS+=netsnmp.9:${PORTSDIR}/net-mgmt/net-snmp
 .if ${OSVERSION} < 491000
 BROKEN=		This version of FreeBSD does not have TCP MD5 signature support
 .endif
-EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.h
+EXTRA_PATCHES+=${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_network.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgp_vty.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.c ${PATCHDIR}/extra-tcpmd5-patch-bgpd-bgpd.h ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.c ${PATCHDIR}/extra-tcpmd5-patch-lib-sockopt.h ${PATCHDIR}/extra-tcpmd5-patch-vtysh-extract.pl.in
 CFLAGS+=	-DQUAGGA_TCP_MD5SIG
 .endif
 
diff --git a/net/quagga/distinfo b/net/quagga/distinfo
index 90f505e5fa4f..ee83c0378e88 100644
--- a/net/quagga/distinfo
+++ b/net/quagga/distinfo
@@ -1,3 +1,3 @@
-MD5 (quagga-0.99.5.tar.gz) = 3f9c71aca6faa22a889e2f84ecfd0076
-SHA256 (quagga-0.99.5.tar.gz) = 2555535654893806d21e804406f2cf594214bb2b9661458eb5bbf00402c31c7b
-SIZE (quagga-0.99.5.tar.gz) = 2311140
+MD5 (quagga-0.99.6.tar.gz) = 78137ecaa66ff4c3780bd05f60e51cf5
+SHA256 (quagga-0.99.6.tar.gz) = a22c927f9ceb7152b0c45c939ccb81217c8d614f3c411c86781b24520f2ec15a
+SIZE (quagga-0.99.6.tar.gz) = 2324051
diff --git a/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c
index 445a16577ee4..83dbea26d5e5 100644
--- a/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c
+++ b/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c
@@ -1,6 +1,6 @@
---- bgpd/bgpd.c.orig	Thu Dec  9 06:46:46 2004
-+++ bgpd/bgpd.c	Sat Jan 29 11:29:26 2005
-@@ -59,6 +59,9 @@
+--- bgpd/bgpd.c.orig	Fri Dec  8 05:24:44 2006
++++ bgpd/bgpd.c	Tue Dec 12 15:34:44 2006
+@@ -60,6 +60,9 @@
  #ifdef HAVE_SNMP
  #include "bgpd/bgp_snmp.h"
  #endif /* HAVE_SNMP */
@@ -10,15 +10,15 @@
  
  /* BGP process wide configuration.  */
  static struct bgp_master bgp_master;
-@@ -707,6 +710,7 @@
+@@ -788,6 +791,7 @@
+   peer->status = Idle;
    peer->ostatus = Idle;
-   peer->version = BGP_VERSION_4;
    peer->weight = 0;
 +  peer->password[0] = '\0';
+   peer->bgp = bgp;
+   peer = peer_lock (peer); /* initial reference */
  
-   /* Set default flags.  */
-   for (afi = AFI_IP; afi < AFI_MAX; afi++)
-@@ -3270,6 +3274,55 @@
+@@ -3379,6 +3383,55 @@
    return 0;
  }
  
@@ -74,7 +74,7 @@
  /* Set distribute list to the peer. */
  int
  peer_distribute_set (struct peer *peer, afi_t afi, safi_t safi, int direct, 
-@@ -4279,6 +4332,13 @@
+@@ -4409,6 +4462,13 @@
        if (peer->desc)
  	vty_out (vty, " neighbor %s description %s%s", addr, peer->desc,
  		 VTY_NEWLINE);
diff --git a/net/quagga/files/extra-tcpmd5-patch-vtysh-extract.pl.in b/net/quagga/files/extra-tcpmd5-patch-vtysh-extract.pl.in
new file mode 100644
index 000000000000..e9522ee8274e
--- /dev/null
+++ b/net/quagga/files/extra-tcpmd5-patch-vtysh-extract.pl.in
@@ -0,0 +1,11 @@
+--- vtysh/extract.pl.in.orig	Mon Sep 19 19:12:11 2005
++++ vtysh/extract.pl.in	Tue Dec 12 15:40:05 2006
+@@ -62,7 +62,7 @@
+ foreach (@ARGV) {
+     $file = $_;
+ 
+-    open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ $file |");
++    open (FH, "cpp -DHAVE_CONFIG_H -DVTYSH_EXTRACT_PL -DHAVE_IPV6 -DQUAGGA_TCP_MD5SIG -I@top_builddir@ -I@srcdir@/ -I@srcdir@/.. -I@top_srcdir@/lib -I@top_srcdir@/isisd/topology @SNMP_INCLUDES@ $file |");
+     local $/; undef $/;
+     $line = <FH>;
+     close (FH);
diff --git a/net/quagga/files/patch-ospfd-ospf_packet.c b/net/quagga/files/patch-ospfd-ospf_packet.c
deleted file mode 100644
index a31dfd2b64db..000000000000
--- a/net/quagga/files/patch-ospfd-ospf_packet.c
+++ /dev/null
@@ -1,51 +0,0 @@
---- ospfd/ospf_packet.c.orig
-+++ ospfd/ospf_packet.c
-@@ -2712,25 +2712,9 @@ ospf_make_db_desc (struct ospf_interface
-   /* Set DD Sequence Number. */
-   stream_putl (s, nbr->dd_seqnum);
- 
-+  /* shortcut unneeded walk of (empty) summary LSDBs */
-   if (ospf_db_summary_isempty (nbr))
--    {
--      /* Sanity check:
--       *
--       * Must be here either:
--       * - Initial DBD (ospf_nsm.c)
--       *   - M must be set
--       * or
--       * - finishing Exchange, and DB-Summary list empty
--       *   - from ospf_db_desc_proc()
--       *   - M must not be set
--       */
--      if (nbr->state >= NSM_Exchange)
--	assert (!IS_SET_DD_M(nbr->dd_flags));
--      else
--        assert (IS_SET_DD_M(nbr->dd_flags));
--
--      return length;
--    }
-+    goto empty;
- 
-   /* Describe LSA Header from Database Summary List. */
-   lsdb = &nbr->db_sum;
-@@ -2785,9 +2769,17 @@ ospf_make_db_desc (struct ospf_interface
-   /* Update 'More' bit */
-   if (ospf_db_summary_isempty (nbr))
-     {
--      UNSET_FLAG (nbr->dd_flags, OSPF_DD_FLAG_M);
--      /* Rewrite DD flags */
--      stream_putc_at (s, pp, nbr->dd_flags);
-+empty:
-+      if (nbr->state >= NSM_Exchange)
-+        {
-+          UNSET_FLAG (nbr->dd_flags, OSPF_DD_FLAG_M);
-+          /* Rewrite DD flags */
-+          stream_putc_at (s, pp, nbr->dd_flags);
-+        }
-+      else
-+        {
-+          assert (IS_SET_DD_M(nbr->dd_flags));
-+        }
-     }
-   return length;
- }
diff --git a/net/quagga/files/patch-ripd-ripd.c b/net/quagga/files/patch-ripd-ripd.c
deleted file mode 100644
index 2c1f0d3b3e3e..000000000000
--- a/net/quagga/files/patch-ripd-ripd.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- ripd/ripd.c.orig	Thu May  4 13:33:44 2006
-+++ ripd/ripd.c	Thu May 11 12:58:35 2006
-@@ -1822,6 +1822,7 @@
-   struct interface *ifp;
-   struct connected *ifc;
-   struct rip_interface *ri;
-+  int vrecv;
- 
-   /* Fetch socket then register myself. */
-   sock = THREAD_FD (t);
-@@ -1937,7 +1938,7 @@
-     }
- 
-   /* RIP Version check. RFC2453, 4.6 and 5.1 */
--  int vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
-+  vrecv = ((ri->ri_receive == RI_RIP_UNSPEC) ?
-                rip->version_recv : ri->ri_receive);
-   if ((packet->version == RIPv1) && !(vrecv & RIPv1))
-     {