5 files changed, 98 insertions, 8 deletions

diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index 3b0fdc448718..c01c2911b64d 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -6,14 +6,15 @@
 #
 
 PORTNAME?=	openbgpd
-PORTVERSION?=	3.7
-PORTREVISION?=	3
+PORTVERSION?=	3.9
+PORTREVISION?=	0
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.openbsd.org/pub/OpenBSD/OpenBGPD/:openbsd \
 		${MASTER_SITE_LOCAL:S/$/:freebsd/g}
 MASTER_SITE_SUBDIR=	flz/openbgpd/:freebsd
 DISTFILES?=	${PORTNAME}-${PORTVERSION}.tgz:openbsd,freebsd
-DISTFILES+=	if_media.h:freebsd pfkey_compat.c:freebsd
+DISTFILES+=	if_media.h:freebsd pfkey_compat.c:freebsd \
+		hash.h:freebsd strtonum.c:freebsd
 DIST_SUBDIR=	openbgpd
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
@@ -27,6 +28,7 @@ MANCOMPRESSED=	yes
 USE_RC_SUBR=	openbgpd.sh
 MAKE_ENV=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
+COPTS+=		-DRTA_LABEL=0
 
 EXTRA_PATCHES?=	${.CURDIR}/files/stable-bgpd_bgpd.8
 
@@ -49,10 +51,8 @@ IGNORE=		requires macros present in <sys/tree.h>
 post-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/if_media.h ${WRKSRC}/bgpctl/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/pfkey_compat.c ${WRKSRC}/bgpd/
-.if ${.CURDIR:M*openbgpd-devel} != ""
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/hash.h ${WRKSRC}/bgpd/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/strtonum.c ${WRKSRC}/bgpctl/
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	\
diff --git a/net/openbgpd/distinfo b/net/openbgpd/distinfo
index 0db8e983c4c6..ca4d04577afd 100644
--- a/net/openbgpd/distinfo
+++ b/net/openbgpd/distinfo
@@ -1,9 +1,15 @@
-MD5 (openbgpd/openbgpd-3.7.tgz) = 4d9d933a705a9b4154a86344e6eae437
-SHA256 (openbgpd/openbgpd-3.7.tgz) = 5976742495ecfcea7446a9a91265656154f0be0492cfe3e976c514e4f9df1616
-SIZE (openbgpd/openbgpd-3.7.tgz) = 114980
+MD5 (openbgpd/openbgpd-3.9.tgz) = 818f0e1725f7804e2ef5f7e5d2da9029
+SHA256 (openbgpd/openbgpd-3.9.tgz) = 041bb2e56dd94db8e755df0825467c0f068bb3abe8e3b613b77aede13cc3fc33
+SIZE (openbgpd/openbgpd-3.9.tgz) = 134112
 MD5 (openbgpd/if_media.h) = 4ff9297f5c133425dafe3ca565c0f811
 SHA256 (openbgpd/if_media.h) = 58225d0ed363c2beb23426f0f8254089d4541c3334776f3750ba434d4491a1d1
 SIZE (openbgpd/if_media.h) = 23762
 MD5 (openbgpd/pfkey_compat.c) = 8c3bdf02fd308b327bd30e09674c1858
 SHA256 (openbgpd/pfkey_compat.c) = 46f559c945552ec11174d218c24eeacb3d0bc1dc010a80f07af525b751df1180
 SIZE (openbgpd/pfkey_compat.c) = 360
+MD5 (openbgpd/hash.h) = 0c397692b9b152f1bca968b6248bc09c
+SHA256 (openbgpd/hash.h) = 0c5561c6765325f49d82d5c5fd9471dbfadf21f44e554758eb112a23f7c317b1
+SIZE (openbgpd/hash.h) = 3488
+MD5 (openbgpd/strtonum.c) = da3ba14723ae645c13b8ea96d3f78f20
+SHA256 (openbgpd/strtonum.c) = eabeece529ed7678b5d79774813818ed1d46b7c7a934c98e474c8f62c56abaec
+SIZE (openbgpd/strtonum.c) = 1769
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) {