Merge pull request #8985 from ThomasWaldmann/vagrant-debian-testing-1.4

Vagrant: debian testing/trixie box (1.4-maint)

Author: ThomasWaldmann

Vagrantfile

@@ -300,6 +300,22 @@ Vagrant.configure(2) do |config|
     b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("jammy", ".*none.*")
   end
 
+  config.vm.define "trixie" do |b|
+    b.vm.box = "debian/testing64"
+    b.vm.provider :virtualbox do |v|
+      v.memory = 1024 + $wmem
+    end
+    b.vm.provision "fs init", :type => :shell, :inline => fs_init("vagrant")
+    b.vm.provision "packages debianoid", :type => :shell, :inline => packages_debianoid("vagrant")
+    b.vm.provision "install pyenv", :type => :shell, :privileged => false, :inline => install_pyenv("trixie")
+    b.vm.provision "install pythons", :type => :shell, :privileged => false, :inline => install_pythons("trixie")
+    b.vm.provision "build env", :type => :shell, :privileged => false, :inline => build_pyenv_venv("trixie")
+    b.vm.provision "install borg", :type => :shell, :privileged => false, :inline => install_borg("llfuse")
+    b.vm.provision "install pyinstaller", :type => :shell, :privileged => false, :inline => install_pyinstaller()
+    b.vm.provision "build binary with pyinstaller", :type => :shell, :privileged => false, :inline => build_binary_with_pyinstaller("trixie")
+    b.vm.provision "run tests", :type => :shell, :privileged => false, :inline => run_tests("trixie", ".*none.*")
+  end
+
   config.vm.define "bookworm" do |b|
     b.vm.box = "debian/bookworm64"
     b.vm.provider :virtualbox do |v|

docs/binaries/00_README.txt

@@ -11,6 +11,7 @@ Download the correct files
 amd64 / x86_64 architecture
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
+borg-linux-glibc241 Linux (built on Debian 13 "Trixie" with glibc 2.41)
 borg-linux-glibc236 Linux (built on Debian 12 "Bookworm" with glibc 2.36)
 borg-linux-glibc231 Linux (built on Debian 11 "Bullseye" with glibc 2.31)
 borg-linux-glibc228 Linux (built on Debian 10 "Buster" with glibc 2.28)

scripts/borg.exe.spec

@@ -12,7 +12,7 @@ basepath = os.path.abspath(os.path.join(here, '..'))
 if is_win32:
     hiddenimports = []
 else:
-    hiddenimports = ['borg.platform.posix', 'pkg_resources.py2_warn', ]
+    hiddenimports = ['borg.platform.posix', ]
 
 block_cipher = None
 
@@ -27,6 +27,7 @@ a = Analysis([os.path.join(basepath, 'src', 'borg', '__main__.py'), ],
              runtime_hooks=[],
              excludes=[
                 '_ssl', 'ssl',
+                'pkg_resources',  # avoid pkg_resources related warnings
              ],
              win_no_prefer_redirects=False,
              win_private_assemblies=False,

scripts/fetch-binaries

@@ -15,6 +15,7 @@ check_and_copy () {
 check_and_copy buster    borg-linux-glibc228
 check_and_copy bullseye  borg-linux-glibc231
 check_and_copy bookworm  borg-linux-glibc236
+check_and_copy trixie    borg-linux-glibc241
 
 check_and_copy freebsd13 borg-freebsd13
 check_and_copy freebsd14 borg-freebsd14