From 7b1988d076585ffe0737cd8c95b6711d5bbb7603 Mon Sep 17 00:00:00 2001
From: Wolfgang <github@linux-dude.de>
Date: Sun, 30 Jun 2024 20:56:15 +0000
Subject: [PATCH] remove support for building proxmox backup on bullseye

---
 .github/workflows/buildtest.yml |  1 -
 .github/workflows/release.yml   | 15 +++------------
 Dockerfile                      |  2 +-
 PREBUILD.md                     |  2 +-
 build.sh                        | 13 ++-----------
 5 files changed, 7 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/buildtest.yml b/.github/workflows/buildtest.yml
index 0dc6764..3eec583 100644
--- a/.github/workflows/buildtest.yml
+++ b/.github/workflows/buildtest.yml
@@ -25,7 +25,6 @@ on:
         type: choice
         description: Base Image
         options:
-        - debian:bullseye-slim
         - debian:bookworm-slim
         - ubuntu:jammy
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d1eb9ed..c46dc83 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,13 +30,8 @@ jobs:
 
     - name: Build packages
       run: |
-        if [[ "${{ github.event.inputs.version }}" =~ ^3. ]] || [[ "${GITHUB_REF_NAME}" =~ ^3. ]]; then
-          baseimage="debian:bookworm-slim"
-          echo "DEB_DIST=Debian/Bookworm" >> $GITHUB_ENV
-        else
-          baseimage="debian:bullseye-slim"
-          echo "DEB_DIST=Debian/Bullseye" >> $GITHUB_ENV
-        fi
+        baseimage="debian:bookworm-slim"
+        echo "DEB_DIST=Debian/Bookworm" >> $GITHUB_ENV
         if [ "${RUNNER_DEBUG}" = "1" ]; then
           docker buildx build -o packages --build-arg buildoptions="cross github debug" --build-arg baseimage=${baseimage} --platform linux/amd64 -f .github/Dockerfile.crosscompile-arm64 .
         else
@@ -46,11 +41,7 @@ jobs:
         echo "DEB_VERSION_UPSTREAM=$(dpkg --info packages/proxmox-backup-server_*.deb | sed -n '/Version/ s/[^:]\+: \([0-9.]\+\)-[0-9]/\1/p')" >> $GITHUB_ENV
     - name: Test packages
       run: |
-        if [[ "${{ github.event.inputs.version }}" =~ ^3. ]] || [[ "${GITHUB_REF_NAME}" =~ ^3. ]]; then
-          baseimage="debian:bookworm-slim"
-        else
-          baseimage="debian:bullseye-slim"
-        fi
+        baseimage="debian:bookworm-slim"
         docker buildx build --build-arg baseimage=${baseimage} --platform linux/arm64 -f .github/Dockerfile.installtest .
     - name: Release packages
       uses: ncipollo/release-action@v1
diff --git a/Dockerfile b/Dockerfile
index 13f624b..51fc94f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-ARG baseimage=debian:bullseye-slim
+ARG baseimage=debian:bookworm-slim
 FROM ${baseimage} as builder-stage
 ARG buildoptions
 # workaround for memory bug https://github.com/rust-lang/cargo/issues/10583
diff --git a/PREBUILD.md b/PREBUILD.md
index 868471b..5a53f66 100644
--- a/PREBUILD.md
+++ b/PREBUILD.md
@@ -1,6 +1,6 @@
 _These are unofficial binary packages of Proxmox Backup Server 3.x for debian/bookworm._
 
-The proxmox-backup*,promox-mini-journalreader and pve-xtermjs packages are cross build using the source from https://git.proxmox.com/ with the build.sh script and the github action docker buildx workflow. The other arch independent packages were downloaded from http://download.proxmox.com/debian/pbs/dists/bullseye/pbs-no-subscription/binary-amd64/.
+The proxmox-backup*,promox-mini-journalreader and pve-xtermjs packages are cross build using the source from https://git.proxmox.com/ with the build.sh script and the github action docker buildx workflow. The other arch independent packages were downloaded from http://download.proxmox.com/debian/pbs/dists/bookworm/pbs-no-subscription/binary-amd64/.
 
 Use at your own risk.
 
diff --git a/build.sh b/build.sh
index c1dd68e..4cf5f0d 100755
--- a/build.sh
+++ b/build.sh
@@ -168,12 +168,6 @@ GITHUB_ACTION=""
 
 . /etc/os-release
 
-if [ "${VERSION_CODENAME}" = "bookworm" ]; then
-	DISTNAME="bookworm"
-else
-	DISTNAME="bullseye"
-fi
-
 [ ! -d "${PACKAGES}" ] && mkdir -p "${PACKAGES}"
 
 while [ "$#" -ge 1 ]
@@ -239,9 +233,9 @@ fi
 
 
 echo "Download packages list from proxmox devel repository"
-PACKAGES_DEVEL=$(load_packages http://download.proxmox.com/debian/devel/dists/${DISTNAME}/main/binary-amd64/Packages.gz)
+PACKAGES_DEVEL=$(load_packages http://download.proxmox.com/debian/devel/dists/bookworm/main/binary-amd64/Packages.gz)
 echo "Download packages list from pbs-no-subscription repository"
-PACKAGES_PBS=$(load_packages http://download.proxmox.com/debian/pbs/dists/${DISTNAME}/pbs-no-subscription/binary-amd64/Packages.gz)
+PACKAGES_PBS=$(load_packages http://download.proxmox.com/debian/pbs/dists/bookworm/pbs-no-subscription/binary-amd64/Packages.gz)
 
 
 echo "Download dependencies"
@@ -307,9 +301,6 @@ if [ ! -e "${PACKAGES}/proxmox-backup-${BUILD_PACKAGE}_${PROXMOX_BACKUP_VER}_${P
 	if [ "${BUILD_PACKAGE}" = "client" ]; then
 		patch -p1 -d proxmox-backup/ < "${PATCHES}/proxmox-backup-client.patch"
 	fi
-	if [ "${DISTNAME}" = "bullseye" ]; then
-		sed -i 's/libsgutils2-.*-2/libsgutils2-2/' proxmox-backup/debian/control
-	fi
 	if [ "${PACKAGE_ARCH}" = "arm64" ]; then
 		sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-file-restore.install
 		sed -i "s/x86_64-linux-gnu/aarch64-linux-gnu/" proxmox-backup/debian/proxmox-backup-file-restore.postinst