6 files changed, 130 insertions, 0 deletions

diff --git a/net/Makefile b/net/Makefile
index 87c48ee82148..9079dbe50dfd 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -352,6 +352,7 @@
     SUBDIR += onenetd
     SUBDIR += openam
     SUBDIR += openbgpd
+    SUBDIR += openbgpd-devel
     SUBDIR += opengk
     SUBDIR += openh323
     SUBDIR += openh323-112
diff --git a/net/openbgpd-devel/Makefile b/net/openbgpd-devel/Makefile
new file mode 100644
index 000000000000..ab8c16ab0609
--- /dev/null
+++ b/net/openbgpd-devel/Makefile
@@ -0,0 +1,30 @@
+# New ports collection makefile for:	openbgpd-devel
+# Date created:				Mar 15 2006
+# Whom:					Florent Thoumie <flz@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	openbgpd-devel
+PORTVERSION=	${SNAPSHOT}
+PORTREVISION=	0
+CATEGORIES=	net
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:freebsd \
+		hash.h:freebsd strtonum.c:freebsd
+SNAPSHOT=	20060320
+
+MAINTAINER=	flz@FreeBSD.org
+COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
+
+CONFLICTS=	zebra-0* quagga-0* openbgpd-devel-*
+
+MASTERDIR=	${.CURDIR}/../openbgpd
+MD5_FILE=	${.CURDIR}/distinfo
+
+EXTRA_PATCHES=	${.CURDIR}/files/devel-bgpd_kroute.c \
+		${.CURDIR}/files/devel-bgpctl_bgpctl.c \
+		${.CURDIR}/files/devel-bgpctl_parser.c
+
+COPTS+=		-DRTA_LABEL=0
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/openbgpd-devel/distinfo b/net/openbgpd-devel/distinfo
new file mode 100644
index 000000000000..86a7ccd20a8e
--- /dev/null
+++ b/net/openbgpd-devel/distinfo
@@ -0,0 +1,15 @@
+MD5 (openbgpd/openbgpd-devel-20060320.tgz) = 2f532bcb074ca5e722a5f757b07eaf13
+SHA256 (openbgpd/openbgpd-devel-20060320.tgz) = b9133bb802277b662da8c3dabd833759fb8cd22da47e9e3f3dc72f5090f95335
+SIZE (openbgpd/openbgpd-devel-20060320.tgz) = 134445
+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
+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
diff --git a/net/openbgpd-devel/files/devel-bgpctl_bgpctl.c b/net/openbgpd-devel/files/devel-bgpctl_bgpctl.c
new file mode 100644
index 000000000000..308e4fc8bdf1
--- /dev/null
+++ b/net/openbgpd-devel/files/devel-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-devel/files/devel-bgpctl_parser.c b/net/openbgpd-devel/files/devel-bgpctl_parser.c
new file mode 100644
index 000000000000..1257dc8f4e13
--- /dev/null
+++ b/net/openbgpd-devel/files/devel-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-devel/files/devel-bgpd_kroute.c b/net/openbgpd-devel/files/devel-bgpd_kroute.c
new file mode 100644
index 000000000000..1084c2c59aa0
--- /dev/null
+++ b/net/openbgpd-devel/files/devel-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) {