Date: Tue, 15 Mar 2005 12:44:23 +0500 From: Boris Kovalenko <boris@tagnet.ru> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78855: [MAINTAINER UPDATE] net/quagga Message-ID: <E1DB6j1-000HX1-2C@boris.nikom.ru> Resent-Message-ID: <200503150750.j2F7oCUZ085932@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78855
>Category: ports
>Synopsis: [MAINTAINER UPDATE] net/quagga
>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 Mar 15 07:50:11 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Boris Kovalenko
>Release: FreeBSD 5.3-STABLE i386
>Organization:
JSC "TAGNet"
>Environment:
System: FreeBSD boris.nikom.ru 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb 9 09:45:12 YEKT
>Description:
[DESCRIBE CHANGES]
1. Added patch for annoing OSPF infinite loop when time is went back. Patch was
approved by developer team
2. Minor Makefile cleanup
Added file(s):
- files/patch-ospfd::ospf_lsa.c
Port maintainer (boris@tagnet.ru) is cc'd.
Generated with FreeBSD Port Tools 0.63
>How-To-Repeat:
>Fix:
--- quagga-0.98.2_2.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/quagga/Makefile /usr/ports/net/quagga.new/Makefile
--- /usr/ports/net/quagga/Makefile Thu Mar 10 08:10:37 2005
+++ /usr/ports/net/quagga.new/Makefile Tue Mar 15 12:40:59 2005
@@ -7,7 +7,7 @@
PORTNAME= quagga
PORTVERSION= 0.98.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net ipv6
MASTER_SITES= http://quagga.net/download/
@@ -38,10 +38,6 @@
SNMP "SNMP support" off \
TCPSOCKETS "Use TCP/IP sockets for protocol daemons" off \
TCPMD5 "Use experimental MD5 patch for BGP" off
-
-.if !defined(BATCH)
-SEL_OPTIONS= yes
-.endif
.include <bsd.port.pre.mk>
diff -ruN --exclude=CVS /usr/ports/net/quagga/files/patch-ospfd::ospf_lsa.c /usr/ports/net/quagga.new/files/patch-ospfd::ospf_lsa.c
--- /usr/ports/net/quagga/files/patch-ospfd::ospf_lsa.c Thu Jan 1 05:00:00 1970
+++ /usr/ports/net/quagga.new/files/patch-ospfd::ospf_lsa.c Tue Mar 15 12:12:09 2005
@@ -0,0 +1,37 @@
+--- ospfd/ospf_lsa.c.orig Wed Dec 22 19:16:02 2004
++++ ospfd/ospf_lsa.c Mon Mar 7 12:24:04 2005
+@@ -3665,6 +3665,7 @@
+ struct listnode *node;
+ struct ospf *ospf = THREAD_ARG (t);
+ int i;
++ time_t ct;
+ struct list *lsa_to_refresh = list_new ();
+
+ if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
+@@ -3672,15 +3673,25 @@
+
+
+ i = ospf->lsa_refresh_queue.index;
++
++ if ((ct = time(NULL)) < ospf->lsa_refresher_started) {
++ zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing lsa_refresher_started: %d -> %d", ospf->lsa_refresher_started, ct);
++ ospf->lsa_refresher_started = ct;
++ }
+
+ ospf->lsa_refresh_queue.index =
+ (ospf->lsa_refresh_queue.index +
+- (time (NULL) - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY)
++ (ct - ospf->lsa_refresher_started) / OSPF_LSA_REFRESHER_GRANULARITY)
+ % OSPF_LSA_REFRESHER_SLOTS;
+
+ if (IS_DEBUG_OSPF (lsa, LSA_REFRESH))
+ zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): next index %d",
+ ospf->lsa_refresh_queue.index);
++
++ if (ospf->lsa_refresh_queue.index >= OSPF_LSA_REFRESHER_SLOTS) {
++ zlog_debug ("LSA[Refresh]: ospf_lsa_refresh_walker(): HACK: fixing index: %hu -> 0", ospf->lsa_refresh_queue.index);
++ ospf->lsa_refresh_queue.index = 0;
++ }
+
+ for (;i != ospf->lsa_refresh_queue.index;
+ i = (i + 1) % OSPF_LSA_REFRESHER_SLOTS)
--- quagga-0.98.2_2.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1DB6j1-000HX1-2C>