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

Alexander V. Chernikov melifaro at FreeBSD.org
Sat Nov 30 21:25:23 UTC 2013 

Author: melifaro (src committer)
Date: Sat Nov 30 21:25:21 2013
New Revision: 335349
URL: http://svnweb.freebsd.org/changeset/ports/335349

Log:
  Update net/bird,net/bird6 to 1.4.0
  Fix simultaneous building for firewall/aggregator protocols.
  
  Reviewed by:	az

Deleted:
  head/net/bird/files/patch-Makefile.in
  head/net/bird/files/patch-bird_addr_select
  head/net/bird/files/patch-netst-proto.c
  head/net/bird/files/patch-proto-ospf-hello.c
  head/net/bird/files/patch-proto-ospf-lsupd.c
  head/net/bird/files/patch-sysdep-bsd-krt-sock.c
  head/net/bird/files/patch-sysdep-unix-main.c
  head/net/bird6/files/patch-netst-proto.c
  head/net/bird6/files/patch-proto-ospf-lsupd.c
  head/net/bird6/files/patch-sysdep-unix-main.c
Modified:
  head/net/bird/Makefile
  head/net/bird/distinfo
  head/net/bird/files/agg_support.patch
  head/net/bird/files/firewall_support.patch
  head/net/bird6/Makefile
  head/net/bird6/distinfo

Modified: head/net/bird/Makefile
==============================================================================
--- head/net/bird/Makefile	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird/Makefile	Sat Nov 30 21:25:21 2013	(r335349)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird
-PORTVERSION=	1.3.11
-PORTREVISION=	2
+PORTVERSION=	1.4.0
 CATEGORIES=	net
 MASTER_SITES=	ftp://bird.network.cz/pub/bird/ \
 		http://bird.mpls.in/distfiles/bird/
@@ -38,6 +37,23 @@ EXTRA_PATCHES+=	${FILESDIR}/firewall_sup
 EXTRA_PATCHES+=	${FILESDIR}/agg_support.patch
 .endif
 
+post-patch:
+.if ${PORT_OPTIONS:MAGG}
+	@${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 agg"/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/  proto_build(\&proto_agg);/;}' ${WRKSRC}/nest/proto.c
+	@${REINPLACE_CMD} -e '/CONFIG_BFD/{G;s/$$/#undef CONFIG_AGG/;}' ${WRKSRC}/sysdep/autoconf.h.in
+	@${REINPLACE_CMD} -e 's/\(proto_bfd\)/\1, proto_agg/' ${WRKSRC}/nest/protocol.h
+.endif
+.if ${PORT_OPTIONS:MFIREWALL}
+	@${REINPLACE_CMD} -e 's/^\(all_protocols=".*\)"/\1 firewall"/' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e '/proto_build(&proto_device);/{G;s/$$/  proto_build(\&proto_firewall);/;}' ${WRKSRC}/nest/proto.c
+	@${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPSET/;}' ${WRKSRC}/sysdep/autoconf.h.in
+	@${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_PF/;}' ${WRKSRC}/sysdep/autoconf.h.in
+	@${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL_IPFW/;}' ${WRKSRC}/sysdep/autoconf.h.in
+	@${REINPLACE_CMD} -e '/CONFIG_PIPE/{G;s/$$/#undef CONFIG_FIREWALL/;}' ${WRKSRC}/sysdep/autoconf.h.in
+	@${REINPLACE_CMD} -e 's/\(proto_bfd\)/\1, proto_firewall/' ${WRKSRC}/nest/protocol.h
+.endif
+
 post-install:
 	@if [ ! -f ${PREFIX}/etc/bird.conf ]; then \
 		${CP} -p ${PREFIX}/etc/bird.conf.example ${PREFIX}/etc/bird.conf ; \

Modified: head/net/bird/distinfo
==============================================================================
--- head/net/bird/distinfo	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird/distinfo	Sat Nov 30 21:25:21 2013	(r335349)
@@ -1,2 +1,2 @@
-SHA256 (bird-1.3.11.tar.gz) = cad6f58dfd8fef9772d46be3fe51a53420f56ee5fbd79d6993889ae6596a8495
-SIZE (bird-1.3.11.tar.gz) = 1108400
+SHA256 (bird-1.4.0.tar.gz) = da1b41cab26388b01d861c30afe41678df22dc9ea0110a14c1cc7b7bffc693c5
+SIZE (bird-1.4.0.tar.gz) = 1242728

Modified: head/net/bird/files/agg_support.patch
==============================================================================
--- head/net/bird/files/agg_support.patch	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird/files/agg_support.patch	Sat Nov 30 21:25:21 2013	(r335349)
@@ -30,24 +30,6 @@ Subject: [PATCH 1/1] Implement general a
  create mode 100644 proto/agg/agg.h
  create mode 100644 proto/agg/config.Y
 
-diff --git a/configure.in b/configure.in
-index dd57ab5..ca9d72d 100644
---- configure.in
-+++ configure.in
-@@ -47,11 +47,11 @@ AC_SUBST(runtimedir)
- if test "$enable_ipv6" = yes ; then
- 	ip=ipv6
- 	SUFFIX=6
--	all_protocols=bgp,ospf,pipe,radv,rip,static
-+	all_protocols=bgp,ospf,pipe,radv,rip,static,agg
- else
- 	ip=ipv4
- 	SUFFIX=""
--	all_protocols=bgp,ospf,pipe,rip,static
-+	all_protocols=bgp,ospf,pipe,rip,static,agg
- fi
- 
- if test "$given_suffix" = yes ; then
 diff --git a/doc/bird.conf.example b/doc/bird.conf.example
 index 5e07ab5..b48faad 100644
 --- doc/bird.conf.example
@@ -159,9 +141,9 @@ diff --git a/filter/filter.h b/filter/fi
 index 2386fc9..f2a5d06 100644
 --- filter/filter.h
 +++ filter/filter.h
-@@ -79,11 +79,13 @@ struct f_tree *build_tree(struct f_tree *);
- struct f_tree *find_tree(struct f_tree *t, struct f_val val);
+@@ -80,11 +80,13 @@
  int same_tree(struct f_tree *t1, struct f_tree *t2);
+ void tree_format(struct f_tree *t, buffer *buf);
  
 -struct f_trie *f_new_trie(linpool *lp);
 -void trie_add_prefix(struct f_trie *t, ip_addr px, int plen, int l, int h);
@@ -170,19 +152,19 @@ index 2386fc9..f2a5d06 100644
  int trie_match_prefix(struct f_trie *t, ip_addr px, int plen);
 +void *trie_match_longest_prefix(struct f_trie *t, ip_addr px, int plen);
  int trie_same(struct f_trie *t1, struct f_trie *t2);
- void trie_print(struct f_trie *t);
+ void trie_format(struct f_trie *t, buffer *buf);
 +void trie_walk(struct f_trie *t, void *func, void *data);
  
  void fprefix_get_bounds(struct f_prefix *px, int *l, int *h);
  
-@@ -186,6 +188,7 @@ struct f_trie
+@@ -204,6 +206,7 @@
  {
    linpool *lp;
    int zero;
 +  size_t node_size;
    struct f_trie_node root;
  };
- 
+
 diff --git a/filter/trie.c b/filter/trie.c
 index 581332c..eba239b 100644
 --- filter/trie.c
@@ -385,20 +367,6 @@ index e80f87e..22f22ca 100644
   * if_notify - notify instance about interface changes
   * @p: protocol instance
   * @flags: interface change flags
-diff --git a/nest/proto.c b/nest/proto.c
-index 887d3e5..4ebc9d6 100644
---- nest/proto.c
-+++ nest/proto.c
-@@ -705,6 +705,9 @@ protos_build(void)
- #ifdef CONFIG_BGP
-   proto_build(&proto_bgp);
- #endif
-+#ifdef CONFIG_AGG
-+  proto_build(&proto_agg);
-+#endif
-   proto_pool = rp_new(&root_pool, "Protocols");
-   proto_flush_event = ev_new(proto_pool);
-   proto_flush_event->hook = proto_flush_loop;
 diff --git a/nest/protocol.h b/nest/protocol.h
 index 8a63271..0a0d8f7 100644
 --- nest/protocol.h
@@ -427,15 +395,6 @@ index 8a63271..0a0d8f7 100644
  };
  
  void protos_build(void);
-@@ -75,7 +83,7 @@ void protos_dump_all(void);
- 
- extern struct protocol
-   proto_device, proto_radv, proto_rip, proto_static,
--  proto_ospf, proto_pipe, proto_bgp;
-+  proto_ospf, proto_pipe, proto_bgp, proto_agg;
- 
- /*
-  *	Routing Protocol Instance
 diff --git a/nest/rt-table.c b/nest/rt-table.c
 index 165f42b..f224cc4 100644
 --- nest/rt-table.c
@@ -2778,34 +2737,3 @@ index c3adf25..ae62c30 100644
  struct rta *bgp_decode_attrs(struct bgp_conn *conn, byte *a, unsigned int len, struct linpool *pool, int mandatory);
  int bgp_get_attr(struct eattr *e, byte *buf, int buflen);
  int bgp_rte_better(struct rte *, struct rte *);
-diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in
-index ac6f7a8..4d4dba5 100644
---- sysdep/autoconf.h.in
-+++ sysdep/autoconf.h.in
-@@ -42,6 +42,7 @@
- #undef CONFIG_BGP
- #undef CONFIG_OSPF
- #undef CONFIG_PIPE
-+#undef CONFIG_AGG
- 
- /* We have <syslog.h> and syslog() */
- #undef HAVE_SYSLOG
--- 
-1.7.3.2
-
---- configure.orig	2012-08-07 13:28:04.000000000 +0400
-+++ configure	2012-08-15 15:54:05.000000000 +0400
-@@ -2355,11 +2355,11 @@
- if test "$enable_ipv6" = yes ; then
- 	ip=ipv6
- 	SUFFIX=6
--	all_protocols=bgp,ospf,pipe,radv,rip,static
-+	all_protocols=bgp,ospf,pipe,radv,rip,static,agg
- else
- 	ip=ipv4
- 	SUFFIX=""
--	all_protocols=bgp,ospf,pipe,rip,static
-+	all_protocols=bgp,ospf,pipe,rip,static,agg
- fi
- 
- if test "$given_suffix" = yes ; then

Modified: head/net/bird/files/firewall_support.patch
==============================================================================
--- head/net/bird/files/firewall_support.patch	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird/files/firewall_support.patch	Sat Nov 30 21:25:21 2013	(r335349)
@@ -29,15 +29,6 @@ diff --git a/configure.in b/configure.in
 index 54993df..51b7cc2 100644
 --- configure.in
 +++ configure.in
-@@ -51,7 +51,7 @@ if test "$enable_ipv6" = yes ; then
- else
- 	ip=ipv4
- 	SUFFIX=""
--	all_protocols=bgp,ospf,pipe,rip,static
-+	all_protocols=bgp,ospf,pipe,rip,static,firewall
- fi
- 
- if test "$given_suffix" = yes ; then
 @@ -137,10 +137,13 @@ else
  		ipv4:netbsd*)	sysdesc=bsd
  				CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
@@ -105,33 +96,6 @@ index 24bc302..a01ec99 100644
  <chapt>Conclusions
  
  <sect>Future work
-diff --git a/nest/proto.c b/nest/proto.c
-index 53d3f1a..78d7600 100644
---- nest/proto.c
-+++ nest/proto.c
-@@ -707,6 +707,9 @@ protos_build(void)
- #ifdef CONFIG_BGP
-   proto_build(&proto_bgp);
- #endif
-+#ifdef CONFIG_FIREWALL
-+  proto_build(&proto_firewall);
-+#endif
-   proto_pool = rp_new(&root_pool, "Protocols");
-   proto_flush_event = ev_new(proto_pool);
-   proto_flush_event->hook = proto_flush_loop;
-diff --git a/nest/protocol.h b/nest/protocol.h
-index 11fcb16..c7275d6 100644
---- nest/protocol.h
-+++ nest/protocol.h
-@@ -75,7 +75,7 @@ void protos_dump_all(void);
- 
- extern struct protocol
-   proto_device, proto_radv, proto_rip, proto_static,
--  proto_ospf, proto_pipe, proto_bgp;
-+  proto_ospf, proto_pipe, proto_bgp, proto_firewall;
- 
- /*
-  *	Routing Protocol Instance
 diff --git a/nest/route.h b/nest/route.h
 index 524e69b..f3062a2 100644
 --- nest/route.h
@@ -512,22 +476,6 @@ index 0000000..c97ed38
 +#define FW_ERR(x, y...)	log_rl(&rl_fw_err, L_ERR x, ##y)
 +
 +#endif
-diff --git a/sysdep/autoconf.h.in b/sysdep/autoconf.h.in
-index ac6f7a8..2d5af5c 100644
---- sysdep/autoconf.h.in
-+++ sysdep/autoconf.h.in
-@@ -42,6 +42,11 @@
- #undef CONFIG_BGP
- #undef CONFIG_OSPF
- #undef CONFIG_PIPE
-+#undef CONFIG_FIREWALL
-+
-+#undef CONFIG_FIREWALL_IPFW
-+#undef CONFIG_FIREWALL_PF
-+#undef CONFIG_FIREWALL_IPSET
- 
- /* We have <syslog.h> and syslog() */
- #undef HAVE_SYSLOG
 diff --git a/sysdep/bsd/Modules b/sysdep/bsd/Modules
 index 3729587..0607321 100644
 --- sysdep/bsd/Modules
@@ -952,20 +900,6 @@ index 0000000..e841e06
 
 --- configure.orig	2012-08-07 13:28:04.000000000 +0400
 +++ configure	2012-08-15 15:54:05.000000000 +0400
-@@ -2355,11 +2355,11 @@
- if test "$enable_ipv6" = yes ; then
- 	ip=ipv6
- 	SUFFIX=6
--	all_protocols=bgp,ospf,pipe,radv,rip,static
-+	all_protocols=bgp,ospf,pipe,radv,rip,static,firewall
- else
- 	ip=ipv4
- 	SUFFIX=""
--	all_protocols=bgp,ospf,pipe,rip,static
-+	all_protocols=bgp,ospf,pipe,rip,static,firewall
- fi
- 
- if test "$given_suffix" = yes ; then
 @@ -4361,6 +4361,8 @@
  		ipv6:freebsd*)	sysdesc=bsd-v6
  				;;
@@ -975,3 +909,4 @@ index 0000000..e841e06
  				;;
  		ipv6:dragonfly*)	sysdesc=bsd-v6
  				;;
+

Modified: head/net/bird6/Makefile
==============================================================================
--- head/net/bird6/Makefile	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird6/Makefile	Sat Nov 30 21:25:21 2013	(r335349)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bird6
-PORTVERSION=	1.3.11
-PORTREVISION=	1
+PORTVERSION=	1.4.0
 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	Sat Nov 30 21:07:47 2013	(r335348)
+++ head/net/bird6/distinfo	Sat Nov 30 21:25:21 2013	(r335349)
@@ -1,2 +1,2 @@
-SHA256 (bird-1.3.11.tar.gz) = cad6f58dfd8fef9772d46be3fe51a53420f56ee5fbd79d6993889ae6596a8495
-SIZE (bird-1.3.11.tar.gz) = 1108400
+SHA256 (bird-1.4.0.tar.gz) = da1b41cab26388b01d861c30afe41678df22dc9ea0110a14c1cc7b7bffc693c5
+SIZE (bird-1.4.0.tar.gz) = 1242728

More information about the svn-ports-all mailing list