Import Debian changes 1.10.0-ok1

libssh2 (1.10.0-ok1) yangtze; urgency=low

  * Initial release.

debian/README.Debian

@@ -0,0 +1,8 @@
+libssh2 for Debian
+
+Please edit this to provide information specific to
+this libssh2 Debian package.
+
+    (Automatically generated by debmake Version 4.3.1)
+
+ -- Luoyaoming <luoyaoming@kylinos.cn>  Fri, 09 Dec 2022 09:50:06 +0800

debian/changelog

@@ -0,0 +1,5 @@
+libssh2 (1.10.0-ok1) yangtze; urgency=low
+
+  * Initial release.
+
+ -- Luoyaoming <luoyaoming@kylinos.cn>  Fri, 09 Dec 2022 09:50:06 +0800

debian/control

@@ -0,0 +1,42 @@
+Source: libssh2
+Section: libs
+Priority: optional
+Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
+Build-Depends: debhelper-compat (= 13)
+             , libssl-dev
+             , zlib1g-dev
+             , chrpath
+             , openssh-server
+Standards-Version: 4.6.0
+Homepage: https://libssh2.org/
+Rules-Requires-Root: no
+Vcs-Browser: https://gitee/openkylin/libssh2
+Vcs-Git: https://gitee/openkylin/libssh2.git
+
+Package: libssh2-1
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: SSH2 client-side library
+ libssh2 is a client-side C library implementing the SSH2 protocol.
+ It supports regular terminal, SCP and SFTP (v1-v5) sessions;
+ port forwarding, X11 forwarding; password, key-based and
+ keyboard-interactive authentication.
+ .
+ This package contains the runtime library.
+
+Package: libssh2-1-dev
+Section: libdevel
+Architecture: any
+Depends: libssh2-1 (= ${binary:Version}), ${misc:Depends}
+       , libssl-dev
+       , zlib1g-dev
+Multi-Arch: same
+Description: SSH2 client-side library (development headers)
+ libssh2 is a client-side C library implementing the SSH2 protocol.
+ It supports regular terminal, SCP and SFTP (v1-v5) sessions;
+ port forwarding, X11 forwarding; password, key-based and
+ keyboard-interactive authentication.
+ .
+ This package contains the development files.

debian/libssh2-1-dev.docs

@@ -0,0 +1 @@
+README

debian/libssh2-1-dev.examples

@@ -0,0 +1,3 @@
+example/*.c
+example/*.h.in
+example/Makefile*

debian/libssh2-1-dev.install

@@ -0,0 +1,4 @@
+usr/include/*
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/pkgconfig/*.pc

debian/libssh2-1-dev.manpages

@@ -0,0 +1 @@
+usr/share/man/man3/libssh2*.3

debian/libssh2-1.docs

@@ -0,0 +1,2 @@
+docs/AUTHORS
+RELEASE-NOTES

debian/libssh2-1.install

@@ -0,0 +1 @@
+usr/lib/*/*.so.*

debian/libssh2-1.symbols

@@ -0,0 +1,132 @@
+# SymbolsHelper-Confirmed: 1.10.0 amd64
+libssh2.so.1 libssh2-1 #MINVER#
+* Build-Depends-Package: libssh2-1-dev
+ libssh2_agent_connect@Base 1.2.3
+ libssh2_agent_disconnect@Base 1.2.3
+ libssh2_agent_free@Base 1.2.3
+ libssh2_agent_get_identity@Base 1.2.3
+ libssh2_agent_get_identity_path@Base 1.9.0
+ libssh2_agent_init@Base 1.2.3
+ libssh2_agent_list_identities@Base 1.2.3
+ libssh2_agent_set_identity_path@Base 1.9.0
+ libssh2_agent_userauth@Base 1.2.3
+ libssh2_banner_set@Base 1.0
+ libssh2_base64_decode@Base 1.0
+ libssh2_channel_close@Base 1.0
+ libssh2_channel_direct_tcpip_ex@Base 1.0
+ libssh2_channel_eof@Base 1.0
+ libssh2_channel_flush_ex@Base 1.0
+ libssh2_channel_forward_accept@Base 1.0
+ libssh2_channel_forward_cancel@Base 1.0
+ libssh2_channel_forward_listen_ex@Base 1.0
+ libssh2_channel_free@Base 1.0
+ libssh2_channel_get_exit_signal@Base 1.2.8
+ libssh2_channel_get_exit_status@Base 1.0
+ libssh2_channel_handle_extended_data2@Base 1.0
+ libssh2_channel_handle_extended_data@Base 1.0
+ libssh2_channel_open_ex@Base 1.0
+ libssh2_channel_process_startup@Base 1.0
+ libssh2_channel_read_ex@Base 1.0
+ libssh2_channel_receive_window_adjust2@Base 1.1
+ libssh2_channel_receive_window_adjust@Base 1.0
+ libssh2_channel_request_auth_agent@Base 1.10
+ libssh2_channel_request_pty_ex@Base 1.0
+ libssh2_channel_request_pty_size_ex@Base 1.0
+ libssh2_channel_send_eof@Base 1.0
+ libssh2_channel_set_blocking@Base 1.0
+ libssh2_channel_setenv_ex@Base 1.0
+ libssh2_channel_wait_closed@Base 1.0
+ libssh2_channel_wait_eof@Base 1.0
+ libssh2_channel_window_read_ex@Base 1.0
+ libssh2_channel_window_write_ex@Base 1.0
+ libssh2_channel_write_ex@Base 1.0
+ libssh2_channel_x11_req_ex@Base 1.0
+ libssh2_crypt_methods@Base 1.0
+ libssh2_exit@Base 1.2.5
+ libssh2_free@Base 1.2.8
+ libssh2_hostkey_hash@Base 1.0
+ libssh2_hostkey_methods@Base 1.0
+ libssh2_init@Base 1.2.5
+ libssh2_keepalive_config@Base 1.2.5
+ libssh2_keepalive_send@Base 1.2.5
+ libssh2_knownhost_add@Base 1.2
+ libssh2_knownhost_addc@Base 1.2.5
+ libssh2_knownhost_check@Base 1.2
+ libssh2_knownhost_checkp@Base 1.2.6
+ libssh2_knownhost_del@Base 1.2
+ libssh2_knownhost_free@Base 1.2
+ libssh2_knownhost_get@Base 1.2
+ libssh2_knownhost_init@Base 1.2
+ libssh2_knownhost_readfile@Base 1.2
+ libssh2_knownhost_readline@Base 1.2
+ libssh2_knownhost_writefile@Base 1.2
+ libssh2_knownhost_writeline@Base 1.2
+ libssh2_poll@Base 1.0
+ libssh2_poll_channel_read@Base 1.0
+ libssh2_publickey_add_ex@Base 1.0
+ libssh2_publickey_init@Base 1.0
+ libssh2_publickey_list_fetch@Base 1.0
+ libssh2_publickey_list_free@Base 1.0
+ libssh2_publickey_remove_ex@Base 1.0
+ libssh2_publickey_shutdown@Base 1.0
+ libssh2_scp_recv@Base 1.0
+ libssh2_scp_recv2@Base 1.7.0
+ libssh2_scp_send64@Base 1.2.6
+ libssh2_scp_send_ex@Base 1.0
+ libssh2_session_abstract@Base 1.0
+ libssh2_session_banner_get@Base 1.4.0
+ libssh2_session_banner_set@Base 1.4.0
+ libssh2_session_block_directions@Base 1.0
+ libssh2_session_callback_set@Base 1.0
+ libssh2_session_disconnect_ex@Base 1.0
+ libssh2_session_flag@Base 1.0
+ libssh2_session_free@Base 1.0
+ libssh2_session_get_blocking@Base 1.0
+ libssh2_session_get_timeout@Base 1.2.9
+ libssh2_session_handshake@Base 1.2.8
+ libssh2_session_hostkey@Base 1.2
+ libssh2_session_init_ex@Base 1.0
+ libssh2_session_last_errno@Base 1.0
+ libssh2_session_last_error@Base 1.0
+ libssh2_session_method_pref@Base 1.0
+ libssh2_session_methods@Base 1.0
+ libssh2_session_set_blocking@Base 1.0
+ libssh2_session_set_last_error@Base 1.7.0
+ libssh2_session_set_timeout@Base 1.2.9
+ libssh2_session_startup@Base 1.0
+ libssh2_session_supported_algs@Base 1.4.0
+ libssh2_sftp_close_handle@Base 1.0
+ libssh2_sftp_dtor@Base 1.0
+ libssh2_sftp_fstat_ex@Base 1.0
+ libssh2_sftp_fstatvfs@Base 1.2.6
+ libssh2_sftp_fsync@Base 1.5.0
+ libssh2_sftp_get_channel@Base 1.4.0
+ libssh2_sftp_init@Base 1.0
+ libssh2_sftp_last_error@Base 1.0
+ libssh2_sftp_mkdir_ex@Base 1.0
+ libssh2_sftp_open_ex@Base 1.0
+ libssh2_sftp_read@Base 1.0
+ libssh2_sftp_readdir_ex@Base 1.0
+ libssh2_sftp_rename_ex@Base 1.0
+ libssh2_sftp_rmdir_ex@Base 1.0
+ libssh2_sftp_seek64@Base 1.0
+ libssh2_sftp_seek@Base 1.0
+ libssh2_sftp_shutdown@Base 1.0
+ libssh2_sftp_stat_ex@Base 1.0
+ libssh2_sftp_statvfs@Base 1.2.
+ libssh2_sftp_symlink_ex@Base 1.0
+ libssh2_sftp_tell64@Base 1.0
+ libssh2_sftp_tell@Base 1.0
+ libssh2_sftp_unlink_ex@Base 1.0
+ libssh2_sftp_write@Base 1.0
+ libssh2_trace@Base 1.0
+ libssh2_trace_sethandler@Base 1.2.3
+ libssh2_userauth_authenticated@Base 1.0
+ libssh2_userauth_hostbased_fromfile_ex@Base 1.0
+ libssh2_userauth_publickey_frommemory@Base 1.7.0
+ libssh2_userauth_keyboard_interactive_ex@Base 1.0
+ libssh2_userauth_list@Base 1.0
+ libssh2_userauth_password_ex@Base 1.0
+ libssh2_userauth_publickey@Base 1.2.3
+ libssh2_userauth_publickey_fromfile_ex@Base 1.0
+ libssh2_version@Base 1.1

debian/man

@@ -0,0 +1,5 @@
+#!/bin/sh
+
+# Stub to avoid running mansyntax.sh test
+
+exit 0

debian/not-installed

@@ -0,0 +1 @@
+usr/lib/*/*.la

debian/patches/0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch

@@ -0,0 +1,30 @@
+From 2fc4ef54ec61e98e757a49719b859d8ee59af952 Mon Sep 17 00:00:00 2001
+From: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Wed, 3 Sep 2014 15:47:19 +0200
+Subject: [PATCH] Add -lgpg-error to .pc to facilitate static linking
+
+Note that this patch is Debian-specific as we know that libssh2 is linked
+to gcrypt.
+
+Patching configure.ac to add gpg-error as a dependent library is not good, as it
+would cause overlinking of libssh2, and there is no separate variable for
+"static dependencies".
+
+All this mess ought to be solved in gcrypt inself by providing .pc file,
+but it is not.
+
+---
+ libssh2.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: libssh2/libssh2.pc.in
+===================================================================
+--- libssh2.orig/libssh2.pc.in
++++ libssh2/libssh2.pc.in
+@@ -13,5 +13,5 @@ Description: Library for SSH-based commu
+ Version: @LIBSSH2VER@
+ Requires.private: @LIBSREQUIRED@
+ Libs: -L${libdir} -lssh2 @LIBS@
+-Libs.private: @LIBS@
++Libs.private: @LIBS@ -lgpg-error
+ Cflags: -I${includedir}

debian/patches/0001-Do-not-expose-private-libraries-nor-link-flags-to-us.patch

@@ -0,0 +1,21 @@
+From a5ba7bd8c57cf5362b1245b7de1c3cf3439e7176 Mon Sep 17 00:00:00 2001
+From: Mikhail Gusarov <dottedmag@dottedmag.net>
+Date: Mon, 19 May 2014 10:12:10 +0200
+Subject: [PATCH] Do not expose private libraries nor link flags to users of
+ libssh2
+
+Reported in https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=747417
+---
+ libssh2.pc.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/libssh2.pc.in
++++ b/libssh2.pc.in
+@@ -12,6 +12,6 @@
+ Description: Library for SSH-based communication
+ Version: @LIBSSH2VER@
+ Requires.private: @LIBSREQUIRED@
+-Libs: -L${libdir} -lssh2 @LIBS@
++Libs: -L${libdir} -lssh2
+ Libs.private: @LIBS@ -lgpg-error
+ Cflags: -I${includedir}

debian/patches/manpage.patch

@@ -0,0 +1,14 @@
+Description: Fix typo
+Author: Nicolas Mora <babelouest@debian.org>
+Forwarded: not-needed
+--- a/docs/libssh2_userauth_publickey_frommemory.3
++++ b/docs/libssh2_userauth_publickey_frommemory.3
+@@ -14,7 +14,7 @@
+                                            size_t privatekeydata_len,
+                                            const char *passphrase);
+ .SH DESCRIPTION
+-This function allows to authenticate a session with a public key read from memory.
++This function allows one to authenticate a session with a public key read from memory.
+ It's only supported when libssh2 is backed by OpenSSL.
+ \fIsession\fP - Session instance as returned by
+ .BR libssh2_session_init_ex(3)

debian/patches/series

@@ -0,0 +1,3 @@
+manpage.patch
+0001-Add-lgpg-error-to-.pc-to-facilitate-static-linking.patch
+0001-Do-not-expose-private-libraries-nor-link-flags-to-us.patch

debian/patches/ssh2-sh.patch

@@ -0,0 +1,15 @@
+Description: Fix ssh2 test
+Author: Nicolas Mora <babelouest@debian.org>
+Forwarded: not-needed
+--- a/tests/ssh2.sh
++++ b/tests/ssh2.sh
+@@ -25,7 +25,8 @@
+     -o 'Port 4711' \
+     -o 'Protocol 2' \
+     -o "AuthorizedKeysFile $srcdir/etc/user.pub" \
+-    -o 'UsePrivilegeSeparation no' \
++    -o 'HostKeyAlgorithms +ssh-rsa' \
++    -o 'PubkeyAcceptedAlgorithms +ssh-rsa' \
+     -o 'StrictModes no' \
+     -D \
+     $libssh2_sshd_params &

debian/rules

@@ -0,0 +1,29 @@
+#!/usr/bin/make -f
+
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+# openssl license issue has been fixed: #668271, #924937
+#CONFIGURE_EXTRA_FLAGS += --with-libgcrypt --without-openssl
+CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
+CONFIGURE_EXTRA_FLAGS += --disable-rpath
+
+%:
+	dh $@ --with autoreconf
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CONFIGURE_EXTRA_FLAGS)
+
+override_dh_installexamples:
+	dh_installexamples -a -X .deps -X Makefile -X .gitignore
+
+override_dh_installchangelogs:
+	dh_installchangelogs NEWS
+
+#
+# mansyntax.sh test duplicates functionality of debhelper and requires presence
+# of en_US.utf8 locale. Ensure it is not run by providing a fake man(1) tool.
+#
+override_dh_auto_test:
+	PATH=$(CURDIR)/debian:$$PATH dh_auto_test -a

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

debian/tests/control

@@ -0,0 +1,2 @@
+Tests: unit-test
+Depends: @, gcc, libc-dev, autoconf, libssl-dev, zlib1g-dev, chrpath, openssh-server

debian/tests/unit-test

@@ -0,0 +1,16 @@
+#!/bin/sh
+
+set -e
+
+exec 2>&1
+
+./configure --disable-static --disable-rpath
+
+make
+
+rm -f src/.libs/libssh2.so*
+ln -s /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)/libssh2.so src/.libs/
+ln -s /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)/libssh2.so.? src/.libs/
+ln -s /usr/lib/$(dpkg-architecture -qDEB_BUILD_MULTIARCH)/libssh2.so.?.?.? src/.libs/
+
+make check

debian/upstream/metadata

@@ -0,0 +1,4 @@
+Bug-Database: https://github.com/libssh2/libssh2/issues
+Bug-Submit: https://github.com/libssh2/libssh2/issues/new
+Repository: https://github.com/libssh2/libssh2.git
+Repository-Browse: https://github.com/libssh2/libssh2

debian/watch

@@ -0,0 +1,3 @@
+version=4
+https://www.libssh2.org/download/libssh2-(.+)\.tar\.gz
+pgpmode=auto