Date: Fri, 17 Apr 2015 09:18:12 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384144 - in head/net/quagga: . files Message-ID: <201504170918.t3H9ICIW051462@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Apr 17 09:18:11 2015 New Revision: 384144 URL: https://svnweb.freebsd.org/changeset/ports/384144 Log: Fix ipv6 on 8 and possibly 9. Obtained from: http://git.savannah.gnu.org/gitweb/?p=quagga.git;a=patch;h=3e07588e6c2d11464b458cef3965ae31b5f99181 Sponsored by: Absolight Added: head/net/quagga/files/patch-zebra_kernel__socket.c (contents, props changed) Modified: head/net/quagga/Makefile Modified: head/net/quagga/Makefile ============================================================================== --- head/net/quagga/Makefile Fri Apr 17 08:43:39 2015 (r384143) +++ head/net/quagga/Makefile Fri Apr 17 09:18:11 2015 (r384144) @@ -3,7 +3,7 @@ PORTNAME= quagga PORTVERSION= 0.99.24.1 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= net ipv6 MASTER_SITES= SAVANNAH Added: head/net/quagga/files/patch-zebra_kernel__socket.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net/quagga/files/patch-zebra_kernel__socket.c Fri Apr 17 09:18:11 2015 (r384144) @@ -0,0 +1,29 @@ +From 3e07588e6c2d11464b458cef3965ae31b5f99181 Mon Sep 17 00:00:00 2001 +From: Greg Troxel <gdt@ir.bbn.com> +Date: Mon, 23 Mar 2015 15:16:29 -0400 +Subject: [PATCH] Fix alignment assumptions on non-RT_ROUNDUP platforms. + +The comment said that apple uses int and BSD traditionally used long, +but the code was backwards. This fixes apple to be int, and otherwise +long. That should make FreeBSD, which aligns to long, work correctly, +even without using SA_SIZE. + +(cherry picked from commit 941789e470199df4f612368f669ecc0fd096fb9a) +--- + zebra/kernel_socket.c | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +--- zebra/kernel_socket.c.orig 2015-03-07 06:58:00 UTC ++++ zebra/kernel_socket.c +@@ -78,9 +78,9 @@ extern struct zebra_t zebrad; + + /* OS X (Xcode as of 2014-12) is known not to define RT_ROUNDUP */ + #ifdef __APPLE__ +-#define ROUNDUP_TYPE long +-#else + #define ROUNDUP_TYPE int ++#else ++#define ROUNDUP_TYPE long + #endif + + #define ROUNDUP(a) \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201504170918.t3H9ICIW051462>