different kodi-task bugfixes

4 files changed, 40 insertions, 21 deletions

diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index d586d6617..231bae2c4 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -4,15 +4,15 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		libssh
-PKG_VERSION:=		0.7.5
+PKG_VERSION:=		0.9.5
 PKG_RELEASE:=		1
-PKG_HASH:=		54e86dd5dc20e5367e58f3caab337ce37675f863f80df85b6b1614966a337095
+PKG_HASH:=		acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718
 PKG_DESCR:=		secure shell library
 PKG_SECTION:=		libs/crypto
 PKG_DEPENDS:=		zlib libressl
 PKG_BUILDDEP:=		cmake-host zlib libressl
 PKG_URL:=		http://www.libssh.org/
-PKG_SITES:=		https://red.libssh.org/attachments/download/218/
+PKG_SITES:=		https://www.libssh.org/files/0.9/
 PKG_OPTS:=		dev
 
 include $(ADK_TOPDIR)/mk/package.mk
@@ -26,6 +26,7 @@ CMAKE_FLAGS:=		-DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \
 			-DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \
 			-DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib' \
 			-DWITH_GSSAPI=off \
+			-DWITH_STACK_PROTECTOR=off \
 			-DWITH_EXAMPLES=off
 
 libssh-install:
diff --git a/package/libssh/patches/patch-CompilerChecks_cmake b/package/libssh/patches/patch-CompilerChecks_cmake
new file mode 100644
index 000000000..8f5d3d805
--- /dev/null
+++ b/package/libssh/patches/patch-CompilerChecks_cmake
@@ -0,0 +1,32 @@
+--- libssh-0.9.5.orig/CompilerChecks.cmake	2020-05-07 13:51:36.000000000 +0200
++++ libssh-0.9.5/CompilerChecks.cmake	2021-03-01 23:53:39.370794233 +0100
+@@ -67,29 +67,6 @@ if (UNIX)
+         endif()
+     endif()
+ 
+-    check_c_compiler_flag_ssp("-fstack-protector-strong" WITH_STACK_PROTECTOR_STRONG)
+-    if (WITH_STACK_PROTECTOR_STRONG)
+-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector-strong")
+-        # This is needed as Solaris has a seperate libssp
+-        if (SOLARIS)
+-            list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector-strong")
+-        endif()
+-    else (WITH_STACK_PROTECTOR_STRONG)
+-        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
+-        if (WITH_STACK_PROTECTOR)
+-            list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-protector")
+-            # This is needed as Solaris has a seperate libssp
+-            if (SOLARIS)
+-                list(APPEND SUPPORTED_LINKER_FLAGS "-fstack-protector")
+-            endif()
+-        endif()
+-    endif (WITH_STACK_PROTECTOR_STRONG)
+-
+-    check_c_compiler_flag_ssp("-fstack-clash-protection" WITH_STACK_CLASH_PROTECTION)
+-    if (WITH_STACK_CLASH_PROTECTION)
+-        list(APPEND SUPPORTED_COMPILER_FLAGS "-fstack-clash-protection")
+-    endif()
+-
+     if (PICKY_DEVELOPER)
+         add_c_compiler_flag("-Wno-error=deprecated-declarations" SUPPORTED_COMPILER_FLAGS)
+         add_c_compiler_flag("-Wno-error=tautological-compare" SUPPORTED_COMPILER_FLAGS)
diff --git a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake b/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
deleted file mode 100644
index b8e077b94..000000000
--- a/package/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake
+++ /dev/null
@@ -1,14 +0,0 @@
---- libssh-0.6.3.orig/cmake/Modules/DefineCompilerFlags.cmake	2014-02-06 10:20:57.000000000 +0100
-+++ libssh-0.6.3/cmake/Modules/DefineCompilerFlags.cmake	2014-03-14 09:10:56.621673326 +0100
-@@ -21,11 +21,6 @@ if (UNIX AND NOT WIN32)
-             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
-         endif (WITH_FPIC)
- 
--        check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
--        if (WITH_STACK_PROTECTOR)
--            set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
--        endif (WITH_STACK_PROTECTOR)
--
-         if (CMAKE_BUILD_TYPE)
-             string(TOLOWER "${CMAKE_BUILD_TYPE}" CMAKE_BUILD_TYPE_LOWER)
-             if (CMAKE_BUILD_TYPE_LOWER MATCHES (release|relwithdebinfo|minsizerel))
diff --git a/package/libssh/patches/patch-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h
index dc60939bf..39310ba16 100644
--- a/package/libssh/patches/patch-include_libssh_libssh_h
+++ b/package/libssh/patches/patch-include_libssh_libssh_h
@@ -1,10 +1,10 @@
---- libssh-0.6.3.orig/include/libssh/libssh.h	2014-03-04 13:20:48.000000000 +0100
-+++ libssh-0.6.3/include/libssh/libssh.h	2014-03-14 09:07:03.304701842 +0100
-@@ -56,6 +56,7 @@
+--- libssh-0.9.5.orig/include/libssh/libssh.h	2020-09-10 14:43:02.000000000 +0200
++++ libssh-0.9.5/include/libssh/libssh.h	2021-03-01 23:52:22.358253014 +0100
+@@ -58,6 +58,7 @@
    typedef unsigned long long uint64_t;
    typedef int mode_t;
  #else /* _MSC_VER */
 +  #include <sys/types.h>
    #include <unistd.h>
    #include <inttypes.h>
- #endif /* _MSC_VER */
+   #include <sys/types.h>