Merge remote-tracking branch 'origin/master' into thread-next

.gitlab-ci.yml

@@ -700,19 +700,22 @@ pkg-ubuntu-24.10-amd64:
 
 build-netlab:
   stage: build
+  variables:
+    BDIR: build-netlab
   tags:
     - netlab
     - amd64
   script:
-    - DIR=$(pwd)
     - autoreconf
-    - ./configure
+    - mkdir $BDIR
+    - cd $BDIR
+    - ../configure
     - BRANCH=$CI_COMMIT_BRANCH make
-    - cd $TOOLS_DIR
-    - sudo git clean -fx
-    - git pull --ff-only
-    - mv $DIR/bird $DIR/birdc netlab/common
-    - ln -s $STAYRTR_BINARY netlab/common/stayrtr
+  artifacts:
+    paths:
+      - $BDIR/bird
+      - $BDIR/birdc
+    expire_in: 2 hours
 
 .test: &test-base
   stage: test
@@ -721,7 +724,13 @@ build-netlab:
     - netlab
     - amd64
   script:
-    - cd $TOOLS_DIR/netlab
+    - DIR=$(pwd)
+    - cd $TOOLS_DIR
+    - sudo git clean -fx
+    - git pull --ff-only
+    - mv $DIR/build-netlab/* netlab/common/
+    - ln -s $STAYRTR_BINARY netlab/common/stayrtr
+    - cd netlab
     - sudo ./stop
     - sudo ./runtest -s v3 -m check $TEST_NAME
 

Makefile.in

@@ -43,7 +43,7 @@ objdir := @objdir@
 exedir := @exedir@
 
 # Find out which version we are actually building
-VERSION := $(strip $(shell bash tools/version))
+VERSION := $(strip $(shell bash $(srcdir)/tools/version))
 CFLAGS += -DBIRD_VERSION='"$(VERSION)"'
 
 ifeq ($(objdir),.)

NEWS

@@ -25,14 +25,6 @@ Version 3.0.1 (2025-01-10)
   o Reduced route attribute normalization heap bloating
   o Merged 2.16.1
 
-Version 2.16.1 (2025-01-10)
-  o ASPA: fixed parser bug in static protocol
-  o ASPA: fixed static protocol reconfiguration
-  o Babel: fixed seqno comparison
-  o BSD: fixed onlink flag assumption with Netlink
-  o Fixed memory alignment issues
-  o Fixed possible rte src collisions in L3VPN
-
 Version 3.0.0 (2024-12-17)
   - from 2.16
     o Multithreaded execution
@@ -89,6 +81,33 @@ Version 3.0-alpha0 (2022-02-07)
   o Lots of refactoring
   o Bugfixes and improvements as they came along
 
+Version 2.17 (2025-04-01)
+  o Babel: next hop control for IPv4
+  o BGP: link-local next hop format configuration
+  o TCP-AO implementation for Linux
+
+Version 2.16.2 (2025-04-01)
+  o BFD: password reconfiguration crash fix
+  o L3VPN attribute fix
+  o Table removal rare crash fix
+  o Logging minor fix
+
+Version 2.16.1 (2025-01-10)
+  o ASPA: fixed parser bug in static protocol
+  o ASPA: fixed static protocol reconfiguration
+  o Babel: fixed seqno comparison
+  o BSD: fixed onlink flag assumption with Netlink
+  o Fixed memory alignment issues
+  o Fixed possible rte src collisions in L3VPN
+
+Version 2.16.1 (2025-01-10)
+  o ASPA: fixed parser bug in static protocol
+  o ASPA: fixed static protocol reconfiguration
+  o Babel: fixed seqno comparison
+  o BSD: fixed onlink flag assumption with Netlink
+  o Fixed memory alignment issues
+  o Fixed possible rte src collisions in L3VPN
+
 Version 2.16 (2024-12-04)
   o BFD: Set password per session
   o BFD: Accept zero checksum for IPv6-UDP