Version 1.3.11 (2013-07-27)

  o OSPF stub router option (RFC 3137).
  o TTL security for OSPF and RIP.
  o Protocol packet priority and traffic class handling.
  o Multiple routing tables support for FreeBSD and OpenBSD.
  o Extends constants to all filter data types.
  o Implements eval command.
  o 'bgppath ~ int set' filter operation.
  o Several bugfixes.

Version 1.3.10 (2013-04-30)
  o Lightweight BIRD client for embedded environments.
  o Dynamic IPv6 router advertisements.
  o New 'next hop keep' option for BGP.
  o Smart default routing table for 'show route export/preexport/protocol'.
  o Automatic router ID selection could be configured to use address of loopback.
  o Allows configured global addresses of NBMA neighbors in OSPFv3.
  o Allows BIRD commands from UNIX shell even in restricted mode.
  o Route limits inherited from templates can be disabled.
  o Symbol names enclosed by apostrophes can contain dots.
  o Several bugfixes.

Version 1.3.9 (2013-01-11)
  o BIRD can be configured to keep and show filtered routes.
  o Separate receive and import limits.
  o Several new reconfiguration cmd options (undo, timeout, check).
  o Configurable automatic router ID selection.
  o Dragonfly BSD support.
  o Fixed OSPFv3 vlinks.
  o Several minor bugfixes.

Version 1.3.8 (2012-08-07)
  o Generalized import and export route limits.
  o RDNSS and DNSSL support for RAdv.
  o Include in config file support wildcards.
  o History deduplication in BIRD client.
  o New route attributes krt_source, krt_metric.
  o Different instance ID support for OSPFv3.
  o Real broadcast mode for OSPFv2.
  o Several minor bugfixes.

Version 1.3.7 (2012-03-22)
  o Route Origin Authorization basics.
  o RIPng working again.
  o Extended clist operations in filters.
  o Fixes several bugs in BSD iface handling.
  o Several minor bugfixes and enhancements.

6 files changed, 27 insertions, 49 deletions

diff --git a/net/bird/Makefile.common b/net/bird/Makefile.common
index 2290dbcd0ec..e7470455a06 100644
--- a/net/bird/Makefile.common
+++ b/net/bird/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.3 2013/07/15 02:02:26 ryoon Exp $
+# $NetBSD: Makefile.common,v 1.4 2014/03/28 23:27:16 pettai Exp $
 # used by net/bird/Makefile
 # used by net/bird6/Makefile
 
-DISTNAME=	bird-1.3.6
+DISTNAME=	bird-1.3.11
 PKGNAME=	${DISTNAME:S/bird/bird${BIRD6}/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/
diff --git a/net/bird/PLIST b/net/bird/PLIST
index 0951edebff6..ffe9fadf4f7 100644
--- a/net/bird/PLIST
+++ b/net/bird/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.2 2014/03/11 14:05:07 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.3 2014/03/28 23:27:16 pettai Exp $
 sbin/bird${BIRD6}
 sbin/birdc${BIRD6}
+sbin/birdcl${BIRD6}
 share/examples/bird${BIRD6}/bird${BIRD6}.conf
diff --git a/net/bird/distinfo b/net/bird/distinfo
index 025de13560c..dbf9591bffb 100644
--- a/net/bird/distinfo
+++ b/net/bird/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.4 2013/10/20 18:00:57 joerg Exp $
+$NetBSD: distinfo,v 1.5 2014/03/28 23:27:16 pettai Exp $
 
-SHA1 (bird-1.3.6.tar.gz) = 8fdc7afb99b5896e3dec85b8b3ba194c8287bf32
-RMD160 (bird-1.3.6.tar.gz) = d4670d79509fc3975ff86d0b67d60bb507bbbcc6
-Size (bird-1.3.6.tar.gz) = 864775 bytes
-SHA1 (patch-configure) = fb6999b955383425a7635d0c94a1a46125db9989
+SHA1 (bird-1.3.11.tar.gz) = c0a425ff2ef85bbeb17dbdf82c97c4565ebfb903
+RMD160 (bird-1.3.11.tar.gz) = f62213b07941cac4e441e8211a37b0a32fd4601b
+Size (bird-1.3.11.tar.gz) = 1108400 bytes
+SHA1 (patch-configure) = ea93a7e90caa274632159172deb53eff9739cb4b
 SHA1 (patch-lib_lists.h) = 7068c6b73841e19a540a08e822658b0455c53a77
-SHA1 (patch-sysdep_bsd_sysio.h) = ff510970668766c95a926948c7a96286da7eca22
-SHA1 (patch-tools_Makefile.in) = b6faf3bc1c866bfc311d74235a92cf3b1f34636f
+SHA1 (patch-tools_Makefile.in) = d16dd8b9acc4392025a478995f2efc0e36f54919
diff --git a/net/bird/patches/patch-configure b/net/bird/patches/patch-configure
index 71adaa9432b..d0ada94d717 100644
--- a/net/bird/patches/patch-configure
+++ b/net/bird/patches/patch-configure
@@ -1,9 +1,9 @@
-$NetBSD: patch-configure,v 1.2 2013/10/20 18:00:57 joerg Exp $
+$NetBSD: patch-configure,v 1.3 2014/03/28 23:27:16 pettai Exp $
 
---- configure.orig	2012-01-20 17:04:39.000000000 +0000
+--- configure.orig	2013-07-28 18:57:59.000000000 +0000
 +++ configure
-@@ -4366,17 +4366,17 @@ $as_echo "$bird_cv_sys_linux_version" >&
- 					esac
+@@ -4442,12 +4442,8 @@ else
+ 				default_iproutedir="/etc/iproute2"
  				;;
  		ipv6:netbsd*)	sysdesc=bsd-v6
 -				CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
@@ -15,12 +15,3 @@ $NetBSD: patch-configure,v 1.2 2013/10/20 18:00:57 joerg Exp $
  				;;
  		ipv6:freebsd*)	sysdesc=bsd-v6
  				;;
- 		ipv4:freebsd*)	sysdesc=bsd
- 				;;
-+		ipv6:dragonfly*) sysdesc=bsd-v6
-+				;;
-+		ipv4:dragonfly*) sysdesc=bsd
-+				;;
- 		ipv6:kfreebsd*) sysdesc=bsd-v6
- 				;;
- 		ipv4:kfreebsd*) sysdesc=bsd
diff --git a/net/bird/patches/patch-sysdep_bsd_sysio.h b/net/bird/patches/patch-sysdep_bsd_sysio.h
deleted file mode 100644
index 4f1f27408a3..00000000000
--- a/net/bird/patches/patch-sysdep_bsd_sysio.h
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-sysdep_bsd_sysio.h,v 1.1 2012/08/07 19:20:41 marino Exp $
-
---- sysdep/bsd/sysio.h.orig	2011-09-11 19:44:45.000000000 +0000
-+++ sysdep/bsd/sysio.h
-@@ -6,6 +6,9 @@
-  *	Can be freely distributed and used under the terms of the GNU GPL.
-  */
- 
-+#ifdef __DragonFly__
-+#define TCP_MD5SIG	TCP_SIGNATURE_ENABLE
-+#endif
- #ifdef IPV6
- 
- static inline void
diff --git a/net/bird/patches/patch-tools_Makefile.in b/net/bird/patches/patch-tools_Makefile.in
index a8ddc55d09c..004289cfb5d 100644
--- a/net/bird/patches/patch-tools_Makefile.in
+++ b/net/bird/patches/patch-tools_Makefile.in
@@ -1,26 +1,27 @@
-$NetBSD: patch-tools_Makefile.in,v 1.1.1.1 2012/01/22 02:53:01 agc Exp $
+$NetBSD: patch-tools_Makefile.in,v 1.2 2014/03/28 23:27:16 pettai Exp $
 
 install the example config files into the correct directory
 
---- tools/Makefile.in.orig	2011-03-31 08:29:42.000000000 +0000
+--- tools/Makefile.in.orig	2013-04-29 21:41:58.000000000 +0000
 +++ tools/Makefile.in
-@@ -55,16 +55,13 @@ tags:
+@@ -68,17 +68,14 @@ tags:
  	cd $(srcdir) ; etags -lc `find $(static-dirs) $(addprefix $(objdir)/,$(dynamic-dirs)) $(client-dirs) -name *.[chY]`
  
  install: all
--	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(localstatedir)/run
-+	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(EGDIR) $(DESTDIR)/$(localstatedir)/run
- 	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX6@
+-	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/@runtimedir@
++	$(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(EGDIR) $(DESTDIR)/@runtimedir@
+ 	$(INSTALL_PROGRAM) -s $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
+ 	$(INSTALL_PROGRAM) -s $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
  	if test -n "@CLIENT@" ; then								\
- 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX6@ ;				\
+ 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
  	fi
--	if ! test -f $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ; then						\
--		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(sysconfdir)/bird@SUFFIX6@.conf ;	\
+-	if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then						\
+-		$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;	\
 -	else											\
--		echo "Not overwriting old bird@SUFFIX@.conf" ;						\
+-		echo "Not overwriting old bird@SUFFIX@.conf" ;					\
 -	fi
-+
-+	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(EGDIR)/bird@SUFFIX6@.conf
++	
++	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(EGDIR)/bird@SUFFIX@.conf
  
  install-docs:
  	$(INSTALL) -d $(DESTDIR)/$(docdir)