From c7e1319f31ca8fe33fb6a6f559bc17386eab2248 Mon Sep 17 00:00:00 2001 From: Orion Poplawski Date: Thu, 21 May 2015 13:27:53 -0600 Subject: [PATCH] Add patch to fix undefined symbol: ssh_forward_listen (bug #1221310) --- ...troduce-ssh_forward_listen-Fixes-194.patch | 28 +++++++++++++++++++ libssh.spec | 10 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-Reintroduce-ssh_forward_listen-Fixes-194.patch diff --git a/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch b/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch new file mode 100644 index 0000000..030983d --- /dev/null +++ b/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch @@ -0,0 +1,28 @@ +From 3c8fe6e2c595ee019408249c364b3019b6c31a8a Mon Sep 17 00:00:00 2001 +From: Mike DePaulo +Date: Fri, 15 May 2015 22:22:13 -0400 +Subject: [PATCH] Reintroduce ssh_forward_listen() (Fixes: #194) + +--- + src/channels.c | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/src/channels.c b/src/channels.c +index 7a4e71f..db5f83a 100644 +--- a/src/channels.c ++++ b/src/channels.c +@@ -2206,6 +2206,11 @@ error: + } + + /* DEPRECATED */ ++int ssh_forward_listen(ssh_session session, const char *address, int port, int *bound_port) { ++ return ssh_channel_listen_forward(session, address, port, bound_port); ++} ++ ++/* DEPRECATED */ + ssh_channel ssh_forward_accept(ssh_session session, int timeout_ms) { + return ssh_channel_accept(session, SSH_CHANNEL_FORWARDED_TCPIP, timeout_ms, NULL); + } +-- +2.1.4 + diff --git a/libssh.spec b/libssh.spec index f66d919..9cba39b 100644 --- a/libssh.spec +++ b/libssh.spec @@ -1,6 +1,6 @@ Name: libssh Version: 0.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A library implementing the SSH protocol License: LGPLv2+ URL: http://www.libssh.org @@ -8,6 +8,10 @@ Group: System Environment/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: https://red.libssh.org/attachments/download/140/libssh-0.7.0.tar.xz +# Fix undefined symbol: ssh_forward_listen +# https://bugzilla.redhat.com/show_bug.cgi?id=1221310 +# https://red.libssh.org/issues/194 +Patch0: https://red.libssh.org/attachments/download/143/0001-Reintroduce-ssh_forward_listen-Fixes-194.patch BuildRequires: cmake BuildRequires: doxygen @@ -36,6 +40,7 @@ applications that use %{name}. %prep %setup -q +%patch0 -p1 # Remove examples, they are not packaged and do not build on EPEL 5 sed -i -e 's|add_subdirectory(examples)||g' CMakeLists.txt rm -rf examples @@ -88,6 +93,9 @@ rm -rf %{buildroot} %{_libdir}/libssh_threads.so %changelog +* Thu May 21 2015 Orion Poplawski - 0.7.0-2 +- Add patch to fix undefined symbol: ssh_forward_listen (bug #1221310) + * Mon May 11 2015 Andreas Schneider - 0.7.0-1 - Update to version 0.7.0 * Added support for ed25519 keys