From bd402424a472178263228d94f314aa50a9687062 Mon Sep 17 00:00:00 2001
From: Renato Westphal <renato@opensourcerouting.org>
Date: Tue, 1 Aug 2017 22:12:24 -0300
Subject: [PATCH 1/2] lib: fix build from git repository on OpenBSD

The OpenBSD's cp(1) command doesn't support the -v option. This will
change in the next releases (starting from v6.2) but this patch fixes
the problem for v6.1 and older releases.

Fixes Issue #875.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---
 lib/subdir.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/subdir.am b/lib/subdir.am
index cc082a8e85..5a1971cba7 100644
--- a/lib/subdir.am
+++ b/lib/subdir.am
@@ -251,7 +251,7 @@ GITH=lib/gitversion.h
 lib/gitversion.h.tmp: $(top_srcdir)/.git
 	@PERL@ $(top_srcdir)/lib/gitversion.pl $(top_srcdir) > ${GITH}.tmp
 lib/gitversion.h: lib/gitversion.h.tmp
-	{ test -f ${GITH} && diff -s -q ${GITH}.tmp ${GITH}; } || cp -v ${GITH}.tmp ${GITH}
+	{ test -f ${GITH} && diff -s -q ${GITH}.tmp ${GITH}; } || cp ${GITH}.tmp ${GITH}
 
 else
 .PHONY: lib/gitversion.h

From 2d3ed84004f926f9267955ef44a06349fe7de530 Mon Sep 17 00:00:00 2001
From: Renato Westphal <renato@opensourcerouting.org>
Date: Tue, 1 Aug 2017 22:19:18 -0300
Subject: [PATCH 2/2] doc/babeld: small documentation update

Fixes Issue #889.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
---
 babeld/babeld.conf.sample | 4 ++--
 doc/babeld.texi           | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/babeld/babeld.conf.sample b/babeld/babeld.conf.sample
index a4924ec7b7..a77453a734 100644
--- a/babeld/babeld.conf.sample
+++ b/babeld/babeld.conf.sample
@@ -9,8 +9,8 @@ debug babel common
 router babel
 ! network wlan0
 ! network eth0
-! redistribute kernel
-! no redistribute static
+! redistribute ipv4 kernel
+! no redistribute ipv6 static
 
 ! The defaults are fine for a wireless interface
 
diff --git a/doc/babeld.texi b/doc/babeld.texi
index 2dfb5f8c0a..341f692869 100644
--- a/doc/babeld.texi
+++ b/doc/babeld.texi
@@ -179,8 +179,8 @@ The default is 4@dmn{s}.
 @node Babel redistribution, Show Babel information, Babel configuration, Babel
 @section Babel redistribution
 
-@deffn {Babel command} {redistribute @var{kind}}
-@deffnx {Babel command} {no redistribute @var{kind}}
+@deffn {Babel command} {redistribute @var{<ipv4|ipv6>} @var{kind}}
+@deffnx {Babel command} {no redistribute @var{<ipv4|ipv6>} @var{kind}}
 Specify which kind of routes should be redistributed into Babel.
 @end deffn