update to 1.2.1

many fixes and improvements, notably speed

3 files changed, 49 insertions, 10 deletions

diff --git a/security/libssh2/Makefile b/security/libssh2/Makefile
index 64fafb2a4ce..fb5218f87b1 100644
--- a/security/libssh2/Makefile
+++ b/security/libssh2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/03/02 14:11:54 bjs Exp $
+# $NetBSD: Makefile,v 1.2 2009/11/15 20:07:45 drochner Exp $
 #
 
-DISTNAME=	libssh2-0.18
+DISTNAME=	libssh2-1.2.1
 CATEGORIES=	security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=libssh2/}
 
@@ -18,6 +18,9 @@ CONFIGURE_ARGS+=	--with-libgcrypt=no
 CONFIGURE_ARGS+=	--with-libz=${BUILDLINK_PREFIX.zlib:Q}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
+PKGCONFIG_OVERRIDE+=	libssh2.pc.in
+TEST_TARGET=		check
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libssh2/PLIST b/security/libssh2/PLIST
index c4126c4fa41..de2bde95e3e 100644
--- a/security/libssh2/PLIST
+++ b/security/libssh2/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/02 14:11:54 bjs Exp $
+@comment $NetBSD: PLIST,v 1.2 2009/11/15 20:07:45 drochner Exp $
 include/libssh2.h
 include/libssh2_publickey.h
 include/libssh2_sftp.h
 lib/libssh2.la
+lib/pkgconfig/libssh2.pc
 man/man3/libssh2_banner_set.3
+man/man3/libssh2_base64_decode.3
 man/man3/libssh2_channel_close.3
 man/man3/libssh2_channel_direct_tcpip_ex.3
 man/man3/libssh2_channel_eof.3
@@ -18,22 +20,51 @@ man/man3/libssh2_channel_handle_extended_data2.3
 man/man3/libssh2_channel_open_ex.3
 man/man3/libssh2_channel_process_startup.3
 man/man3/libssh2_channel_read_ex.3
+man/man3/libssh2_channel_receive_window_adjust.3
+man/man3/libssh2_channel_receive_window_adjust2.3
 man/man3/libssh2_channel_request_pty_ex.3
+man/man3/libssh2_channel_request_pty_size_ex.3
 man/man3/libssh2_channel_send_eof.3
 man/man3/libssh2_channel_set_blocking.3
 man/man3/libssh2_channel_setenv_ex.3
+man/man3/libssh2_channel_wait_closed.3
 man/man3/libssh2_channel_wait_eof.3
+man/man3/libssh2_channel_window_read_ex.3
+man/man3/libssh2_channel_window_write_ex.3
+man/man3/libssh2_channel_write_ex.3
 man/man3/libssh2_channel_x11_req_ex.3
+man/man3/libssh2_free_host_entry.3
+man/man3/libssh2_host_entry_match.3
 man/man3/libssh2_hostkey_hash.3
+man/man3/libssh2_knownhost_add.3
+man/man3/libssh2_knownhost_check.3
+man/man3/libssh2_knownhost_del.3
+man/man3/libssh2_knownhost_get.3
+man/man3/libssh2_knownhost_init.3
+man/man3/libssh2_knownhost_readfile.3
+man/man3/libssh2_knownhost_readline.3
+man/man3/libssh2_knownhost_writefile.3
+man/man3/libssh2_knownhost_writeline.3
+man/man3/libssh2_new_host_entry.3
 man/man3/libssh2_poll.3
 man/man3/libssh2_poll_channel_read.3
+man/man3/libssh2_publickey_add_ex.3
+man/man3/libssh2_publickey_init.3
+man/man3/libssh2_publickey_list_fetch.3
+man/man3/libssh2_publickey_list_free.3
+man/man3/libssh2_publickey_remove_ex.3
+man/man3/libssh2_publickey_shutdown.3
 man/man3/libssh2_scp_recv.3
 man/man3/libssh2_scp_send_ex.3
 man/man3/libssh2_session_abstract.3
+man/man3/libssh2_session_block_directions.3
 man/man3/libssh2_session_callback_set.3
 man/man3/libssh2_session_disconnect_ex.3
+man/man3/libssh2_session_flag.3
 man/man3/libssh2_session_free.3
-man/man3/libssh2_session_init.3
+man/man3/libssh2_session_get_blocking.3
+man/man3/libssh2_session_hostkey.3
+man/man3/libssh2_session_init_ex.3
 man/man3/libssh2_session_last_errno.3
 man/man3/libssh2_session_last_error.3
 man/man3/libssh2_session_method_pref.3
@@ -47,7 +78,7 @@ man/man3/libssh2_sftp_last_error.3
 man/man3/libssh2_sftp_mkdir_ex.3
 man/man3/libssh2_sftp_open_ex.3
 man/man3/libssh2_sftp_read.3
-man/man3/libssh2_sftp_readdir.3
+man/man3/libssh2_sftp_readdir_ex.3
 man/man3/libssh2_sftp_rename_ex.3
 man/man3/libssh2_sftp_rmdir_ex.3
 man/man3/libssh2_sftp_seek.3
@@ -55,9 +86,14 @@ man/man3/libssh2_sftp_shutdown.3
 man/man3/libssh2_sftp_stat_ex.3
 man/man3/libssh2_sftp_symlink_ex.3
 man/man3/libssh2_sftp_tell.3
+man/man3/libssh2_sftp_tell64.3
 man/man3/libssh2_sftp_unlink_ex.3
 man/man3/libssh2_sftp_write.3
+man/man3/libssh2_trace.3
 man/man3/libssh2_userauth_authenticated.3
+man/man3/libssh2_userauth_hostbased_fromfile_ex.3
+man/man3/libssh2_userauth_keyboard_interactive_ex.3
 man/man3/libssh2_userauth_list.3
 man/man3/libssh2_userauth_password_ex.3
-man/man3/libssh2_userauth_publickey_fromfile.3
+man/man3/libssh2_userauth_publickey_fromfile_ex.3
+man/man3/libssh2_version.3
diff --git a/security/libssh2/distinfo b/security/libssh2/distinfo
index 58524aa0af8..1cbcbab5adc 100644
--- a/security/libssh2/distinfo
+++ b/security/libssh2/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/02 14:11:54 bjs Exp $
+$NetBSD: distinfo,v 1.2 2009/11/15 20:07:45 drochner Exp $
 
-SHA1 (libssh2-0.18.tar.gz) = 9bc6148869fca08350e27ea2c9fc44917ac027ff
-RMD160 (libssh2-0.18.tar.gz) = 2088c73a7903828670e14c6289a6961f5a3e4764
-Size (libssh2-0.18.tar.gz) = 541428 bytes
+SHA1 (libssh2-1.2.1.tar.gz) = fc5e66089340cce1cf03a8cfd75b6f15ed59d30c
+RMD160 (libssh2-1.2.1.tar.gz) = 12da32cc6a1f79dd3627037645b848f4bf1c7b20
+Size (libssh2-1.2.1.tar.gz) = 533302 bytes