(pkgsrc)

 - Add comment on patches, by picking from cvs log
(upstream)
 - Update bird and bird6 from 1.3.11 to 1.4.5
----------------------
Version 1.4.5 (2014-10-06)
  o New 'show route noexport' command option.
  o Port option for BGP sessions.
  o Better constant handling in set literals.
  o Better rate filtering of log messages.
  o Several minor bugfixes.

Version 1.4.4 (2014-07-09)
  o Extended OSPF multipath support.
  o Default router preference for RAdv.
  o Significant changes in socket layer.
  o Important bugfix in BGP.
  o Several minor bugfixes.

Version 1.4.3 (2014-04-14)
  o Important bugfix in IPv6 BGP.

Version 1.4.2 (2014-04-02)
  o Important bugfix in BFD.

Version 1.4.1 (2014-03-31)
  o BGP add-path support (RFC draft).
  o BGP graceful restart (RFC 4724).
  o OSPF: many changes in socket layer.
  o OSPF: support for secondary addresses in BSD.
  o OSPF: names for vlink pseudointerfaces (vlinkX).
  o Several bugfixes.

Version 1.4.0 (2013-11-25)
  o BFD protocol (RFC 5880).
  o BFD support for OSPF and BGP.
  o New 'allow local as' option for BGP.
  o Filters allows setting gw, ifname and ifindex.
  o Filter operator 'delete/filter' extended to bgp_paths.
  o Filter operator 'len' extended to [e]clists.
  o BIRD client now allows shorthands for noninteractive commands.
  o Flag -P for PID file support.
  o Flag -f added to force BIRD to run in foreground.
  o Protocol export/import/receive limits are checked during reconfiguration.
  o Several bugfixes and minor improvements.
  o Several minor but incompatible changes:
     - IBGP is multihop by default.
     - Changes primary address selection on BSD to the first one.
     - Integers in filters are handled as unsigned.
     - ISO 8601 time formats used by default.
     - Import of device routes from kernel protocol allowed.
     - Last state change now tracks just protocol state change.
     - Minor changes to default router ID calculation.

5 files changed, 47 insertions, 42 deletions

diff --git a/net/bird/Makefile.common b/net/bird/Makefile.common
index 2ef08ebe098..de8a0a448f2 100644
--- a/net/bird/Makefile.common
+++ b/net/bird/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.6 2015/01/04 03:44:50 dholland Exp $
+# $NetBSD: Makefile.common,v 1.7 2015/02/03 13:58:32 mef Exp $
 # used by net/bird/Makefile
 # used by net/bird6/Makefile
 
-DISTNAME=	bird-1.3.11
+DISTNAME=	bird-1.4.5
 PKGNAME=	${DISTNAME:S/bird/bird${BIRD6}/}
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/
diff --git a/net/bird/distinfo b/net/bird/distinfo
index 0a275cc2d19..3c75d1381b3 100644
--- a/net/bird/distinfo
+++ b/net/bird/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.6 2014/04/17 20:28:12 joerg Exp $
+$NetBSD: distinfo,v 1.7 2015/02/03 13:58:32 mef Exp $
 
-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-client_birdc.c) = 58da10193bbd2eeb377c01afd6b40fe7b9c11495
-SHA1 (patch-configure) = ea93a7e90caa274632159172deb53eff9739cb4b
-SHA1 (patch-lib_lists.h) = 7068c6b73841e19a540a08e822658b0455c53a77
-SHA1 (patch-tools_Makefile.in) = d16dd8b9acc4392025a478995f2efc0e36f54919
+SHA1 (bird-1.4.5.tar.gz) = 9ef3200fa9cae4e545afe55eb4a017d1fd298c7a
+RMD160 (bird-1.4.5.tar.gz) = 4b45aaac768542e2eec9451a6be4dab4b338e7cb
+Size (bird-1.4.5.tar.gz) = 1284666 bytes
+SHA1 (patch-configure) = b22044e5be530867a05406d4b32d789933993d53
+SHA1 (patch-lib_lists.h) = 1ce09f2483dc74c8c26a57c2fd959f7ffb7ff216
+SHA1 (patch-tools_Makefile.in) = 4a6ad298abbe8c42627528c9156ce581a6e07917
diff --git a/net/bird/patches/patch-configure b/net/bird/patches/patch-configure
index d0ada94d717..430dd0eb0ec 100644
--- a/net/bird/patches/patch-configure
+++ b/net/bird/patches/patch-configure
@@ -1,4 +1,7 @@
-$NetBSD: patch-configure,v 1.3 2014/03/28 23:27:16 pettai Exp $
+$NetBSD: patch-configure,v 1.4 2015/02/03 13:58:32 mef Exp $
+
+date: 2013-10-21 03:00:57 +0900;  author: joerg;  state: Exp;  lines: +12 -1;  commitid: 17vYRnrUrAvnK3ax;
+Prefix rpath options with -Wl.
 
 --- configure.orig	2013-07-28 18:57:59.000000000 +0000
 +++ configure
diff --git a/net/bird/patches/patch-lib_lists.h b/net/bird/patches/patch-lib_lists.h
index c95cd1ac5ec..eb5dd453bbb 100644
--- a/net/bird/patches/patch-lib_lists.h
+++ b/net/bird/patches/patch-lib_lists.h
@@ -1,31 +1,34 @@
-$NetBSD: patch-lib_lists.h,v 1.1 2012/06/29 12:37:45 joerg Exp $
+$NetBSD: patch-lib_lists.h,v 1.2 2015/02/03 13:58:32 mef Exp $
 
---- lib/lists.h.orig	2012-06-25 12:34:50.000000000 +0000
-+++ lib/lists.h
-@@ -47,19 +47,19 @@ typedef struct list {			/* In fact two o
+date: 2012-06-29 21:37:45 +0900;  author: joerg;  state: Exp;
+Fix inline usage.
+
+--- lib/lists.h.orig	2014-04-01 18:24:10.000000000 +0900
++++ lib/lists.h	2015-02-03 22:46:25.000000000 +0900
+@@ -50,13 +50,6 @@ typedef struct list {			/* In fact two o
  
  #define EMPTY_LIST(list) (!(list).head->next)
  
-+#ifndef _BIRD_LISTS_C_
-+#define LIST_INLINE static inline
-+#include "lib/lists.c"
-+#undef LIST_INLINE
-+#else
-+#define LIST_INLINE
-+
- void add_tail(list *, node *);
- void add_head(list *, node *);
- void rem_node(node *);
- void add_tail_list(list *, list *);
- void init_list(list *);
- void insert_node(node *, node *);
--
--#ifndef _BIRD_LISTS_C_
--#define LIST_INLINE extern inline
--#include "lib/lists.c"
--#undef LIST_INLINE
--#else
--#define LIST_INLINE
+-void add_tail(list *, node *);
+-void add_head(list *, node *);
+-void rem_node(node *);
+-void rem2_node(node *);
+-void add_tail_list(list *, list *);
+-void init_list(list *);
+-void insert_node(node *, node *);
+ 
+ #ifndef _BIRD_LISTS_C_
+ #define LIST_INLINE extern inline
+@@ -66,4 +59,12 @@ void insert_node(node *, node *);
+ #define LIST_INLINE
  #endif
  
++void add_tail(list *, node *);
++void add_head(list *, node *);
++void rem_node(node *);
++void rem2_node(node *);
++void add_tail_list(list *, list *);
++void init_list(list *);
++void insert_node(node *, node *);
++
  #endif
diff --git a/net/bird/patches/patch-tools_Makefile.in b/net/bird/patches/patch-tools_Makefile.in
index 004289cfb5d..f2b157301c3 100644
--- a/net/bird/patches/patch-tools_Makefile.in
+++ b/net/bird/patches/patch-tools_Makefile.in
@@ -1,26 +1,26 @@
-$NetBSD: patch-tools_Makefile.in,v 1.2 2014/03/28 23:27:16 pettai Exp $
+$NetBSD: patch-tools_Makefile.in,v 1.3 2015/02/03 13:58:32 mef Exp $
 
 install the example config files into the correct directory
 
---- tools/Makefile.in.orig	2013-04-29 21:41:58.000000000 +0000
-+++ tools/Makefile.in
+--- tools/Makefile.in.orig	2015-02-03 22:44:02.000000000 +0900
++++ tools/Makefile.in	2015-02-03 22:49:01.000000000 +0900
 @@ -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)/@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@
+ 	$(INSTALL_PROGRAM) $(exedir)/bird $(DESTDIR)/$(sbindir)/bird@SUFFIX@
+ 	$(INSTALL_PROGRAM) $(exedir)/birdcl $(DESTDIR)/$(sbindir)/birdcl@SUFFIX@
  	if test -n "@CLIENT@" ; then								\
- 		$(INSTALL_PROGRAM) -s $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
+ 		$(INSTALL_PROGRAM) $(exedir)/birdc $(DESTDIR)/$(sbindir)/birdc@SUFFIX@ ;	\
  	fi
 -	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" ;					\
 -	fi
-+	
++
 +	$(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(EGDIR)/bird@SUFFIX@.conf
  
  install-docs: