Re: pkg/45178 (quagga-0.99.17: zebra Abort trap)

[Masanori Kanaoka <kanaoka%ann.hi-ho.ne.jp@localhost>]

Hi,

You think so, Would you please Close PR?

       From: gdt%NetBSD.org@localhost
    Subject: Re: pkg/45178 (quagga-0.99.17: zebra Abort trap)
      Date : Thu, 14 Jun 2012 12:50:54 +0000 (UTC)
 Message-ID: <20120614125054.AEF5163B882%www.NetBSD.org@localhost>

$ Synopsis: quagga-0.99.17: zebra Abort trap
$ 
$ State-Changed-From-To: open->feedback
$ State-Changed-By: gdt%NetBSD.org@localhost
$ State-Changed-When: Thu, 14 Jun 2012 12:50:53 +0000
$ State-Changed-Why:
$ This is an upstream bug, not a packaging bug.  Please file a bug upstream.


I don't think so.
I send you next patch at Date: Thu, 28 Jul 2011 22:13:37 +0900 (JST).

Regards!
---
 Masanori Kanaoka        kanaoka AT ann.hi-ho.ne.jp



--- lib/zebra.h.org     2011-07-28 21:49:00.000000000 +0900
+++ lib/zebra.h 2011-07-28 21:51:29.000000000 +0900
@@ -365,6 +365,9 @@
 #define HAVE_IP_HDRINCL_BSD_ORDER
 #endif
 
+#if defined(__NetBSD__) && (__NetBSD_Version__ >= 599004500)
+#define HAVE_RT_ROUNDUP_MACRO
+#endif
 /* Define BYTE_ORDER, if not defined. Useful for compiler conditional
  * code, rather than preprocessor conditional.
  * Not all the world has this BSD define.
--- zebra/kernel_socket.c.orig  2011-07-28 21:52:04.000000000 +0900
+++ zebra/kernel_socket.c       2011-07-28 21:55:02.000000000 +0900
@@ -41,6 +41,13 @@
 extern struct zebra_privs_t zserv_privs;
 extern struct zebra_t zebrad;
 
+#ifdef HAVE_RT_ROUNDUP_MACRO
+/*
+ * Given a sockaddr length, use RT_ROUNDUP() in <net/route.h>.
+ *
+ */
+#define ROUNDUP(a)  RT_ROUNDUP(a)
+#else
 /*
  * Given a sockaddr length, round it up to include pad bytes following
  * it.  Assumes the kernel pads to sizeof(long).
@@ -51,7 +58,7 @@
  */
 #define ROUNDUP(a) \
   ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
-
+#endif /* HAVE_RT_ROUNDUP_MACRO */
 /*
  * Given a pointer (sockaddr or void *), return the number of bytes
  * taken up by the sockaddr and any padding needed for alignment.