From 38bf714742ec7dbd7bbb055f39655a888d3daa6a Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 20:30:37 +0000
Subject: [PATCH 1/6] Updated appveyor cfg

---
 .appveyor.yml              | 24 +++++++++++++-----------
 ci/appveyor/build_ssh2.bat |  4 ++--
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 1dfa5981..a943cf54 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -61,22 +61,24 @@ install:
   # specific code.
   # Fix version used by versioneer to current git tag so the generated .c files
   # do not cause a version change.
-  - "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
-  - mv -f .git .git.bak
-  - 7z x ci\appveyor\zlib1211.zip
+  # -
+#  - "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
+#  - mv -f .git .git.bak
+#  - 7z x ci\appveyor\zlib1211.zip
 
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\
-  - ci\\appveyor\\build_zlib.bat
-  - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
-  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
-  - ci\\appveyor\\build_ssh2.bat
-  - for %%I in (%PYTHONVERS%) do cp build_dir/src/libssh2.lib %%I/libs/ || cp build_dir/src/Release/libssh2.lib %%I/libs/
-  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
-  - rm -f ssh2/*.c
+  - dir %OPENSSL_DIR%\lib\VC\
+#  - ci\\appveyor\\build_zlib.bat
+#  - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
+#  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
+#  - ci\\appveyor\\build_ssh2.bat
+#  - for %%I in (%PYTHONVERS%) do cp build_dir/src/Release/libssh2.lib %%I/libs/
+#  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
+#  - rm -f ssh2/*.c
 
 test_script:
-  - ci\\appveyor\\build_package.bat
+#  - ci\\appveyor\\build_package.bat
 
 artifacts:
   - path: "*.whl"
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index 79490c2e..aff74050 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -16,8 +16,8 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
        -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
 )
 
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto*.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl*.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto64MD.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl64MD.lib %APPVEYOR_BUILD_FOLDER%
 
 dir %APPVEYOR_BUILD_FOLDER%\
 

From 7050b739ac2bd8a7e0c3088ad5cbef3816185f24 Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 20:40:37 +0000
Subject: [PATCH 2/6] Updated appveyor cfg

---
 .appveyor.yml                 | 28 +++++++++++++++-------------
 ci/appveyor/build_package.bat |  2 --
 ci/appveyor/fix_version.py    |  4 +++-
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index a943cf54..0ceaf797 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -32,7 +32,8 @@ environment:
     PYTHON_DEF: "C:\\Python38-x64"
     PYTHON_VERSION: "3.8"
     # Python versions to build wheels for
-    PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
+    PYTHONVERS: C:\Python310-x64
+    # PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
     PYTHON_ARCH: "64"
     MSVC: "Visual Studio 16 2019"
 
@@ -61,24 +62,25 @@ install:
   # specific code.
   # Fix version used by versioneer to current git tag so the generated .c files
   # do not cause a version change.
-  # -
-#  - "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
-#  - mv -f .git .git.bak
-#  - 7z x ci\appveyor\zlib1211.zip
+  - "%PYTHON_DEF%\\python.exe ci/appveyor/fix_version.py ."
+  - mv -f .git .git.bak
+  - 7z x ci\appveyor\zlib1211.zip
 
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\
   - dir %OPENSSL_DIR%\lib\VC\
-#  - ci\\appveyor\\build_zlib.bat
-#  - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
-#  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
-#  - ci\\appveyor\\build_ssh2.bat
-#  - for %%I in (%PYTHONVERS%) do cp build_dir/src/Release/libssh2.lib %%I/libs/
-#  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
-#  - rm -f ssh2/*.c
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/
+  - ci\\appveyor\\build_zlib.bat
+  - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
+  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
+  - ci\\appveyor\\build_ssh2.bat
+  - for %%I in (%PYTHONVERS%) do cp build_dir/src/Release/libssh2.lib %%I/libs/
+  - for %%I in (%PYTHONVERS%) do ls %%I/libs/
+  - rm -f ssh2/*.c
 
 test_script:
-#  - ci\\appveyor\\build_package.bat
+  - ci\\appveyor\\build_package.bat
 
 artifacts:
   - path: "*.whl"
diff --git a/ci/appveyor/build_package.bat b/ci/appveyor/build_package.bat
index fb0d347f..b2742136 100755
--- a/ci/appveyor/build_package.bat
+++ b/ci/appveyor/build_package.bat
@@ -1,5 +1,3 @@
-IF NOT "%APPVEYOR_REPO_TAG%" == "true" (exit 0)
-
 dir ssh2/
 
 for %%I in (%PYTHONVERS%) do %%I\python.exe -V
diff --git a/ci/appveyor/fix_version.py b/ci/appveyor/fix_version.py
index 0f8e484a..8e4aa901 100644
--- a/ci/appveyor/fix_version.py
+++ b/ci/appveyor/fix_version.py
@@ -4,8 +4,10 @@
 import json
 import sys
 
+
 def get_describe_tag():
-    return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8')
+    return subprocess.check_output(['git', 'describe', '--tags']).strip().decode('utf-8').split('-')[0]
+
 
 def make_version_file(basedir):
     rev = os.environ.get('APPVEYOR_REPO_COMMIT',

From 8ad011b452d6461150ae44c0054824d7800d1df3 Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 20:48:09 +0000
Subject: [PATCH 3/6] Updated appveyor cfg

---
 ci/appveyor/build_ssh2.bat | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index aff74050..68179dcd 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -13,11 +13,13 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
        -DENABLE_MAC_NONE=ON                   ^
        -DZLIB_LIBRARY=C:/zlib/lib/zlib.lib    ^
        -DZLIB_INCLUDE_DIR=C:/zlib/include     ^
-       -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%
-)
+       -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%       ^
+       -DOPENSSL_LIBRARIES=%OPENSSL_DIR%/lib/VC/x64/MD
 
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto64MD.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl64MD.lib %APPVEYOR_BUILD_FOLDER%
+
+dir %OPENSSL_DIR%\lib\VC\x64\
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%
 
 dir %APPVEYOR_BUILD_FOLDER%\
 

From ae63e217d06c2944cc88fc045d2bb79efcd2b78a Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 20:53:25 +0000
Subject: [PATCH 4/6] Updated appveyor cfg

---
 .appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index 0ceaf797..b12ab685 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -47,7 +47,7 @@ install:
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
           throw "There are newer queued builds for this pull request, failing early." }
-  - set OPENSSL_DIR="C:\OpenSSL-v34-Win64"
+  - set OPENSSL_DIR="C:\OpenSSL-v33-Win64"
   - set VCLIBDIR=%WINDIR%\System32
   - cp %VCLIBDIR%/vcruntime*.dll ssh2/
   - cp %VCLIBDIR%/msvcp*.dll ssh2/

From fdb783b37aa4ac57490bbf6b9012cb315dc29762 Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 20:57:51 +0000
Subject: [PATCH 5/6] Updated appveyor cfg

---
 .appveyor.yml              | 4 ++--
 ci/appveyor/build_ssh2.bat | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index b12ab685..aaab599d 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -69,8 +69,8 @@ install:
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\
   - dir %OPENSSL_DIR%\lib\VC\
-  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/
-  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/libcrypto64MD.lib
+  - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/libssl64MD.lib
   - ci\\appveyor\\build_zlib.bat
   - for %%I in (%PYTHONVERS%) do cp C:/zlib/lib/zlibstatic.lib %%I/libs/
   - for %%I in (%PYTHONVERS%) do ls %%I/libs/
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index 68179dcd..9ea51932 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -13,13 +13,15 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
        -DENABLE_MAC_NONE=ON                   ^
        -DZLIB_LIBRARY=C:/zlib/lib/zlib.lib    ^
        -DZLIB_INCLUDE_DIR=C:/zlib/include     ^
+       -DBUILD_EXAMPLES=OFF                   ^
+       -DBUILD_TESTING=OFF                    ^
        -DOPENSSL_ROOT_DIR=%OPENSSL_DIR%       ^
        -DOPENSSL_LIBRARIES=%OPENSSL_DIR%/lib/VC/x64/MD
 
 
 dir %OPENSSL_DIR%\lib\VC\x64\
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%
-cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%\libcrypto64MD.lib
+cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%\libssl64MD.lib
 
 dir %APPVEYOR_BUILD_FOLDER%\
 

From 78c172fd8d0a7ba483d8f4422db587803c8ba202 Mon Sep 17 00:00:00 2001
From: Panos <danst@tutanota.com>
Date: Sun, 12 Jan 2025 21:05:37 +0000
Subject: [PATCH 6/6] Fix broken openssl library names

---
 .appveyor.yml              | 6 ++----
 ci/appveyor/build_ssh2.bat | 2 +-
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/.appveyor.yml b/.appveyor.yml
index aaab599d..487bf0a1 100644
--- a/.appveyor.yml
+++ b/.appveyor.yml
@@ -32,8 +32,7 @@ environment:
     PYTHON_DEF: "C:\\Python38-x64"
     PYTHON_VERSION: "3.8"
     # Python versions to build wheels for
-    PYTHONVERS: C:\Python310-x64
-    # PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
+    PYTHONVERS: C:\Python38-x64 C:\Python39-x64 C:\Python310-x64 C:\Python311-x64 C:\Python312-x64
     PYTHON_ARCH: "64"
     MSVC: "Visual Studio 16 2019"
 
@@ -47,7 +46,7 @@ install:
         https://ci.appveyor.com/api/projects/$env:APPVEYOR_ACCOUNT_NAME/$env:APPVEYOR_PROJECT_SLUG/history?recordsNumber=50).builds | `
         Where-Object pullRequestId -eq $env:APPVEYOR_PULL_REQUEST_NUMBER)[0].buildNumber) { `
           throw "There are newer queued builds for this pull request, failing early." }
-  - set OPENSSL_DIR="C:\OpenSSL-v33-Win64"
+  - set OPENSSL_DIR="C:\OpenSSL-v34-Win64"
   - set VCLIBDIR=%WINDIR%\System32
   - cp %VCLIBDIR%/vcruntime*.dll ssh2/
   - cp %VCLIBDIR%/msvcp*.dll ssh2/
@@ -68,7 +67,6 @@ install:
 
 build_script:
   - dir %OPENSSL_DIR%\lib\VC\x64\MD\
-  - dir %OPENSSL_DIR%\lib\VC\
   - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libcrypto.lib %%I/libs/libcrypto64MD.lib
   - for %%I in (%PYTHONVERS%) do cp %OPENSSL_DIR%/lib/VC/x64/MD/libssl.lib %%I/libs/libssl64MD.lib
   - ci\\appveyor\\build_zlib.bat
diff --git a/ci/appveyor/build_ssh2.bat b/ci/appveyor/build_ssh2.bat
index 9ea51932..2ac60521 100755
--- a/ci/appveyor/build_ssh2.bat
+++ b/ci/appveyor/build_ssh2.bat
@@ -19,7 +19,7 @@ cmake ..\libssh2 -G "NMake Makefiles" ^
        -DOPENSSL_LIBRARIES=%OPENSSL_DIR%/lib/VC/x64/MD
 
 
-dir %OPENSSL_DIR%\lib\VC\x64\
+dir %OPENSSL_DIR%\lib\VC\x64\MD\
 cp %OPENSSL_DIR%\lib\VC\x64\MD\libcrypto.lib %APPVEYOR_BUILD_FOLDER%\libcrypto64MD.lib
 cp %OPENSSL_DIR%\lib\VC\x64\MD\libssl.lib %APPVEYOR_BUILD_FOLDER%\libssl64MD.lib