CVS commit: pkgsrc/net/bird

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan  8 14:26:29 UTC 2026

Modified Files:
        pkgsrc/net/bird: Makefile distinfo
        pkgsrc/net/bird/patches: patch-configure
Added Files:
        pkgsrc/net/bird/patches: patch-sysdep_bsd_krt-sock.c
Removed Files:
        pkgsrc/net/bird/patches: patch-proto_bfd_bfd.h

Log Message:
bird: updated to 3.2.0

3.2.0
BGP dynamic unnumbered, IGP metric attribute


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/bird/Makefile
cvs rdiff -u -r1.16 -r1.17 pkgsrc/net/bird/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/net/bird/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/net/bird/patches/patch-proto_bfd_bfd.h
cvs rdiff -u -r0 -r1.3 pkgsrc/net/bird/patches/patch-sysdep_bsd_krt-sock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/bird/Makefile
diff -u pkgsrc/net/bird/Makefile:1.11 pkgsrc/net/bird/Makefile:1.12
--- pkgsrc/net/bird/Makefile:1.11       Wed Dec 17 22:53:00 2025
+++ pkgsrc/net/bird/Makefile    Thu Jan  8 14:26:29 2026
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2025/12/17 22:53:00 nia Exp $
+# $NetBSD: Makefile,v 1.12 2026/01/08 14:26:29 adam Exp $
 
-DISTNAME=      bird-3.1.4
+DISTNAME=      bird-3.2.0
 CATEGORIES=    net
 MASTER_SITES=  https://bird.nic.cz/download/
 

Index: pkgsrc/net/bird/distinfo
diff -u pkgsrc/net/bird/distinfo:1.16 pkgsrc/net/bird/distinfo:1.17
--- pkgsrc/net/bird/distinfo:1.16       Tue Sep 30 13:05:18 2025
+++ pkgsrc/net/bird/distinfo    Thu Jan  8 14:26:29 2026
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.16 2025/09/30 13:05:18 adam Exp $
+$NetBSD: distinfo,v 1.17 2026/01/08 14:26:29 adam Exp $
 
-BLAKE2s (bird-3.1.4.tar.gz) = 5f1fccea1ac7b53356a8f2a93c0ebfcd6b2e9a934cee74f904524ee842e4e8cf
-SHA512 (bird-3.1.4.tar.gz) = f890be2ab869c058026acfa0a39f81af5fe33ca96e9a2d3275045d2cdf8128b64748ee112173f36d3ac8fb3495e74a82f6fe511774e685f0f769077dfa3424c8
-Size (bird-3.1.4.tar.gz) = 2738002 bytes
+BLAKE2s (bird-3.2.0.tar.gz) = 129f84bd8e224462afceabde6a6dc3a18205adfe33fc0afb90b3ccaa7219c6be
+SHA512 (bird-3.2.0.tar.gz) = df26edb9329ef548c4029689858cb4c5c490a28d0813bd14b2e6028798933d534bd4bb4e60ab754df190ef4c6a9b4e2d571af0d2bb539619109a306a793d5c50
+Size (bird-3.2.0.tar.gz) = 2737808 bytes
 SHA1 (patch-Makefile.in) = e5bea06cf3cc7f7d8f6711c8e67c000b0f79e665
-SHA1 (patch-configure) = 35a910fae3bba6f328cf6c24895acbab501d7e3a
+SHA1 (patch-configure) = 41939832d43a1c6d5b4a331be957a4c38f207f60
 SHA1 (patch-doc_bird.conf.example) = 4b8799ed0bc6bf8ed0e8a9966f54ab9bea0bacb1
-SHA1 (patch-proto_bfd_bfd.h) = d0b33274053d20ff3c438da082658c81475c5116
+SHA1 (patch-sysdep_bsd_krt-sock.c) = 237d4c69f8e926a2b9665e7b6811a4e8d198ce40

Index: pkgsrc/net/bird/patches/patch-configure
diff -u pkgsrc/net/bird/patches/patch-configure:1.6 pkgsrc/net/bird/patches/patch-configure:1.7
--- pkgsrc/net/bird/patches/patch-configure:1.6 Fri Sep  5 06:23:45 2025
+++ pkgsrc/net/bird/patches/patch-configure     Thu Jan  8 14:26:29 2026
@@ -1,20 +1,10 @@
-$NetBSD: patch-configure,v 1.6 2025/09/05 06:23:45 adam Exp $
+$NetBSD: patch-configure,v 1.7 2026/01/08 14:26:29 adam Exp $
 
-pthread_spin_lock() is portable.
 Let pkgsrc figure out the correct paths.
 
---- configure.orig     2025-05-26 19:27:50.000000000 +0000
+--- configure.orig     2025-12-26 16:16:05.000000000 +0000
 +++ configure
-@@ -4776,8 +4776,6 @@ main (void)
- 
-             pthread_t pt;
-             pthread_create(&pt, NULL, NULL, NULL);
--            pthread_spinlock_t lock;
--            pthread_spin_lock(&lock);
- 
- 
-   ;
-@@ -5651,21 +5649,15 @@ else
+@@ -5788,21 +5788,15 @@ else
        ;;
      freebsd*)
        sysdesc=bsd

Added files:

Index: pkgsrc/net/bird/patches/patch-sysdep_bsd_krt-sock.c
diff -u /dev/null pkgsrc/net/bird/patches/patch-sysdep_bsd_krt-sock.c:1.3
--- /dev/null   Thu Jan  8 14:26:29 2026
+++ pkgsrc/net/bird/patches/patch-sysdep_bsd_krt-sock.c Thu Jan  8 14:26:29 2026
@@ -0,0 +1,24 @@
+$NetBSD: patch-sysdep_bsd_krt-sock.c,v 1.3 2026/01/08 14:26:29 adam Exp $
+
+Fix build.
+
+--- sysdep/bsd/krt-sock.c.orig 2026-01-08 10:38:17.947637208 +0000
++++ sysdep/bsd/krt-sock.c
+@@ -358,7 +358,7 @@ krt_send_route(struct krt_proto *p, int 
+ 
+     sockaddr_fill(&gate, af, gw, i, 0);
+ #else
+-    sockaddr_fill_dl(&gate, i);
++    sockaddr_fill_dl((struct sockaddr_dl *)&gate, i);
+ #endif
+ 
+     msg.rtm.rtm_addrs |= RTA_GATEWAY;
+@@ -1233,7 +1233,7 @@ kif_update_sysdep_addr(struct iface *i)
+     return 0;
+ 
+   ip4_addr old = i->sysdep;
+-  i->sysdep = ipa_to_ip4(ipa_from_sa4(&ifr.ifr_addr));
++  i->sysdep = ipa_to_ip4(ipa_from_sa4((sockaddr *)&ifr.ifr_addr));
+ 
+   return !ip4_equal(i->sysdep, old);
+ }