CVS commit: pkgsrc/net

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Sun, 18 May 2025 02:10:50 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun May 18 02:10:50 UTC 2025

Modified Files:
        pkgsrc/net: Makefile
        pkgsrc/net/bird: DESCR Makefile PLIST distinfo
        pkgsrc/net/bird/files: bird.sh
        pkgsrc/net/bird/patches: patch-configure
Added Files:
        pkgsrc/net/bird/patches: patch-Makefile.in patch-doc_bird.conf.example
Removed Files:
        pkgsrc/net/bird: Makefile.common
        pkgsrc/net/bird/files: bird6.sh
        pkgsrc/net/bird/patches: patch-sysdep_bsd_krt-sock.c
            patch-tools_Makefile.in
        pkgsrc/net/bird6: Makefile

Log Message:
bird: update to 2.17.1

Since version 2 IPv6 support is included in the same binary so remove
bird6 package

8 years of development since 1.6.3


To generate a diff of this commit:
cvs rdiff -u -r1.1600 -r1.1601 pkgsrc/net/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/bird/DESCR
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/bird/Makefile
cvs rdiff -u -r1.11 -r0 pkgsrc/net/bird/Makefile.common
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/bird/PLIST
cvs rdiff -u -r1.13 -r1.14 pkgsrc/net/bird/distinfo
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/bird/files/bird.sh
cvs rdiff -u -r1.1.1.1 -r0 pkgsrc/net/bird/files/bird6.sh
cvs rdiff -u -r0 -r1.1 pkgsrc/net/bird/patches/patch-Makefile.in \
    pkgsrc/net/bird/patches/patch-doc_bird.conf.example
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/bird/patches/patch-configure
cvs rdiff -u -r1.1 -r0 pkgsrc/net/bird/patches/patch-sysdep_bsd_krt-sock.c
cvs rdiff -u -r1.3 -r0 pkgsrc/net/bird/patches/patch-tools_Makefile.in
cvs rdiff -u -r1.4 -r0 pkgsrc/net/bird6/Makefile

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

Modified files:

Index: pkgsrc/net/Makefile
diff -u pkgsrc/net/Makefile:1.1600 pkgsrc/net/Makefile:1.1601
--- pkgsrc/net/Makefile:1.1600  Fri May  9 22:18:38 2025
+++ pkgsrc/net/Makefile Sun May 18 02:10:49 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1600 2025/05/09 22:18:38 tnn Exp $
+# $NetBSD: Makefile,v 1.1601 2025/05/18 02:10:49 markd Exp $
 #
 
 COMMENT=       Networking tools
@@ -47,7 +47,6 @@ SUBDIR+=      beanstalkd
 SUBDIR+=       bftpd
 SUBDIR+=       bind918
 SUBDIR+=       bird
-SUBDIR+=       bird6
 SUBDIR+=       bmon
 SUBDIR+=       bombadillo
 SUBDIR+=       bounce

Index: pkgsrc/net/bird/DESCR
diff -u pkgsrc/net/bird/DESCR:1.2 pkgsrc/net/bird/DESCR:1.3
--- pkgsrc/net/bird/DESCR:1.2   Sun Jan 22 02:58:11 2012
+++ pkgsrc/net/bird/DESCR       Sun May 18 02:10:49 2025
@@ -2,7 +2,6 @@ The BIRD project aims to develop a fully
 primarily targetted on (but not limited to) UNIX-like systems and distributed
 under the GNU General Public License.
 
-+ The bird package is for IPv4, bird6 for IPv6
 + Multiple routing tables
 + BGP
 + RIP

Index: pkgsrc/net/bird/Makefile
diff -u pkgsrc/net/bird/Makefile:1.5 pkgsrc/net/bird/Makefile:1.6
--- pkgsrc/net/bird/Makefile:1.5        Mon May  6 08:40:30 2024
+++ pkgsrc/net/bird/Makefile    Sun May 18 02:10:49 2025
@@ -1,4 +1,37 @@
-# $NetBSD: Makefile,v 1.5 2024/05/06 08:40:30 jperkin Exp $
+# $NetBSD: Makefile,v 1.6 2025/05/18 02:10:49 markd Exp $
+# used by net/bird/Makefile
+# used by net/bird6/Makefile
 
-PKGREVISION= 1
-.include "../../net/bird/Makefile.common"
+DISTNAME=      bird-2.17.1
+CATEGORIES=    net
+MASTER_SITES=  https://bird.network.cz/download/
+MASTER_SITES+= ftp://bird.network.cz/pub/bird/
+
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      https://bird.network.cz/
+COMMENT=       The BIRD Internet Routing Daemon
+LICENSE=       gnu-gpl-v2
+
+# Has hardcoded BSD/Linux support.
+NOT_FOR_PLATFORM=      SunOS-*-*
+
+BUILD_DEFS+=           VARBASE
+
+USE_LIBTOOL=           yes
+GNU_CONFIGURE=         yes
+USE_TOOLS+=            gmake flex bison gm4
+
+CONFIGURE_ARGS+=       --sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=       --localstatedir=${VARBASE}
+
+RCD_SCRIPTS+=          bird
+
+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 "../../security/libssh/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/bird/PLIST
diff -u pkgsrc/net/bird/PLIST:1.3 pkgsrc/net/bird/PLIST:1.4
--- pkgsrc/net/bird/PLIST:1.3   Fri Mar 28 23:27:16 2014
+++ pkgsrc/net/bird/PLIST       Sun May 18 02:10:49 2025
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2014/03/28 23:27:16 pettai Exp $
-sbin/bird${BIRD6}
-sbin/birdc${BIRD6}
-sbin/birdcl${BIRD6}
-share/examples/bird${BIRD6}/bird${BIRD6}.conf
+@comment $NetBSD: PLIST,v 1.4 2025/05/18 02:10:49 markd Exp $
+sbin/bird
+sbin/birdc
+sbin/birdcl
+share/examples/bird/bird.conf

Index: pkgsrc/net/bird/distinfo
diff -u pkgsrc/net/bird/distinfo:1.13 pkgsrc/net/bird/distinfo:1.14
--- pkgsrc/net/bird/distinfo:1.13       Tue Oct 26 11:05:25 2021
+++ pkgsrc/net/bird/distinfo    Sun May 18 02:10:49 2025
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2021/10/26 11:05:25 nia Exp $
+$NetBSD: distinfo,v 1.14 2025/05/18 02:10:49 markd Exp $
 
-BLAKE2s (bird-1.6.3.tar.gz) = 8c6ee673cfda04dd02f747c98e0e41eb820e636b4f726da01585d447e96535d9
-SHA512 (bird-1.6.3.tar.gz) = d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-Size (bird-1.6.3.tar.gz) = 1337198 bytes
-SHA1 (patch-configure) = b22044e5be530867a05406d4b32d789933993d53
-SHA1 (patch-sysdep_bsd_krt-sock.c) = e5e13621e06959222f18a06446fe7941cb33ffef
-SHA1 (patch-tools_Makefile.in) = 4a6ad298abbe8c42627528c9156ce581a6e07917
+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
+SHA1 (patch-Makefile.in) = e5bea06cf3cc7f7d8f6711c8e67c000b0f79e665
+SHA1 (patch-configure) = c604d52199b2b1953b1865ef77da9e2eba66beab
+SHA1 (patch-doc_bird.conf.example) = 4b8799ed0bc6bf8ed0e8a9966f54ab9bea0bacb1

Index: pkgsrc/net/bird/files/bird.sh
diff -u pkgsrc/net/bird/files/bird.sh:1.1.1.1 pkgsrc/net/bird/files/bird.sh:1.2
--- pkgsrc/net/bird/files/bird.sh:1.1.1.1       Sun Jan 22 02:53:01 2012
+++ pkgsrc/net/bird/files/bird.sh       Sun May 18 02:10:50 2025
@@ -1,9 +1,10 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-#      $NetBSD: bird.sh,v 1.1.1.1 2012/01/22 02:53:01 agc Exp $
+#      $NetBSD: bird.sh,v 1.2 2025/05/18 02:10:50 markd Exp $
 #
 # PROVIDE: bird
-# REQUIRE: DAEMON NETWORKING
+# REQUIRE: network
+# BEFORE: NETWORKING
 
 if [ -f /etc/rc.subr ]
 then

Index: pkgsrc/net/bird/patches/patch-configure
diff -u pkgsrc/net/bird/patches/patch-configure:1.4 pkgsrc/net/bird/patches/patch-configure:1.5
--- pkgsrc/net/bird/patches/patch-configure:1.4 Tue Feb  3 13:58:32 2015
+++ pkgsrc/net/bird/patches/patch-configure     Sun May 18 02:10:50 2025
@@ -1,20 +1,28 @@
-$NetBSD: patch-configure,v 1.4 2015/02/03 13:58:32 mef Exp $
+$NetBSD: patch-configure,v 1.5 2025/05/18 02:10:50 markd Exp $
 
-date: 2013-10-21 03:00:57 +0900;  author: joerg;  state: Exp;  lines: +12 -1;  commitid: 17vYRnrUrAvnK3ax;
-Prefix rpath options with -Wl.
+let pkgsrc figure out the correct paths
 
---- configure.orig     2013-07-28 18:57:59.000000000 +0000
+--- configure.orig     2025-04-03 18:50:57.000000000 +0000
 +++ configure
-@@ -4442,12 +4442,8 @@ else
-                               default_iproutedir="/etc/iproute2"
-                               ;;
-               ipv6:netbsd*)   sysdesc=bsd-v6
--                              CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
--                              LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
-                               ;;
-               ipv4:netbsd*)   sysdesc=bsd
--                              CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
--                              LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
-                               ;;
-               ipv6:freebsd*)  sysdesc=bsd-v6
-                               ;;
+@@ -5596,21 +5596,15 @@ else
+       ;;
+     freebsd*)
+       sysdesc=bsd
+-      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-      LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       ;;
+     kfreebsd*)
+       sysdesc=bsd
+       ;;
+     netbsd*)
+       sysdesc=bsd
+-      CPPFLAGS="$CPPFLAGS -I/usr/pkg/include"
+-      LDFLAGS="$LDFLAGS -L/usr/pkg/lib -R/usr/pkg/lib"
+       ;;
+     openbsd*)
+       sysdesc=bsd
+-      CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-      LDFLAGS="$LDFLAGS -L/usr/local/lib"
+       ;;
+     dragonfly*)
+       sysdesc=bsd

Added files:

Index: pkgsrc/net/bird/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/net/bird/patches/patch-Makefile.in:1.1
--- /dev/null   Sun May 18 02:10:50 2025
+++ pkgsrc/net/bird/patches/patch-Makefile.in   Sun May 18 02:10:50 2025
@@ -0,0 +1,24 @@
+$NetBSD: patch-Makefile.in,v 1.1 2025/05/18 02:10:50 markd Exp $
+
+install the example config files into the correct directory
+
+--- Makefile.in.orig   2025-04-03 18:50:57.000000000 +0000
++++ Makefile.in
+@@ -204,15 +204,11 @@ cscope:
+ # Install
+ 
+ install: all
+-      $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(sysconfdir) $(DESTDIR)/$(runstatedir)
++      $(INSTALL) -d $(DESTDIR)/$(sbindir) $(DESTDIR)/$(EGDIR) $(DESTDIR)/$(runstatedir)
+       for BIN in bird @CLIENT@ ; do                                                           \
+               $(INSTALL_PROGRAM) $(exedir)/$$BIN $(DESTDIR)/$(sbindir)/$$BIN ;                \
+       done
+-      if ! test -f $(DESTDIR)/@CONFIG_FILE@ ; then                                            \
+-              $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/@CONFIG_FILE@ ;      \
+-      else                                                                                    \
+-              echo "Not overwriting old bird.conf" ;                                          \
+-      fi
++      $(INSTALL_DATA) $(srcdir)/doc/bird.conf.example $(DESTDIR)/$(EGDIR)/bird.conf
+ 
+ install-docs:
+       $(INSTALL) -d $(DESTDIR)/$(docdir)
Index: pkgsrc/net/bird/patches/patch-doc_bird.conf.example
diff -u /dev/null pkgsrc/net/bird/patches/patch-doc_bird.conf.example:1.1
--- /dev/null   Sun May 18 02:10:50 2025
+++ pkgsrc/net/bird/patches/patch-doc_bird.conf.example Sun May 18 02:10:50 2025
@@ -0,0 +1,26 @@
+$NetBSD: patch-doc_bird.conf.example,v 1.1 2025/05/18 02:10:50 markd Exp $
+
+Note how to write to kernel on NetBSD without getting errors for direct connect 
+networks
+https://bird.network.cz/pipermail/bird-users/2025-April/018178.html
+
+--- doc/bird.conf.example.orig 2022-03-02 09:29:17.000000000 +0000
++++ doc/bird.conf.example
+@@ -57,6 +57,8 @@ protocol kernel {
+ #           table master4;    # Default IPv4 table is master4
+ #           import all;       # Import to table, default is import all
+             export all;       # Export to protocol. default is export none
++#           export where source != RTS_DEVICE; # NetBSD complains about
++                              # overwriting direct connect networks so don't
+       };
+ #     learn;                  # Learn alien routes from the kernel
+ #     kernel table 10;        # Kernel table to synchronize with (default: main)
+@@ -65,6 +67,8 @@ protocol kernel {
+ # Another instance for IPv6, skipping default options
+ protocol kernel {
+       ipv6 { export all; };
++#     ipv6 { export where source != RTS_DEVICE; }; # NetBSD complains about
++                              # overwriting direct connect networks so don't
+ }
+ 
+ # Static routes (Again, there can be multiple instances, for different address

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index