Merge branch 'debian-bullseye' into current

* debian-bullseye:
  T3641: hooks: use Python3 interpreter
  vmware: tools.conf is now provided via vyos-1x-vmware package
  Docker: T3641: add libiptc-dev build time dependency required by strongSwan
  FRR: T3641: fix package build on Bullseye (workaround)
  Docker: T3641: update rtrlib version 0.6.3 -> 0.7.0
  Debian: T3641: switch to new distro Debian 11 - Bullseye

11 files changed, 43 insertions, 151 deletions

diff --git a/data/defaults.json b/data/defaults.json
index 507dd376..707d4195 100644
--- a/data/defaults.json
+++ b/data/defaults.json
@@ -1,8 +1,8 @@
 {
   "architecture": "amd64",
   "debian_mirror": "http://deb.debian.org/debian",
-  "debian_security_mirror": "http://deb.debian.org/debian-security",
-  "debian_distribution": "buster",
+  "debian_security_mirror": "http://deb.debian.org/debian",
+  "debian_distribution": "bullseye",
   "vyos_mirror": "http://dev.packages.vyos.net/repositories/current",
   "vyos_branch": "current",
   "kernel_version": "5.10.45",
diff --git a/data/live-build-config/archives/bullseye.list.chroot b/data/live-build-config/archives/bullseye.list.chroot
deleted file mode 100644
index 16eb57e5..00000000
--- a/data/live-build-config/archives/bullseye.list.chroot
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.debian.org/debian/ bullseye main
diff --git a/data/live-build-config/archives/bullseye.pref.chroot b/data/live-build-config/archives/bullseye.pref.chroot
deleted file mode 100644
index 7c7f38f3..00000000
--- a/data/live-build-config/archives/bullseye.pref.chroot
+++ /dev/null
@@ -1,47 +0,0 @@
-Package: libyang1
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: ddclient
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: podman
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: conmon
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: containernetworking-plugins
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: golang-github-containers-image
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: golang-github-containers-common
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: libseccomp2
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: runc
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: python3-cryptography
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: python3-paramiko
-Pin: release n=bullseye
-Pin-Priority: 600
-
-Package: *
-Pin: release n=bullseye
-Pin-Priority: -10
diff --git a/data/live-build-config/archives/buster-backports.pref.chroot b/data/live-build-config/archives/buster-backports.pref.chroot
deleted file mode 100644
index e6eee698..00000000
--- a/data/live-build-config/archives/buster-backports.pref.chroot
+++ /dev/null
@@ -1,31 +0,0 @@
-Package: nftables
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: libnftables1
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: libnftnl11
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: conserver-server
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: conserver-client
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: keepalived
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: wireguard-tools
-Pin: release n=buster-backports
-Pin-Priority: 600
-
-Package: *
-Pin: release n=buster-backports
-Pin-Priority: -10
diff --git a/data/live-build-config/hooks/live/30-frr-configs.chroot b/data/live-build-config/hooks/live/30-frr-configs.chroot
index 3180e36d..a5afed2d 100755
--- a/data/live-build-config/hooks/live/30-frr-configs.chroot
+++ b/data/live-build-config/hooks/live/30-frr-configs.chroot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # For FRR to work in VyOS as expected we need a few fixups
 #
diff --git a/data/live-build-config/hooks/live/30-openvmtools-configs.chroot b/data/live-build-config/hooks/live/30-openvmtools-configs.chroot
deleted file mode 100755
index e3762cc9..00000000
--- a/data/live-build-config/hooks/live/30-openvmtools-configs.chroot
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-
-# open-vm-tools settings
-
-import re
-
-vmtools_config = """
-[guestinfo]
-    poll-interval=30
-
-"""
-
-with open('/etc/vmware-tools/tools.conf', 'w') as f:
-    f.write(vmtools_config)
diff --git a/data/live-build-config/hooks/live/30-strongswan-configs.chroot b/data/live-build-config/hooks/live/30-strongswan-configs.chroot
index 59e000a9..a0efc126 100755
--- a/data/live-build-config/hooks/live/30-strongswan-configs.chroot
+++ b/data/live-build-config/hooks/live/30-strongswan-configs.chroot
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # The Cisco Unity plugin, that implements a proprietary extension
 # for IPsec split tunneling, interfers with DMVPN
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 51ad41d9..eb393f0a 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -18,7 +18,7 @@
 
 # This Dockerfile is installable on both x86, x86-64, armhf and arm64 systems
 ARG ARCH=
-FROM ${ARCH}debian:buster
+FROM ${ARCH}debian:bullseye
 
 # It is also possible to emulate an arm system inside docker,
 # execution of this emulated system needs to be executed on an x86 or x86-64 host.
@@ -38,10 +38,7 @@ FROM ${ARCH}debian:buster
 # On some versions of docker the emulation framework is not installed by default and
 # you need to install qemu, qemu-user-static and register qemu inside docker manually using:
 # `docker run --rm --privileged multiarch/qemu-user-static:register --reset`
-
-
 LABEL authors="VyOS Maintainers <maintainers@vyos.io>"
-
 ENV DEBIAN_FRONTEND noninteractive
 
 # Standard shell should be bash not dash
@@ -91,7 +88,9 @@ RUN apt-get update && apt-get install -y \
       python3-git \
       python3-pip \
       python3-flake8 \
-      python3-autopep8
+      python3-autopep8 \
+      debootstrap \
+      live-build
 
 # Syslinux and Grub2 is only supported on x86 and x64 systems
 RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
@@ -158,20 +157,6 @@ RUN wget -O /tmp/open-vmdk-master.zip https://github.com/vmware/open-vmdk/archiv
     make install
 
 #
-# live-build: building with local packages fails due to missing keys
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=941691
-# https://salsa.debian.org/live-team/live-build/merge_requests/30
-#
-RUN wget https://salsa.debian.org/jestabro-guest/live-build/commit/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch \
-      -O /tmp/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
-    git clone https://salsa.debian.org/live-team/live-build.git /tmp/live-build && \
-    cd /tmp/live-build && git checkout debian/1%20190311 && \
-    patch -p1 < /tmp/63425b3e4f7ad3712ced4c9a3584ef9851c0355a.patch && \
-    dch -n "Applying fix for missing archive keys" && \
-    dpkg-buildpackage -us -uc && \
-    sudo dpkg -i ../live-build*.deb
-
-#
 # live-build: building in docker fails with mounting /proc | /sys
 #
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919659
@@ -255,7 +240,7 @@ RUN apt-get update && apt-get install -y \
       bison \
       debhelper \
       flex \
-      iptables-dev \
+      libxtables-dev \
       libatm1-dev \
       libcap-dev \
       libdb-dev \
@@ -277,22 +262,13 @@ RUN apt-get update && apt-get install -y \
       libssh-dev \
       doxygen
 
-# Build rtrlib release 0.6.3
-RUN export RTRLIB_VERSION="0.6.3" && export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
+# Build rtrlib release 0.7.0
+RUN export RTRLIB_VERSION="0.7.0" && export ARCH=$(dpkg-architecture -qDEB_HOST_ARCH) && \
     wget -P /tmp https://github.com/rtrlib/rtrlib/archive/v${RTRLIB_VERSION}.tar.gz && \
     tar xf /tmp/v${RTRLIB_VERSION}.tar.gz -C /tmp && \
     cd /tmp/rtrlib-${RTRLIB_VERSION} && dpkg-buildpackage -uc -us -tc -b && \
     dpkg -i ../librtr0*_${ARCH}.deb ../librtr-dev*_${ARCH}.deb ../rtr-tools*_${ARCH}.deb
 
-# Upgrading to FRR 7.5 requires a more recent version of libyang which is only
-# available from Debian Bullseye
-RUN echo "deb http://deb.debian.org/debian/ bullseye main" \
-      > /etc/apt/sources.list.d/bullseye.list && \
-    apt-get update && apt-get install -y -t bullseye \
-      libyang-dev \
-      libyang1; \
-    rm -f /etc/apt/sources.list.d/bullseye.list
-
 # Packages needed to build FRR itself
 # https://github.com/FRRouting/frr/blob/master/doc/developer/building-libyang.rst
 # for more info
@@ -385,11 +361,12 @@ RUN apt-get update && apt-get install -y \
       dpkg-dev \
       flex \
       gperf \
-      iptables-dev \
+      libxtables-dev \
       libcap-dev \
       libcurl4-openssl-dev \
       libgcrypt20-dev \
       libgmp3-dev \
+      libiptc-dev \
       libkrb5-dev \
       libldap2-dev \
       libnm-dev \
@@ -434,8 +411,6 @@ RUN if dpkg-architecture -ii386 || dpkg-architecture -iamd64; then \
 
 # Packages needed for vyos-cloud-init
 RUN apt-get update && apt-get install -y \
-      pep8 \
-      pyflakes \
       python3-configobj \
       python3-httpretty \
       python3-jsonpatch \
@@ -501,21 +476,6 @@ RUN apt-get update && apt-get install -y \
       libnfnetlink-dev \
       libtool
 
-# Packages needed for conntrack-tools
-RUN apt-get update && apt-get install -y \
-      bison \
-      debhelper \
-      flex \
-      libmnl-dev \
-      libnetfilter-cthelper0-dev \
-      libnetfilter-cttimeout-dev \
-      libnetfilter-queue-dev \
-      libnfnetlink-dev \
-      libsystemd-dev \
-      autoconf \
-      automake \
-      libtool
-
 # Packages needed for wide-dhcpv6
 RUN apt-get update && apt-get install -y \
       bison \
diff --git a/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch b/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch
new file mode 100644
index 00000000..d1fb19e0
--- /dev/null
+++ b/packages/frr/patches/0001-Debian-fix-package-build-on-Bullseye-workaround.patch
@@ -0,0 +1,25 @@
+From c88011519aba9462bf9e464830fcee5b6f7bfc25 Mon Sep 17 00:00:00 2001
+From: Christian Poessinger <christian@poessinger.com>
+Date: Sat, 19 Jun 2021 13:38:56 +0000
+Subject: [PATCH] Debian: fix package build on Bullseye (workaround)
+
+This is the workaround mentioned in https://github.com/FRRouting/frr/issues/6502
+---
+ debian/frr-doc.install | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/frr-doc.install b/debian/frr-doc.install
+index c48dc5a8d..6cc87e9cb 100644
+--- a/debian/frr-doc.install
++++ b/debian/frr-doc.install
+@@ -3,7 +3,7 @@ usr/share/doc/frr/html
+
+ # info + images referenced by it
+ usr/share/info/
+-doc/user/_build/texinfo/*.png usr/share/info
++#doc/user/_build/texinfo/*.png usr/share/info
+
+ # other
+ README.md         usr/share/doc/frr
+--
+2.30.2
diff --git a/scripts/live-build-config b/scripts/live-build-config
index 467ef252..6a2a345d 100755
--- a/scripts/live-build-config
+++ b/scripts/live-build-config
@@ -42,7 +42,7 @@ lb config noauto \
         --bootloader syslinux,grub-efi \
         --binary-images iso-hybrid \
         --checksums 'sha256 md5' \
-        --debian-installer false \
+        --debian-installer none \
         --distribution {{distribution}} \
         --iso-application "VyOS" \
         --iso-publisher "{{build_by}}" \
@@ -56,9 +56,9 @@ lb config noauto \
         --archive-areas "main contrib non-free" \
         --firmware-chroot false \
         --firmware-binary false \
-        --updates true \
-        --security true \
-        --backports true \
+        --updates false \
+        --security false \
+        --backports false \
         --apt-recommends false \
         --apt-options "--yes -oAPT::Default-Release="current" -oAPT::Get::allow-downgrades=true" \
         --apt-indices false
diff --git a/scripts/make-version-file b/scripts/make-version-file
index e35dfd8b..04e27c44 100755
--- a/scripts/make-version-file
+++ b/scripts/make-version-file
@@ -105,7 +105,7 @@ PRETTY_NAME="VyOS {version} ({build_config['release_train']})"
 NAME="VyOS"
 VERSION_ID="{version}"
 VERSION="{version} ({build_config['release_train']})"
-VERSION_CODENAME=buster
+VERSION_CODENAME=bullseye
 ID=vyos
 HOME_URL="https://vyos.io"
 SUPPORT_URL="https://support.vyos.io"