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

…erge-master

* 'release/2.6' of github.com:OpenVPN/openvpn-build:
  debian-sbuild: Adapt oracular packaging to our infrastructure
  debian-sbuild: Add Ubuntu 24.10 (oracular)
  GHA: Fix building Debian packages on Ubuntu 24.04 runner
  chore(deps): update github actions
  chore(deps): update src/vcpkg digest to 80d54ff
  chore(deps): update src/vcpkg digest to b545373
  chore(deps): update src/openvpn digest to 62d41de
  chore(deps): update github actions
  chore(deps): update src/openvpn-gui digest to 3ba02de
  chore(deps): update src/openvpn digest to 2776810
  chore(deps): update src/vcpkg digest to cd124b8

.github/workflows/build.yaml

@@ -35,7 +35,7 @@ jobs:
           vcpkgJsonGlob: '**/src/openvpn/contrib/vcpkg-manifests/windows/vcpkg.json'
 
       - name: Get latest CMake and ninja
-        uses: lukka/get-cmake@5979409e62bdf841487c5fb3c053149de97a86d3 # v3.31.2
+        uses: lukka/get-cmake@8567b9d9b63052b8430ef30042e13c3ba5288f16 # v3.31.3
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -85,7 +85,7 @@ jobs:
     name: Run t_client tests on AWS
     needs: msvc
     concurrency: aws_tclient_tests
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.repository == 'openvpn/openvpn-build' && github.event_name != 'pull_request' }}
     env:
       AWS_REGION : "eu-west-1"
@@ -135,7 +135,7 @@ jobs:
   upload_msis:
     needs: run_tclient_tests
     name: upload-msis
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.event_name != 'pull_request' && github.ref == 'refs/heads/master' && github.repository == 'openvpn/openvpn-build' }}
 
     steps:
@@ -171,7 +171,7 @@ jobs:
 
   debian:
     name: Build Debian packages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     env:
       CHROOT_CONF: chroots/chroot.d.tar
       OPENVPN_CURRENT_TAG: HEAD
@@ -189,7 +189,7 @@ jobs:
         run: |
           sudo apt-get update
           # for sbuild
-          sudo apt-get install -y sbuild git quilt debhelper dkms
+          sudo apt-get install -y sbuild git quilt debhelper dkms dh-dkms
           # for ./configure && make dist
           sudo apt-get install -y autoconf automake libcap-ng-dev libssl-dev python3-docutils
 
@@ -247,9 +247,12 @@ jobs:
         run: |
           scripts/prepare-all.sh
 
+      # includes work-around for https://github.com/actions/runner-images/issues/9932
+      # (sg and newgrp require password to run)
       - name: Build packages
         working-directory: debian-sbuild
         run: |
+          sudo gpasswd -r sbuild
           sg sbuild ./scripts/build-all.sh
 
       - name: Archive packages

debian-sbuild/config/variants.amd64.conf

@@ -3,3 +3,4 @@ debian bookworm amd64
 ubuntu focal amd64
 ubuntu jammy amd64
 ubuntu noble amd64
+ubuntu oracular amd64

debian-sbuild/config/variants.arm64.conf

@@ -3,3 +3,4 @@ debian bookworm arm64
 ubuntu focal arm64
 ubuntu jammy arm64
 ubuntu noble arm64
+ubuntu oracular arm64

debian-sbuild/openvpn-dco-dkms/oracular/debian/changelog

@@ -0,0 +1,99 @@
+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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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 <[email protected]>  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
+    - target experimental due to the freeze
+    - new ovpn-dco-v2 module to be used with OpenVPN 2.6.2+. Not adding a
+      versioned relationship to untangle testing migration, because it will
+      just not use the "wrong" version and run unaccelerated.
+  * d/dkms: rename module to ovpn-dco-v2
+
+ -- Bernhard Schmidt <[email protected]>  Sat, 25 Mar 2023 00:01:17 +0100
+
+openvpn-dco-dkms (0.0+git20230125-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20230125
+    - Fixes build with kernel version 6.2 (Closes: #1027799)
+
+ -- Bernhard Schmidt <[email protected]>  Wed, 25 Jan 2023 21:44:50 +0100
+
+openvpn-dco-dkms (0.0+git20221022-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20221022
+  * Fix build with kernel version > 5.19
+
+ -- Bernhard Schmidt <[email protected]>  Tue, 08 Nov 2022 21:33:46 +0100
+
+openvpn-dco-dkms (0.0+git20220816-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20220816
+  * Drop patch applied upstream
+
+ -- Bernhard Schmidt <[email protected]>  Thu, 18 Aug 2022 10:35:42 +0200
+
+openvpn-dco-dkms (0.0+git20220801-1) unstable; urgency=medium
+
+  [ Andreas Beckmann ]
+  * Switch to dh-sequence-dkms.
+  * Let dh_dkms perform the version substitution.
+  * Declare Testsuite: autopkgtest-pkg-dkms.
+
+  [ Bernhard Schmidt ]
+  * New upstream version 0.0+git20220801
+  * Add patch pending upstream to fix UDPv6 fragmentation
+
+ -- Bernhard Schmidt <[email protected]>  Tue, 09 Aug 2022 11:42:30 +0200
+
+openvpn-dco-dkms (0.0+git20220421-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20220421
+  * Bump Standards-Version to 4.6.0, no changes needed
+  * add Enhances: openvpn relationship
+
+ -- Bernhard Schmidt <[email protected]>  Tue, 10 May 2022 21:12:23 +0200
+
+openvpn-dco-dkms (0.0+git20220322-1) unstable; urgency=medium
+
+  * New upstream version 0.0+git20220322
+  * d/copyright: GPL-2.0-only WITH Linux-syscall-note for kernel header
+
+ -- Bernhard Schmidt <[email protected]>  Wed, 23 Mar 2022 10:26:43 +0100
+
+openvpn-dco-dkms (0.0+git20220320-1) unstable; urgency=medium
+
+  * Initial release (Closes: #1008044)
+
+ -- Bernhard Schmidt <[email protected]>  Sun, 20 Mar 2022 22:16:06 +0100

debian-sbuild/openvpn-dco-dkms/oracular/debian/control

@@ -0,0 +1,25 @@
+Source: openvpn-dco-dkms
+Section: net
+Priority: optional
+Maintainer: Bernhard Schmidt <[email protected]>
+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
+Vcs-Git: https://salsa.debian.org/debian/openvpn-dco-dkms.git
+Rules-Requires-Root: no
+Testsuite: autopkgtest-pkg-dkms
+
+Package: openvpn-dco-dkms
+Architecture: all
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Enhances: openvpn
+Description: DCO (Data-Channel Offload) kernel module for OpenVPN)
+ This kernel module allows OpenVPN to offload any data plane management to the
+ linux kernel, thus allowing it to exploit any Linux low level API, while
+ avoiding expensive and slow payload transfer between kernel space and user
+ space. You need a matching dco-enabled OpenVPN to use this, the feature is
+ supposed to land in OpenVPN 2.6.
+ .
+ This package uses DKMS to automatically build the ovpn-dco kernel module.

debian-sbuild/openvpn-dco-dkms/oracular/debian/copyright

@@ -0,0 +1,63 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: openvpn-dco-dkms
+Upstream-Contact: [email protected]
+Source: https://github.com/OpenVPN/ovpn-dco
+
+Files: *
+Copyright: 2012-2022 OpenVPN, Inc.
+License: GPL-2.0-only
+
+Files: include/uapi/linux/ovpn_dco.h
+Copyright: 2019-2021 OpenVPN, Inc.
+License: GPL-2.0-only WITH Linux-syscall-note exception
+
+Files: debian/*
+Copyright: 2022 Bernhard Schmidt <[email protected]>
+License: GPL-2.0-only
+
+License: GPL-2.0-only
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+License: GPL-2.0-only WITH Linux-syscall-note exception
+ NOTE! This copyright does *not* cover user programs that use kernel services
+ by normal system calls - this is merely considered normal use of the kernel,
+ and does *not* fall under the heading of "derived work". Also note that the
+ GPL below is copyrighted by the Free Software Foundation, but the instance of
+ code that it refers to (the Linux kernel) is copyrighted by me and others who
+ actually wrote it.
+ .
+ Also note that the only valid version of the GPL as far as the kernel is
+ concerned is _this_ particular version of the license (ie v2, not v2.2 or v3.x
+ or whatever), unless explicitly otherwise stated.
+ .
+ Linus Torvalds
+ .
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; version 2 of the License.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian and systems the full text of the GNU General Public
+ License version 2 can be found in the file
+ "/usr/share/common-licenses/GPL-2".

debian-sbuild/openvpn-dco-dkms/oracular/debian/dkms

@@ -0,0 +1,9 @@
+PACKAGE_NAME="ovpn-dco"
+PACKAGE_VERSION="#MODULE_VERSION#"
+AUTOINSTALL="yes"
+MAKE="make VER=${kernelver} KERNEL_SRC=${kernel_source_dir} REVISION=$PACKAGE_VERSION"
+CLEAN="make clean"
+BUILT_MODULE_NAME[0]="ovpn-dco-v2"
+BUILT_MODULE_LOCATION[0]="drivers/net/ovpn-dco"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ovpn-dco"
+

debian-sbuild/openvpn-dco-dkms/oracular/debian/rules

@@ -0,0 +1,26 @@
+#!/usr/bin/make -f
+# See debhelper(7) (uncomment to enable)
+# output every command that modifies files on the build system.
+#export DH_VERBOSE = 1
+
+include /usr/share/dpkg/pkg-info.mk
+export DEB_VERSION_UPSTREAM
+
+INSTALLDIR=debian/openvpn-dco-dkms/usr/src/ovpn-dco-${DEB_VERSION_UPSTREAM}
+
+%:
+	dh $@
+
+# Nothing to clean, configure, or build (this all happens after
+# installation using dkms)
+override_dh_auto_clean:
+override_dh_auto_configure:
+override_dh_auto_build:
+override_dh_auto_install:
+	mkdir -p ${INSTALLDIR}
+	for f in compat-include drivers include linux-compat.h Makefile gen-compat-autoconf.sh; do \
+		cp -a $$f ${INSTALLDIR}; \
+	done
+
+override_dh_dkms:
+	dh_dkms -V $(DEB_VERSION_UPSTREAM)

debian-sbuild/openvpn-dco-dkms/oracular/debian/salsa-ci.yml

@@ -0,0 +1,4 @@
+---
+include:
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
+  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml

debian-sbuild/openvpn-dco-dkms/oracular/debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)