diff --git a/net-libs/libssh/libssh-0.9.1.recipe b/net-libs/libssh/libssh-0.9.2.recipe similarity index 96% rename from net-libs/libssh/libssh-0.9.1.recipe rename to net-libs/libssh/libssh-0.9.2.recipe index 50465a301..16af15f52 100644 --- a/net-libs/libssh/libssh-0.9.1.recipe +++ b/net-libs/libssh/libssh-0.9.2.recipe @@ -20,13 +20,13 @@ LICENSE="GNU LGPL v2.1 BSD (2-clause)" REVISION="1" SOURCE_URI="https://www.libssh.org/files/${portVersion%.*}/libssh-$portVersion.tar.xz" -CHECKSUM_SHA256="33249bb616bb696e184cf930ea5d14239b65bb999c0815589efc35e5ed895787" +CHECKSUM_SHA256="1970a8991374fc8cbdcb7fcc3683fe8f8824aa37d575f38cfb75fe0fe50fd9ad" PATCHES="libssh-$portVersion.patchset" ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" -libVersion="4.8.2" +libVersion="4.8.3" libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" diff --git a/net-libs/libssh/patches/libssh-0.9.1.patchset b/net-libs/libssh/patches/libssh-0.9.2.patchset similarity index 83% rename from net-libs/libssh/patches/libssh-0.9.1.patchset rename to net-libs/libssh/patches/libssh-0.9.2.patchset index ae68ed30b..183180c59 100644 --- a/net-libs/libssh/patches/libssh-0.9.1.patchset +++ b/net-libs/libssh/patches/libssh-0.9.2.patchset @@ -1,14 +1,14 @@ -From 28f2ed9fef9635da6238dd274f3f7b6d215d3973 Mon Sep 17 00:00:00 2001 +From d47dcec5cc2814bd7ce7f586b27d66e6280fcafd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= Date: Sat, 22 Sep 2018 16:20:25 +0200 Subject: Haiku networking functions lives in lnetwork diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake -index 2ab140d..58d593e 100644 +index c8bb2aa..41e95cd 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake -@@ -209,6 +209,11 @@ if (UNIX) +@@ -244,6 +244,11 @@ if (UNIX) set(HAVE_GETADDRINFO TRUE) set(_REQUIRED_LIBRARIES ${_REQUIRED_LIBRARIES} socket) endif (HAVE_LIBSOCKET) @@ -21,12 +21,12 @@ index 2ab140d..58d593e 100644 # libnsl/inet_pton (Solaris) check_library_exists(nsl inet_pton "" HAVE_LIBNSL) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index fffb9a4..77601ea 100644 +index 804aa41..8942a5b 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -25,6 +25,13 @@ if (HAVE_LIBSOCKET) +@@ -15,6 +15,13 @@ if (WIN32) ) - endif (HAVE_LIBSOCKET) + endif (WIN32) +if (HAVE_LIBNETWORK) + set(LIBSSH_LINK_LIBRARIES @@ -39,5 +39,5 @@ index fffb9a4..77601ea 100644 set(LIBSSH_PRIVATE_INCLUDE_DIRS ${LIBSSH_PRIVATE_INCLUDE_DIRS} -- -2.19.0 +2.23.0