From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Dec 12 11:50:05 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2BAAC16A417 for ; Tue, 12 Dec 2006 11:50:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.FreeBSD.org (Postfix) with ESMTP id B6D8643CCF for ; Tue, 12 Dec 2006 11:48:41 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id kBCBo3pw054228 for ; Tue, 12 Dec 2006 11:50:03 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kBCBo3ff054227; Tue, 12 Dec 2006 11:50:03 GMT (envelope-from gnats) Resent-Date: Tue, 12 Dec 2006 11:50:03 GMT Resent-Message-Id: <200612121150.kBCBo3ff054227@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Boris Kovalenko Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32A1B16A4AB for ; Tue, 12 Dec 2006 11:41:17 +0000 (UTC) (envelope-from boris@ntmk.ru) Received: from mail.ntmk.ru (mail.ntmk.ru [217.114.241.6]) by mx1.FreeBSD.org (Postfix) with ESMTP id 1471843EA8 for ; Tue, 12 Dec 2006 11:35:50 +0000 (GMT) (envelope-from boris@ntmk.ru) Received: from boris.nikom.ru ([10.1.16.195]) by mail.ntmk.ru with esmtp (Exim 4.62) (envelope-from ) id 1Gu5wd-0003iZ-B1 for FreeBSD-gnats-submit@freebsd.org; Tue, 12 Dec 2006 16:37:11 +0500 Received: from root by boris.nikom.ru with local (Exim 4.63 (FreeBSD)) (envelope-from ) id 1Gu5wd-000H8U-88 for FreeBSD-gnats-submit@freebsd.org; Tue, 12 Dec 2006 16:37:11 +0500 Message-Id: Date: Tue, 12 Dec 2006 16:37:11 +0500 From: Boris Kovalenko To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106640: [MAINTAINER UPDATE] net/quagga: update to 0.99.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Dec 2006 11:50:05 -0000 >Number: 106640 >Category: ports >Synopsis: [MAINTAINER UPDATE] net/quagga: update to 0.99.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Tue Dec 12 11:50:02 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Boris Kovalenko >Release: FreeBSD 6.1-RELEASE i386 >Organization: JSC "TAGNet" >Environment: System: FreeBSD boris.nikom.ru 6.1-RELEASE FreeBSD 6.1-RELEASE #3: Thu Jul 27 14:51:35 YEKST 2006 >Description: Update to new version of Quagga. Full changelog at http://www.quagga.net/download/quagga-0.99.6.changelog.txt - Update to 0.99.6 Added file(s): - files/extra-tcpmd5-patch-vtysh-extract.pl.in Removed file(s): - files/patch-ospfd-ospf_packet.c - files/patch-ripd-ripd.c Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- quagga-0.99.6.patch begins here --- diff -ruN --exclude=CVS /usr/ports/net/quagga/Makefile /usr/ports/net/quagga.new/Makefile --- /usr/ports/net/quagga/Makefile Thu Nov 9 08:31:58 2006 +++ /usr/ports/net/quagga.new/Makefile Tue Dec 12 15:41:20 2006 @@ -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 @@ .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 -ruN --exclude=CVS /usr/ports/net/quagga/distinfo /usr/ports/net/quagga.new/distinfo --- /usr/ports/net/quagga/distinfo Fri Nov 3 09:50:38 2006 +++ /usr/ports/net/quagga.new/distinfo Tue Dec 12 15:24:13 2006 @@ -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 -ruN --exclude=CVS /usr/ports/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-bgpd-bgpd.c --- /usr/ports/net/quagga/files/extra-tcpmd5-patch-bgpd-bgpd.c Tue Aug 30 18:36:47 2005 +++ /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-bgpd-bgpd.c Tue Dec 12 15:53:32 2006 @@ -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 -ruN --exclude=CVS /usr/ports/net/quagga/files/extra-tcpmd5-patch-vtysh-extract.pl.in /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-vtysh-extract.pl.in --- /usr/ports/net/quagga/files/extra-tcpmd5-patch-vtysh-extract.pl.in Thu Jan 1 05:00:00 1970 +++ /usr/ports/net/quagga.new/files/extra-tcpmd5-patch-vtysh-extract.pl.in Tue Dec 12 15:42:26 2006 @@ -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 = ; + close (FH); diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-ospfd-ospf_packet.c /usr/ports/net/quagga.new/files/patch-ospfd-ospf_packet.c --- /usr/ports/net/quagga/files/patch-ospfd-ospf_packet.c Thu Nov 9 04:07:29 2006 +++ /usr/ports/net/quagga.new/files/patch-ospfd-ospf_packet.c Thu Jan 1 05:00:00 1970 @@ -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 -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-ripd-ripd.c /usr/ports/net/quagga.new/files/patch-ripd-ripd.c --- /usr/ports/net/quagga/files/patch-ripd-ripd.c Tue May 30 02:28:35 2006 +++ /usr/ports/net/quagga.new/files/patch-ripd-ripd.c Thu Jan 1 05:00:00 1970 @@ -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)) - { --- quagga-0.99.6.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: