Attachment 218667 Details for Bug 250274 – patch

[patch] patch

openbgpd6.diff (text/plain), 8.84 KB, created by Kurt Jaeger on 2020-10-11 15:38:27 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Kurt Jaeger

Created: 2020-10-11 15:38:27 UTC

Size: 8.84 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 552035)
>+++ Makefile	(working copy)
>@@ -1,8 +1,7 @@
> # $FreeBSD$
> 
> PORTNAME=	openbgpd
>-PORTVERSION=	6.6p0
>-PORTREVISION=	1
>+PORTVERSION=	6.7p0
> CATEGORIES=	net
> MASTER_SITES=	OPENBSD/OpenBGPD
> PKGNAMESUFFIX=	6
>Index: distinfo
>===================================================================
>--- distinfo	(revision 552035)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1575231489
>-SHA256 (openbgpd-6.6p0.tar.gz) = 83ad5ee8177d324a2a5cc2ce014835007deff8c91550c009c12b7aa16cb2e046
>-SIZE (openbgpd-6.6p0.tar.gz) = 676732
>+TIMESTAMP = 1592137617
>+SHA256 (openbgpd-6.7p0.tar.gz) = c319bfdc31227cb64f7b7d530c029afb0f261336c55d6aa94f625f96b2f7a249
>+SIZE (openbgpd-6.7p0.tar.gz) = 699211
>Index: files/patch-Makefile.am
>===================================================================
>--- files/patch-Makefile.am	(revision 552035)
>+++ files/patch-Makefile.am	(working copy)
>@@ -1,12 +1,12 @@
>---- 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 \
>@@ -13,7 +13,9 @@
>  		$(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 \
>Index: files/patch-src__bgpctl__output_json.c
>===================================================================
>--- files/patch-src__bgpctl__output_json.c	(nonexistent)
>+++ files/patch-src__bgpctl__output_json.c	(working copy)
>@@ -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: 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: files/patch-src_bgpctl_output.c
>===================================================================
>--- files/patch-src_bgpctl_output.c	(nonexistent)
>+++ files/patch-src_bgpctl_output.c	(working copy)
>@@ -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: 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: files/patch-src_bgpd_bgpd.c
>===================================================================
>--- files/patch-src_bgpd_bgpd.c	(nonexistent)
>+++ files/patch-src_bgpd_bgpd.c	(working copy)
>@@ -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: 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: files/patch-src_bgpd_bgpd.h
>===================================================================
>--- files/patch-src_bgpd_bgpd.h	(nonexistent)
>+++ files/patch-src_bgpd_bgpd.h	(working copy)
>@@ -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: 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: files/patch-src_bgpd_rde.c
>===================================================================
>--- files/patch-src_bgpd_rde.c	(nonexistent)
>+++ files/patch-src_bgpd_rde.c	(working copy)
>@@ -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: 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: files/patch-src_bgpd_session.c
>===================================================================
>--- files/patch-src_bgpd_session.c	(nonexistent)
>+++ files/patch-src_bgpd_session.c	(working copy)
>@@ -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: 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: files/patch-src_bgpd_session.h
>===================================================================
>--- files/patch-src_bgpd_session.h	(nonexistent)
>+++ files/patch-src_bgpd_session.h	(working copy)
>@@ -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: 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

Actions: View | Diff

Attachments on bug 250274: 218667