Is anyone running bird that can test this? Thanks.
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/bird/Makefile,v
retrieving revision 1.42
diff -u -p -r1.42 Makefile
--- Makefile 7 Mar 2016 10:24:34 -0000 1.42
+++ Makefile 1 May 2016 13:24:15 -0000
@@ -3,8 +3,7 @@
COMMENT-main= BIRD internet routing daemon
COMMENT-doc= BIRD internet routing daemon (documentation)
-V= 1.5.0
-REVISION-main= 3
+V= 1.6.0
DISTNAME= bird-$V
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME:S/-/-doc-/}${EXTRACT_SUFX}
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/bird/distinfo,v
retrieving revision 1.27
diff -u -p -r1.27 distinfo
--- distinfo 23 Apr 2015 22:39:28 -0000 1.27
+++ distinfo 1 May 2016 13:24:15 -0000
@@ -1,4 +1,4 @@
-SHA256 (bird-1.5.0.tar.gz) = edXEJU4l9YkGJoMMpCquA3NXFr3xUt3YNoRz0rPBe10=
-SHA256 (bird-doc-1.5.0.tar.gz) = wsdASgR0sOSbx7tBwuVN2tbceMlwxAfMyPaKWy8UNk8=
-SIZE (bird-1.5.0.tar.gz) = 1300141
-SIZE (bird-doc-1.5.0.tar.gz) = 527192
+SHA256 (bird-1.6.0.tar.gz) = 2z3+N96sc7OLfWlm5XeYX3uOI/JGdgywla0TsNgBDhM=
+SHA256 (bird-doc-1.6.0.tar.gz) = o9afhGl0LiSFgRhcWGt6hc34kOLsRrMgV7SR00Lj+n8=
+SIZE (bird-1.6.0.tar.gz) = 1273899
+SIZE (bird-doc-1.6.0.tar.gz) = 543196
Index: patches/patch-sysdep_unix_io_c
===================================================================
RCS file: /cvs/ports/net/bird/patches/patch-sysdep_unix_io_c,v
retrieving revision 1.3
diff -u -p -r1.3 patch-sysdep_unix_io_c
--- patches/patch-sysdep_unix_io_c 12 Feb 2016 17:09:00 -0000 1.3
+++ patches/patch-sysdep_unix_io_c 1 May 2016 13:24:15 -0000
@@ -1,20 +1,7 @@
$OpenBSD: patch-sysdep_unix_io_c,v 1.3 2016/02/12 17:09:00 sthen Exp $
-
-Hunks #2 and #3: FD_SET overflow.
-
-From 338f85ca7721fac16394ccabd561ddb5ccaacb36 Mon Sep 17 00:00:00 2001
-From: Ondrej Zajicek (work) <[email protected]>
-Date: Tue, 3 Nov 2015 11:08:57 +0100
-Subject: [PATCH] IO: Handle fd values too big for select()
-
-From 3aed0a6ff7b2b811a535202fd787281d2ac33409 Mon Sep 17 00:00:00 2001
-From: Ondrej Zajicek (work) <[email protected]>
-Date: Tue, 3 Nov 2015 11:27:27 +0100
-Subject: [PATCH] IO: Fix the previous bugfix
-
---- sysdep/unix/io.c.orig Wed Apr 22 15:41:44 2015
-+++ sysdep/unix/io.c Fri Feb 12 17:06:31 2016
-@@ -261,7 +261,7 @@ tm_start(timer *t, unsigned after)
+--- sysdep/unix/io.c.orig Fri Apr 29 10:13:23 2016
++++ sysdep/unix/io.c Sun May 1 14:18:39 2016
+@@ -262,7 +262,7 @@ tm_start(timer *t, unsigned after)
bird_clock_t when;
if (t->randomize)
@@ -23,34 +10,7 @@ Subject: [PATCH] IO: Fix the previous bu
when = now + after;
if (t->expires == when)
return;
-@@ -1328,6 +1328,16 @@ sk_passive_connected(sock *s, int type)
- log(L_WARN "SOCK: Cannot get remote IP address for TCP<");
- }
-
-+ if (fd >= FD_SETSIZE)
-+ {
-+ /* FIXME: Call err_hook instead ? */
-+ log(L_ERR "SOCK: Incoming connection from %I%J (port %d) %s",
-+ t->daddr, ipa_is_link_local(t->daddr) ? t->iface : NULL,
-+ t->dport, "rejected due to FD_SETSIZE limit");
-+ close(fd);
-+ return 1;
-+ }
-+
- if (sk_setup(t) < 0)
- {
- /* FIXME: Call err_hook instead ? */
-@@ -1404,6 +1414,9 @@ sk_open(sock *s)
- if (fd < 0)
- ERR("socket");
-
-+ if (fd >= FD_SETSIZE)
-+ ERR2("FD_SETSIZE limit reached");
-+
- s->af = af;
- s->fd = fd;
-
-@@ -2038,7 +2051,6 @@ io_init(void)
+@@ -2043,7 +2043,6 @@ io_init(void)
init_times();
update_times();
boot_time = now;
Index: patches/patch-tools_Makefile_in
===================================================================
RCS file: patches/patch-tools_Makefile_in
diff -N patches/patch-tools_Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_Makefile_in 1 May 2016 13:24:15 -0000
@@ -0,0 +1,23 @@
+$OpenBSD$
+--- tools/Makefile.in.orig Fri Apr 29 10:13:23 2016
++++ tools/Makefile.in Sun May 1 14:20:56 2016
+@@ -37,16 +37,13 @@ subdir: sysdep/paths.h .dir-stamp .dep-stamp
+ set -e ; for a in $(static-dirs) $(client-dirs) ; do $(MAKE) -C $$a -f
$(srcdir_abs)/$$a/Makefile $@ ; done
+
+ $(exedir)/bird: $(bird-dep)
+- @echo LD $(LDFLAGS) -o $@ $^ $(LIBS)
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ $(exedir)/birdc: $(birdc-dep)
+- @echo LD $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(CLIENT_LIBS)
+
+ $(exedir)/birdcl: $(birdcl-dep)
+- @echo LD $(LDFLAGS) -o $@ $^ $(LIBS)
+- @$(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
++ $(CC) $(LDFLAGS) -o $@ $^ $(LIBS)
+
+ .dir-stamp: sysdep/paths.h
+ mkdir -p $(static-dirs) $(client-dirs) $(doc-dirs)
Index: patches/patch-tools_Rules_in
===================================================================
RCS file: patches/patch-tools_Rules_in
diff -N patches/patch-tools_Rules_in
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-tools_Rules_in 1 May 2016 13:24:15 -0000
@@ -0,0 +1,20 @@
+$OpenBSD$
+--- tools/Rules.in.orig Fri Apr 29 10:13:23 2016
++++ tools/Rules.in Sun May 1 14:20:53 2016
+@@ -68,14 +68,12 @@ subdir: all.o
+ all.o: $(objs)
+ # $(LD) -r -o $@ $^
+ # Changed to $(CC) because $(LD) has problems with crosscompiling
+- @echo LD -r -o $@ $^
+- @$(CC) -nostdlib -r -o $@ $^
++ $(CC) -nostdlib -r -o $@ $^
+
+ endif
+
+ %.o: $(src-path)%.c
+- @echo CC -o $@ -c $<
+- @$(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CFLAGS) -o $@ -c $<
+
+ ifndef source-dep
+ source-dep := $(source)
