Merge branch 'release/2.6' of github.com:OpenVPN/openvpn-build into merge-2.6

* 'release/2.6' of github.com:OpenVPN/openvpn-build:
  debian-sbuild: Adapt Plucky package to our infrastructure
  debian-sbuild: Add Ubuntu 25.04 (plucky)
  chore(deps): update src/openvpn-gui digest to d31c391
  chore(deps): update src/vcpkg digest to bc3512a
  chore(deps): update github actions
  chore(deps): update src/vcpkg digest to d5182f7
  debian-sbuild: Remove support for Ubuntu 20.04
  chore(deps): update lukka/get-cmake action to v4
  chore(deps): update src/openvpn-gui digest to 3e4adfa
  chore(deps): update src/openvpn digest to 3d25fbe
  chore(deps): update src/vcpkg digest to f9a99aa

Author: flichtenheld

.github/workflows/build.yaml

@@ -40,7 +40,7 @@ jobs:
           vcpkgJsonGlob: '**/src/openvpn/contrib/vcpkg-manifests/windows/vcpkg.json'
 
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@28983e0d3955dba2bb0a6810caae0c6cf268ec0c # v4.0.0
+        uses: lukka/get-cmake@57c20a23a6cac5b90f31864439996e5b206df9dc # v4.0.1
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -49,7 +49,7 @@ jobs:
         uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
 
       - name: Set up Java
-        uses: actions/setup-java@3a4f6e1af504cf6a31855fa899c6aa5355ba6c12 # v4.7.0
+        uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4.7.1
         if: ${{ env.SigningKeyStore != '' }}
         with:
           java-version: 17

debian-sbuild/config/variants.amd64.conf

@@ -1,6 +1,5 @@
 debian bullseye amd64
 debian bookworm amd64
-ubuntu focal amd64
 ubuntu jammy amd64
 ubuntu noble amd64
-ubuntu oracular amd64
+ubuntu plucky amd64

debian-sbuild/config/variants.arm64.conf

@@ -1,6 +1,5 @@
 debian bullseye arm64
 debian bookworm arm64
-ubuntu focal arm64
 ubuntu jammy arm64
 ubuntu noble arm64
-ubuntu oracular arm64
+ubuntu plucky arm64

debian-sbuild/openvpn-dco-dkms/focal/debian/compat

@@ -1,3 +1,44 @@
+openvpn-dco-dkms (0.0+git20241121-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20241121
+    - fixes build errors with Linux 6.12+ (Closes: #1089502)
+
+ -- Bernhard Schmidt <berni@debian.org>  Sun, 08 Dec 2024 14:37:32 +0100
+
+openvpn-dco-dkms (0.0+git20240712-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20240712
+    - fixes build errors with Linux 6.10+ (Closes: #1077838)
+
+ -- Bernhard Schmidt <berni@debian.org>  Mon, 19 Aug 2024 23:16:18 +0200
+
+openvpn-dco-dkms (0.0+git20231103-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20231103
+    - fixes refcount imbalance ("waiting for tunxxx to become free") seen
+      on heavy loaded TCP servers
+
+ -- Bernhard Schmidt <berni@debian.org>  Sat, 11 Nov 2023 22:20:21 +0100
+
+openvpn-dco-dkms (0.0+git20230816-2) unstable; urgency=medium
+
+  * Install compat-include directory (Closes: #1050211)
+
+ -- Bernhard Schmidt <berni@debian.org>  Tue, 22 Aug 2023 18:00:24 +0200
+
+openvpn-dco-dkms (0.0+git20230816-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20230816
+    - fix build error on kernel 6.5+ (Closes: #1043116)
+
+ -- Bernhard Schmidt <berni@debian.org>  Mon, 21 Aug 2023 22:51:04 +0200
+
+openvpn-dco-dkms (0.0+git20230324-1) unstable; urgency=medium
+
+  * Release to unstable targetting bookworm.
+
+ -- Bernhard Schmidt <berni@debian.org>  Thu, 13 Apr 2023 09:47:41 +0200
+
 openvpn-dco-dkms (0.0+git20230324-1~exp1) experimental; urgency=medium
 
   * New upstream version 0.0+git20230324

…/openvpn-dco-dkms/focal/debian/changelog …openvpn-dco-dkms/plucky/debian/changelogdebian-sbuild/openvpn-dco-dkms/focal/debian/changelog renamed to debian-sbuild/openvpn-dco-dkms/plucky/debian/changelog debian-sbuild/openvpn-dco-dkms/focal/debian/changelog renamed to debian-sbuild/openvpn-dco-dkms/plucky/debian/changelog

@@ -2,7 +2,8 @@ Source: openvpn-dco-dkms
 Section: net
 Priority: optional
 Maintainer: Bernhard Schmidt <berni@debian.org>
-Build-Depends: debhelper (>= 12), dkms,
+Build-Depends: debhelper-compat (= 13),
+	dh-sequence-dkms,
 Standards-Version: 4.6.0
 Homepage: https://github.com/OpenVPN/ovpn-dco
 Vcs-Browser: https://salsa.debian.org/debian/openvpn-dco-dkms

…ld/openvpn-dco-dkms/focal/debian/control …d/openvpn-dco-dkms/plucky/debian/controldebian-sbuild/openvpn-dco-dkms/focal/debian/control renamed to debian-sbuild/openvpn-dco-dkms/plucky/debian/control debian-sbuild/openvpn-dco-dkms/focal/debian/control renamed to debian-sbuild/openvpn-dco-dkms/plucky/debian/control

@@ -9,7 +9,7 @@ export DEB_VERSION_UPSTREAM
 INSTALLDIR=debian/openvpn-dco-dkms/usr/src/ovpn-dco-${DEB_VERSION_UPSTREAM}
 
 %:
-	dh $@ --with dkms
+	dh $@
 
 # Nothing to clean, configure, or build (this all happens after
 # installation using dkms)