Attachment 168299 Details for Bug 208064 – patch

[patch] patch

quagga.diff (text/plain), 3.23 KB, created by Kurt Jaeger on 2016-03-16 15:07:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2016-03-16 15:07:01 UTC

Size: 3.23 KB

patch

obsolete

>diff -r -u -N net/quagga/Makefile ../../home/pi/myp/net/quagga/Makefile
>--- net/quagga/Makefile	2015-08-01 00:46:33.895406000 +0200
>+++ ../../home/pi/myp/net/quagga/Makefile	2016-03-16 12:41:43.790350000 +0100
>@@ -2,8 +2,7 @@
> # $FreeBSD: head/net/quagga/Makefile 392567 2015-07-20 13:03:15Z bapt $
> 
> PORTNAME=	quagga
>-PORTVERSION=	0.99.24.1
>-PORTREVISION=	2
>+PORTVERSION=	1.0.20160315
> CATEGORIES=	net ipv6
> MASTER_SITES=	SAVANNAH
> 
>diff -r -u -N net/quagga/distinfo ../../home/pi/myp/net/quagga/distinfo
>--- net/quagga/distinfo	2015-08-01 00:46:33.896325000 +0200
>+++ ../../home/pi/myp/net/quagga/distinfo	2016-03-16 12:41:51.897967000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (quagga-0.99.24.1.tar.xz) = 6fd6baadb136a801c29c1dd72d0fe69da9f19ae498e87bff7057778361e43b14
>-SIZE (quagga-0.99.24.1.tar.xz) = 1779120
>+SHA256 (quagga-1.0.20160315.tar.xz) = d284af5dd875dbba90ab875d40db5d68fdc9ede17a76f2af525f85344be56767
>+SIZE (quagga-1.0.20160315.tar.xz) = 1819488
>diff -r -u -N net/quagga/files/patch-zebra_kernel__socket.c ../../home/pi/myp/net/quagga/files/patch-zebra_kernel__socket.c
>--- net/quagga/files/patch-zebra_kernel__socket.c	2015-08-01 00:46:33.816091000 +0200
>+++ ../../home/pi/myp/net/quagga/files/patch-zebra_kernel__socket.c	1970-01-01 01:00:00.000000000 +0100
>@@ -1,29 +0,0 @@
>-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) \
>diff -r -u -N net/quagga/pkg-plist ../../home/pi/myp/net/quagga/pkg-plist
>--- net/quagga/pkg-plist	2015-08-01 00:46:33.894618000 +0200
>+++ ../../home/pi/myp/net/quagga/pkg-plist	2016-03-16 12:52:21.280766000 +0100
>@@ -1,9 +1,11 @@
> %%PIMD%%bin/test_igmpv3_join
> bin/vtysh
>+bin/bgp_btoa
> include/quagga/buffer.h
> include/quagga/checksum.h
> include/quagga/command.h
> include/quagga/distribute.h
>+include/quagga/fifo.h
> include/quagga/filter.h
> include/quagga/getopt.h
> include/quagga/hash.h
>@@ -44,6 +46,7 @@
> include/quagga/thread.h
> include/quagga/vector.h
> include/quagga/version.h
>+include/quagga/vrf.h
> include/quagga/vty.h
> include/quagga/workqueue.h
> include/quagga/zassert.h
>@@ -72,7 +75,6 @@
> man/man8/ripngd.8.gz
> man/man8/watchquagga.8.gz
> man/man8/zebra.8.gz
>-sbin/babeld
> sbin/bgpd
> %%ISISD%%sbin/isisd
> sbin/ospf6d
>@@ -83,7 +85,6 @@
> sbin/ripngd
> sbin/watchquagga
> sbin/zebra
>-%%EXAMPLESDIR%%/babeld.conf.sample
> %%EXAMPLESDIR%%/bgpd.conf.sample
> %%EXAMPLESDIR%%/bgpd.conf.sample2
> %%ISISD%%%%EXAMPLESDIR%%/isisd.conf.sample

Actions: View | Diff

Attachments on bug 208064: 168299