CVS commit: pkgsrc/net/bird

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

Module Name:    pkgsrc
Committed By:   adam
Date:           Fri Sep  5 06:23:45 UTC 2025

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

Log Message:
bird: updated to 3.1.3

3.1.3
No changelog


To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 pkgsrc/net/bird/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/net/bird/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bird/patches/patch-configure
cvs rdiff -u -r0 -r1.1 pkgsrc/net/bird/patches/patch-proto_bfd_bfd.h

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.8 pkgsrc/net/bird/Makefile:1.9
--- pkgsrc/net/bird/Makefile:1.8        Sun May 18 10:07:34 2025
+++ pkgsrc/net/bird/Makefile    Fri Sep  5 06:23:45 2025
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.8 2025/05/18 10:07:34 markd Exp $
+# $NetBSD: Makefile,v 1.9 2025/09/05 06:23:45 adam Exp $
 
-DISTNAME=      bird-2.17.1
+DISTNAME=      bird-3.1.3
 CATEGORIES=    net
-MASTER_SITES=  https://bird.network.cz/download/
-MASTER_SITES+= ftp://bird.network.cz/pub/bird/
+MASTER_SITES=  https://bird.nic.cz/download/
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://bird.network.cz/
+HOMEPAGE=      https://bird.nic.cz/
 COMMENT=       The BIRD Internet Routing Daemon
 LICENSE=       gnu-gpl-v2
 
 # Has hardcoded BSD/Linux support.
-NOT_FOR_PLATFORM=      SunOS-*-*
+NOT_FOR_PLATFORM=      Darwin-*-* SunOS-*-*
 
 SUPERSEDES+=           bird6-[0-9]*
 
 BUILD_DEFS+=           VARBASE
 
 USE_LIBTOOL=           yes
-GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake flex bison gm4
-
+GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
 
@@ -30,8 +28,7 @@ EGDIR=                        ${PREFIX}/share/examples/bird
 ALL_ENV+=              EGDIR=${EGDIR}
 CONF_FILES=            ${EGDIR}/bird.conf ${PKG_SYSCONFDIR}/bird.conf
 
-.include "../../devel/readline/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../security/libssh/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/bird/distinfo
diff -u pkgsrc/net/bird/distinfo:1.14 pkgsrc/net/bird/distinfo:1.15
--- pkgsrc/net/bird/distinfo:1.14       Sun May 18 02:10:49 2025
+++ pkgsrc/net/bird/distinfo    Fri Sep  5 06:23:45 2025
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.14 2025/05/18 02:10:49 markd Exp $
+$NetBSD: distinfo,v 1.15 2025/09/05 06:23:45 adam Exp $
 
-BLAKE2s (bird-2.17.1.tar.gz) = 2b16a8d0ed4d8b04d9c5472bb75decc97f9cdab7e91d47df7d980749f5309504
-SHA512 (bird-2.17.1.tar.gz) = b535bc74f7e865167f40eef3dd82042f085d06de394a2eac2d94bae4c44e247b590d4c45206afe360b2d8879e33f2478117f0a0b1a5182431204cbbf595b9890
-Size (bird-2.17.1.tar.gz) = 1471008 bytes
+BLAKE2s (bird-3.1.3.tar.gz) = 2963a0b60498d0412829be597fee061cc7496e5b834c4065b576cbe0da52f5a4
+SHA512 (bird-3.1.3.tar.gz) = 696b0438dc25363d5e3acbf22cd0b36004b1df41f292e078efcc3088ef73304f41160050ba45d85cc64d9a3be9494537ed899e88f7506daa290f0c3540ea1106
+Size (bird-3.1.3.tar.gz) = 2733495 bytes
 SHA1 (patch-Makefile.in) = e5bea06cf3cc7f7d8f6711c8e67c000b0f79e665
-SHA1 (patch-configure) = c604d52199b2b1953b1865ef77da9e2eba66beab
+SHA1 (patch-configure) = 35a910fae3bba6f328cf6c24895acbab501d7e3a
 SHA1 (patch-doc_bird.conf.example) = 4b8799ed0bc6bf8ed0e8a9966f54ab9bea0bacb1
+SHA1 (patch-proto_bfd_bfd.h) = d0b33274053d20ff3c438da082658c81475c5116

Index: pkgsrc/net/bird/patches/patch-configure
diff -u pkgsrc/net/bird/patches/patch-configure:1.5 pkgsrc/net/bird/patches/patch-configure:1.6
--- pkgsrc/net/bird/patches/patch-configure:1.5 Sun May 18 02:10:50 2025
+++ pkgsrc/net/bird/patches/patch-configure     Fri Sep  5 06:23:45 2025
@@ -1,10 +1,20 @@
-$NetBSD: patch-configure,v 1.5 2025/05/18 02:10:50 markd Exp $
+$NetBSD: patch-configure,v 1.6 2025/09/05 06:23:45 adam Exp $
 
-let pkgsrc figure out the correct paths
+pthread_spin_lock() is portable.
+Let pkgsrc figure out the correct paths.
 
---- configure.orig     2025-04-03 18:50:57.000000000 +0000
+--- configure.orig     2025-05-26 19:27:50.000000000 +0000
 +++ configure
-@@ -5596,21 +5596,15 @@ else
+@@ -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
        ;;
      freebsd*)
        sysdesc=bsd

Added files:

Index: pkgsrc/net/bird/patches/patch-proto_bfd_bfd.h
diff -u /dev/null pkgsrc/net/bird/patches/patch-proto_bfd_bfd.h:1.1
--- /dev/null   Fri Sep  5 06:23:45 2025
+++ pkgsrc/net/bird/patches/patch-proto_bfd_bfd.h       Fri Sep  5 06:23:45 2025
@@ -0,0 +1,14 @@
+$NetBSD: patch-proto_bfd_bfd.h,v 1.1 2025/09/05 06:23:45 adam Exp $
+
+Remove unused field (pthread_spinlock_t is not portable).
+
+--- proto/bfd/bfd.h.orig       2025-09-05 05:46:36.421261181 +0000
++++ proto/bfd/bfd.h
+@@ -82,7 +82,6 @@ struct bfd_proto
+ {
+   struct proto p;
+ 
+-  pthread_spinlock_t lock;
+ 
+   pool *tpool;
+