Index: branches/2020Q4/net/openbgpd6/Makefile
===================================================================
--- branches/2020Q4/net/openbgpd6/Makefile	(revision 552926)
+++ branches/2020Q4/net/openbgpd6/Makefile	(revision 552927)
@@ -1,33 +1,32 @@
 # $FreeBSD$
 
 PORTNAME=	openbgpd
-PORTVERSION=	6.6p0
-PORTREVISION=	1
+PORTVERSION=	6.8p0
 CATEGORIES=	net
 MASTER_SITES=	OPENBSD/OpenBGPD
 PKGNAMESUFFIX=	6
 
 MAINTAINER=	pi@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
 
 LICENSE=	ISCL
 LICENSE_FILE=	${FILESDIR}/COPYING
 
 USES=		autoreconf libtool uidfix
 USE_RC_SUBR=	${PORTNAME}
 
 GNU_CONFIGURE=	yes
 
 SUB_FILES=	pkg-message
 
 USERS=		_bgpd
 GROUPS=		_bgpd
 
 CONFLICTS=	zebra-[0-9]* quagga-[0-9]*
 
 OPTIONS_DEFINE=		IPV6LLPEER
 OPTIONS_DEFAULT=	IPV6LLPEER
 IPV6LLPEER_DESC=	Support nexthop using IPv6 link-local address
 IPV6LLPEER_MAKE_ARGS=	-DIPV6_LINKLOCAL_PEER
 
 .include <bsd.port.mk>
Index: branches/2020Q4/net/openbgpd6/distinfo
===================================================================
--- branches/2020Q4/net/openbgpd6/distinfo	(revision 552926)
+++ branches/2020Q4/net/openbgpd6/distinfo	(revision 552927)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575231489
-SHA256 (openbgpd-6.6p0.tar.gz) = 83ad5ee8177d324a2a5cc2ce014835007deff8c91550c009c12b7aa16cb2e046
-SIZE (openbgpd-6.6p0.tar.gz) = 676732
+TIMESTAMP = 1603267757
+SHA256 (openbgpd-6.8p0.tar.gz) = 61487aed98071d9e975e9c38d1bfa0731dd7e55623f655372c318e665d928ff8
+SIZE (openbgpd-6.8p0.tar.gz) = 701164
Index: branches/2020Q4/net/openbgpd6/files/patch-Makefile.am
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-Makefile.am	(revision 552926)
+++ branches/2020Q4/net/openbgpd6/files/patch-Makefile.am	(revision 552927)
@@ -1,20 +1,22 @@
---- Makefile.am.orig	2019-05-01 11:22:14 UTC
+--- Makefile.am.orig	2020-05-05 08:36:21 UTC
 +++ Makefile.am
-@@ -19,13 +19,14 @@
- EXTRA_DIST = README.md VERSION bgpd.conf
+@@ -19,13 +19,16 @@ ACLOCAL_AMFLAGS = -I m4
+ EXTRA_DIST = README.md LICENSE VERSION bgpd.conf
  
  install-data-hook:
--	@if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \
-+	if [ ! -d "$(DESTDIR)$(localstatedir)/run" ]; then \
- 		$(INSTALL) -m 755 -d "$(DESTDIR)$(localstatedir)/run"; \
+-	@if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
++	if [ ! -d "$(DESTDIR)$(runstatedir)" ]; then \
+ 		$(INSTALL) -m 755 -d "$(DESTDIR)$(runstatedir)"; \
  	fi
 -	@if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
 +	if [ ! -d "$(DESTDIR)$(sysconfdir)" ]; then \
  		$(INSTALL) -m 755 -d "$(DESTDIR)$(sysconfdir)"; \
  	fi
 -	@if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
-+	$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample"; \
++	if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample" ]; then \
++		$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf.sample"; \
++	fi
 +	if [ ! -f "$(DESTDIR)$(sysconfdir)/bgpd.conf" ]; then \
  		$(INSTALL) -m 644 "$(srcdir)/bgpd.conf" "$(DESTDIR)$(sysconfdir)/bgpd.conf"; \
  	else \
  		echo; \
Index: branches/2020Q4/net/openbgpd6/files/patch-src__bgpctl__output_json.c
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src__bgpctl__output_json.c	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src__bgpctl__output_json.c	(revision 552927)
@@ -0,0 +1,11 @@
+--- src/bgpctl/output_json.c.orig	2020-05-18 19:17:41 UTC
++++ src/bgpctl/output_json.c
+@@ -22,6 +22,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/endian.h>
++
+ #include "bgpd.h"
+ #include "session.h"
+ #include "rde.h"

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src__bgpctl__output_json.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpctl_output.c
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpctl_output.c	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpctl_output.c	(revision 552927)
@@ -0,0 +1,11 @@
+--- src/bgpctl/output.c.orig	2020-05-18 19:17:41 UTC
++++ src/bgpctl/output.c
+@@ -25,6 +25,8 @@
+ #include <stdlib.h>
+ #include <string.h>
+ 
++#include <sys/endian.h>
++
+ #include "bgpd.h"
+ #include "session.h"
+ #include "rde.h"

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpctl_output.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.c
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.c	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.c	(revision 552927)
@@ -0,0 +1,11 @@
+--- src/bgpd/bgpd.c.orig	2020-05-18 19:17:41 UTC
++++ src/bgpd/bgpd.c
+@@ -61,6 +61,8 @@ struct rib_names	 ribnames = SIMPLEQ_HEAD_INITIALIZER(
+ char			*cname;
+ char			*rcname;
+ 
++enum bgpd_process bgpd_process;
++
+ void
+ sighdlr(int sig)
+ {

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.h
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.h	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.h	(revision 552927)
@@ -0,0 +1,23 @@
+--- src/bgpd/bgpd.h.orig	2020-05-19 09:24:33 UTC
++++ src/bgpd/bgpd.h
+@@ -130,7 +130,8 @@ enum bgpd_process {
+ 	PROC_MAIN,
+ 	PROC_SE,
+ 	PROC_RDE
+-} bgpd_process;
++};
++extern enum bgpd_process bgpd_process;
+ 
+ enum reconf_action {
+ 	RECONF_NONE,
+@@ -532,6 +533,10 @@ enum imsg_type {
+ 	IMSG_XON,
+ 	IMSG_XOFF
+ };
++
++extern struct imsgbuf *ibuf_se;
++extern struct imsgbuf *ibuf_rde;
++extern struct imsgbuf *ibuf_main;
+ 
+ struct demote_msg {
+ 	char		 demote_group[IFNAMSIZ];

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_bgpd.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_rde.c
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_rde.c	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_rde.c	(revision 552927)
@@ -0,0 +1,15 @@
+--- src/bgpd/rde.c.orig	2020-05-04 14:45:09 UTC
++++ src/bgpd/rde.c
+@@ -99,11 +99,9 @@ void		 rde_shutdown(void);
+ int		 ovs_match(struct prefix *, u_int32_t);
+ 
+ volatile sig_atomic_t	 rde_quit = 0;
+-struct bgpd_config	*conf, *nconf;
++static struct bgpd_config	*conf, *nconf;
+ struct filter_head	*out_rules, *out_rules_tmp;
+-struct imsgbuf		*ibuf_se;
+ struct imsgbuf		*ibuf_se_ctl;
+-struct imsgbuf		*ibuf_main;
+ struct rde_memstats	 rdemem;
+ int			 softreconfig;
+ 

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_rde.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.c
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.c	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.c	(revision 552927)
@@ -0,0 +1,18 @@
+--- src/bgpd/session.c.orig	2020-05-19 09:24:33 UTC
++++ src/bgpd/session.c
+@@ -100,13 +100,13 @@ void		 session_template_clone(struct peer *, struct so
+ 		    u_int32_t, u_int32_t);
+ int		 session_match_mask(struct peer *, struct bgpd_addr *);
+ 
+-struct bgpd_config	*conf, *nconf;
++static struct bgpd_config	*conf, *nconf;
++struct ctl_conns ctl_conns;
+ struct bgpd_sysdep	 sysdep;
+ volatile sig_atomic_t	 session_quit;
+ int			 pending_reconf;
+ int			 csock = -1, rcsock = -1;
+ u_int			 peer_cnt;
+-struct imsgbuf		*ibuf_rde;
+ struct imsgbuf		*ibuf_rde_ctl;
+ struct imsgbuf		*ibuf_main;
+ 

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.c
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.h
===================================================================
--- branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.h	(nonexistent)
+++ branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.h	(revision 552927)
@@ -0,0 +1,20 @@
+--- src/bgpd/session.h.orig	2020-05-18 19:17:41 UTC
++++ src/bgpd/session.h
+@@ -18,6 +18,7 @@
+ 
+ #include <sys/types.h>
+ #include <sys/socket.h>
++#include <sys/queue.h>
+ #include <time.h>
+ 
+ #define	MAX_BACKLOG			5
+@@ -146,7 +147,8 @@ struct ctl_conn {
+ 	int			terminate;
+ };
+ 
+-TAILQ_HEAD(ctl_conns, ctl_conn)	ctl_conns;
++TAILQ_HEAD(ctl_conns, ctl_conn);
++extern struct ctl_conns ctl_conns;
+ 
+ struct peer_stats {
+ 	unsigned long long	 msg_rcvd_open;

Property changes on: branches/2020Q4/net/openbgpd6/files/patch-src_bgpd_session.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 552926)
+++ branches/2020Q4	(revision 552927)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r552864