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

…aster-merge

* 'release/2.6' of github.com:OpenVPN/openvpn-build:
  chore(deps): update src/openvpn-gui digest to 2a68580
  chore(deps): update src/vcpkg digest to 5c7d3a8
  chore(deps): update src/openvpn digest to 0234680
  chore(deps): update lukka/get-cmake action to v3.30.1
  chore(deps): update src/vcpkg digest to 821100d
  Prepare release of 2.6.12-I001
  chore(deps): update src/openvpn-gui digest to e7ad359
  chore(deps): update src/openvpn digest to 3435739
  chore(deps): update garygrossgarten/github-action-scp action to v0.9.0
  chore(deps): update src/openvpn-gui digest to f20062e
  chore(deps): update src/vcpkg digest to 1318ab1
  chore(deps): update src/ovpn-dco digest to d22d04e
  chore(deps): update src/vcpkg digest to 47bf3d1
  chore(deps): update github actions
  chore(deps): update github actions
  chore(deps): update src/vcpkg digest to c202ce4
  chore(deps): update src/openvpn digest to 3c43b01

.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@983956e4a5edce90f0dfcc38c1543077e668402b # v3.30.0
+        uses: lukka/get-cmake@34181361be075620f7c3871daa1cadb92d9a903e # v3.30.1
 
       - name: Install rst2html
         run: python -m pip install --upgrade pip docutils
@@ -156,7 +156,7 @@ jobs:
         run: knock -d 500 ${{ secrets.MSI_UPLOAD_REMOTE_HOST }} ${{ secrets.MSI_UPLOAD_REMOTE_KNOCK_SEQUENCE }} ; sleep 1
 
       - name: Copy MSI to remote
-        uses: garygrossgarten/github-action-scp@8a27854bb4f124a497a67316e83783efda770119 # v0.8.0
+        uses: garygrossgarten/github-action-scp@2d32ef6b45d73b9df04aac224c0839f70d5e39d6 # 0.9.0
         with:
           local: msi
           remote: ${{ secrets.MSI_UPLOAD_REMOTE_PATH }}

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

@@ -0,0 +1,5 @@
+openvpn-dco-dkms (0.2.20240712-debian0) stable; urgency=medium
+
+  * ovpn-dco: drop ending year from copyright lines (Antonio Quartulli, d22d04e)
+
+ -- Yuriy Darnobyt <yuriy.darnobyt@openvpn.net>  Fri, 12 Jul 2024 23:20:17 +0200

debian-sbuild/openvpn/changelog-2.6.12

@@ -0,0 +1,8 @@
+openvpn (2.6.12-debian0) stable; urgency=medium
+
+  * preparing release 2.6.12 (Gert Doering, 038a94ba)
+  * Allow trailing \r and \n in control channel message (Arne Schwabe, 34357399)
+  * configure: Try to detect LZO with pkg-config (Frank Lichtenheld, 3c43b016)
+  * Http-proxy: fix bug preventing proxy credentials caching (Gianmarco De Gregori, ad0c2c07)
+
+ -- Yuriy Darnobyt <yuriy.darnobyt@openvpn.net>  Wed, 17 Jul 2024 22:14:46 +0200

release/vars.example

@@ -25,22 +25,22 @@ WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E"
 MSI_BUILD_ONLY="NO"
 
 # Version numbers
-OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.10}"
+OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.11}"
 OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.7_git}"
 OPENVPN_CURRENT_TAG="${OPENVPN_CURRENT_TAG:-HEAD}"
 OPENVPN_PREVIOUS_TAG="refs/tags/v$OPENVPN_PREVIOUS_VERSION"
 
 OPENVPN_GUI_CURRENT_MAJ_VERSION=11
-OPENVPN_GUI_CURRENT_MIN_VERSION=49
+OPENVPN_GUI_CURRENT_MIN_VERSION=50
 OPENVPN_GUI_CURRENT_FULL_VERSION="$OPENVPN_GUI_CURRENT_MAJ_VERSION.$OPENVPN_GUI_CURRENT_MIN_VERSION.0.0"
 OPENVPN_GUI_BRANCH="master"
 
-OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20240612}"
-OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240619}"
+OPENVPN_DCO_PREVIOUS_VERSION="${OPENVPN_DCO_PREVIOUS_VERSION:-0.2.20240619}"
+OPENVPN_DCO_CURRENT_VERSION="${OPENVPN_DCO_CURRENT_VERSION:-0.2.20240712}"
 OPENVPN_DCO_CURRENT_TAG="${OPENVPN_DCO_CURRENT_TAG:-refs/tags/v$OPENVPN_DCO_CURRENT_VERSION}"
 OPENVPN_DCO_PREVIOUS_TAG="refs/tags/v$OPENVPN_DCO_PREVIOUS_VERSION"
 
-INSTALLER_BUILD=2
+INSTALLER_BUILD=1
 INSTALLER_VERSION="I"$(printf "%03d\n" $INSTALLER_BUILD)
 # Debian packaging scripts do not allow underscores (e.g "2.4_alpha2")
 DEBIAN_UPSTREAM_VERSION=`echo $OPENVPN_CURRENT_VERSION|sed s/"_"/"-"/g`