Merge branch 'SoftEtherVPN:master' into master

Merge pull request #2019 from LinearAlpha/patch-1
URL for Nightly builds for windows is updated
2024-11-22 01:19:52 +03:00 · 2024-07-15 11:05:43 +03:00 · 2024-07-10 21:43:09 +02:00 · 2024-07-10 21:34:31 +02:00 · 2024-07-04 19:26:11 +02:00 · 2024-07-04 13:05:30 -04:00
5 changed files with 9 additions and 4 deletions
--- 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:
@ -24,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 }}
--- 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)
--- a/CMakeSettings.json
+++ b/CMakeSettings.json
@ -1,5 +1,5 @@
 {
-  "environments": [ { "BuildNumber": "5185" } ],
+  "environments": [ { "BuildNumber": "5186" } ],
  "configurations": [
    {
      "name": "x64-native",
--- 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://dev.azure.com/SoftEther-VPN/SoftEther%20VPN/_build?definitionId=6)
+[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)
--- a/src/Mayaqua/Encrypt.c
+++ b/src/Mayaqua/Encrypt.c
@ -20,7 +20,9 @@
 #include <openssl/ssl.h>
 #include <openssl/err.h>
 #include <openssl/rand.h>
+#ifndef OPENSSL_NO_ENGINE
 #include <openssl/engine.h>
+#endif
 #include <openssl/bio.h>
 #include <openssl/x509.h>
 #include <openssl/pkcs7.h>
Author	SHA1	Message	Date
AMajor-C	882269e4db	Merge branch 'SoftEtherVPN:master' into master	2024-07-15 11:05:43 +03:00
Ilya Shipitsin	4e8f797036	Merge pull request #2019 from LinearAlpha/patch-1 URL for Nightly builds for windows is updated	2024-07-10 21:43:09 +02:00
Ilia Shipitsin	b1bdc03cd7	adjust nightly/releases links	2024-07-10 21:34:31 +02:00
Ilya Shipitsin	c76f11a523	Merge pull request #2026 from siddharth-narayan/fedora-fix-engine Fix openssl engine support on Fedora Rawhide	2024-07-04 19:26:11 +02:00
siddharth-narayan	25585a1e3d	Guard engine.h include	2024-07-04 13:05:30 -04:00
siddharth-narayan	4370efcc90	replace openssl-devel with openssl-devel-engine	2024-07-04 13:02:16 -04:00
Ilya Shipitsin	b8fbb3e3d8	Merge pull request #2025 from chipitsine/fedora_pull_request CI: enable Fedora Rawgide on pull requests	2024-07-03 23:43:19 +02:00
Ilia Shipitsin	98a8d5249d	CI: enable Fedora Rawgide on pull requests	2024-07-03 23:21:44 +02:00
Ilya Shipitsin	dd2a53e049	Merge pull request #2024 from chipitsine/master bump version for upcoming 5186 release	2024-07-03 21:16:01 +02:00
Ilia Shipitsin	7ce9c088ff	bump version for upcoming 5186 release	2024-07-03 19:20:14 +02:00
Minpyo Kim	48f6bc57cc	URL for Nightly builds is updated Based on issue #1993, the build has been moved from Azure to Github.	2024-06-22 23:43:23 +09:00