libssh: bump to 0.11.3

Remove patches no longer needed:
- 001-fix-cmake4.patch
- 100-mbedtls_fix.patch

Signed-off-by: Nick Hainke <[email protected]>

diff --git a/libs/libssh/Makefile b/libs/libssh/Makefile
index 960e37302d455b1188e4f5aebbf65765b3562072..99ed53261061999278c0006f6b8c9bd500753c3a 100644 (file)
--- a/libs/libssh/Makefile
+++ b/libs/libssh/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libssh
-PKG_VERSION:=0.10.6
-PKG_RELEASE:=3
+PKG_VERSION:=0.11.3
+PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
-PKG_SOURCE_URL:=https://www.libssh.org/files/0.10/
-PKG_HASH:=1861d498f5b6f1741b6abc73e608478491edcf9c9d4b6630eef6e74596de9dc1
+PKG_SOURCE_URL:=https://www.libssh.org/files/0.11/
+PKG_HASH:=7d8a1361bb094ec3f511964e78a5a4dba689b5986e112afabe4f4d0d6c6125c3
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=LGPL-2.1-or-later BSD-2-Clause

diff --git a/libs/libssh/patches/001-fix-cmake4.patch b/libs/libssh/patches/001-fix-cmake4.patch
deleted file mode 100644 (file)
index 71b7b0c..0000000
--- a/libs/libssh/patches/001-fix-cmake4.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.3.0)
-+cmake_minimum_required(VERSION 3.10.0)
- cmake_policy(SET CMP0048 NEW)
- 
- # Specify search path for CMake modules to be loaded by include()

diff --git a/libs/libssh/patches/100-mbedtls_fix.patch b/libs/libssh/patches/100-mbedtls_fix.patch
deleted file mode 100644 (file)
index 4a6309c..0000000
--- a/libs/libssh/patches/100-mbedtls_fix.patch
+++ /dev/null
@@ -1,53 +0,0 @@
---- a/cmake/Modules/FindMbedTLS.cmake
-+++ b/cmake/Modules/FindMbedTLS.cmake
-@@ -34,7 +34,7 @@ set(_MBEDTLS_ROOT_HINTS_AND_PATHS
- 
- find_path(MBEDTLS_INCLUDE_DIR
-     NAMES
--        mbedtls/config.h
-+        mbedtls/version.h
-     HINTS
-         ${_MBEDTLS_ROOT_HINTS_AND_PATHS}
-     PATH_SUFFIXES
-@@ -72,7 +72,13 @@ find_library(MBEDTLS_X509_LIBRARY
- set(MBEDTLS_LIBRARIES ${MBEDTLS_SSL_LIBRARY} ${MBEDTLS_CRYPTO_LIBRARY}
-         ${MBEDTLS_X509_LIBRARY})
- 
--if (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h")
-+if (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h")
-+    file(STRINGS "${MBEDTLS_INCLUDE_DIR}/mbedtls/build_info.h" _mbedtls_version_str REGEX
-+            "^#[\t ]*define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"[0-9]+.[0-9]+.[0-9]+\"")
-+
-+    string(REGEX REPLACE "^.*MBEDTLS_VERSION_STRING.*([0-9]+.[0-9]+.[0-9]+).*"
-+            "\\1" MBEDTLS_VERSION "${_mbedtls_version_str}")
-+elseif (MBEDTLS_INCLUDE_DIR AND EXISTS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h")
-     file(STRINGS "${MBEDTLS_INCLUDE_DIR}/mbedtls/version.h" _mbedtls_version_str REGEX
-             "^#[\t ]*define[\t ]+MBEDTLS_VERSION_STRING[\t ]+\"[0-9]+.[0-9]+.[0-9]+\"")
- 
-@@ -93,7 +99,7 @@ if (MBEDTLS_VERSION)
-             in the system variable MBEDTLS_ROOT_DIR"
-     )
- else (MBEDTLS_VERSION)
--    find_package_handle_standard_args(MBedTLS
-+    find_package_handle_standard_args(MbedTLS
-         "Could NOT find mbedTLS, try to set the path to mbedLS root folder in
-         the system variable MBEDTLS_ROOT_DIR"
-         MBEDTLS_INCLUDE_DIR
---- a/src/libmbedcrypto.c
-+++ b/src/libmbedcrypto.c
-@@ -118,8 +118,14 @@ int hmac_update(HMACCTX c, const void *d
- 
- int hmac_final(HMACCTX c, unsigned char *hashmacbuf, size_t *len)
- {
-+    const mbedtls_md_info_t *md_info;
-     int rc;
--    *len = (unsigned int)mbedtls_md_get_size(c->md_info);
-+#if MBEDTLS_VERSION_MAJOR >= 3
-+      md_info = mbedtls_md_info_from_ctx(c);
-+#else
-+      md_info = c->md_info;
-+#endif
-+    *len = (unsigned int)mbedtls_md_get_size(md_info);
-     rc = !mbedtls_md_hmac_finish(c, hashmacbuf);
-     mbedtls_md_free(c);
-     SAFE_FREE(c);