Merge commit 'a2be93c7f' into thread-next

diff --cc .gitlab-ci.yml
index 32c693248bd7964c9e3946ef3d8d452a7d7ddca5,27b35fb3da8e8f369baf93601644b03b8e43b765..d31b7794adb1055926551df1785057e34cb7df95
--- 1/.gitlab-ci.yml
--- 2/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@@ -80,13 -260,17 +260,21 @@@ build-debian-11-amd64
    <<: *build-linux
    image: registry.nic.cz/labs/bird:debian-11-amd64
  
- #build-debian-11-i386:
- #  <<: *build-linux
- #  image: registry.nic.cz/labs/bird:debian-11-i386
 +build-debian-12-amd64:
 +  <<: *build-linux
 +  image: registry.nic.cz/labs/bird:debian-12-amd64
 +
+ build-debian-11-i386:
+   <<: *build-linux
+   image: registry.nic.cz/labs/bird:debian-11-i386
+ 
+ build-debian-12-amd64:
+   <<: *build-linux
+   image: registry.nic.cz/labs/bird:debian-12-amd64
+ 
+ build-debian-12-i386:
+   <<: *build-linux
+   image: registry.nic.cz/labs/bird:debian-12-i386
  
  build-debian-testing-amd64:
    <<: *build-linux
@@@ -262,10 -450,8 +454,10 @@@ build-only-static
  .pkg-deb: &pkg-deb
    stage: pkg
    script:
 +    # create venv only if it's installed
 +    - if python3 -m venv venv; then . venv/bin/activate; fi
      - pip3 install apkg
-     - apkg build
+     - BRANCH=$CI_COMMIT_BRANCH ARCHIVE_DOCS=false apkg build
      #- apkg install -y pkg/pkgs/*/*/*.deb
    artifacts:
      paths:
@@@ -307,20 -493,20 +499,25 @@@ pkg-debian-11-amd64
    needs: [build-debian-11-amd64]
    image: registry.nic.cz/labs/bird:debian-11-amd64
  
- pkg-fedora-30-amd64:
-   <<: *pkg-rpm-wa
-   needs: [build-fedora-30-amd64]
-   image: registry.nic.cz/labs/bird:fedora-30-amd64
 +pkg-debian-12-amd64:
 +  <<: *pkg-deb
 +  needs: [build-debian-12-amd64]
 +  image: registry.nic.cz/labs/bird:debian-12-amd64
 +
+ pkg-debian-11-i386:
+   <<: *pkg-deb
+   needs: [build-debian-11-i386]
+   image: registry.nic.cz/labs/bird:debian-11-i386
  
- pkg-fedora-31-amd64:
-   <<: *pkg-rpm-wa
-   needs: [build-fedora-31-amd64]
-   image: registry.nic.cz/labs/bird:fedora-31-amd64
+ pkg-debian-12-amd64:
+   <<: *pkg-deb
+   needs: [build-debian-12-amd64]
+   image: registry.nic.cz/labs/bird:debian-12-amd64
+ 
+ pkg-debian-12-i386:
+   <<: *pkg-deb
+   needs: [build-debian-12-i386]
+   image: registry.nic.cz/labs/bird:debian-12-i386
  
  pkg-fedora-32-amd64:
    <<: *pkg-rpm-wa
@@@ -337,6 -523,48 +534,41 @@@ pkg-fedora-34-amd64
    needs: [build-fedora-34-amd64]
    image: registry.nic.cz/labs/bird:fedora-34-amd64
  
 -#pkg-centos-7-amd64:
 -#  <<: *pkg-rpm-wa
 -#  variables:
 -#    LC_ALL: en_US.UTF-8
 -#  needs: [build-centos-7-amd64]
 -#  image: registry.nic.cz/labs/bird:centos-7-amd64
 -
+ pkg-fedora-35-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-35-amd64]
+   image: registry.nic.cz/labs/bird:fedora-35-amd64
+ 
+ pkg-fedora-36-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-36-amd64]
+   image: registry.nic.cz/labs/bird:fedora-36-amd64
+ 
+ pkg-fedora-37-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-37-amd64]
+   image: registry.nic.cz/labs/bird:fedora-37-amd64
+ 
+ pkg-fedora-38-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-38-amd64]
+   image: registry.nic.cz/labs/bird:fedora-38-amd64
+ 
+ pkg-fedora-39-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-39-amd64]
+   image: registry.nic.cz/labs/bird:fedora-39-amd64
+ 
+ pkg-fedora-40-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-40-amd64]
+   image: registry.nic.cz/labs/bird:fedora-40-amd64
+ 
+ pkg-fedora-41-amd64:
+   <<: *pkg-rpm
+   needs: [build-fedora-41-amd64]
+   image: registry.nic.cz/labs/bird:fedora-41-amd64
+ 
  # Removed due to apkg breakage
  #pkg-centos-8-amd64:
  #  <<: *pkg-rpm-wa

diff --cc Makefile.in
Simple merge