svn commit: r323976 - in head/net: bird bird/files bird6 bird6/files

[Alexander V. Chernikov]

Author: melifaro (src committer)
Date: Tue Jul 30 17:22:51 2013
New Revision: 323976
URL: http://svnweb.freebsd.org/changeset/ports/323976

Log:
  Update net/bird & net/bird6 to 1.3.11
  
  New features:
   * OSPF stub router option (RFC 3137).
   * TTL security for OSPF and RIP.
   * Protocol packet priority and traffic class handling.
   * Multiple routing tables support for FreeBSD and OpenBSD.
   * Extends constants to all filter data types.
   * Implements eval command.
   * 'bgppath ~ int set' filter operation.
   * Several bugfixes.
  
  MFIBS option was removed (gone to upstream, enabled by default)
  
  Approved by:	az

Deleted:
  head/net/bird/files/fibs.diff
Modified:
  head/net/bird/Makefile
  head/net/bird/distinfo
  head/net/bird/files/bird.in
  head/net/bird6/Makefile
  head/net/bird6/distinfo
  head/net/bird6/files/bird6.in

Modified: head/net/bird/Makefile
==============================================================================
--- head/net/bird/Makefile	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird/Makefile	Tue Jul 30 17:22:51 2013	(r323976)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-PORTVERSION=	1.3.10
+PORTVERSION=	1.3.11
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/
@@ -18,8 +18,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var
 USE_CSTD=	gnu89
 
-OPTIONS_DEFINE=	FIBS FIREWALL AGG
-FIBS_DESC=	Enable multiple fib support
+OPTIONS_DEFINE=	FIREWALL AGG
 FIREWALL_DESC=	Enable firewall protocol
 AGG_DESC=	Enable aggregation protocol (EXPERIMENTAL)
 NO_OPTIONS_SORT=	yes
@@ -30,10 +29,6 @@ USE_RC_SUBR=	bird
 
 .include <bsd.port.pre.mk>
 
-.if ${PORT_OPTIONS:MFIBS}
-EXTRA_PATCHES+=	${FILESDIR}/fibs.diff
-.endif
-
 .if ${PORT_OPTIONS:MFIREWALL}
 EXTRA_PATCHES+=	${FILESDIR}/firewall_support.patch
 .endif
@@ -47,16 +42,5 @@ post-install:
 		${CP} -p ${PREFIX}/etc/bird.conf.example ${PREFIX}/etc/bird.conf ; \
 		${CHMOD} 0640 ${PREFIX}/etc/bird.conf ; \
 	fi
-.if ${PORT_OPTIONS:MFIBS}
-	@${ECHO_MSG}
-	@${ECHO_MSG} =====================================================================
-	@${ECHO_MSG}
-	@${ECHO_MSG} "        WARNING: Please take a look on kern/134931"
-	@${ECHO_MSG} "        WARNING: before using multiple fibs in production!"
-	@${ECHO_MSG} "        This PR was fixed in r225975(8.2-S) on Oct 4, 2011"
-	@${ECHO_MSG}
-	@${ECHO_MSG} =====================================================================
-	@${ECHO_MSG}
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/net/bird/distinfo
==============================================================================
--- head/net/bird/distinfo	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird/distinfo	Tue Jul 30 17:22:51 2013	(r323976)
@@ -1,2 +1,2 @@
-SHA256 (bird-1.3.10.tar.gz) = 4c080001555fe1399920fa251e9394a4f286e2021f07e1d53f232917c2aabfbb
-SIZE (bird-1.3.10.tar.gz) = 1003066
+SHA256 (bird-1.3.11.tar.gz) = cad6f58dfd8fef9772d46be3fe51a53420f56ee5fbd79d6993889ae6596a8495
+SIZE (bird-1.3.11.tar.gz) = 1108400

Modified: head/net/bird/files/bird.in
==============================================================================
--- head/net/bird/files/bird.in	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird/files/bird.in	Tue Jul 30 17:22:51 2013	(r323976)
@@ -2,7 +2,7 @@
 
 # $FreeBSD$
 #
-# PROVIDE: bird
+# PROVIDE: bird dynamicrouting
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #

Modified: head/net/bird6/Makefile
==============================================================================
--- head/net/bird6/Makefile	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird6/Makefile	Tue Jul 30 17:22:51 2013	(r323976)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird6
-PORTVERSION=	1.3.10
+PORTVERSION=	1.3.11
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/

Modified: head/net/bird6/distinfo
==============================================================================
--- head/net/bird6/distinfo	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird6/distinfo	Tue Jul 30 17:22:51 2013	(r323976)
@@ -1,2 +1,2 @@
-SHA256 (bird-1.3.10.tar.gz) = 4c080001555fe1399920fa251e9394a4f286e2021f07e1d53f232917c2aabfbb
-SIZE (bird-1.3.10.tar.gz) = 1003066
+SHA256 (bird-1.3.11.tar.gz) = cad6f58dfd8fef9772d46be3fe51a53420f56ee5fbd79d6993889ae6596a8495
+SIZE (bird-1.3.11.tar.gz) = 1108400

Modified: head/net/bird6/files/bird6.in
==============================================================================
--- head/net/bird6/files/bird6.in	Tue Jul 30 16:47:50 2013	(r323975)
+++ head/net/bird6/files/bird6.in	Tue Jul 30 17:22:51 2013	(r323976)
@@ -2,7 +2,7 @@
 
 # $FreeBSD$
 #
-# PROVIDE: bird6
+# PROVIDE: bird6 dynamicrouting
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #