Update openbgpd to 3.9.

Reminded by:	osa

3 files changed, 84 insertions, 0 deletions

diff --git a/net/openbgpd/files/patch-bgpctl_bgpctl.c b/net/openbgpd/files/patch-bgpctl_bgpctl.c
new file mode 100644
index 000000000000..308e4fc8bdf1
--- /dev/null
+++ b/net/openbgpd/files/patch-bgpctl_bgpctl.c
@@ -0,0 +1,26 @@
+--- bgpctl/bgpctl.c.orig	Tue Jan 24 15:28:03 2006
++++ bgpctl/bgpctl.c	Mon Mar 20 11:55:29 2006
+@@ -29,7 +29,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#if defined(__OpenBSD__)
+ #include <util.h>
++#else /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) */
++#include <libutil.h>
++#endif
+ 
+ #include "bgpd.h"
+ #include "session.h"
+@@ -1032,7 +1039,11 @@
+ {
+ 	static char	buf[16];
+ 
++#if defined(__OpenBSD__)
+ 	if (fmt_scaled(num, buf) == -1)
++#else /* defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) */
++	if (humanize_number(buf, 16, num, "", HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL) == -1)
++#endif
+ 		snprintf(buf, sizeof(buf), "%lldB", num);
+ 
+ 	return (buf);
diff --git a/net/openbgpd/files/patch-bgpctl_parser.c b/net/openbgpd/files/patch-bgpctl_parser.c
new file mode 100644
index 000000000000..1257dc8f4e13
--- /dev/null
+++ b/net/openbgpd/files/patch-bgpctl_parser.c
@@ -0,0 +1,12 @@
+--- bgpctl/parser.c.orig	Mon Mar 20 11:57:05 2006
++++ bgpctl/parser.c	Mon Mar 20 11:57:27 2006
+@@ -29,6 +29,9 @@
+ 
+ #include "parser.h"
+ 
++/* Ok, this is awful. */
++#include "strtonum.c"
++
+ enum token_type {
+ 	NOTOKEN,
+ 	ENDTOKEN,
diff --git a/net/openbgpd/files/patch-bgpd_kroute.c b/net/openbgpd/files/patch-bgpd_kroute.c
new file mode 100644
index 000000000000..1084c2c59aa0
--- /dev/null
+++ b/net/openbgpd/files/patch-bgpd_kroute.c
@@ -0,0 +1,46 @@
+--- bgpd/kroute.c.orig	23 Feb 2006 15:25:18 -0000	1.144
++++ bgpd/kroute.c	16 Mar 2006 18:09:15 -0000
+@@ -1723,7 +1723,9 @@ send_rtmsg(int fd, int action, struct kr
+ 		struct sockaddr_in	prefix;
+ 		struct sockaddr_in	nexthop;
+ 		struct sockaddr_in	mask;
++#if 0
+ 		struct sockaddr_rtlabel	label;
++#endif
+ 	} r;
+ 
+ 	if (kr_state.fib_sync == 0)
+@@ -1756,9 +1758,11 @@ send_rtmsg(int fd, int action, struct kr
+ 	r.mask.sin_family = AF_INET;
+ 	r.mask.sin_addr.s_addr = htonl(prefixlen2mask(kroute->prefixlen));
+ 
++#if 0
+ 	r.label.sr_len = sizeof(r.label);
+ 	strlcpy(r.label.sr_label, rtlabel_id2name(kroute->labelid),
+ 	    sizeof(r.label.sr_label));
++#endif
+ 
+ retry:
+ 	if (write(fd, &r, sizeof(r)) == -1) {
+@@ -1799,7 +1803,9 @@ send_rt6msg(int fd, int action, struct k
+ 		struct sockaddr_in6	prefix;
+ 		struct sockaddr_in6	nexthop;
+ 		struct sockaddr_in6	mask;
++#if 0
+ 		struct sockaddr_rtlabel	label;
++#endif
+ 	} r;
+ 
+ 	if (kr_state.fib_sync == 0)
+@@ -1832,9 +1838,11 @@ send_rt6msg(int fd, int action, struct k
+ 	memcpy(&r.mask.sin6_addr, prefixlen2mask6(kroute->prefixlen),
+ 	    sizeof(struct in6_addr));
+ 
++#if 0
+ 	r.label.sr_len = sizeof(r.label);
+ 	strlcpy(r.label.sr_label, rtlabel_id2name(kroute->labelid),
+ 	    sizeof(r.label.sr_label));
++#endif
+ 
+ retry:
+ 	if (write(fd, &r, sizeof(r)) == -1) {