Accepting request 184894 from network:synchronization:files
Update to 0.5.5. OBS-URL: https://build.opensuse.org/request/show/184894 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libssh?expand=0&rev=28
This commit is contained in:
parent
753c926479
commit
06be2731ab
1
baselibs.conf
Normal file
1
baselibs.conf
Normal file
@ -0,0 +1 @@
|
|||||||
|
libssh4
|
@ -1,50 +0,0 @@
|
|||||||
diff -rupN a/src/options.c b/src/options.c
|
|
||||||
--- a/options.c 2013-01-22 11:38:30.000000000 +0100
|
|
||||||
+++ b/src/options.c 2013-07-15 09:45:28.000000000 +0200
|
|
||||||
@@ -655,11 +655,15 @@ int ssh_options_set(ssh_session session,
|
|
||||||
return -1;
|
|
||||||
} else {
|
|
||||||
SAFE_FREE(session->ProxyCommand);
|
|
||||||
- q = strdup(value);
|
|
||||||
- if (q == NULL) {
|
|
||||||
- return -1;
|
|
||||||
+ /* Setting the command to 'none' disables this option. */
|
|
||||||
+ rc = strcasecmp(value, "none");
|
|
||||||
+ if (rc != 0) {
|
|
||||||
+ q = strdup(value);
|
|
||||||
+ if (q == NULL) {
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
+ session->ProxyCommand = q;
|
|
||||||
}
|
|
||||||
- session->ProxyCommand = q;
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
default:
|
|
||||||
--- a/tests/unittests/torture_options.c.orig 2013-07-25 22:06:19.016024956 +0200
|
|
||||||
+++ b/tests/unittests/torture_options.c 2013-07-25 22:11:28.941507282 +0200
|
|
||||||
@@ -119,6 +119,24 @@
|
|
||||||
assert_string_equal(session->identity->root->next->data, "identity1");
|
|
||||||
}
|
|
||||||
|
|
||||||
+static void torture_options_proxycommand(void **state) {
|
|
||||||
+ ssh_session session = *state;
|
|
||||||
+ int rc;
|
|
||||||
+
|
|
||||||
+ /* Enable ProxyCommand */
|
|
||||||
+ rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "ssh -q -A -X -W %h:%p JUMPHOST");
|
|
||||||
+ assert_int_equal(rc, 0);
|
|
||||||
+
|
|
||||||
+ assert_string_equal(session->opts.ProxyCommand, "ssh -q -A -X -W %h:%p JUMPHOST");
|
|
||||||
+
|
|
||||||
+ /* Disable ProxyCommand */
|
|
||||||
+ rc = ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, "none");
|
|
||||||
+ assert_int_equal(rc, 0);
|
|
||||||
+
|
|
||||||
+ assert_null(session->opts.ProxyCommand);
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+
|
|
||||||
int torture_run_tests(void) {
|
|
||||||
int rc;
|
|
||||||
const UnitTest tests[] = {
|
|
@ -1,56 +0,0 @@
|
|||||||
From fcf8af20f81f196cff69a32d7a38a0e193e07d54 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Andreas Schneider <asn@cryptomilk.org>
|
|
||||||
Date: Sun, 02 Jun 2013 17:06:33 +0000
|
|
||||||
Subject: BUG 103: Fix ProxyCommand parsing.
|
|
||||||
|
|
||||||
---
|
|
||||||
diff --git a/src/config.c b/src/config.c
|
|
||||||
index cb98a60..632a50b 100644
|
|
||||||
--- a/src/config.c
|
|
||||||
+++ b/src/config.c
|
|
||||||
@@ -82,7 +82,7 @@ static enum ssh_config_opcode_e ssh_config_get_opcode(char *keyword) {
|
|
||||||
return SOC_UNSUPPORTED;
|
|
||||||
}
|
|
||||||
|
|
||||||
-static char *ssh_config_get_token(char **str) {
|
|
||||||
+static char *ssh_config_get_cmd(char **str) {
|
|
||||||
register char *c;
|
|
||||||
char *r;
|
|
||||||
|
|
||||||
@@ -103,6 +103,25 @@ static char *ssh_config_get_token(char **str) {
|
|
||||||
}
|
|
||||||
|
|
||||||
for (r = c; *c; c++) {
|
|
||||||
+ if (*c == '\n') {
|
|
||||||
+ *c = '\0';
|
|
||||||
+ goto out;
|
|
||||||
+ }
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
+out:
|
|
||||||
+ *str = c + 1;
|
|
||||||
+
|
|
||||||
+ return r;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
+static char *ssh_config_get_token(char **str) {
|
|
||||||
+ register char *c;
|
|
||||||
+ char *r;
|
|
||||||
+
|
|
||||||
+ c = ssh_config_get_cmd(str);
|
|
||||||
+
|
|
||||||
+ for (r = c; *c; c++) {
|
|
||||||
if (isblank(*c)) {
|
|
||||||
*c = '\0';
|
|
||||||
goto out;
|
|
||||||
@@ -299,7 +318,7 @@ static int ssh_config_parse_line(ssh_session session, const char *line,
|
|
||||||
}
|
|
||||||
break;
|
|
||||||
case SOC_PROXYCOMMAND:
|
|
||||||
- p = ssh_config_get_str(&s, NULL);
|
|
||||||
+ p = ssh_config_get_cmd(&s);
|
|
||||||
if (p && *parsing) {
|
|
||||||
ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, p);
|
|
||||||
}
|
|
||||||
--
|
|
||||||
cgit v0.9.1
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:6ede50e8b88ccc4965903dcd74d7499da724b0f2bb69a38534c75d3aa12ece48
|
|
||||||
size 239153
|
|
3
libssh-0.5.5.tar.xz
Normal file
3
libssh-0.5.5.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:7215b4ec500c64867ba7c0800b38511e60a6c3df98f7e99b4374b4ccd998c702
|
||||||
|
size 225528
|
@ -1,3 +1,21 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 29 08:17:19 UTC 2013 - asn@cryptomilk.org
|
||||||
|
|
||||||
|
- Add baselibs.conf
|
||||||
|
- Require xz to fix build on older distro versions.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 26 07:44:37 UTC 2013 - asn@cryptomilk.org
|
||||||
|
|
||||||
|
- Update to version 0.5.5
|
||||||
|
* BUG 103: Fix ProxyCommand parsing.
|
||||||
|
- Remove patch fix-proxycomand-parsing1.diff
|
||||||
|
- Remove patch fix-proxy-command-none.diff
|
||||||
|
* Fix setting -D_FORTIFY_SOURCE=2.
|
||||||
|
* Fix pollset error return if emtpy.
|
||||||
|
* Fix NULL pointer checks in channel functions.
|
||||||
|
* Several bugfixes.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jul 25 19:56:12 UTC 2013 - lbeltrame@kde.org
|
Thu Jul 25 19:56:12 UTC 2013 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
11
libssh.spec
11
libssh.spec
@ -24,17 +24,14 @@ BuildRequires: doxygen
|
|||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
Version: 0.5.4
|
BuildRequires: xz
|
||||||
|
Version: 0.5.5
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: SSH library
|
Summary: SSH library
|
||||||
License: LGPL-2.1+
|
License: LGPL-2.1+
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
Source0: %{name}-%{version}.tar.bz2
|
Source0: %{name}-%{version}.tar.xz
|
||||||
Patch1: remove-pedantic-errors.diff
|
Patch1: remove-pedantic-errors.diff
|
||||||
#PATCH-FIX-UPSTREAM: Parse ProxyCommand correctly (libssh bug 103)
|
|
||||||
Patch2: fix-proxycomand-parsing1.diff
|
|
||||||
#PATCH-FIX-UPSTREAM: Parse ProxyCommand when it is "none" (libssh bug 103)
|
|
||||||
Patch3: fix-proxy-command-none.diff
|
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
|
|
||||||
%description
|
%description
|
||||||
@ -85,8 +82,6 @@ Documentation for libssh development.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch -P 1 -p1
|
%patch -P 1 -p1
|
||||||
%patch2 -p1
|
|
||||||
%patch3 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
if test ! -e "build"; then
|
if test ! -e "build"; then
|
||||||
|
Loading…
Reference in New Issue
Block a user