sync upstream config

debian/README.Debian

@@ -1,8 +0,0 @@
-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/control

@@ -1,19 +1,22 @@
 Source: libssh2
 Section: libs
 Priority: optional
-Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
-Build-Depends: debhelper-compat (= 13)
+Maintainer: openKylin Developers <packaging@lists.openkylin.top>
+Build-Depends: dpkg-dev (>= 1.22.5), debhelper-compat (= 13)
              , libssl-dev
              , zlib1g-dev
              , chrpath
              , openssh-server
-Standards-Version: 4.6.0
+Standards-Version: 4.6.2
 Homepage: https://libssh2.org/
 Rules-Requires-Root: no
-Vcs-Browser: https://gitee/openkylin/libssh2
-Vcs-Git: https://gitee/openkylin/libssh2.git
+Vcs-Browser: https://gitee.com/openkylin/libssh2
+Vcs-Git: https://gitee.com/openkylin/libssh2.git
 
-Package: libssh2-1
+Package: libssh2-1t64
+Provides: ${t64:Provides}
+Replaces: libssh2-1
+Breaks: libssh2-1 (<< ${source:Version})
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
@@ -29,7 +32,7 @@ Description: SSH2 client-side library
 Package: libssh2-1-dev
 Section: libdevel
 Architecture: any
-Depends: libssh2-1 (= ${binary:Version}), ${misc:Depends}
+Depends: libssh2-1t64 (= ${binary:Version}), ${misc:Depends}
        , libssl-dev
        , zlib1g-dev
 Multi-Arch: same

debian/libssh2-1-dev.examples

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

debian/libssh2-1t64.lintian-overrides

@@ -0,0 +1 @@
+libssh2-1t64: package-name-doesnt-match-sonames libssh2-1

debian/libssh2-1t64.symbols

@@ -1,5 +1,5 @@
-# SymbolsHelper-Confirmed: 1.10.0 amd64
-libssh2.so.1 libssh2-1 #MINVER#
+# SymbolsHelper-Confirmed: 1.11.0 amd64
+libssh2.so.1 libssh2-1t64 #MINVER#
 * Build-Depends-Package: libssh2-1-dev
  libssh2_agent_connect@Base 1.2.3
  libssh2_agent_disconnect@Base 1.2.3
@@ -9,10 +9,12 @@ libssh2.so.1 libssh2-1 #MINVER#
  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_sign@Base 1.11.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_streamlocal_ex@Base 1.11.0
  libssh2_channel_direct_tcpip_ex@Base 1.0
  libssh2_channel_eof@Base 1.0
  libssh2_channel_flush_ex@Base 1.0
@@ -35,6 +37,7 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_channel_send_eof@Base 1.0
  libssh2_channel_set_blocking@Base 1.0
  libssh2_channel_setenv_ex@Base 1.0
+ libssh2_channel_signal_ex@Base 1.11.0
  libssh2_channel_wait_closed@Base 1.0
  libssh2_channel_wait_eof@Base 1.0
  libssh2_channel_window_read_ex@Base 1.0
@@ -42,6 +45,7 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_channel_write_ex@Base 1.0
  libssh2_channel_x11_req_ex@Base 1.0
  libssh2_crypt_methods@Base 1.0
+ libssh2_crypto_engine@Base 1.11.0
  libssh2_exit@Base 1.2.5
  libssh2_free@Base 1.2.8
  libssh2_hostkey_hash@Base 1.0
@@ -82,6 +86,7 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_session_flag@Base 1.0
  libssh2_session_free@Base 1.0
  libssh2_session_get_blocking@Base 1.0
+ libssh2_session_get_read_timeout@Base 1.11.0
  libssh2_session_get_timeout@Base 1.2.9
  libssh2_session_handshake@Base 1.2.8
  libssh2_session_hostkey@Base 1.2
@@ -92,6 +97,7 @@ libssh2.so.1 libssh2-1 #MINVER#
  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_read_timeout@Base 1.11.0
  libssh2_session_set_timeout@Base 1.2.9
  libssh2_session_startup@Base 1.0
  libssh2_session_supported_algs@Base 1.4.0
@@ -105,6 +111,7 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_sftp_last_error@Base 1.0
  libssh2_sftp_mkdir_ex@Base 1.0
  libssh2_sftp_open_ex@Base 1.0
+ libssh2_sftp_open_ex_r@Base 1.11.0
  libssh2_sftp_read@Base 1.0
  libssh2_sftp_readdir_ex@Base 1.0
  libssh2_sftp_rename_ex@Base 1.0
@@ -119,9 +126,11 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_sftp_tell@Base 1.0
  libssh2_sftp_unlink_ex@Base 1.0
  libssh2_sftp_write@Base 1.0
+ libssh2_sign_sk@Base 1.11.0
  libssh2_trace@Base 1.0
  libssh2_trace_sethandler@Base 1.2.3
  libssh2_userauth_authenticated@Base 1.0
+ libssh2_userauth_banner@Base 1.11.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
@@ -129,4 +138,5 @@ libssh2.so.1 libssh2-1 #MINVER#
  libssh2_userauth_password_ex@Base 1.0
  libssh2_userauth_publickey@Base 1.2.3
  libssh2_userauth_publickey_fromfile_ex@Base 1.0
+ libssh2_userauth_publickey_sk@Base 1.11.0
  libssh2_version@Base 1.1

debian/rules

@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export OPENSSH_NO_DOCKER = true
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
@@ -13,7 +14,8 @@ CONFIGURE_EXTRA_FLAGS += --disable-rpath
 	dh $@ --with autoreconf
 
 override_dh_auto_configure:
-	dh_auto_configure -- $(CONFIGURE_EXTRA_FLAGS)
+	dh_auto_configure -- --disable-docker-tests \
+											 $(CONFIGURE_EXTRA_FLAGS)
 
 override_dh_installexamples:
 	dh_installexamples -a -X .deps -X Makefile -X .gitignore

debian/tests/unit-test

@@ -4,7 +4,7 @@ set -e
 
 exec 2>&1
 
-./configure --disable-static --disable-rpath
+./configure --disable-docker-tests
 
 make
 

debian/upstream/metadata

@@ -1,4 +0,0 @@
-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

@@ -1,3 +1,2 @@
 version=4
-https://www.libssh2.org/download/libssh2-(.+)\.tar\.gz
-pgpmode=auto
+opts=pgpsigurlmangle=s/$/.asc/ https://www.libssh2.org/download/libssh2-(.+)\.tar\.gz