diff --git a/net/bird2/Makefile b/net/bird2/Makefile index 9a23335cc348..6a154583c230 100644 --- a/net/bird2/Makefile +++ b/net/bird2/Makefile @@ -1,73 +1,72 @@ PORTNAME= bird -DISTVERSION= 2.0.11 +DISTVERSION= 2.0.12 CATEGORIES= net MASTER_SITES= https://bird.network.cz/download/ PKGNAMESUFFIX= 2 MAINTAINER= olivier@FreeBSD.org COMMENT= Dynamic IP routing daemon WWW= https://bird.network.cz/ LICENSE= GPLv2 FLAVORS= base netlink netlink_PKGNAMESUFFIX= 2-netlink USES= bison cpe gmake ncurses readline CONFLICTS= bird CONFLICTS+= bird6 CPE_VENDOR= nic USE_CSTD= gnu99 GNU_CONFIGURE= yes CONFIGURE_ARGS= --localstatedir=/var USE_RC_SUBR= bird SUB_FILES= pkg-message GROUPS= birdvty MAKE_JOBS_UNSAFE= yes OPTIONS_MULTI= RP RP_DESC= Routing Protocols OPTIONS_MULTI_RP= BFD BABEL BGP MRT OSPF PIPE RADV RIP RPKI STATIC OPTIONS_DEFAULT= ${OPTIONS_MULTI_RP} BFD_DESC= Bidirectional Forwarding Detection BABEL_DESC= Babel routing protocol BGP_DESC= Border Gateway Protocol MRT_DESC= Dumping Routing Information in MRT Format OSPF_DESC= Open Short Path First PIPE_DESC= PIPE routing RADV_DESC= Router Advertisement RIP_DESC= Routing Information Protocol RPKI_DESC= Resource Public Key Infrastructure STATIC_DESC= Static routing BFD_VARS= rt_prot+=bfd BABEL_VARS= rt_prot+=babel BGP_VARS= rt_prot+=bgp MRT_VARS= rt_prot+=mrt OSPF_VARS= rt_prot+=ospf PIPE_VARS= rt_prot+=pipe RADV_VARS= rt_prot+=radv RIP_VARS= rt_prot+=rip RPKI_VARS= rt_prot+=rpki STATIC_VARS= rt_prot+=static CONFIGURE_ARGS+=--with-protocols="${RT_PROT}" RPKI_LIB_DEPENDS= libssh.so:security/libssh .include .if ${FLAVOR:U} == netlink CONFIGURE_ARGS+=--with-sysconfig=bsd-netlink -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-netlink -.if ${OSVERSION} < 1400073 -BROKEN=No netlink support +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1302000 +IGNORE= No netlink support .endif .endif .include diff --git a/net/bird2/distinfo b/net/bird2/distinfo index 3b3692fdba36..a689b2355f43 100644 --- a/net/bird2/distinfo +++ b/net/bird2/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670848920 -SHA256 (bird-2.0.11.tar.gz) = 60a7b83b67b9d089d2a745a11fddd12461f631abc7b645b6c085adf90b3f55d6 -SIZE (bird-2.0.11.tar.gz) = 1301502 +TIMESTAMP = 1676386068 +SHA256 (bird-2.0.12.tar.gz) = 3ec462a237d06d1f4455d6ec00a42f0b1686061fc988e5c89a841d01dd753b53 +SIZE (bird-2.0.12.tar.gz) = 1307984 diff --git a/net/bird2/files/extra-patch-netlink b/net/bird2/files/extra-patch-netlink deleted file mode 100644 index fd58ddaed2b3..000000000000 --- a/net/bird2/files/extra-patch-netlink +++ /dev/null @@ -1,31 +0,0 @@ -From d890c5cca7f6239ddd7ea605e45854658f50d39b Mon Sep 17 00:00:00 2001 -From: Alexander Chernikov -Date: Tue, 13 Sep 2022 12:08:58 +0000 -Subject: [PATCH 1/1] FreeBSD: add netlink support - -Netlink can be enabled by picking new sysconfig target: -./configure --with-sysconfig=bsd-netlink ---- - sysdep/bsd-netlink/Makefile | 9 +++++++++ - sysdep/cf/bsd-netlink.h | 34 ++++++++++++++++++++++++++++++++++ - sysdep/cf/linux.h | 2 ++ - sysdep/linux/netlink.c | 7 ++++++- - 4 files changed, 51 insertions(+), 1 deletion(-) - create mode 100644 sysdep/bsd-netlink/Makefile - create mode 100644 sysdep/cf/bsd-netlink.h - -diff --git sysdep/bsd-netlink/Makefile sysdep/bsd-netlink/Makefile -new file mode 100644 -index 00000000..90b639a4 ---- /dev/null -+++ sysdep/bsd-netlink/Makefile -@@ -0,0 +1,9 @@ -+src := $(s)../linux/netlink.c -+obj := $(objdir)/sysdep/bsd-netlink/netlink.o -+$(obj): $(src) -+ $(E)echo CC -o $@ -c $< -+ $(Q)$(CC) $(CFLAGS) -MMD -MP -o $@ -c $< -+$(all-daemon) -+$(conf-y-targets): $(s)../linux/netlink.Y -+ -+tests_objs := $(tests_objs) $(obj) diff --git a/net/bird2/files/patch-sysdep_bsd_sysio.h b/net/bird2/files/patch-sysdep_bsd_sysio.h deleted file mode 100644 index 2991c873126e..000000000000 --- a/net/bird2/files/patch-sysdep_bsd_sysio.h +++ /dev/null @@ -1,48 +0,0 @@ -diff --git sysdep/bsd/sysio.h sysdep/bsd/sysio.h -index f1887fb4..5167a5dd 100644 ---- sysdep/bsd/sysio.h -+++ sysdep/bsd/sysio.h -@@ -48,11 +48,16 @@ - static inline int - sk_setup_multicast4(sock *s) - { -- struct in_addr ifa = ip4_to_in4(s->iface->sysdep); - u8 ttl = s->ttl; - u8 n = 0; - - /* This defines where should we send _outgoing_ multicasts */ -+#ifdef __FreeBSD__ -+ struct ip_mreqn ifa = { .imr_ifindex = s->iface->index }; -+#else -+ struct in_addr ifa = ip4_to_in4(s->iface->sysdep); -+#endif -+ - if (setsockopt(s->fd, IPPROTO_IP, IP_MULTICAST_IF, &ifa, sizeof(ifa)) < 0) - ERR("IP_MULTICAST_IF"); - -@@ -68,8 +73,11 @@ sk_setup_multicast4(sock *s) - static inline int - sk_join_group4(sock *s, ip_addr maddr) - { -+#ifdef __FreeBSD__ -+ struct ip_mreqn mr = { .imr_multiaddr = ipa_to_in4(maddr), .imr_ifindex = s->iface->index }; -+#else - struct ip_mreq mr = INIT_MREQ4(maddr, s->iface); -- -+#endif - if (setsockopt(s->fd, IPPROTO_IP, IP_ADD_MEMBERSHIP, &mr, sizeof(mr)) < 0) - ERR("IP_ADD_MEMBERSHIP"); - -@@ -79,8 +87,11 @@ sk_join_group4(sock *s, ip_addr maddr) - static inline int - sk_leave_group4(sock *s, ip_addr maddr) - { -+#ifdef __FreeBSD__ -+ struct ip_mreqn mr = { .imr_multiaddr = ipa_to_in4(maddr), .imr_ifindex = s->iface->index }; -+#else - struct ip_mreq mr = INIT_MREQ4(maddr, s->iface); -- -+#endif - if (setsockopt(s->fd, IPPROTO_IP, IP_DROP_MEMBERSHIP, &mr, sizeof(mr)) < 0) - ERR("IP_ADD_MEMBERSHIP"); - diff --git a/net/bird2/files/patch-sysdep_linux_netlink.c b/net/bird2/files/patch-sysdep_linux_netlink.c deleted file mode 100644 index b84707c46be2..000000000000 --- a/net/bird2/files/patch-sysdep_linux_netlink.c +++ /dev/null @@ -1,22 +0,0 @@ ---- sysdep/linux/netlink.c.orig 2022-12-15 15:03:21 UTC -+++ sysdep/linux/netlink.c -@@ -27,15 +27,15 @@ - #include "lib/hash.h" - #include "conf/conf.h" - -+#ifdef CONFIG_FREEBSD_NETLINK -+#include -+#include -+#endif - #ifdef CONFIG_LINUX_NETLINK - #include - #include - #include - #include --#endif --#ifdef CONFIG_FREEBSD_NETLINK --#include --#include - #endif - - #ifdef HAVE_MPLS_KERNEL