forked from openkylin/libssh2
changed debian/source/format to native
This commit is contained in:
parent
861b1bc86b
commit
dda2ea2e0e
|
@ -1,30 +0,0 @@
|
|||
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}
|
|
@ -1,21 +0,0 @@
|
|||
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}
|
|
@ -1,14 +0,0 @@
|
|||
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)
|
|
@ -1,3 +0,0 @@
|
|||
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
|
|
@ -1,15 +0,0 @@
|
|||
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 &
|
|
@ -1 +1 @@
|
|||
3.0 (quilt)
|
||||
3.0 (native)
|
||||
|
|
Loading…
Reference in New Issue