diff options
author | Baruch Siach <baruch@tkos.co.il> | 2018-10-11 21:46:40 +0300 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@bootlin.com> | 2018-10-11 20:56:40 +0200 |
commit | 540e37bf7457fe41ffb6270ad23bea2fc8a706a4 (patch) | |
tree | 38ab8774034a746177322f1c75a5b30e7fb9921d /package/libssh/0001-config-Fix-building-without-globbing-support.patch | |
parent | d8738d3b97a1ec1b356143269b293d55c91de860 (diff) | |
download | buildroot-540e37bf7457fe41ffb6270ad23bea2fc8a706a4.tar.gz buildroot-540e37bf7457fe41ffb6270ad23bea2fc8a706a4.zip |
libssh: bump to version 0.8.3
Drop GNU glob detection patch; issue fixed upstream.
Add upstream patch that completes the build fix when GNU glob is not
present.
Cc: Scott Fan <fancp2007@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Diffstat (limited to 'package/libssh/0001-config-Fix-building-without-globbing-support.patch')
-rw-r--r-- | package/libssh/0001-config-Fix-building-without-globbing-support.patch | 30 |
1 files changed, 30 insertions, 0 deletions
diff --git a/package/libssh/0001-config-Fix-building-without-globbing-support.patch b/package/libssh/0001-config-Fix-building-without-globbing-support.patch new file mode 100644 index 0000000000..81585db49f --- /dev/null +++ b/package/libssh/0001-config-Fix-building-without-globbing-support.patch @@ -0,0 +1,30 @@ +From 97b2a61d74edebad43ad09612c92a0341090f165 Mon Sep 17 00:00:00 2001 +From: Andreas Schneider <asn@cryptomilk.org> +Date: Tue, 25 Sep 2018 14:35:43 +0200 +Subject: [PATCH] config: Fix building without globbing support + +Signed-off-by: Andreas Schneider <asn@cryptomilk.org> +(cherry picked from commit f709c3ac585f7b47317758b8693a6d104b30f951) +Signed-off-by: Baruch Siach <baruch@tkos.co.il> +--- +Upstream status: commit 97b2a61d74 (stable-0.8 branch) + + src/config.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/config.c b/src/config.c +index df6b48bf6d5e..3d87a1780a58 100644 +--- a/src/config.c ++++ b/src/config.c +@@ -462,7 +462,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line, + + p = ssh_config_get_str_tok(&s, NULL); + if (p && *parsing) { +-#ifdef HAVE_GLOB ++#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER) + local_parse_glob(session, p, parsing, seen); + #else + local_parse_file(session, p, parsing, seen); +-- +2.19.1 + |