Index: Makefile
===================================================================
RCS file: /cvs/ports/security/libssh/Makefile,v
diff -u -p -r1.36 Makefile
--- Makefile 5 Nov 2024 19:00:35 -0000 1.36
+++ Makefile 12 Dec 2024 12:52:56 -0000
@@ -1,9 +1,8 @@
COMMENT = C library implementing server and client side SSH
-V = 0.10.6
+V = 0.11.1
DISTNAME = libssh-${V}
-REVISION = 0
-SHARED_LIBS += ssh 4.2 # 4.8
+SHARED_LIBS += ssh 4.3 # 4.8
CATEGORIES = security devel
@@ -18,6 +17,10 @@ COMPILER = base-clang ports-gcc
COMPILER_LANGS = c
WANTLIB += crypto z
+
+# see patches/patch-src_CMakeLists_txt /
+# https://gitlab.com/libssh/libssh-mirror/-/issues/286
+WANTLIB += pthread
MODULES = devel/cmake
Index: distinfo
===================================================================
RCS file: /cvs/ports/security/libssh/distinfo,v
diff -u -p -r1.23 distinfo
--- distinfo 18 Dec 2023 19:05:47 -0000 1.23
+++ distinfo 12 Dec 2024 12:52:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.10.6.tar.xz) = GGHUmPW28XQbarxz5ghHhJHtz5ydS2Yw7vbnRZbencE=
-SIZE (libssh-0.10.6.tar.xz) = 561036
+SHA256 (libssh-0.11.1.tar.xz) = FLfcxy6R4IFRxYuYGntXCrJmP2MOfSg3ZF1anGEsG3k=
+SIZE (libssh-0.11.1.tar.xz) = 621108
Index: patches/patch-CompilerChecks_cmake
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-CompilerChecks_cmake,v
diff -u -p -r1.1 patch-CompilerChecks_cmake
--- patches/patch-CompilerChecks_cmake 10 Jan 2023 13:04:06 -0000 1.1
+++ patches/patch-CompilerChecks_cmake 12 Dec 2024 12:52:56 -0000
@@ -2,7 +2,7 @@ Drop -Werror flag fatal with clang 15.
Index: CompilerChecks.cmake
--- CompilerChecks.cmake.orig
+++ CompilerChecks.cmake
-@@ -25,7 +25,6 @@ if (UNIX)
+@@ -24,7 +24,6 @@ if (UNIX)
#add_c_compiler_flag("-Wcast-qual" SUPPORTED_COMPILER_FLAGS)
add_c_compiler_flag("-Werror=address" SUPPORTED_COMPILER_FLAGS)
add_c_compiler_flag("-Wstrict-prototypes" SUPPORTED_COMPILER_FLAGS)
Index: patches/patch-ConfigureChecks_cmake
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-ConfigureChecks_cmake,v
diff -u -p -r1.6 patch-ConfigureChecks_cmake
--- patches/patch-ConfigureChecks_cmake 1 Sep 2022 18:54:17 -0000 1.6
+++ patches/patch-ConfigureChecks_cmake 12 Dec 2024 12:52:56 -0000
@@ -1,9 +1,21 @@
+We have EVP_chacha20 but not EVP_PKEY_POLY1305 so the code using it
+fails.
+
Fix exit code.
Index: ConfigureChecks.cmake
--- ConfigureChecks.cmake.orig
+++ ConfigureChecks.cmake
-@@ -306,7 +306,7 @@ check_c_source_compiles("
+@@ -102,7 +102,7 @@ if (OPENSSL_FOUND)
+ check_function_exists(EVP_KDF_CTX_new HAVE_OPENSSL_EVP_KDF_CTX_NEW)
+ check_function_exists(FIPS_mode HAVE_OPENSSL_FIPS_MODE)
+ check_function_exists(RAND_priv_bytes HAVE_OPENSSL_RAND_PRIV_BYTES)
+- check_function_exists(EVP_chacha20 HAVE_OPENSSL_EVP_CHACHA20)
++ #check_function_exists(EVP_chacha20 HAVE_OPENSSL_EVP_CHACHA20)
+
+ unset(CMAKE_REQUIRED_INCLUDES)
+ unset(CMAKE_REQUIRED_LIBRARIES)
+@@ -261,7 +261,7 @@ check_c_source_compiles("
__thread int tls;
int main(void) {
Index: patches/patch-src_CMakeLists_txt
===================================================================
RCS file: patches/patch-src_CMakeLists_txt
diff -N patches/patch-src_CMakeLists_txt
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-src_CMakeLists_txt 12 Dec 2024 12:52:56 -0000
@@ -0,0 +1,21 @@
+Force pthread linkage until there's a better idea, proxy jump support
+uses pthread functions whether or not pthread was linked.
+(https://gitlab.com/libssh/libssh-mirror/-/issues/286)
+
+Index: src/CMakeLists.txt
+--- src/CMakeLists.txt.orig
++++ src/CMakeLists.txt
+@@ -69,6 +69,13 @@ if (MINGW AND Threads_FOUND)
+ )
+ endif()
+
++if (Threads_FOUND)
++ set(LIBSSH_LINK_LIBRARIES
++ ${LIBSSH_LINK_LIBRARIES}
++ pthread
++ )
++endif()
++
+ # The ws2_32 needs to be last for mingw to build
+ # https://gitlab.com/libssh/libssh-mirror/-/issues/84
+ if (WIN32)
Index: patches/patch-tests_torture_c
===================================================================
RCS file: /cvs/ports/security/libssh/patches/patch-tests_torture_c,v
diff -u -p -r1.2 patch-tests_torture_c
--- patches/patch-tests_torture_c 11 Mar 2022 19:53:32 -0000 1.2
+++ patches/patch-tests_torture_c 12 Dec 2024 12:52:56 -0000
@@ -10,4 +10,4 @@ Index: tests/torture.c
+#include <limits.h>
#elif (defined _WIN32) || (defined _WIN64)
#include <direct.h>
- #include <io.h>
+ #define chdir _chdir
Index: patches/patch-tests_unittests_torture_misc_c
===================================================================
RCS file:
/cvs/ports/security/libssh/patches/patch-tests_unittests_torture_misc_c,v
diff -u -p -r1.9 patch-tests_unittests_torture_misc_c
--- patches/patch-tests_unittests_torture_misc_c 18 Dec 2023 19:05:47
-0000 1.9
+++ patches/patch-tests_unittests_torture_misc_c 12 Dec 2024 12:52:56
-0000
@@ -3,7 +3,7 @@ Disable unit test "torture_path_expand_t
Index: tests/unittests/torture_misc.c
--- tests/unittests/torture_misc.c.orig
+++ tests/unittests/torture_misc.c
-@@ -887,7 +887,8 @@ int torture_run_tests(void) {
+@@ -1139,7 +1139,8 @@ int torture_run_tests(void) {
#ifdef _WIN32
cmocka_unit_test(torture_path_expand_tilde_win),
#else
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/security/libssh/pkg/PLIST,v
diff -u -p -r1.10 PLIST
--- pkg/PLIST 11 Mar 2022 19:53:32 -0000 1.10
+++ pkg/PLIST 12 Dec 2024 12:52:56 -0000
@@ -6,6 +6,7 @@ include/libssh/libssh_version.h
include/libssh/libsshpp.hpp
include/libssh/server.h
include/libssh/sftp.h
+include/libssh/sftpserver.h
include/libssh/ssh2.h
lib/cmake/
lib/cmake/libssh/
