Update to 4.4.1. Take maintainership.

7 files changed, 79 insertions, 47 deletions

diff --git a/net/openbgpd/Makefile b/net/openbgpd/Makefile
index e8c2be74fa8..c616c37fc2f 100644
--- a/net/openbgpd/Makefile
+++ b/net/openbgpd/Makefile
@@ -5,22 +5,21 @@
 # $FreeBSD$
 #
 
-PORTNAME?=	openbgpd
-PORTVERSION?=	4.2
-PORTREVISION?=	0
+PORTNAME=	openbgpd
+PORTVERSION=	4.4.1
 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 hash.h:freebsd strtonum.c:freebsd
+DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz:openbsd,freebsd \
+		if_media.h:freebsd hash.h:freebsd strtonum.c:freebsd
 DIST_SUBDIR=	openbgpd
 EXTRACT_ONLY=	${PORTNAME}-${PORTVERSION}.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	hrs@FreeBSD.org
 COMMENT=	Free implementation of the Border Gateway Protocol, Version 4
 
-CONFLICTS=	zebra-0* quagga-0*
+CONFLICTS=	zebra-[0-9]* quagga-[0-9]*
 
 WRKSRC=		${WRKDIR}
 MANCOMPRESSED=	yes
@@ -47,21 +46,16 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"	\
-		${WRKSRC}/bgpd/Makefile			\
 		${WRKSRC}/bgpd/bgpd.8			\
 		${WRKSRC}/bgpd/bgpd.h			\
 		${WRKSRC}/bgpd/bgpd.conf.5		\
-		${WRKSRC}/bgpctl/Makefile		\
 		${WRKSRC}/bgpctl/bgpctl.8
-	@${REINPLACE_CMD} -e "/__dead2/d"		\
-		${WRKSRC}/bgpd/bgpd.h
 	@${REINPLACE_CMD} -e "s|__dead||"		\
 		${WRKSRC}/bgpd/bgpd.c 		\
 		${WRKSRC}/bgpd/bgpd.h 		\
 		${WRKSRC}/bgpctl/bgpctl.c	\
 		${WRKSRC}/bgpctl/irrfilter.h	\
 		${WRKSRC}/bgpctl/irrfilter.c
-	@${REINPLACE_CMD} -e "s|SIMPLEQ|STAILQ|" ${WRKSRC}/bgpd/*.[chy]
 	@${REINPLACE_CMD} -e "s|<net/if_media.h>|\"if_media.h\"|" ${WRKSRC}/bgpctl/bgpctl.c
 	@${REINPLACE_CMD} -e "s|pfkey.c|pfkey_compat.c|" ${WRKSRC}/bgpd/Makefile
 	@${REINPLACE_CMD} -e "s|sys/hash.h|hash.h|"	\
@@ -73,12 +67,12 @@ post-patch:
 
 do-build:
 .for i in ${SUBDIRS}
-	cd ${WRKSRC}/$i; make COPTS="${COPTS}"
+	cd ${WRKSRC}/$i && ${MAKE} COPTS="${COPTS}"
 .endfor
 
 do-install:
 .for i in ${SUBDIRS}
-	cd ${WRKSRC}/$i; make install ${MAKE_ENV}
+	cd ${WRKSRC}/$i && ${MAKE} ${INSTALL_TARGET} ${MAKE_ENV}
 .endfor
 
 post-install:
diff --git a/net/openbgpd/distinfo b/net/openbgpd/distinfo
index 50f81c01f67..e6ddbe50d38 100644
--- a/net/openbgpd/distinfo
+++ b/net/openbgpd/distinfo
@@ -1,6 +1,6 @@
-MD5 (openbgpd/openbgpd-4.2.tgz) = e5f16db7f76648f08eec67727dc5342f
-SHA256 (openbgpd/openbgpd-4.2.tgz) = fb64f17acb9360bf91c7d76f406b86fbb04578c256a48d178e9e7e198e28e0de
-SIZE (openbgpd/openbgpd-4.2.tgz) = 158762
+MD5 (openbgpd/openbgpd-4.4.1.tgz) = 5ac036b2ca2905a7efe2e0364aef00e7
+SHA256 (openbgpd/openbgpd-4.4.1.tgz) = 284406daa359bf1e9386e5055a1803453d04fd9c9ef5479ac324c8d1eebc33a4
+SIZE (openbgpd/openbgpd-4.4.1.tgz) = 163070
 MD5 (openbgpd/if_media.h) = 4ff9297f5c133425dafe3ca565c0f811
 SHA256 (openbgpd/if_media.h) = 58225d0ed363c2beb23426f0f8254089d4541c3334776f3750ba434d4491a1d1
 SIZE (openbgpd/if_media.h) = 23762
diff --git a/net/openbgpd/files/patch-bgpctl-compat-openbsd.h b/net/openbgpd/files/patch-bgpctl-compat-openbsd.h
new file mode 100644
index 00000000000..bbec3833bac
--- /dev/null
+++ b/net/openbgpd/files/patch-bgpctl-compat-openbsd.h
@@ -0,0 +1,6 @@
+--- /dev/null	2009-06-24 01:22:00.000000000 +0900
++++ bgpctl/compat-openbsd.h	2009-06-24 01:24:55.000000000 +0900
+@@ -0,0 +1,3 @@
++#include <sys/endian.h>
++
++#define betoh64(x)	(be64toh(x))
diff --git a/net/openbgpd/files/patch-bgpctl_bgpctl.c b/net/openbgpd/files/patch-bgpctl_bgpctl.c
index ff3e155fb20..5cdfa29bea4 100644
--- a/net/openbgpd/files/patch-bgpctl_bgpctl.c
+++ b/net/openbgpd/files/patch-bgpctl_bgpctl.c
@@ -1,5 +1,5 @@
---- bgpctl/bgpctl.c	2007-08-06 21:16:06.000000000 +0200
-+++ bgpctl/bgpctl.c	2008-03-18 14:27:24.000000000 +0100
+--- bgpctl/bgpctl.c.orig	2009-01-16 23:03:29.000000000 +0900
++++ bgpctl/bgpctl.c	2009-06-24 01:26:24.000000000 +0900
 @@ -20,7 +20,6 @@
  #include <sys/socket.h>
  #include <sys/un.h>
@@ -8,7 +8,7 @@
  #include <net/if_types.h>
  
  #include <err.h>
-@@ -29,14 +28,19 @@
+@@ -29,14 +28,20 @@
  #include <stdlib.h>
  #include <string.h>
  #include <unistd.h>
@@ -22,6 +22,7 @@
 +#include "util.h"
  #include "irrfilter.h"
 +#include "if_media.h"
++#include "compat-openbsd.h"
 +
 +#if defined(__FreeBSD__) /* FreeBSD has no LINK_STATE_IS_UP macro. */
 +#define LINK_STATE_IS_UP(_s)  ((_s) >= LINK_STATE_UP)
@@ -29,3 +30,21 @@
  
  enum neighbor_views {
  	NV_DEFAULT,
+@@ -84,7 +89,7 @@
+ 
+ struct imsgbuf	*ibuf;
+ 
+-__dead void
++ void
+ usage(void)
+ {
+ 	extern char	*__progname;
+@@ -677,7 +682,7 @@
+ }
+ 
+ void
+-print_timer(const char *name, timer_t d)
++print_timer(const char *name, time_t d)
+ {
+ 	printf("  %-20s ", name);
+ 
diff --git a/net/openbgpd/files/patch-bgpctl_parser.h b/net/openbgpd/files/patch-bgpctl_parser.h
new file mode 100644
index 00000000000..2bd14da4507
--- /dev/null
+++ b/net/openbgpd/files/patch-bgpctl_parser.h
@@ -0,0 +1,9 @@
+--- bgpctl/parser.h.orig	2009-01-16 23:03:29.000000000 +0900
++++ bgpctl/parser.h	2009-06-22 14:54:34.000000000 +0900
+@@ -63,5 +63,5 @@
+ 	sa_family_t		 af;
+ };
+ 
+-__dead void		 usage(void);
++void		 usage(void);
+ struct parse_result	*parse(int, char *[]);
diff --git a/net/openbgpd/files/patch-bgpd_kroute.c b/net/openbgpd/files/patch-bgpd_kroute.c
index 4f97f3cdd40..c4eb9b6e56f 100644
--- a/net/openbgpd/files/patch-bgpd_kroute.c
+++ b/net/openbgpd/files/patch-bgpd_kroute.c
@@ -1,6 +1,6 @@
---- bgpd/kroute.c.orig	2007-05-11 13:27:59.000000000 +0200
-+++ bgpd/kroute.c	2009-04-23 05:14:47.000000000 +0200
-@@ -1738,7 +1738,9 @@
+--- bgpd/kroute.c.orig	2009-01-16 23:03:20.000000000 +0900
++++ bgpd/kroute.c	2009-06-22 14:53:15.000000000 +0900
+@@ -1747,7 +1747,9 @@
  	struct sockaddr_in	prefix;
  	struct sockaddr_in	nexthop;
  	struct sockaddr_in	mask;
@@ -10,17 +10,21 @@
  	int			iovcnt = 0;
  
  	if (kr_state.fib_sync == 0)
-@@ -1748,7 +1750,9 @@
+@@ -1757,9 +1759,13 @@
  	bzero(&hdr, sizeof(hdr));
  	hdr.rtm_version = RTM_VERSION;
  	hdr.rtm_type = action;
-+#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */ 
++#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */
  	hdr.rtm_tableid = kr_state.rtableid;
-+#endif
++#endif /* !defined(__FreeBSD__) */
  	hdr.rtm_flags = RTF_PROTO1;
++#if !defined(__FreeBSD__) /* XXX: FreeBSD has no rtm_priority */
+ 	hdr.rtm_priority = RTP_BGP;
++#endif /* !defined(__FreeBSD__) */
  	if (kroute->flags & F_BLACKHOLE)
  		hdr.rtm_flags |= RTF_BLACKHOLE;
-@@ -1799,6 +1803,7 @@
+ 	if (kroute->flags & F_REJECT)
+@@ -1809,6 +1815,7 @@
  	iov[iovcnt++].iov_len = sizeof(mask);
  
  	if (kroute->labelid) {
@@ -28,7 +32,7 @@
  		bzero(&label, sizeof(label));
  		label.sr_len = sizeof(label);
  		strlcpy(label.sr_label, rtlabel_id2name(kroute->labelid),
-@@ -1809,6 +1814,7 @@
+@@ -1819,6 +1826,7 @@
  		/* adjust iovec */
  		iov[iovcnt].iov_base = &label;
  		iov[iovcnt++].iov_len = sizeof(label);
@@ -36,7 +40,7 @@
  	}
  
  retry:
-@@ -1850,7 +1856,9 @@
+@@ -1860,7 +1868,9 @@
  	struct sockaddr_in6	prefix;
  	struct sockaddr_in6	nexthop;
  	struct sockaddr_in6	mask;
@@ -46,17 +50,17 @@
  	int			iovcnt = 0;
  
  	if (kr_state.fib_sync == 0)
-@@ -1860,7 +1868,9 @@
+@@ -1870,7 +1880,9 @@
  	bzero(&hdr, sizeof(hdr));
  	hdr.rtm_version = RTM_VERSION;
  	hdr.rtm_type = action;
 +#if !defined(__FreeBSD__) /* XXX: FreeBSD has no multiple routing tables */ 
  	hdr.rtm_tableid = kr_state.rtableid;
-+#endif
++#endif /* !defined(__FreeBSD__) */
  	hdr.rtm_flags = RTF_PROTO1;
  	if (kroute->flags & F_BLACKHOLE)
  		hdr.rtm_flags |= RTF_BLACKHOLE;
-@@ -1914,6 +1924,7 @@
+@@ -1924,6 +1936,7 @@
  	iov[iovcnt++].iov_len = sizeof(mask);
  
  	if (kroute->labelid) {
@@ -64,7 +68,7 @@
  		bzero(&label, sizeof(label));
  		label.sr_len = sizeof(label);
  		strlcpy(label.sr_label, rtlabel_id2name(kroute->labelid),
-@@ -1924,6 +1935,7 @@
+@@ -1934,6 +1947,7 @@
  		/* adjust iovec */
  		iov[iovcnt].iov_base = &label;
  		iov[iovcnt++].iov_len = sizeof(label);
@@ -72,18 +76,18 @@
  	}
  
  retry:
-@@ -1960,8 +1972,8 @@
+@@ -1970,8 +1984,8 @@
  int
  fetchtable(u_int rtableid, int connected_only)
  {
 -	size_t			 len;
 -	int			 mib[7];
-+	size_t		 	len;
-+	int		 		mib[6];
++	size_t			len;
++	int		 	mib[6];
  	char			*buf, *next, *lim;
  	struct rt_msghdr	*rtm;
  	struct sockaddr		*sa, *gw, *rti_info[RTAX_MAX];
-@@ -1976,9 +1988,8 @@
+@@ -1986,9 +2000,8 @@
  	mib[3] = 0;
  	mib[4] = NET_RT_DUMP;
  	mib[5] = 0;
@@ -91,10 +95,10 @@
  
 -	if (sysctl(mib, 7, NULL, &len, NULL, 0) == -1) {
 +	if (sysctl(mib, 6, NULL, &len, NULL, 0) == -1) {
- 		if (rtableid != 0 && errno == EINVAL)	/* table nonexistant */
+ 		if (rtableid != 0 && errno == EINVAL)	/* table nonexistent */
  			return (0);
  		log_warn("sysctl");
-@@ -1988,7 +1999,7 @@
+@@ -1998,7 +2011,7 @@
  		log_warn("fetchtable");
  		return (-1);
  	}
@@ -103,7 +107,7 @@
  		log_warn("sysctl");
  		free(buf);
  		return (-1);
-@@ -2240,12 +2251,14 @@
+@@ -2252,12 +2265,14 @@
  				continue;
  
  			connected_only = 0;
@@ -114,7 +118,7 @@
  				else
  					continue;
  			}
-+#endif
++#endif /* !defined(__FreeBSD__) */
  
  			if (dispatch_rtmsg_addr(rtm, rti_info,
  			    connected_only) == -1)
diff --git a/net/openbgpd/files/patch-bgpd_parse.y b/net/openbgpd/files/patch-bgpd_parse.y
index 6aaa9507667..b44615764ed 100644
--- a/net/openbgpd/files/patch-bgpd_parse.y
+++ b/net/openbgpd/files/patch-bgpd_parse.y
@@ -1,19 +1,19 @@
---- bgpd/parse.y	2007-05-31 20:38:58.000000000 +0200
-+++ bgpd/parse.y	2008-03-18 13:27:29.000000000 +0100
+--- bgpd/parse.y.orig	2009-01-16 23:03:20.000000000 +0900
++++ bgpd/parse.y	2009-06-22 14:49:56.000000000 +0900
 @@ -523,11 +523,16 @@
  			free($4);
  		}
- 		| RTABLE number {
+ 		| RTABLE NUMBER {
 +#ifdef __FreeBSD__
-+ 			yyerror("rtable id not supported in FreeBSD, yet");
-+ 			YYERROR;
++			yyerror("rtable id not supported in FreeBSD, yet");
++			YYERROR;
 +#else
  			if ($2 > RT_TABLEID_MAX || $2 < 0) {
  				yyerror("invalid rtable id");
  				YYERROR;
  			}
  			conf->rtableid = $2;
-+#endif
++#endif /* __FreeBSD__ */
  		}
  		;