From 48f6bc57cc593d7207fd132b9a919e011b5d9499 Mon Sep 17 00:00:00 2001 From: Minpyo Kim Date: Sat, 22 Jun 2024 23:43:23 +0900 Subject: [PATCH 1/6] URL for Nightly builds is updated Based on issue #1993, the build has been moved from Azure to Github. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 5cab02e2..2b224ece 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,7 @@ Also SoftEther VPN [Stable Edition](https://www.freshports.org/security/softethe ## For Windows -[Nightly builds](https://dev.azure.com/SoftEther-VPN/SoftEther%20VPN/_build?definitionId=6) +[Nightly builds](https://github.com/SoftEtherVPN/SoftEtherVPN/releases) (choose appropriate platform, then find binaries or installers as artifacts) ## From binary installers (stable channel) From 7ce9c088ff77a9b06110e64bdf95471539e0b63e Mon Sep 17 00:00:00 2001 From: Ilia Shipitsin Date: Wed, 3 Jul 2024 19:20:14 +0200 Subject: [PATCH 2/6] bump version for upcoming 5186 release --- CMakeLists.txt | 2 +- CMakeSettings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4d1d827..623f0c87 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.10) set(BUILD_NUMBER CACHE STRING "The number of the current build.") if ("${BUILD_NUMBER}" STREQUAL "") - set(BUILD_NUMBER "5185") + set(BUILD_NUMBER "5186") endif() if (BUILD_NUMBER LESS 5180) diff --git a/CMakeSettings.json b/CMakeSettings.json index b5d3b77e..9853e477 100644 --- a/CMakeSettings.json +++ b/CMakeSettings.json @@ -1,5 +1,5 @@ { - "environments": [ { "BuildNumber": "5185" } ], + "environments": [ { "BuildNumber": "5186" } ], "configurations": [ { "name": "x64-native", From 98a8d5249da911ff74300ba208fc4a4a62a356fd Mon Sep 17 00:00:00 2001 From: Ilia Shipitsin Date: Wed, 3 Jul 2024 23:21:44 +0200 Subject: [PATCH 3/6] CI: enable Fedora Rawgide on pull requests --- .github/workflows/fedora-rawhide.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml index bafcd2f7..59f9500e 100644 --- a/.github/workflows/fedora-rawhide.yml +++ b/.github/workflows/fedora-rawhide.yml @@ -4,6 +4,7 @@ on: schedule: - cron: "0 0 25 * *" push: + pull_request: workflow_dispatch: permissions: From 4370efcc90f0f63b8b2d153e42eab4d2923b1d41 Mon Sep 17 00:00:00 2001 From: siddharth-narayan Date: Thu, 4 Jul 2024 13:02:16 -0400 Subject: [PATCH 4/6] replace openssl-devel with openssl-devel-engine --- .github/workflows/fedora-rawhide.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/fedora-rawhide.yml b/.github/workflows/fedora-rawhide.yml index 59f9500e..66c7116b 100644 --- a/.github/workflows/fedora-rawhide.yml +++ b/.github/workflows/fedora-rawhide.yml @@ -25,7 +25,7 @@ jobs: submodules: true - name: Install dependencies run: | - dnf -y install git cmake ncurses-devel openssl-devel libsodium-devel readline-devel zlib-devel gcc-c++ clang + dnf -y install git cmake ncurses-devel openssl-devel-engine libsodium-devel readline-devel zlib-devel gcc-c++ clang - name: Compile with ${{ matrix.cc }} run: | export CC=${{ matrix.cc }} From 25585a1e3d05a3ba45210e8f9bdd7665939dfdef Mon Sep 17 00:00:00 2001 From: siddharth-narayan Date: Thu, 4 Jul 2024 13:05:30 -0400 Subject: [PATCH 5/6] Guard engine.h include --- src/Mayaqua/Encrypt.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Mayaqua/Encrypt.c b/src/Mayaqua/Encrypt.c index fab64387..ddb1efc7 100644 --- a/src/Mayaqua/Encrypt.c +++ b/src/Mayaqua/Encrypt.c @@ -20,7 +20,9 @@ #include #include #include +#ifndef OPENSSL_NO_ENGINE #include +#endif #include #include #include From b1bdc03cd76ca52f5b09e8240cb8808d1fe82f66 Mon Sep 17 00:00:00 2001 From: Ilia Shipitsin Date: Wed, 10 Jul 2024 21:34:31 +0200 Subject: [PATCH 6/6] adjust nightly/releases links --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2b224ece..4ae7578b 100644 --- a/README.md +++ b/README.md @@ -201,7 +201,9 @@ Also SoftEther VPN [Stable Edition](https://www.freshports.org/security/softethe ## For Windows -[Nightly builds](https://github.com/SoftEtherVPN/SoftEtherVPN/releases) +[Releases](https://github.com/SoftEtherVPN/SoftEtherVPN/releases) + +[Nightly builds](https://github.com/SoftEtherVPN/SoftEtherVPN/actions/workflows/windows.yml) (choose appropriate platform, then find binaries or installers as artifacts) ## From binary installers (stable channel)