summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/libssh/Makefile20
-rw-r--r--package/libssh/patches/patch-CompilerChecks_cmake32
-rw-r--r--package/libssh/patches/patch-include_libssh_libssh_h10
3 files changed, 10 insertions, 52 deletions
diff --git a/package/libssh/Makefile b/package/libssh/Makefile
index 231bae2c4..2175813ae 100644
--- a/package/libssh/Makefile
+++ b/package/libssh/Makefile
@@ -4,15 +4,15 @@
include $(ADK_TOPDIR)/rules.mk
PKG_NAME:= libssh
-PKG_VERSION:= 0.9.5
+PKG_VERSION:= 0.11.0
PKG_RELEASE:= 1
-PKG_HASH:= acffef2da98e761fc1fd9c4fddde0f3af60ab44c4f5af05cd1b2d60a3fa08718
+PKG_HASH:= 860e814579e7606f3fc3db98c5807bef2ab60f793ec871d81bcd23acdcdd3e91
PKG_DESCR:= secure shell library
PKG_SECTION:= libs/crypto
-PKG_DEPENDS:= zlib libressl
-PKG_BUILDDEP:= cmake-host zlib libressl
+PKG_DEPENDS:= zlib libopenssl
+PKG_BUILDDEP:= cmake-host zlib openssl
PKG_URL:= http://www.libssh.org/
-PKG_SITES:= https://www.libssh.org/files/0.9/
+PKG_SITES:= https://www.libssh.org/files/0.11/
PKG_OPTS:= dev
include $(ADK_TOPDIR)/mk/package.mk
@@ -21,14 +21,14 @@ $(eval $(call PKG_template,LIBSSH,libssh,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEP
WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj
CONFIG_STYLE:= cmake
-CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIRS='$(STAGING_TARGET_DIR)/usr/include' \
+CMAKE_FLAGS:= -DOPENSSL_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \
-DOPENSSL_LIBRARIES='-lcrypto -lssl -lz' \
- -DZLIB_INCLUDE_DIR='$(STAGING_TARGET_DIR)/usr/include' \
- -DZLIB_LIBRARY='$(STAGING_TARGET_DIR)/usr/lib' \
- -DWITH_GSSAPI=off \
- -DWITH_STACK_PROTECTOR=off \
+ -DWITH_GSSAPI=on \
+ -DWITH_SYMBOL_VERSIONING=off \
-DWITH_EXAMPLES=off
+XAKE_FLAGS+= VERBOSE=1
+
libssh-install:
$(INSTALL_DIR) $(IDIR_LIBSSH)/usr/lib
$(CP) $(WRKINST)/usr/lib/libssh*.so* \
diff --git a/package/libssh/patches/patch-CompilerChecks_cmake b/package/libssh/patches/patch-CompilerChecks_cmake
deleted file mode 100644
index 8f5d3d805..000000000
--- a/package/libssh/patches/patch-CompilerChecks_cmake
+++ /dev/null
@@ -1,32 +0,0 @@
---- 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-include_libssh_libssh_h b/package/libssh/patches/patch-include_libssh_libssh_h
deleted file mode 100644
index 39310ba16..000000000
--- a/package/libssh/patches/patch-include_libssh_libssh_h
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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>
- #include <sys/types.h>