Update containerd version from 1.7.28 to 1.7.30

.github/workflows/build.yml

@@ -9,10 +9,4 @@ jobs:
     with:
       release: ${{ github.ref == 'refs/heads/main' }}
       build_dep: |
-        gardenlinux/package-golang 1.24.4-1gl0+bp1592
-        gardenlinux/bp-package-golang-golang-x-net-dev 0.27.0-2gl2+bp1592
-        gardenlinux/bp-package-golang-net 0.33.0-1gl1+bp1592
-        gardenlinux/bp-package-golang-x-crypto 0.36.0-1+exp1gl2+bp1592
-        gardenlinux/bp-package-golang-golang-x-sys-dev 0.22.0-1gl1+bp1592
-        gardenlinux/bp-package-golang-golang-x-term-dev 0.22.0-1gl1+bp1592
-        gardenlinux/bp-package-golang-golang-x-text-dev 0.16.0-1gl1+bp1592
+        gardenlinux/package-golang 1.24.9-1gl0+bp1592

patches/debian.patch

@@ -1,11 +1,12 @@
 diff --git a/debian/control b/debian/control
-index 9e0e4a3da..9f2fa3284 100644
+index 18a56565c..0d1f34c7c 100644
 --- a/debian/control
 +++ b/debian/control
-@@ -10,71 +10,7 @@ Build-Depends: debhelper-compat (= 13),
+@@ -9,72 +9,8 @@ Uploaders: Tianon Gravi <tianon@debian.org>,
+ Build-Depends: debhelper-compat (= 13),
                 dh-golang,
                 go-md2man,
-                golang-any,
+-               golang-any,
 -               golang-github-blang-semver-dev,
 -               golang-github-container-orchestrated-devices-container-device-interface-dev (>= 0.8.0~),
 -               golang-github-containerd-btrfs-dev (>= 2),
@@ -54,6 +55,7 @@ index 9e0e4a3da..9f2fa3284 100644
 -               golang-github-sirupsen-logrus-dev,
 -               golang-github-spf13-pflag-dev,
 -               golang-github-tchap-go-patricia-dev,
++               golang-1.24-go,
                 golang-github-urfave-cli-dev (>= 1.22.2-4~),
 -               golang-github-vishvananda-netlink-dev,
 -               golang-go-zfs-dev,
@@ -71,11 +73,11 @@ index 9e0e4a3da..9f2fa3284 100644
 -               golang-k8s-utils-dev,
 -               golang-opentelemetry-otel-dev (>> 1.31),
 -               golang-tags.cncf-container-device-interface-dev
- Standards-Version: 4.6.2
- Rules-Requires-Root: no
+ Standards-Version: 4.7.2
  Homepage: https://containerd.io/
+ Vcs-Git: https://salsa.debian.org/go-team/packages/containerd.git
 diff --git a/debian/rules b/debian/rules
-index 6ed2d9483..c07502763 100755
+index 6bc612c7a..d01d5dff5 100755
 --- a/debian/rules
 +++ b/debian/rules
 @@ -17,6 +17,7 @@ EXTRA_EXCLUDES += vendor
@@ -86,6 +88,16 @@ index 6ed2d9483..c07502763 100755
 
  %:
  	dh $@ --buildsystem=golang --with=golang --builddirectory=_build
+@@ -48,9 +49,4 @@ endif
+ override_dh_auto_install:
+ 	DH_GOLANG_EXCLUDES="$(EXCLUDES) $(EXTRA_EXCLUDES)" dh_auto_install
+
+-execute_after_dh_install-indep:
+-	# now move the gprc api definitions to its own package
+-	mkdir -pv debian/golang-github-containerd-containerd-api-dev/usr/share/gocode/src/github.com/containerd/containerd/
+-	mv -v debian/golang-github-containerd-containerd-dev/usr/share/gocode/src/github.com/containerd/containerd/api \
+-	          debian/golang-github-containerd-containerd-api-dev/usr/share/gocode/src/github.com/containerd/containerd/
+
 diff --git a/debian/copyright b/debian/copyright
 index 6348f3854..658fe78a0 100644
 --- a/debian/copyright

prepare_binary

@@ -0,0 +1,2 @@
+update-alternatives --install /usr/bin/go go /usr/lib/go-1.24/bin/go 50
+update-alternatives --install /usr/bin/gofmt gofmt /usr/lib/go-1.24/bin/gofmt 50

prepare_source

@@ -1,11 +1,11 @@
-git_src --branch v1.7.28 https://github.com/containerd/containerd
+git_src --branch v1.7.30 https://github.com/containerd/containerd
 
 # debian specific things
 crd=$(mktemp -d)      
 git clone https://salsa.debian.org/go-team/packages/containerd.git $crd
 pushd $crd
-#git checkout debian/1.7.24_ds1-6
-git checkout 7d9c32230c3fef2e3e12a8c689244d9799580e66
+#git checkout debian/1.7.24_ds1-10
+git checkout 5e72d13e5ef9facd3f8398b4bbc29c188f285569
 cp -r debian "$dir/src/"
 popd
 rm -rf "$crd"
@@ -17,8 +17,8 @@ apply_patches
 cp -r upstream_patches/remove-limitnofile.patch "$dir/src/debian/patches/"
 echo remove-limitnofile.patch >> "$dir/src/debian/patches/series"
 
-version="1.7.28-0"
-message="Update to 1.7.28-0"
+version="1.7.30-0"
+message="Update to 1.7.30-0"
 
 
 version_suffix=gl0~bp1592