[Midnightbsd-cvs] mports [19625] trunk/security/libssh2: libssh 1.4.3

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Fri Jul 31 19:39:13 EDT 2015


Revision: 19625
          http://svnweb.midnightbsd.org/mports/?rev=19625
Author:   laffer1
Date:     2015-07-31 19:39:13 -0400 (Fri, 31 Jul 2015)
Log Message:
-----------
libssh 1.4.3

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

Modified: trunk/security/libssh2/Makefile
===================================================================
--- trunk/security/libssh2/Makefile	2015-07-31 23:37:46 UTC (rev 19624)
+++ trunk/security/libssh2/Makefile	2015-07-31 23:39:13 UTC (rev 19625)
@@ -1,219 +1,49 @@
 # $MidnightBSD$
 
 PORTNAME=	libssh2
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 PORTEPOCH=	2
 CATEGORIES=	security devel
 MASTER_SITES=	http://www.libssh2.org/download/ \
-		${MASTER_SITE_LOCAL:S,%SUBDIR%,sbz,}
+		FREEBSD_LOCAL/sbz
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A library implementing the SSH2 protocol
+COMMENT=	Library implementing the SSH2 protocol
+
 LICENSE=	bsd3
 
-USE_OPENSSL=	yes
-USE_AUTOTOOLS=	autoconf
 GNU_CONFIGURE=	yes
+INSTALL_TARGET=	install-strip
+USES=		libtool pathfix
 USE_LDCONFIG=	yes
 
-OPTIONS=	GCRYPT "Use libgcrypt instead of OpenSSL" off \
-		TRACE "Enable debug packet traces" off \
-		ZLIB "Enable compression" on
+OPTIONS_DEFINE=	GCRYPT TRACE ZLIB
+OPTIONS_DEFAULT=	ZLIB
 
-.include <bsd.port.pre.mk>
+TRACE_DESC=	Enable debug packet traces
 
-.if defined(WITH_TRACE)
-CONFIGURE_ARGS+=	--enable-debug
-.else
-CONFIGURE_ARGS+=	--disable-debug
-.endif
+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_CPPFLAGS=	-I${LOCALBASE}/include
+GCRYPT_LIBS=		-L${LOCALBASE}/lib
+ZLIB_CONFIGURE_WITH=	libz
 
-.if defined(WITH_GCRYPT)
-LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
-CONFIGURE_ARGS+=	--with-libgcrypt -with-libgcrypt-prefix=${LOCALBASE} --without-openssl
-CFLAGS+=-I${LOCALBASE}/include
-LDFLAGS+=-L${LOCALBASE}/lib
-.endif
+.include <bsd.mport.options.mk>
 
-.if defined(WITH_ZLIB)
-CONFIGURE_ARGS+=	--with-libz
-.else
-CONFIGURE_ARGS+=	--without-libz
+.if ! ${PORT_OPTIONS:MGCRYPT}
+USE_OPENSSL=	yes
 .endif
 
-MAN3=	libssh2_agent_connect.3 \
-	libssh2_agent_disconnect.3 \
-	libssh2_agent_free.3 \
-	libssh2_agent_get_identity.3 \
-	libssh2_agent_init.3 \
-	libssh2_agent_list_identities.3 \
-	libssh2_agent_userauth.3 \
-	libssh2_banner_set.3 \
-	libssh2_base64_decode.3 \
-	libssh2_channel_close.3 \
-	libssh2_channel_direct_tcpip.3 \
-	libssh2_channel_direct_tcpip_ex.3 \
-	libssh2_channel_eof.3 \
-	libssh2_channel_exec.3 \
-	libssh2_channel_flush.3 \
-	libssh2_channel_flush_ex.3 \
-	libssh2_channel_flush_stderr.3 \
-	libssh2_channel_forward_accept.3 \
-	libssh2_channel_forward_cancel.3 \
-	libssh2_channel_forward_listen.3 \
-	libssh2_channel_forward_listen_ex.3 \
-	libssh2_channel_free.3 \
-	libssh2_channel_get_exit_signal.3 \
-	libssh2_channel_get_exit_status.3 \
-	libssh2_channel_handle_extended_data.3 \
-	libssh2_channel_handle_extended_data2.3 \
-	libssh2_channel_ignore_extended_data.3 \
-	libssh2_channel_open_ex.3 \
-	libssh2_channel_open_session.3 \
-	libssh2_channel_process_startup.3 \
-	libssh2_channel_read.3 \
-	libssh2_channel_read_ex.3 \
-	libssh2_channel_read_stderr.3 \
-	libssh2_channel_receive_window_adjust.3 \
-	libssh2_channel_receive_window_adjust2.3 \
-	libssh2_channel_request_pty.3 \
-	libssh2_channel_request_pty_ex.3 \
-	libssh2_channel_request_pty_size.3 \
-	libssh2_channel_request_pty_size_ex.3 \
-	libssh2_channel_send_eof.3 \
-	libssh2_channel_set_blocking.3 \
-	libssh2_channel_setenv.3 \
-	libssh2_channel_setenv_ex.3 \
-	libssh2_channel_shell.3 \
-	libssh2_channel_subsystem.3 \
-	libssh2_channel_wait_closed.3 \
-	libssh2_channel_wait_eof.3 \
-	libssh2_channel_window_read.3 \
-	libssh2_channel_window_read_ex.3 \
-	libssh2_channel_window_write.3 \
-	libssh2_channel_window_write_ex.3 \
-	libssh2_channel_write.3 \
-	libssh2_channel_write_ex.3 \
-	libssh2_channel_write_stderr.3 \
-	libssh2_channel_x11_req.3 \
-	libssh2_channel_x11_req_ex.3 \
-	libssh2_exit.3 \
-	libssh2_free.3 \
-	libssh2_hostkey_hash.3 \
-	libssh2_init.3 \
-	libssh2_keepalive_config.3 \
-	libssh2_keepalive_send.3 \
-	libssh2_knownhost_add.3 \
-	libssh2_knownhost_addc.3 \
-	libssh2_knownhost_check.3 \
-	libssh2_knownhost_checkp.3 \
-	libssh2_knownhost_del.3 \
-	libssh2_knownhost_free.3 \
-	libssh2_knownhost_get.3 \
-	libssh2_knownhost_init.3 \
-	libssh2_knownhost_readfile.3 \
-	libssh2_knownhost_readline.3 \
-	libssh2_knownhost_writefile.3 \
-	libssh2_knownhost_writeline.3 \
-	libssh2_poll.3 \
-	libssh2_poll_channel_read.3 \
-	libssh2_publickey_add.3 \
-	libssh2_publickey_add_ex.3 \
-	libssh2_publickey_init.3 \
-	libssh2_publickey_list_fetch.3 \
-	libssh2_publickey_list_free.3 \
-	libssh2_publickey_remove.3 \
-	libssh2_publickey_remove_ex.3 \
-	libssh2_publickey_shutdown.3 \
-	libssh2_scp_recv.3 \
-	libssh2_scp_send.3 \
-	libssh2_scp_send64.3 \
-	libssh2_scp_send_ex.3 \
-	libssh2_session_abstract.3 \
-	libssh2_session_banner_get.3 \
-	libssh2_session_banner_set.3 \
-	libssh2_session_block_directions.3 \
-	libssh2_session_callback_set.3 \
-	libssh2_session_disconnect.3 \
-	libssh2_session_disconnect_ex.3 \
-	libssh2_session_flag.3 \
-	libssh2_session_free.3 \
-	libssh2_session_get_blocking.3 \
-	libssh2_session_get_timeout.3 \
-	libssh2_session_hostkey.3 \
-	libssh2_session_init.3 \
-	libssh2_session_init_ex.3 \
-	libssh2_session_last_errno.3 \
-	libssh2_session_last_error.3 \
-	libssh2_session_method_pref.3 \
-	libssh2_session_methods.3 \
-	libssh2_session_set_blocking.3 \
-	libssh2_session_set_timeout.3 \
-	libssh2_session_startup.3 \
-	libssh2_session_supported_algs.3 \
-	libssh2_sftp_close.3 \
-	libssh2_sftp_close_handle.3 \
-	libssh2_sftp_closedir.3 \
-	libssh2_sftp_fsetstat.3 \
-	libssh2_sftp_fstat.3 \
-	libssh2_sftp_fstat_ex.3 \
-	libssh2_sftp_fstatvfs.3 \
-	libssh2_sftp_get_channel.3 \
-	libssh2_sftp_init.3 \
-	libssh2_sftp_last_error.3 \
-	libssh2_sftp_lstat.3 \
-	libssh2_sftp_mkdir.3 \
-	libssh2_sftp_mkdir_ex.3 \
-	libssh2_sftp_open.3 \
-	libssh2_sftp_open_ex.3 \
-	libssh2_sftp_opendir.3 \
-	libssh2_sftp_read.3 \
-	libssh2_sftp_readdir.3 \
-	libssh2_sftp_readdir_ex.3 \
-	libssh2_sftp_readlink.3 \
-	libssh2_sftp_realpath.3 \
-	libssh2_sftp_rename.3 \
-	libssh2_sftp_rename_ex.3 \
-	libssh2_sftp_rewind.3 \
-	libssh2_sftp_rmdir.3 \
-	libssh2_sftp_rmdir_ex.3 \
-	libssh2_sftp_seek.3 \
-	libssh2_sftp_seek64.3 \
-	libssh2_sftp_setstat.3 \
-	libssh2_sftp_shutdown.3 \
-	libssh2_sftp_stat.3 \
-	libssh2_sftp_stat_ex.3 \
-	libssh2_sftp_statvfs.3 \
-	libssh2_sftp_symlink.3 \
-	libssh2_sftp_symlink_ex.3 \
-	libssh2_sftp_tell.3 \
-	libssh2_sftp_tell64.3 \
-	libssh2_sftp_unlink.3 \
-	libssh2_sftp_unlink_ex.3 \
-	libssh2_sftp_write.3 \
-	libssh2_trace.3 \
-	libssh2_trace_sethandler.3 \
-	libssh2_userauth_authenticated.3 \
-	libssh2_userauth_hostbased_fromfile.3 \
-	libssh2_userauth_hostbased_fromfile_ex.3 \
-	libssh2_userauth_keyboard_interactive.3 \
-	libssh2_userauth_keyboard_interactive_ex.3 \
-	libssh2_userauth_list.3 \
-	libssh2_userauth_password.3 \
-	libssh2_userauth_password_ex.3 \
-	libssh2_userauth_publickey.3 \
-	libssh2_userauth_publickey_fromfile.3 \
-	libssh2_userauth_publickey_fromfile_ex.3 \
-	libssh2_version.3
+.include <bsd.port.pre.mk>
 
-# allow maintainer to generate MAN3 manpages list (make extract is required before)
-x-generate-man3:
-	@(cd ${WRKSRC}/docs && ${LS} -1F *.3 | ${SORT} | ${CUT} -d '/' -f4 \
-		| ${GREP} -v template)
-
 post-patch:
-	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/Libs:/s/@LDFLAGS@//' -e '/Libs:/s/@LIBS@//' \
+		${WRKSRC}/libssh2.pc.in
+.if defined(WITH_OPENSSL_BASE)
+	@${REINPLACE_CMD} -e 's/LIBSREQUIRED=libssl,libcrypto/LIBS="$$LIBS -lssl -lcrypto"/' \
+		${WRKSRC}/configure
+.endif
 
 .include <bsd.port.post.mk>

Modified: trunk/security/libssh2/distinfo
===================================================================
--- trunk/security/libssh2/distinfo	2015-07-31 23:37:46 UTC (rev 19624)
+++ trunk/security/libssh2/distinfo	2015-07-31 23:39:13 UTC (rev 19625)
@@ -1,3 +1,2 @@
-SHA256 (libssh2-1.4.0.tar.gz) = dfc5bbad14a5049fea5c5e8a7a743130bb1e365730e13e2bb7d6494c92a4c581
-RMD160 (libssh2-1.4.0.tar.gz) = 36f1a8fbc0a805552aa8db59ac906e837abf8f9b
-SIZE (libssh2-1.4.0.tar.gz) = 653514
+SHA256 (libssh2-1.4.3.tar.gz) = eac6f85f9df9db2e6386906a6227eb2cd7b3245739561cad7d6dc1d5d021b96d
+SIZE (libssh2-1.4.3.tar.gz) = 685712

Modified: trunk/security/libssh2/pkg-descr
===================================================================
--- trunk/security/libssh2/pkg-descr	2015-07-31 23:37:46 UTC (rev 19624)
+++ trunk/security/libssh2/pkg-descr	2015-07-31 23:39:13 UTC (rev 19625)
@@ -1,5 +1,5 @@
-libssh2 is a library implementing the SSH2 protocol as defined by
-Internet Drafts: SECSH-TRANS(22), SECSH-USERAUTH(25), SECSH-CONNECTION(23),
-SECSH-ARCH(20), SECSH-FILEXFER(06)*, SECSH-DHGEX(04), and SECSH-NUMBERS(10).
+libssh2 is a client-side C library implementing the SSH2 protocol. It supports
+regular terminal, SCP and SFTP sessions; port forwarding; password, key-based
+and keyboard-interactive authentication.
 
-WWW: http://libssh2.sourceforge.net/
+WWW: http://www.libssh2.org/

Modified: trunk/security/libssh2/pkg-plist
===================================================================
--- trunk/security/libssh2/pkg-plist	2015-07-31 23:37:46 UTC (rev 19624)
+++ trunk/security/libssh2/pkg-plist	2015-07-31 23:39:13 UTC (rev 19625)
@@ -1,8 +1,172 @@
 include/libssh2.h
 include/libssh2_publickey.h
 include/libssh2_sftp.h
+lib/libssh2.a
 lib/libssh2.so
 lib/libssh2.so.1
-lib/libssh2.la
-lib/libssh2.a
+lib/libssh2.so.1.0.1
+man/man3/libssh2_agent_connect.3.gz
+man/man3/libssh2_agent_disconnect.3.gz
+man/man3/libssh2_agent_free.3.gz
+man/man3/libssh2_agent_get_identity.3.gz
+man/man3/libssh2_agent_init.3.gz
+man/man3/libssh2_agent_list_identities.3.gz
+man/man3/libssh2_agent_userauth.3.gz
+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.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_forward_accept.3.gz
+man/man3/libssh2_channel_forward_cancel.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
+man/man3/libssh2_channel_handle_extended_data.3.gz
+man/man3/libssh2_channel_handle_extended_data2.3.gz
+man/man3/libssh2_channel_ignore_extended_data.3.gz
+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_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.3.gz
+man/man3/libssh2_channel_request_pty_size_ex.3.gz
+man/man3/libssh2_channel_send_eof.3.gz
+man/man3/libssh2_channel_set_blocking.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.3.gz
+man/man3/libssh2_channel_window_read_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_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
+man/man3/libssh2_init.3.gz
+man/man3/libssh2_keepalive_config.3.gz
+man/man3/libssh2_keepalive_send.3.gz
+man/man3/libssh2_knownhost_add.3.gz
+man/man3/libssh2_knownhost_addc.3.gz
+man/man3/libssh2_knownhost_check.3.gz
+man/man3/libssh2_knownhost_checkp.3.gz
+man/man3/libssh2_knownhost_del.3.gz
+man/man3/libssh2_knownhost_free.3.gz
+man/man3/libssh2_knownhost_get.3.gz
+man/man3/libssh2_knownhost_init.3.gz
+man/man3/libssh2_knownhost_readfile.3.gz
+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.3.gz
+man/man3/libssh2_poll_channel_read.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.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_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.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_hostkey.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_timeout.3.gz
+man/man3/libssh2_session_startup.3.gz
+man/man3/libssh2_session_supported_algs.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.3.gz
+man/man3/libssh2_sftp_fstat_ex.3.gz
+man/man3/libssh2_sftp_fstatvfs.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.3.gz
+man/man3/libssh2_sftp_mkdir_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.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.3.gz
+man/man3/libssh2_sftp_rename_ex.3.gz
+man/man3/libssh2_sftp_rewind.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.3.gz
+man/man3/libssh2_sftp_stat_ex.3.gz
+man/man3/libssh2_sftp_statvfs.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.3.gz
+man/man3/libssh2_sftp_unlink_ex.3.gz
+man/man3/libssh2_sftp_write.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.3.gz
+man/man3/libssh2_userauth_hostbased_fromfile_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.3.gz
+man/man3/libssh2_userauth_password_ex.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