summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-03 12:40:53 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2018-01-03 12:40:53 +0000
commit170a620a11b00dc0de7960eb81ac519076424818 (patch)
tree5bd3663f8208d6fc2b61bd1b70d3fde5fff001bb
parentMerging upstream version 0.8.0~20170825.94fa1e38. (diff)
downloadlibssh-170a620a11b00dc0de7960eb81ac519076424818.zip
libssh-170a620a11b00dc0de7960eb81ac519076424818.tar.xz
Merging debian version 0.8.0~20170825.94fa1e38-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/changelog18
-rw-r--r--debian/control4
-rw-r--r--debian/copyright10
-rw-r--r--debian/copyright.in257
-rw-r--r--debian/libssh-4.symbols23
-rw-r--r--debian/libssh-gcrypt-4.lintian-overrides4
-rw-r--r--debian/libssh-gcrypt-4.symbols23
-rw-r--r--debian/patches/1001_error-msg-typo-fix.patch25
-rw-r--r--debian/patches/2003-disable-expand_tilde_unix-test.patch22
-rw-r--r--debian/patches/2004-fix-upstream-version.patch35
-rw-r--r--debian/patches/series1
-rw-r--r--debian/upstream/signing-key.asc76
-rw-r--r--debian/watch8
13 files changed, 216 insertions, 290 deletions
diff --git a/debian/changelog b/debian/changelog
index c6ec7d9..3c978f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+libssh (0.8.0~20170825.94fa1e38-1) unstable; urgency=medium
+
+ [ Laurent Bigonville ]
+ * debian/watch: Verify the signature of the upstream tarball
+ * debian/libssh-gcrypt-4.lintian-overrides: Adjust the overrides
+
+ [ Matteo F. Vescovi ]
+ * New upstream git snapshot (based on commit 94fa1e38) (Closes: #828413)
+ * debian/patches/: patchset refreshed against snapshot release
+ * debian/: symbols files refreshed for snapshot release
+ * debian/control: bump OpenSSL b-dep to use 1.1 version
+ * debian/copyright: entried updated
+ * debian/copyright.in: drop useless file
+ * debian/patches/: patchset updated
+ - 2004-fix-upstream-version.patch added
+
+ -- Laurent Bigonville <bigon@debian.org> Wed, 13 Sep 2017 14:36:14 +0200
+
libssh (0.7.5-1~dschinn1) dschinn-backports; urgency=medium
* Initial upload to dschinn-backports.
diff --git a/debian/control b/debian/control
index 922765b..746e3a0 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Build-Depends: cmake (>= 2.8.5),
libcmocka-dev,
libgcrypt-dev,
libkrb5-dev | heimdal-dev,
- libssl1.0-dev,
+ libssl-dev,
libz-dev,
openssh-client,
pkg-config
@@ -55,7 +55,7 @@ Package: libssh-dev
Section: libdevel
Architecture: any
Depends: libssh-4 (= ${binary:Version}),
- libssl1.0-dev,
+ libssl-dev,
zlib1g-dev,
${misc:Depends}
Suggests: libssh-doc
diff --git a/debian/copyright b/debian/copyright
index 9ed5117..fdd2d56 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,7 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: libssh
Upstream-Contact: libssh@libssh.org
Andreas Schneider <asn@cryptomilk.org>
-Source: https://red.libssh.org/projects/libssh/files
+Source: https://git.libssh.org/projects/libssh.git
+
+Files: *
+Copyright: *No copyright*
+License: LGPL-2.1+~OpenSSL
+Comment:
+ Using license from COPYING file.
Files: include/libssh/auth.h
include/libssh/bignum.h
@@ -90,6 +96,7 @@ License: LGPL-2.1+~OpenSSL
Files: examples/exec.c
examples/senddata.c
+ examples/CMakeLists.txt
include/libssh/ssh1.h
include/libssh/ssh2.h
tests/authentication.c
@@ -99,7 +106,6 @@ Files: examples/exec.c
tests/client/torture_proxycommand.c
tests/client/torture_sftp_dir.c
tests/client/torture_sftp_read.c
- tests/client/torture_sftp_static.c
tests/cmdline.c
tests/connection.c
tests/generate.py
diff --git a/debian/copyright.in b/debian/copyright.in
deleted file mode 100644
index bf752d9..0000000
--- a/debian/copyright.in
+++ /dev/null
@@ -1,257 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: FIXME
-Upstream-Contact: FIXME
-Source: FIXME
-Disclaimer: Autogenerated by CDBS
-
-Files: include/libssh/auth.h
- include/libssh/bind.h
- include/libssh/buffer.h
- include/libssh/channels.h
- include/libssh/crc32.h
- include/libssh/crypto.h
- include/libssh/dh.h
- include/libssh/ecdh.h
- include/libssh/gssapi.h
- include/libssh/kex.h
- include/libssh/keys.h
- include/libssh/legacy.h
- include/libssh/libcrypto.h
- include/libssh/libgcrypt.h
- include/libssh/libssh.h
- include/libssh/libsshpp.hpp
- include/libssh/messages.h
- include/libssh/misc.h
- include/libssh/packet.h
- include/libssh/pcap.h
- include/libssh/pki.h
- include/libssh/pki_priv.h
- include/libssh/poll.h
- include/libssh/priv.h
- include/libssh/scp.h
- include/libssh/server.h
- include/libssh/session.h
- include/libssh/sftp.h
- include/libssh/socket.h
- include/libssh/string.h
- include/libssh/threads.h
- include/libssh/wrapper.h
- src/auth1.c
- src/base64.c
- src/bind.c
- src/buffer.c
- src/client.c
- src/connect.c
- src/crc32.c
- src/ecdh.c
- src/error.c
- src/gcrypt_missing.c
- src/init.c
- src/kex.c
- src/kex1.c
- src/legacy.c
- src/libcrypto.c
- src/libgcrypt.c
- src/log.c
- src/messages.c
- src/packet.c
- src/packet1.c
- src/packet_cb.c
- src/packet_crypt.c
- src/pcap.c
- src/server.c
- src/session.c
- src/sftpserver.c
- src/socket.c
- src/string.c
- src/threads.c
- src/threads/pthread.c
- src/wrapper.c
- tests/benchmarks/bench_raw.c
- tests/benchmarks/bench_scp.c
- tests/benchmarks/bench_sftp.c
- tests/benchmarks/benchmarks.c
- tests/benchmarks/benchmarks.h
- tests/benchmarks/latency.c
- tests/client/torture_algorithms.c
- tests/client/torture_auth.c
- tests/client/torture_connect.c
- tests/client/torture_knownhosts.c
- tests/client/torture_session.c
- tests/test_pcap.c
- tests/test_socket.c
-Copyright: 2003, Aris Adamantiadis
- 2003-2006, Aris Adamantiadis
- 2003-2008, Aris Adamantiadis
- 2003-2009, Aris Adamantiadis
- 2003-2013, Aris Adamantiadis
- 2004-2005, Aris Adamantiadis
- 2004-2013, Aris Adamantiadis
- 2005, Aris Adamantiadis
- 2005-2005, Aris Adamantiadis
- 2005-2008, Aris Adamantiadis
- 2005-2013, Aris Adamantiadis
- 2008-2010, Aris Adamantiadis
- 2008-2013, Aris Adamantiadis
- 2009, Aris Adamantiadis
- 2010, Aris Adamantiadis
- 2011, Aris Adamantiadis
- 2011-2013, Aris Adamantiadis
- 2012, Aris Adamantiadis
- 2013, Aris Adamantiadis
-License: LGPL-2.1+
- FIXME
-
-Files: examples/exec.c
- examples/senddata.c
- include/libssh/ssh1.h
- include/libssh/ssh2.h
- src/curve25519_ref.c
- tests/authentication.c
- tests/benchmarks/bench1.sh
- tests/benchmarks/bench2.sh
- tests/chmodtest.c
- tests/client/torture_proxycommand.c
- tests/client/torture_sftp_dir.c
- tests/client/torture_sftp_read.c
- tests/client/torture_sftp_static.c
- tests/cmdline.c
- tests/connection.c
- tests/generate.py
- tests/sftp_stress/main.c
- tests/test_exec.c
- tests/test_ssh_bind_accept_fd.c
- tests/test_tunnel.c
- tests/tests.h
- tests/unittests/torture_buffer.c
- tests/unittests/torture_callbacks.c
- tests/unittests/torture_channel.c
- tests/unittests/torture_init.c
- tests/unittests/torture_isipaddr.c
- tests/unittests/torture_keyfiles.c
- tests/unittests/torture_list.c
- tests/unittests/torture_misc.c
- tests/unittests/torture_options.c
- tests/unittests/torture_pki.c
- tests/unittests/torture_rand.c
-Copyright: *No copyright*
-License: UNKNOWN
- FIXME
-
-Files: examples/authentication.c
- examples/connect_ssh.c
- examples/examples_common.h
- examples/knownhosts.c
- examples/libssh_scp.c
- examples/libsshpp.cpp
- examples/libsshpp_noexcept.cpp
- examples/proxy.c
- examples/sample.c
- examples/samplesftp.c
- examples/samplesshd-cb.c
- examples/samplesshd-kbdint.c
- examples/samplesshd-tty.c
- examples/samplesshd.c
- examples/scp_download.c
- examples/sshnetcat.c
-Copyright: 2003-2009, Aris Adamantiadis
- 2003-2011, Aris Adamantiadis
- 2003-2013, Aris Adamantiadis
- 2009, Aris Adamantiadis
- 2010, Aris Adamantiadis
-License: UNKNOWN
- FIXME
-
-Files: src/channels.c
- src/channels1.c
- src/gzip.c
- src/known_hosts.c
- src/misc.c
- src/options.c
- src/pki.c
- src/pki_crypto.c
- src/pki_gcrypt.c
- src/sftp.c
-Copyright: 2003, Aris Adamantiadis
- 2003-2008, Aris Adamantiadis
- 2003-2009, Aris Adamantiadis
- 2003-2013, Aris Adamantiadis
- 2005-2008, Aris Adamantiadis
- 2008-2009, Andreas Schneider <asn@cryptomilk.org>
- 2009, Andreas Schneider <asn@cryptomilk.org>
- 2009-2011, Andreas Schneider <asn@cryptomilk.org>
- 2009-2013, Andreas Schneider <asn@cryptomilk.org>
- 2010, Aris Adamantiadis
- 2011-2013, Andreas Schneider <asn@cryptomilk.org>
-License: LGPL-2.1+
- FIXME
-
-Files: include/libssh/agent.h
- include/libssh/options.h
- src/agent.c
- src/callbacks.c
- src/config.c
- tests/client/torture_forward.c
- tests/client/torture_request_env.c
- tests/torture.c
- tests/torture.h
-Copyright: 2008-2009, Andreas Schneider <asn@cryptomilk.org>
- 2008-2013, Andreas Schneider <asn@cryptomilk.org>
- 2009-2013, Andreas Schneider <asn@cryptomilk.org>
- 2011, Andreas Schneider <asn@cryptomilk.org>
- 2013, Andreas Schneider <asn@cryptomilk.org>
-License: LGPL-2.1+
- FIXME
-
-Files: include/libssh/curve25519.h
- src/curve25519.c
-Copyright: 2013, Aris Adamantiadis <aris@badcode.be>
-License: LGPL-2.1
- FIXME
-
-Files: include/libssh/callbacks.h
- src/scp.c
-Copyright: 2009, Aris Adamantiadis <aris@0xbadc0de.be>
-License: LGPL-2.1+
- FIXME
-
-Files: src/match.c
-Copyright: 1995, Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
- 2000, Markus Friedl.
-License: BSD (2 clause)
- FIXME
-
-Files: include/libssh/knownhosts.h
-Copyright: 20014 Aris Adamantiadis <aris@badcode.be>
-License: LGPL
- FIXME
-
-Files: src/poll.c
-Copyright: 2003-2013, Aris Adamantiadis
- 2009, Aleksandar Kanchev
- 2009-2013, Andreas Schneider <asn@cryptomilk.org>
-License: LGPL-2.1+
- FIXME
-
-Files: src/dh.c
-Copyright: 2003-2013, Aris Adamantiadis
- 2009-2013, Andreas Schneider <asn@cryptomilk.org>
- 2012, Dmitriy Kuznetsov <dk@yandex.ru>
-License: LGPL-2.1+
- FIXME
-
-Files: src/auth.c
-Copyright: 2003-2013, Aris Adamantiadis <aris@0xbadc0de.be>
- 2008-2013, Andreas Schneider <asn@cryptomilk.org>
-License: LGPL-2.1+
- FIXME
-
-Files: src/getpass.c
-Copyright: 2011-2013, Andreas Schneider <mail@cryptomilk.org>
-License: LGPL-2.1+
- FIXME
-
-Files: src/gssapi.c
-Copyright: 2013, Aris Adamantiadis <aris@badcode.be>
-License: LGPL-2.1+
- FIXME
diff --git a/debian/libssh-4.symbols b/debian/libssh-4.symbols
index f880858..12e78ed 100644
--- a/debian/libssh-4.symbols
+++ b/debian/libssh-4.symbols
@@ -67,6 +67,7 @@ libssh.so.4 libssh-4 #MINVER#
sftp_free@Base 0.3.4
sftp_fstat@Base 0.3.4
sftp_fstatvfs@Base 0.3.91
+ sftp_fsync@Base 0.8.0~20170825.94fa1e38
sftp_get_client_message@Base 0.6.1
sftp_get_error@Base 0.3.4
sftp_init@Base 0.3.4
@@ -99,6 +100,7 @@ libssh.so.4 libssh-4 #MINVER#
sftp_utimes@Base 0.3.4
sftp_write@Base 0.3.4
ssh_accept@Base 0.3.4
+ ssh_add_channel_callbacks@Base 0.8.0~20170825.94fa1e38
ssh_auth_list@Base 0.3.4
ssh_basename@Base 0.3.4
ssh_bind_accept@Base 0.3.4
@@ -113,10 +115,14 @@ libssh.so.4 libssh-4 #MINVER#
ssh_bind_set_callbacks@Base 0.5.0
ssh_bind_set_fd@Base 0.3.4
ssh_blocking_flush@Base 0.5.0
+ ssh_buffer_add_data@Base 0.8.0~20170825.94fa1e38
ssh_buffer_free@Base 0.5.0
- ssh_buffer_get_begin@Base 0.5.0
+ ssh_buffer_get@Base 0.8.0~20170825.94fa1e38
+#MISSING: 0.8.0~20170825.94fa1e38-1# ssh_buffer_get_begin@Base 0.5.0
+ ssh_buffer_get_data@Base 0.8.0~20170825.94fa1e38
ssh_buffer_get_len@Base 0.5.0
ssh_buffer_new@Base 0.5.0
+ ssh_buffer_reinit@Base 0.8.0~20170825.94fa1e38
ssh_channel_accept_forward@Base 0.5.4-2~
ssh_channel_accept_x11@Base 0.5.0
ssh_channel_cancel_forward@Base 0.7.3
@@ -140,6 +146,7 @@ libssh.so.4 libssh-4 #MINVER#
ssh_channel_read@Base 0.5.0
ssh_channel_read_nonblocking@Base 0.5.0
ssh_channel_read_timeout@Base 0.6.1
+ ssh_channel_request_auth_agent@Base 0.8.0~20170825.94fa1e38
ssh_channel_request_env@Base 0.5.0
ssh_channel_request_exec@Base 0.5.0
ssh_channel_request_pty@Base 0.5.0
@@ -160,14 +167,23 @@ libssh.so.4 libssh-4 #MINVER#
ssh_channel_write_stderr@Base 0.5.0
ssh_clean_pubkey_hash@Base 0.3.91
ssh_connect@Base 0.3.4
+ ssh_connector_free@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_new@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_in_channel@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_in_fd@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_out_channel@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_out_fd@Base 0.8.0~20170825.94fa1e38
ssh_copyright@Base 0.3.4
ssh_dirname@Base 0.3.4
ssh_disconnect@Base 0.3.4
+ ssh_dump_knownhost@Base 0.8.0~20170825.94fa1e38
+ ssh_event_add_connector@Base 0.8.0~20170825.94fa1e38
ssh_event_add_fd@Base 0.6.1
ssh_event_add_session@Base 0.6.1
ssh_event_dopoll@Base 0.6.1
ssh_event_free@Base 0.6.1
ssh_event_new@Base 0.6.1
+ ssh_event_remove_connector@Base 0.8.0~20170825.94fa1e38
ssh_event_remove_fd@Base 0.6.1
ssh_event_remove_session@Base 0.6.1
ssh_execute_message_callbacks@Base 0.5.0
@@ -198,6 +214,7 @@ libssh.so.4 libssh-4 #MINVER#
ssh_get_publickey@Base 0.6.1
ssh_get_publickey_hash@Base 0.6.1
ssh_get_random@Base 0.3.4
+ ssh_get_server_publickey@Base 0.8.0~20170825.94fa1e38
ssh_get_serverbanner@Base 0.6.1
ssh_get_status@Base 0.3.4
ssh_get_version@Base 0.3.4
@@ -272,11 +289,14 @@ libssh.so.4 libssh-4 #MINVER#
ssh_pcap_file_free@Base 0.5.0
ssh_pcap_file_new@Base 0.5.0
ssh_pcap_file_open@Base 0.5.0
+ ssh_pki_copy_cert_to_privkey@Base 0.8.0~20170825.94fa1e38
ssh_pki_export_privkey_file@Base 0.6.1
ssh_pki_export_privkey_to_pubkey@Base 0.6.1
ssh_pki_export_pubkey_base64@Base 0.6.1
ssh_pki_export_pubkey_file@Base 0.6.1
ssh_pki_generate@Base 0.6.1
+ ssh_pki_import_cert_base64@Base 0.8.0~20170825.94fa1e38
+ ssh_pki_import_cert_file@Base 0.8.0~20170825.94fa1e38
ssh_pki_import_privkey_base64@Base 0.6.1
ssh_pki_import_privkey_file@Base 0.6.1
ssh_pki_import_pubkey_base64@Base 0.6.1
@@ -285,6 +305,7 @@ libssh.so.4 libssh-4 #MINVER#
ssh_print_hexa@Base 0.3.4
ssh_privatekey_type@Base 0.4.3
ssh_publickey_to_file@Base 0.4.2
+ ssh_remove_channel_callbacks@Base 0.8.0~20170825.94fa1e38
ssh_scp_accept_request@Base 0.3.91
ssh_scp_close@Base 0.3.91
ssh_scp_deny_request@Base 0.3.91
diff --git a/debian/libssh-gcrypt-4.lintian-overrides b/debian/libssh-gcrypt-4.lintian-overrides
index f849087..ad83564 100644
--- a/debian/libssh-gcrypt-4.lintian-overrides
+++ b/debian/libssh-gcrypt-4.lintian-overrides
@@ -1,4 +1,4 @@
libssh-gcrypt-4: package-name-doesnt-match-sonames libssh-gcrypt4 libssh-gcrypt-threads4
# The development symlink is not renamed to add the "-gcrypt" suffix
-libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libssh-gcrypt.so.4.4.2 usr/lib/x86_64-linux-gnu/libssh-gcrypt.so
-libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/x86_64-linux-gnu/libssh-gcrypt_threads.so.4.4.2 usr/lib/x86_64-linux-gnu/libssh-gcrypt_threads.so
+libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/*/libssh-gcrypt.so.4.5.0 usr/lib/*/libssh-gcrypt.so
+libssh-gcrypt-4: dev-pkg-without-shlib-symlink usr/lib/*/libssh-gcrypt_threads.so.4.5.0 usr/lib/*/libssh-gcrypt_threads.so
diff --git a/debian/libssh-gcrypt-4.symbols b/debian/libssh-gcrypt-4.symbols
index 3523eac..bae6d56 100644
--- a/debian/libssh-gcrypt-4.symbols
+++ b/debian/libssh-gcrypt-4.symbols
@@ -67,6 +67,7 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
sftp_free@Base 0.3.4
sftp_fstat@Base 0.3.4
sftp_fstatvfs@Base 0.3.91
+ sftp_fsync@Base 0.8.0~20170825.94fa1e38
sftp_get_client_message@Base 0.6.1
sftp_get_error@Base 0.3.4
sftp_init@Base 0.3.4
@@ -99,6 +100,7 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
sftp_utimes@Base 0.3.4
sftp_write@Base 0.3.4
ssh_accept@Base 0.3.4
+ ssh_add_channel_callbacks@Base 0.8.0~20170825.94fa1e38
ssh_auth_list@Base 0.3.4
ssh_basename@Base 0.3.4
ssh_bind_accept@Base 0.3.4
@@ -113,10 +115,14 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_bind_set_callbacks@Base 0.5.0
ssh_bind_set_fd@Base 0.3.4
ssh_blocking_flush@Base 0.5.0
+ ssh_buffer_add_data@Base 0.8.0~20170825.94fa1e38
ssh_buffer_free@Base 0.5.0
- ssh_buffer_get_begin@Base 0.5.0
+ ssh_buffer_get@Base 0.8.0~20170825.94fa1e38
+#MISSING: 0.8.0~20170825.94fa1e38-1# ssh_buffer_get_begin@Base 0.5.0
+ ssh_buffer_get_data@Base 0.8.0~20170825.94fa1e38
ssh_buffer_get_len@Base 0.5.0
ssh_buffer_new@Base 0.5.0
+ ssh_buffer_reinit@Base 0.8.0~20170825.94fa1e38
ssh_channel_accept_forward@Base 0.5.4-2~
ssh_channel_accept_x11@Base 0.5.0
ssh_channel_cancel_forward@Base 0.7.3
@@ -140,6 +146,7 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_channel_read@Base 0.5.0
ssh_channel_read_nonblocking@Base 0.5.0
ssh_channel_read_timeout@Base 0.6.1
+ ssh_channel_request_auth_agent@Base 0.8.0~20170825.94fa1e38
ssh_channel_request_env@Base 0.5.0
ssh_channel_request_exec@Base 0.5.0
ssh_channel_request_pty@Base 0.5.0
@@ -160,14 +167,23 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_channel_write_stderr@Base 0.5.0
ssh_clean_pubkey_hash@Base 0.3.91
ssh_connect@Base 0.3.4
+ ssh_connector_free@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_new@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_in_channel@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_in_fd@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_out_channel@Base 0.8.0~20170825.94fa1e38
+ ssh_connector_set_out_fd@Base 0.8.0~20170825.94fa1e38
ssh_copyright@Base 0.3.4
ssh_dirname@Base 0.3.4
ssh_disconnect@Base 0.3.4
+ ssh_dump_knownhost@Base 0.8.0~20170825.94fa1e38
+ ssh_event_add_connector@Base 0.8.0~20170825.94fa1e38
ssh_event_add_fd@Base 0.6.1
ssh_event_add_session@Base 0.6.1
ssh_event_dopoll@Base 0.6.1
ssh_event_free@Base 0.6.1
ssh_event_new@Base 0.6.1
+ ssh_event_remove_connector@Base 0.8.0~20170825.94fa1e38
ssh_event_remove_fd@Base 0.6.1
ssh_event_remove_session@Base 0.6.1
ssh_execute_message_callbacks@Base 0.5.0
@@ -198,6 +214,7 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_get_publickey@Base 0.6.1
ssh_get_publickey_hash@Base 0.6.1
ssh_get_random@Base 0.3.4
+ ssh_get_server_publickey@Base 0.8.0~20170825.94fa1e38
ssh_get_serverbanner@Base 0.6.1
ssh_get_status@Base 0.3.4
ssh_get_version@Base 0.3.4
@@ -272,11 +289,14 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_pcap_file_free@Base 0.5.0
ssh_pcap_file_new@Base 0.5.0
ssh_pcap_file_open@Base 0.5.0
+ ssh_pki_copy_cert_to_privkey@Base 0.8.0~20170825.94fa1e38
ssh_pki_export_privkey_file@Base 0.6.1
ssh_pki_export_privkey_to_pubkey@Base 0.6.1
ssh_pki_export_pubkey_base64@Base 0.6.1
ssh_pki_export_pubkey_file@Base 0.6.1
ssh_pki_generate@Base 0.6.1
+ ssh_pki_import_cert_base64@Base 0.8.0~20170825.94fa1e38
+ ssh_pki_import_cert_file@Base 0.8.0~20170825.94fa1e38
ssh_pki_import_privkey_base64@Base 0.6.1
ssh_pki_import_privkey_file@Base 0.6.1
ssh_pki_import_pubkey_base64@Base 0.6.1
@@ -285,6 +305,7 @@ libssh-gcrypt.so.4 libssh-gcrypt-4 #MINVER#
ssh_print_hexa@Base 0.3.4
ssh_privatekey_type@Base 0.4.3
ssh_publickey_to_file@Base 0.4.2
+ ssh_remove_channel_callbacks@Base 0.8.0~20170825.94fa1e38
ssh_scp_accept_request@Base 0.3.91
ssh_scp_close@Base 0.3.91
ssh_scp_deny_request@Base 0.3.91
diff --git a/debian/patches/1001_error-msg-typo-fix.patch b/debian/patches/1001_error-msg-typo-fix.patch
index 365b408..fdb29ee 100644
--- a/debian/patches/1001_error-msg-typo-fix.patch
+++ b/debian/patches/1001_error-msg-typo-fix.patch
@@ -1,33 +1,34 @@
Description: Fix spelling error in pki_* code
Author: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
+
--- a/src/pki_crypto.c
+++ b/src/pki_crypto.c
-@@ -653,7 +653,7 @@ ssh_string pki_private_key_to_pem(const
- return NULL;
+@@ -710,7 +710,7 @@ ssh_string pki_private_key_to_pem(const ssh_key key,
+ case SSH_KEYTYPE_RSA_CERT01:
case SSH_KEYTYPE_UNKNOWN:
BIO_free(mem);
-- ssh_pki_log("Unkown or invalid private key type %d", key->type);
-+ ssh_pki_log("Unknown or invalid private key type %d", key->type);
+- SSH_LOG(SSH_LOG_WARN, "Unkown or invalid private key type %d", key->type);
++ SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key type %d", key->type);
return NULL;
}
-@@ -779,7 +779,7 @@ ssh_key pki_private_key_from_base64(cons
- /* Cannot open ed25519 keys with libcrypto */
+@@ -841,7 +841,7 @@ ssh_key pki_private_key_from_base64(const char *b64_key,
+ case SSH_KEYTYPE_RSA_CERT01:
case SSH_KEYTYPE_UNKNOWN:
BIO_free(mem);
-- ssh_pki_log("Unkown or invalid private key type %d", type);
-+ ssh_pki_log("Unknown or invalid private key type %d", type);
+- SSH_LOG(SSH_LOG_WARN, "Unkown or invalid private key type %d", type);
++ SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key type %d", type);
return NULL;
}
--- a/src/pki_gcrypt.c
+++ b/src/pki_gcrypt.c
-@@ -671,7 +671,7 @@ ssh_key pki_private_key_from_base64(cons
- case SSH_KEYTYPE_ECDSA:
+@@ -1003,7 +1003,7 @@ ssh_key pki_private_key_from_base64(const char *b64_key,
+ /* Cannot open ed25519 keys with libgcrypt */
case SSH_KEYTYPE_UNKNOWN:
default:
-- ssh_pki_log("Unkown or invalid private key type %d", type);
-+ ssh_pki_log("Unknown or invalid private key type %d", type);
+- SSH_LOG(SSH_LOG_WARN, "Unkown or invalid private key type %d", type);
++ SSH_LOG(SSH_LOG_WARN, "Unknown or invalid private key type %d", type);
return NULL;
}
diff --git a/debian/patches/2003-disable-expand_tilde_unix-test.patch b/debian/patches/2003-disable-expand_tilde_unix-test.patch
index 86a25f8..b5583e0 100644
--- a/debian/patches/2003-disable-expand_tilde_unix-test.patch
+++ b/debian/patches/2003-disable-expand_tilde_unix-test.patch
@@ -5,20 +5,20 @@ Author: Laurent Bigonville <bigon@debian.org>
--- a/tests/unittests/torture_misc.c
+++ b/tests/unittests/torture_misc.c
-@@ -206,11 +206,11 @@ int torture_run_tests(void) {
- unit_test(torture_basename),
- unit_test(torture_dirname),
- unit_test(torture_ntohll),
+@@ -353,11 +353,11 @@ int torture_run_tests(void) {
+ cmocka_unit_test(torture_basename),
+ cmocka_unit_test(torture_dirname),
+ cmocka_unit_test(torture_ntohll),
-#ifdef _WIN32
-- unit_test(torture_path_expand_tilde_win),
+- cmocka_unit_test(torture_path_expand_tilde_win),
-#else
-- unit_test(torture_path_expand_tilde_unix),
+- cmocka_unit_test(torture_path_expand_tilde_unix),
-#endif
+//#ifdef _WIN32
-+// unit_test(torture_path_expand_tilde_win),
++// cmocka_unit_test(torture_path_expand_tilde_win),
+//#else
-+// unit_test(torture_path_expand_tilde_unix),
++// cmocka_unit_test(torture_path_expand_tilde_unix),
+//#endif
- unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
- unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
- unit_test(torture_timeout_elapsed),
+ cmocka_unit_test_setup_teardown(torture_path_expand_escape, setup, teardown),
+ cmocka_unit_test_setup_teardown(torture_path_expand_known_hosts, setup, teardown),
+ cmocka_unit_test(torture_timeout_elapsed),
diff --git a/debian/patches/2004-fix-upstream-version.patch b/debian/patches/2004-fix-upstream-version.patch
new file mode 100644
index 0000000..70ced2f
--- /dev/null
+++ b/debian/patches/2004-fix-upstream-version.patch
@@ -0,0 +1,35 @@
+From f7b839412734ecb9675988e3167a06951c94da1a Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@cryptomilk.org>
+Date: Tue, 12 Sep 2017 07:40:45 +0200
+Subject: cmake: Bump version numbers
+
+Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 30b1025c..b561947b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -7,7 +7,7 @@ cmake_minimum_required(VERSION 2.8.5)
+ set(APPLICATION_NAME ${PROJECT_NAME})
+
+ set(APPLICATION_VERSION_MAJOR "0")
+-set(APPLICATION_VERSION_MINOR "7")
++set(APPLICATION_VERSION_MINOR "8")
+ set(APPLICATION_VERSION_PATCH "0")
+
+ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
+@@ -19,7 +19,7 @@ set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINO
+ # Increment AGE. Set REVISION to 0
+ # If the source code was changed, but there were no interface changes:
+ # Increment REVISION.
+-set(LIBRARY_VERSION "4.4.0")
++set(LIBRARY_VERSION "4.5.0")
+ set(LIBRARY_SOVERSION "4")
+
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
+--
+cgit v1.1
+
diff --git a/debian/patches/series b/debian/patches/series
index ecf0385..09f8a0c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
1001_error-msg-typo-fix.patch
1003-custom-lib-names.patch
2003-disable-expand_tilde_unix-test.patch
+2004-fix-upstream-version.patch
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..b45101f
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,76 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+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
+Moa6VnExtGM9CbcGhfjwwetiEboCkn+z
+=ce0w
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 1b13035..5f5eddb 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,7 @@
-version=3
+version=4
+opts="pgpmode=next,decompress" \
https://red.libssh.org/projects/libssh/files \
- /attachments/download/\d+/libssh-(.*)\.tar\.(?:gz|xz)
+ /attachments/download/(?:\d+)/libssh-@ANY_VERSION@@ARCHIVE_EXT@ debian
+opts="pgpmode=previous" \
+https://red.libssh.org/projects/libssh/files \
+ /attachments/download/(?:\d+)/libssh-@ANY_VERSION@.tar.asc previous