[Midnightbsd-cvs] mports [24639] trunk/security/libssh2: update libssh2 to 1.8.0

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Wed Nov 21 21:07:34 EST 2018 

Revision: 24639
          http://svnweb.midnightbsd.org/mports/?rev=24639
Author:   laffer1
Date:     2018-11-21 21:07:33 -0500 (Wed, 21 Nov 2018)
Log Message:
-----------
update libssh2 to 1.8.0

Modified Paths:
--------------
    trunk/security/libssh2/Makefile
    trunk/security/libssh2/distinfo
    trunk/security/libssh2/pkg-plist

Added Paths:
-----------
    trunk/security/libssh2/files/
    trunk/security/libssh2/files/patch-configure

Modified: trunk/security/libssh2/Makefile
===================================================================
--- trunk/security/libssh2/Makefile	2018-11-22 02:04:34 UTC (rev 24638)
+++ trunk/security/libssh2/Makefile	2018-11-22 02:07:33 UTC (rev 24639)
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 
 PORTNAME=	libssh2
-PORTVERSION=	1.4.3
-PORTEPOCH=	2
+PORTVERSION=	1.8.0
+PORTEPOCH=	3
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh2.org/download/ \
 		FREEBSD_LOCAL/sbz
@@ -23,27 +23,24 @@
 TRACE_DESC=	Enable debug packet traces
 
 TRACE_CONFIGURE_ENABLE=	debug
-GCRYPT_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-GCRYPT_CONFIGURE_ON=	--with-libgcrypt --without-openssl
-GCRYPT_CONFIGURE_OFF=	--without-libgcrypt --with-openssl
+GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt
+GCRYPT_CONFIGURE_ON=	--with-libgcrypt
+GCRYPT_CONFIGURE_OFF=	--with-openssl
 GCRYPT_CPPFLAGS=	-I${LOCALBASE}/include
 GCRYPT_LIBS=		-L${LOCALBASE}/lib
+GCRYPT_USES_OFF=	ssl
 ZLIB_CONFIGURE_WITH=	libz
 
-.include <bsd.mport.options.mk>
-
-.if ! ${PORT_OPTIONS:MGCRYPT}
-EXTENSIONS+=	ssl
-.endif
-
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
+	@${REINPLACE_CMD} -e '/Libs:/s/@LIBS@//' \
 		${WRKSRC}/libssh2.pc.in
-.if defined(WITH_OPENSSL_BASE)
+.if ! ${PORT_OPTIONS:MGCRYPT}
+.  if ${SSL_DEFAULT} == base
 	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \
 		${WRKSRC}/configure
+.  endif
 .endif
 
 .include <bsd.port.post.mk>

Modified: trunk/security/libssh2/distinfo
===================================================================
--- trunk/security/libssh2/distinfo	2018-11-22 02:04:34 UTC (rev 24638)
+++ trunk/security/libssh2/distinfo	2018-11-22 02:07:33 UTC (rev 24639)
@@ -1,2 +1,3 @@
-SHA256 (libssh2-1.4.3.tar.gz) = eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d
-SIZE (libssh2-1.4.3.tar.gz) = 685712
+TIMESTAMP = 1481730876
+SHA256 (libssh2-1.8.0.tar.gz) = 39f34e2f6835f4b992cafe8625073a88e5a28ba78f83e8099610a7b3af4676d4
+SIZE (libssh2-1.8.0.tar.gz) = 854916

Added: trunk/security/libssh2/files/patch-configure
===================================================================
--- trunk/security/libssh2/files/patch-configure	                        (rev 0)
+++ trunk/security/libssh2/files/patch-configure	2018-11-22 02:07:33 UTC (rev 24639)
@@ -0,0 +1,15 @@
+--- configure.orig	2016-11-28 18:30:51 UTC
++++ configure
+@@ -14250,9 +14250,9 @@ if test "${with_libgcrypt+set}" = set; t
+ 
+   old_LDFLAGS=$LDFLAGS
+   old_CFLAGS=$CFLAGS
+-  if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
+-    LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
+-    CFLAGS="$CFLAGS -I$use_libgcrypt/include"
++  if test -n "$with_libgcrypt_prefix" && test "$with_libgcrypt_prefix" != "no"; then
++    LDFLAGS="$LDFLAGS -L$with_libgcrypt_prefix/lib"
++    CFLAGS="$CFLAGS -I$with_libgcrypt_prefix/include"
+   fi
+ 
+ 


Property changes on: trunk/security/libssh2/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Modified: trunk/security/libssh2/pkg-plist
===================================================================
--- trunk/security/libssh2/pkg-plist	2018-11-22 02:04:34 UTC (rev 24638)
+++ trunk/security/libssh2/pkg-plist	2018-11-22 02:07:33 UTC (rev 24639)
@@ -15,17 +15,17 @@
 man/man3/libssh2_banner_set.3.gz
 man/man3/libssh2_base64_decode.3.gz
 man/man3/libssh2_channel_close.3.gz
+man/man3/libssh2_channel_direct_tcpip_ex.3.gz
 man/man3/libssh2_channel_direct_tcpip.3.gz
-man/man3/libssh2_channel_direct_tcpip_ex.3.gz
 man/man3/libssh2_channel_eof.3.gz
 man/man3/libssh2_channel_exec.3.gz
-man/man3/libssh2_channel_flush.3.gz
 man/man3/libssh2_channel_flush_ex.3.gz
 man/man3/libssh2_channel_flush_stderr.3.gz
+man/man3/libssh2_channel_flush.3.gz
 man/man3/libssh2_channel_forward_accept.3.gz
 man/man3/libssh2_channel_forward_cancel.3.gz
+man/man3/libssh2_channel_forward_listen_ex.3.gz
 man/man3/libssh2_channel_forward_listen.3.gz
-man/man3/libssh2_channel_forward_listen_ex.3.gz
 man/man3/libssh2_channel_free.3.gz
 man/man3/libssh2_channel_get_exit_signal.3.gz
 man/man3/libssh2_channel_get_exit_status.3.gz
@@ -35,32 +35,32 @@
 man/man3/libssh2_channel_open_ex.3.gz
 man/man3/libssh2_channel_open_session.3.gz
 man/man3/libssh2_channel_process_startup.3.gz
-man/man3/libssh2_channel_read.3.gz
 man/man3/libssh2_channel_read_ex.3.gz
 man/man3/libssh2_channel_read_stderr.3.gz
+man/man3/libssh2_channel_read.3.gz
 man/man3/libssh2_channel_receive_window_adjust.3.gz
 man/man3/libssh2_channel_receive_window_adjust2.3.gz
-man/man3/libssh2_channel_request_pty.3.gz
 man/man3/libssh2_channel_request_pty_ex.3.gz
+man/man3/libssh2_channel_request_pty_size_ex.3.gz
 man/man3/libssh2_channel_request_pty_size.3.gz
-man/man3/libssh2_channel_request_pty_size_ex.3.gz
+man/man3/libssh2_channel_request_pty.3.gz
 man/man3/libssh2_channel_send_eof.3.gz
 man/man3/libssh2_channel_set_blocking.3.gz
+man/man3/libssh2_channel_setenv_ex.3.gz
 man/man3/libssh2_channel_setenv.3.gz
-man/man3/libssh2_channel_setenv_ex.3.gz
 man/man3/libssh2_channel_shell.3.gz
 man/man3/libssh2_channel_subsystem.3.gz
 man/man3/libssh2_channel_wait_closed.3.gz
 man/man3/libssh2_channel_wait_eof.3.gz
+man/man3/libssh2_channel_window_read_ex.3.gz
 man/man3/libssh2_channel_window_read.3.gz
-man/man3/libssh2_channel_window_read_ex.3.gz
+man/man3/libssh2_channel_window_write_ex.3.gz
 man/man3/libssh2_channel_window_write.3.gz
-man/man3/libssh2_channel_window_write_ex.3.gz
-man/man3/libssh2_channel_write.3.gz
 man/man3/libssh2_channel_write_ex.3.gz
 man/man3/libssh2_channel_write_stderr.3.gz
+man/man3/libssh2_channel_write.3.gz
+man/man3/libssh2_channel_x11_req_ex.3.gz
 man/man3/libssh2_channel_x11_req.3.gz
-man/man3/libssh2_channel_x11_req_ex.3.gz
 man/man3/libssh2_exit.3.gz
 man/man3/libssh2_free.3.gz
 man/man3/libssh2_hostkey_hash.3.gz
@@ -79,94 +79,99 @@
 man/man3/libssh2_knownhost_readline.3.gz
 man/man3/libssh2_knownhost_writefile.3.gz
 man/man3/libssh2_knownhost_writeline.3.gz
+man/man3/libssh2_poll_channel_read.3.gz
 man/man3/libssh2_poll.3.gz
-man/man3/libssh2_poll_channel_read.3.gz
+man/man3/libssh2_publickey_add_ex.3.gz
 man/man3/libssh2_publickey_add.3.gz
-man/man3/libssh2_publickey_add_ex.3.gz
 man/man3/libssh2_publickey_init.3.gz
 man/man3/libssh2_publickey_list_fetch.3.gz
 man/man3/libssh2_publickey_list_free.3.gz
+man/man3/libssh2_publickey_remove_ex.3.gz
 man/man3/libssh2_publickey_remove.3.gz
-man/man3/libssh2_publickey_remove_ex.3.gz
 man/man3/libssh2_publickey_shutdown.3.gz
 man/man3/libssh2_scp_recv.3.gz
+man/man3/libssh2_scp_recv2.3.gz
+man/man3/libssh2_scp_send_ex.3.gz
 man/man3/libssh2_scp_send.3.gz
 man/man3/libssh2_scp_send64.3.gz
-man/man3/libssh2_scp_send_ex.3.gz
 man/man3/libssh2_session_abstract.3.gz
 man/man3/libssh2_session_banner_get.3.gz
 man/man3/libssh2_session_banner_set.3.gz
 man/man3/libssh2_session_block_directions.3.gz
 man/man3/libssh2_session_callback_set.3.gz
+man/man3/libssh2_session_disconnect_ex.3.gz
 man/man3/libssh2_session_disconnect.3.gz
-man/man3/libssh2_session_disconnect_ex.3.gz
 man/man3/libssh2_session_flag.3.gz
 man/man3/libssh2_session_free.3.gz
 man/man3/libssh2_session_get_blocking.3.gz
 man/man3/libssh2_session_get_timeout.3.gz
+man/man3/libssh2_session_handshake.3.gz
 man/man3/libssh2_session_hostkey.3.gz
+man/man3/libssh2_session_init_ex.3.gz
 man/man3/libssh2_session_init.3.gz
-man/man3/libssh2_session_init_ex.3.gz
 man/man3/libssh2_session_last_errno.3.gz
 man/man3/libssh2_session_last_error.3.gz
 man/man3/libssh2_session_method_pref.3.gz
 man/man3/libssh2_session_methods.3.gz
 man/man3/libssh2_session_set_blocking.3.gz
+man/man3/libssh2_session_set_last_error.3.gz
 man/man3/libssh2_session_set_timeout.3.gz
 man/man3/libssh2_session_startup.3.gz
 man/man3/libssh2_session_supported_algs.3.gz
+man/man3/libssh2_sftp_close_handle.3.gz
 man/man3/libssh2_sftp_close.3.gz
-man/man3/libssh2_sftp_close_handle.3.gz
 man/man3/libssh2_sftp_closedir.3.gz
 man/man3/libssh2_sftp_fsetstat.3.gz
+man/man3/libssh2_sftp_fstat_ex.3.gz
 man/man3/libssh2_sftp_fstat.3.gz
-man/man3/libssh2_sftp_fstat_ex.3.gz
 man/man3/libssh2_sftp_fstatvfs.3.gz
+man/man3/libssh2_sftp_fsync.3.gz
 man/man3/libssh2_sftp_get_channel.3.gz
 man/man3/libssh2_sftp_init.3.gz
 man/man3/libssh2_sftp_last_error.3.gz
 man/man3/libssh2_sftp_lstat.3.gz
+man/man3/libssh2_sftp_mkdir_ex.3.gz
 man/man3/libssh2_sftp_mkdir.3.gz
-man/man3/libssh2_sftp_mkdir_ex.3.gz
+man/man3/libssh2_sftp_open_ex.3.gz
 man/man3/libssh2_sftp_open.3.gz
-man/man3/libssh2_sftp_open_ex.3.gz
 man/man3/libssh2_sftp_opendir.3.gz
 man/man3/libssh2_sftp_read.3.gz
+man/man3/libssh2_sftp_readdir_ex.3.gz
 man/man3/libssh2_sftp_readdir.3.gz
-man/man3/libssh2_sftp_readdir_ex.3.gz
 man/man3/libssh2_sftp_readlink.3.gz
 man/man3/libssh2_sftp_realpath.3.gz
+man/man3/libssh2_sftp_rename_ex.3.gz
 man/man3/libssh2_sftp_rename.3.gz
-man/man3/libssh2_sftp_rename_ex.3.gz
 man/man3/libssh2_sftp_rewind.3.gz
+man/man3/libssh2_sftp_rmdir_ex.3.gz
 man/man3/libssh2_sftp_rmdir.3.gz
-man/man3/libssh2_sftp_rmdir_ex.3.gz
 man/man3/libssh2_sftp_seek.3.gz
 man/man3/libssh2_sftp_seek64.3.gz
 man/man3/libssh2_sftp_setstat.3.gz
 man/man3/libssh2_sftp_shutdown.3.gz
+man/man3/libssh2_sftp_stat_ex.3.gz
 man/man3/libssh2_sftp_stat.3.gz
-man/man3/libssh2_sftp_stat_ex.3.gz
 man/man3/libssh2_sftp_statvfs.3.gz
+man/man3/libssh2_sftp_symlink_ex.3.gz
 man/man3/libssh2_sftp_symlink.3.gz
-man/man3/libssh2_sftp_symlink_ex.3.gz
 man/man3/libssh2_sftp_tell.3.gz
 man/man3/libssh2_sftp_tell64.3.gz
+man/man3/libssh2_sftp_unlink_ex.3.gz
 man/man3/libssh2_sftp_unlink.3.gz
-man/man3/libssh2_sftp_unlink_ex.3.gz
 man/man3/libssh2_sftp_write.3.gz
+man/man3/libssh2_trace_sethandler.3.gz
 man/man3/libssh2_trace.3.gz
-man/man3/libssh2_trace_sethandler.3.gz
 man/man3/libssh2_userauth_authenticated.3.gz
+man/man3/libssh2_userauth_hostbased_fromfile_ex.3.gz
 man/man3/libssh2_userauth_hostbased_fromfile.3.gz
-man/man3/libssh2_userauth_hostbased_fromfile_ex.3.gz
+man/man3/libssh2_userauth_keyboard_interactive_ex.3.gz
 man/man3/libssh2_userauth_keyboard_interactive.3.gz
-man/man3/libssh2_userauth_keyboard_interactive_ex.3.gz
 man/man3/libssh2_userauth_list.3.gz
+man/man3/libssh2_userauth_password_ex.3.gz
 man/man3/libssh2_userauth_password.3.gz
-man/man3/libssh2_userauth_password_ex.3.gz
+man/man3/libssh2_userauth_publickey_fromfile_ex.3.gz
+man/man3/libssh2_userauth_publickey_fromfile.3.gz
+man/man3/libssh2_userauth_publickey_frommemory.3.gz
 man/man3/libssh2_userauth_publickey.3.gz
-man/man3/libssh2_userauth_publickey_fromfile.3.gz
-man/man3/libssh2_userauth_publickey_fromfile_ex.3.gz
 man/man3/libssh2_version.3.gz
 libdata/pkgconfig/libssh2.pc

More information about the Midnightbsd-cvs mailing list