Skip to contentSkip to conversation

libssh: bump to version 0.7.2

PATCH New Baruch Siach 3 participants 4 messages Oct 1, 2015 – Oct 2, 2015

lore
Share & tools
lore

Baruch Siach

author
#0 lore raw

PATCH 1/1 libssh: bump to version 0.7.2

Also, require threads support. cmake detects threads support correctly, but libssh build system uses this information incorrectly.

Signed-off-by Baruch Siach <[email protected]>
---
 package/libssh/Config.in   | 5 +++--
 package/libssh/libssh.hash | 6 +++---
 package/libssh/libssh.mk   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
package/libssh/Config.in +3 -2
index 30aabd621fb6..3357fb9e9252 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSSH
 	bool "libssh"
 	depends on BR2_USE_MMU # fork()
 	depends on !BR2_STATIC_LIBS
+	depends on BR2_TOOLCHAIN_HAS_THREADS
 	# Either OpenSSL or libgcrypt are mandatory
 	select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
 	help

@@ -12,6 +13,6 @@ config BR2_PACKAGE_LIBSSH
 
 	  http://www.libssh.org/
 
-comment "libssh needs a toolchain w/ dynamic library"
+comment "libssh needs a toolchain w/ dynamic library, threads"
 	depends on BR2_USE_MMU
-	depends on BR2_STATIC_LIBS
+	depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS
package/libssh/libssh.hash +3 -3
index 473ced36c73b..49bf6c959fe2 100644
@@ -1,4 +1,4 @@
 # from https://red.libssh.org/projects/libssh/files/
-md5	bffc9dc548c3bae3a3afc5ac1654b272	libssh-0.7.1.tar.xz
-# Locally calculated
-sha256	2fc7ccf96d3263cbd8ab520118cb94d9a2e11714c61e22b3f761fc5352fd046d  libssh-0.7.1.tar.xz
+md5	5d7d468937649a6dfc6186edfff083db	libssh-0.7.2.tar.xz
+# Locally calculated after checking signature on uncompressed libssh-0.7.2.tar
+sha256	a32c45b9674141cab4bde84ded7d53e931076c6b0f10b8fd627f3584faebae62  libssh-0.7.2.tar.xz
package/libssh/libssh.mk +2 -2
index cd537b04fc99..d425ff0b74bc 100644
@@ -4,9 +4,9 @@
 #
 ################################################################################
 
-LIBSSH_VERSION = 0.7.1
+LIBSSH_VERSION = 0.7.2
 LIBSSH_SOURCE = libssh-$(LIBSSH_VERSION).tar.xz
-LIBSSH_SITE = https://red.libssh.org/attachments/download/154
+LIBSSH_SITE = https://red.libssh.org/attachments/download/177
 LIBSSH_LICENSE = LGPLv2.1
 LIBSSH_LICENSE_FILES = COPYING
 LIBSSH_INSTALL_STAGING = YES
Signature · 1 line
2.5.3
#1 lore raw

PATCH 1/1 libssh: bump to version 0.7.2

HI Baruch,

Quoted 23 lines · Baruch Siach

Also, require threads support. cmake detects threads support correctly, but libssh build system uses this information incorrectly.

Signed-off-by Baruch Siach <[email protected]>
---
 package/libssh/Config.in   | 5 +++--
 package/libssh/libssh.hash | 6 +++---
 package/libssh/libssh.mk   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
package/libssh/Config.in +1 -0
index 30aabd621fb6..3357fb9e9252 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSSH
        bool "libssh"
        depends on BR2_USE_MMU # fork()
        depends on !BR2_STATIC_LIBS
+       depends on BR2_TOOLCHAIN_HAS_THREADS
        # Either OpenSSL or libgcrypt are mandatory
        select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
        help

package/libssh/Config.in config BR2_PACKAGE_LIBSSH · line 18

Quoted 8 lines
package/libssh/Config.in +2 -2
@@ -12,6 +13,6 @@ config BR2_PACKAGE_LIBSSH
 
          http://www.libssh.org/
 
-comment "libssh needs a toolchain w/ dynamic library"
+comment "libssh needs a toolchain w/ dynamic library, threads"
        depends on BR2_USE_MMU
-       depends on BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

It appears that this patch an your previous patch should be a series. Was this your intention?

This patch assume that your previous patch has been applied in order to bump the version. Your previous patch being "libssh: needs shared library support" [1].

Thanks,
-Ryan

[1] - http://lists.busybox.net/pipermail/buildroot/2015-October/140551.html

[...]

Signature · 5 lines
Ryan Barnett / Sr Software Engineer
Airborne Information Systems / Security Systems and Software
MS 131-100, C Ave NE, Cedar Rapids, IA, 52498, USA
ryan.barnett at rockwellcollins.com
www.rockwellcollins.com
author
#2 lore raw

PATCH 1/1 libssh: bump to version 0.7.2

Hi Ryan,

Quoted 36 lines · Ryan Barnett
Quoted 23 lines · Baruch Siach

Also, require threads support. cmake detects threads support correctly, but libssh build system uses this information incorrectly.

Signed-off-by Baruch Siach <[email protected]>
---
 package/libssh/Config.in   | 5 +++--
 package/libssh/libssh.hash | 6 +++---
 package/libssh/libssh.mk   | 4 ++--
 3 files changed, 8 insertions(+), 7 deletions(-)
package/libssh/Config.in +1 -0
index 30aabd621fb6..3357fb9e9252 100644
@@ -2,6 +2,7 @@ config BR2_PACKAGE_LIBSSH
        bool "libssh"
        depends on BR2_USE_MMU # fork()
        depends on !BR2_STATIC_LIBS
+       depends on BR2_TOOLCHAIN_HAS_THREADS
        # Either OpenSSL or libgcrypt are mandatory
        select BR2_PACKAGE_LIBGCRYPT if !BR2_PACKAGE_OPENSSL
        help

package/libssh/Config.in config BR2_PACKAGE_LIBSSH · line 18

Quoted 8 lines
package/libssh/Config.in +2 -2
@@ -12,6 +13,6 @@ config BR2_PACKAGE_LIBSSH
 
          http://www.libssh.org/
 
-comment "libssh needs a toolchain w/ dynamic library"
+comment "libssh needs a toolchain w/ dynamic library, threads"
        depends on BR2_USE_MMU
-       depends on BR2_STATIC_LIBS
+       depends on BR2_STATIC_LIBS || !BR2_TOOLCHAIN_HAS_THREADS

It appears that this patch an your previous patch should be a series. Was this your intention?

Quoted 5 lines

This patch assume that your previous patch has been applied in order to bump the version. Your previous patch being "libssh: needs shared library support" [1].

[1] - http://lists.busybox.net/pipermail/buildroot/2015-October/140551.html

Correct. Only after sending the first patch I figured out that there is a new libssh release.

Thanks for noticing,
baruch

Signature · 3 lines
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -