From 7cc1d537cc3930a407794d5e0cf7559d60132d95 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 26 Jun 2024 17:15:24 +0000 Subject: [PATCH 01/17] chore(deps): update src/openvpn digest to 3c43b01 --- src/openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn b/src/openvpn index ddf6bf6d..3c43b016 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit ddf6bf6d2a13583535c417532e96e8a8af77f977 +Subproject commit 3c43b016e9767df74909ea5644399e8872e38c97 From 1bb18b9150d3d03041be4bf231c09706b5e927e6 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Tue, 2 Jul 2024 19:15:59 +0000 Subject: [PATCH 02/17] chore(deps): update src/vcpkg digest to c202ce4 --- src/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg b/src/vcpkg index 1cdb5e0b..c202ce4d 160000 --- a/src/vcpkg +++ b/src/vcpkg @@ -1 +1 @@ -Subproject commit 1cdb5e0b24c303b41fcac0dce00baf21881f6da2 +Subproject commit c202ce4d469096bd6d46fe65de74a4737beee01b From f02e5da4af3dabfa20f6120bc2918a785b0d5868 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 3 Jul 2024 06:43:00 +0000 Subject: [PATCH 03/17] chore(deps): update github actions --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index cbbddb4c..686cab83 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout openvpn-build - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 submodules: true @@ -35,7 +35,7 @@ jobs: vcpkgJsonGlob: '**/src/openvpn/contrib/vcpkg-manifests/windows/vcpkg.json' - name: Get latest CMake and ninja - uses: lukka/get-cmake@18d87816d12dd87ec1449d47b9b3a587e0a1cc19 # v3.29.5 + uses: lukka/get-cmake@983956e4a5edce90f0dfcc38c1543077e668402b # v3.30.0 - name: Install rst2html run: python -m pip install --upgrade pip docutils @@ -99,7 +99,7 @@ jobs: aws-region: ${{ env.AWS_REGION }} - name: Clone openvpn-windows-test repo - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: repository: openvpn/openvpn-windows-test ref: master @@ -177,7 +177,7 @@ jobs: steps: - name: Checkout openvpn-build - uses: actions/checkout@a5ac7e51b41094c92402da3b24376905380afc29 # v4.1.6 + uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7 with: fetch-depth: 0 submodules: true From d2292f00cc0ceb563a8f83997ff347326264ac23 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 8 Jul 2024 02:23:22 +0000 Subject: [PATCH 04/17] chore(deps): update github actions --- .github/workflows/build.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 686cab83..b8c263f4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -76,7 +76,7 @@ jobs: echo "DATETIME=${dt}" >> $Env:GITHUB_ENV - name: Archive artifacts - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: openvpn-master-${{ env.DATETIME }}-${{ env.OPENVPN_COMMIT }}-${{ matrix.arch }} path: ${{ github.workspace }}\windows-msi\image\*-${{ matrix.arch }}.msi @@ -112,7 +112,7 @@ jobs: known_hosts: unnecessary - name: Get artifacts - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: path: msi @@ -125,7 +125,7 @@ jobs: .\Start-AWSTest.ps1 -SSH_KEY ~/.ssh/id_rsa -MSI_PATH $(Get-ChildItem ../msi/*-amd64/*.msi | select -ExpandProperty FullName) - name: Archive openvpn logs - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 if: ${{ always() }} with: name: t_client_openvpn_logs @@ -142,7 +142,7 @@ jobs: run: sudo apt install knockd - name: Get artifacts - uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7 + uses: actions/download-artifact@fa0a91b85d4f404e444e00e005971372dc801d16 # v4.1.8 with: path: msi @@ -250,7 +250,7 @@ jobs: sg sbuild ./scripts/build-all.sh - name: Archive packages - uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4.3.3 + uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4.3.4 with: name: openvpn-debian path: | From c3cfea9b94d2354108040b0b3c2a69da1f1a2bab Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 8 Jul 2024 15:19:26 +0000 Subject: [PATCH 05/17] chore(deps): update src/vcpkg digest to 47bf3d1 --- src/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg b/src/vcpkg index c202ce4d..47bf3d1a 160000 --- a/src/vcpkg +++ b/src/vcpkg @@ -1 +1 @@ -Subproject commit c202ce4d469096bd6d46fe65de74a4737beee01b +Subproject commit 47bf3d1ac192b3fa0feb6e6ac9c845de179eebe9 From 44c4c0e674f5d6aad82b9cdff0ba9873edf0c077 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Fri, 12 Jul 2024 21:37:21 +0000 Subject: [PATCH 06/17] chore(deps): update src/ovpn-dco digest to d22d04e --- src/ovpn-dco | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ovpn-dco b/src/ovpn-dco index 4a58dbe0..d22d04e4 160000 --- a/src/ovpn-dco +++ b/src/ovpn-dco @@ -1 +1 @@ -Subproject commit 4a58dbe09278f76bfef9e6f20638a53345fca9cd +Subproject commit d22d04e4cea22ff0dd5ae375a92de20ddd6317d4 From 11a813e0f83a360e568b1037980b102bb985d4ff Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Tue, 16 Jul 2024 23:39:42 +0000 Subject: [PATCH 07/17] chore(deps): update src/vcpkg digest to 1318ab1 --- src/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg b/src/vcpkg index 47bf3d1a..1318ab14 160000 --- a/src/vcpkg +++ b/src/vcpkg @@ -1 +1 @@ -Subproject commit 47bf3d1ac192b3fa0feb6e6ac9c845de179eebe9 +Subproject commit 1318ab14aae14db20085441cd71366891a9c9d0c From 225ee23c4b0753db518d27e2971714f46591cce2 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 15 Jul 2024 17:16:17 +0000 Subject: [PATCH 08/17] chore(deps): update src/openvpn-gui digest to f20062e --- src/openvpn-gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn-gui b/src/openvpn-gui index 67940974..f20062ed 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit 6794097462efd78bb41c7a18d0cc63a4c9044292 +Subproject commit f20062edd5e4d435ac966a1eed913e63c98df1b3 From 0ecf781412081f4bccfeb6af572587813622de2f Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 15 Jul 2024 02:28:10 +0000 Subject: [PATCH 09/17] chore(deps): update garygrossgarten/github-action-scp action to v0.9.0 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index b8c263f4..8ebe2bd2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 }} From f912e8275a5d9c624434332d581a403f1d41948b Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 17 Jul 2024 20:19:39 +0000 Subject: [PATCH 10/17] chore(deps): update src/openvpn digest to 3435739 --- src/openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn b/src/openvpn index 3c43b016..34357399 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 3c43b016e9767df74909ea5644399e8872e38c97 +Subproject commit 343573990135023d855d151fcd9248e5c26d9f8b From 4d1bfdd9e9ee1b80e0fe0c3677db54d51c9018f8 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 17 Jul 2024 21:17:18 +0000 Subject: [PATCH 11/17] chore(deps): update src/openvpn-gui digest to e7ad359 --- src/openvpn-gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn-gui b/src/openvpn-gui index f20062ed..e7ad3595 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit f20062edd5e4d435ac966a1eed913e63c98df1b3 +Subproject commit e7ad359568f2d5b4b0d4411abc0f83c081801213 From 8c09e26efc3d9c7a2ecacae544008213b6921586 Mon Sep 17 00:00:00 2001 From: Yuriy Darnobyt Date: Thu, 18 Jul 2024 11:48:52 +0300 Subject: [PATCH 12/17] Prepare release of 2.6.12-I001 Signed-off-by: Yuriy Darnobyt --- .../openvpn-dco-dkms/changelog-0.2.20240712 | 5 +++++ debian-sbuild/openvpn/changelog-2.6.12 | 8 ++++++++ release/vars.example | 14 +++++++------- src/openvpn | 2 +- src/openvpn-gui | 2 +- windows-msi/version.m4 | 6 +++--- 6 files changed, 25 insertions(+), 12 deletions(-) create mode 100644 debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240712 create mode 100644 debian-sbuild/openvpn/changelog-2.6.12 diff --git a/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240712 b/debian-sbuild/openvpn-dco-dkms/changelog-0.2.20240712 new file mode 100644 index 00000000..d72af4b3 --- /dev/null +++ b/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 Fri, 12 Jul 2024 23:20:17 +0200 diff --git a/debian-sbuild/openvpn/changelog-2.6.12 b/debian-sbuild/openvpn/changelog-2.6.12 new file mode 100644 index 00000000..80a7529b --- /dev/null +++ b/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 Wed, 17 Jul 2024 22:14:46 +0200 diff --git a/release/vars.example b/release/vars.example index 9b922396..dc12cfad 100644 --- a/release/vars.example +++ b/release/vars.example @@ -22,25 +22,25 @@ WINDOWS_SIGNING_KEY_FP="31DA19926259519C9EA312C71935B13C33FC6E7E" # It does not require to tag and push OpenVPN sources again # It also does not require to re-build linux packages # With MSI_BUILD_ONLY="YES" we can skip all that steps -MSI_BUILD_ONLY="YES" +MSI_BUILD_ONLY="NO" # Version numbers -OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.10}" -OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.11}" +OPENVPN_PREVIOUS_VERSION="${OPENVPN_PREVIOUS_VERSION:-2.6.11}" +OPENVPN_CURRENT_VERSION="${OPENVPN_CURRENT_VERSION:-2.6.12}" OPENVPN_CURRENT_TAG="${OPENVPN_CURRENT_TAG:-refs/tags/v$OPENVPN_CURRENT_VERSION}" 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` diff --git a/src/openvpn b/src/openvpn index 34357399..038a94ba 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 343573990135023d855d151fcd9248e5c26d9f8b +Subproject commit 038a94bae57a446cc74be9c8386ee475246836f1 diff --git a/src/openvpn-gui b/src/openvpn-gui index e7ad3595..5d9c4662 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit e7ad359568f2d5b4b0d4411abc0f83c081801213 +Subproject commit 5d9c4662d87fb8a564a514a7c20c05266beabbc0 diff --git a/windows-msi/version.m4 b/windows-msi/version.m4 index d7a38ae1..d617d576 100644 --- a/windows-msi/version.m4 +++ b/windows-msi/version.m4 @@ -41,15 +41,15 @@ define([PRODUCT_NAME], [OpenVPN]) define([PRODUCT_PUBLISHER], [OpenVPN, Inc.]) dnl The package version as displayed by UI and used in filenames (no spaces, please). -define([PACKAGE_VERSION], [2.6.11-I002]) +define([PACKAGE_VERSION], [2.6.12-I001]) dnl The MSI product version in the form of n[.n[.n]] (numbers only). dnl The third field is 100*openvpn bugfix release + MSI build number. dnl So for the 2nd MSI build for OpenVPN 2.6.3 use 2.6.302 -define([PRODUCT_VERSION], [2.6.1102]) +define([PRODUCT_VERSION], [2.6.1201]) dnl The MSI product code MUST change on each product release. -define([PRODUCT_CODE], [{36ABBEF7-01F9-4A05-BC1C-929F2E391C20}]) +define([PRODUCT_CODE], [{68900C00-D1AC-4940-B63A-CABA2BF18B17}]) dnl The MSI upgrade codes MUST persist for all versions of the same product line. dnl Please use own upgrade codes when deploying a non-official OpenVPN release. From a1f89751cd12a3dd47fc8e1374635ebf0b09d584 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 22 Jul 2024 01:20:09 +0000 Subject: [PATCH 13/17] chore(deps): update src/vcpkg digest to 821100d --- src/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg b/src/vcpkg index 1318ab14..821100d9 160000 --- a/src/vcpkg +++ b/src/vcpkg @@ -1 +1 @@ -Subproject commit 1318ab14aae14db20085441cd71366891a9c9d0c +Subproject commit 821100d967e1737d96414a308e3f7cbe0d1abf18 From 9cc71619390fa8411b0d61c162111fe2f61af200 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 22 Jul 2024 02:27:40 +0000 Subject: [PATCH 14/17] chore(deps): update lukka/get-cmake action to v3.30.1 --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 8ebe2bd2..e4487a5f 100644 --- a/.github/workflows/build.yaml +++ b/.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 From 1cc764f0003a3bb59598ccb9a5c24741daeb6067 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Mon, 22 Jul 2024 13:38:24 +0000 Subject: [PATCH 15/17] chore(deps): update src/openvpn digest to 0234680 --- src/openvpn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn b/src/openvpn index 038a94ba..02346806 160000 --- a/src/openvpn +++ b/src/openvpn @@ -1 +1 @@ -Subproject commit 038a94bae57a446cc74be9c8386ee475246836f1 +Subproject commit 02346806adafd3c656f018a7a1b3fb2c585a1cea From d34161ce64f0e405f144fdc2e7abb06a1ede9996 Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Wed, 31 Jul 2024 19:37:52 +0000 Subject: [PATCH 16/17] chore(deps): update src/vcpkg digest to 5c7d3a8 --- src/vcpkg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vcpkg b/src/vcpkg index 821100d9..5c7d3a87 160000 --- a/src/vcpkg +++ b/src/vcpkg @@ -1 +1 @@ -Subproject commit 821100d967e1737d96414a308e3f7cbe0d1abf18 +Subproject commit 5c7d3a872dd861817fc812647176d5076085a7eb From b86989e5b1a87e7267e1b0bbdf90515458571f4c Mon Sep 17 00:00:00 2001 From: OpenVPN Renovate Date: Tue, 23 Jul 2024 14:16:44 +0000 Subject: [PATCH 17/17] chore(deps): update src/openvpn-gui digest to 2a68580 --- src/openvpn-gui | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/openvpn-gui b/src/openvpn-gui index 5d9c4662..2a68580d 160000 --- a/src/openvpn-gui +++ b/src/openvpn-gui @@ -1 +1 @@ -Subproject commit 5d9c4662d87fb8a564a514a7c20c05266beabbc0 +Subproject commit 2a68580dd9ad10b6d9361ef20a658187d1dec4ab