# HG changeset patch # User Yiteng Zhang # Date 1452106968 28800 # Node ID c85859d16ccb4f56c428838c7e3164e727efbd78 # Parent 03a3a267d87263841ed93799ff34b6ec2ac5998c PSARC 2012/341 libssh2 version 1.4.2 15801027 SUNBT7180403 Include libssh2 for use by libcurl 17626706 The man page for libssh2_sftp_fstatvfs is broken diff -r 03a3a267d872 -r c85859d16ccb components/libssh2/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libssh2/Makefile Wed Jan 06 11:02:48 2016 -0800 @@ -0,0 +1,61 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. +# +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= libssh2 +COMPONENT_VERSION= 1.4.2 +COMPONENT_PROJECT_URL= http://www.libssh2.org/ +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.gz +COMPONENT_ARCHIVE_HASH= \ + sha256:418c09061fb9c3c26fec391a35a062780b21b3199885e3b27054619582469bd3 +COMPONENT_ARCHIVE_URL= $(COMPONENT_PROJECT_URL)download/$(COMPONENT_ARCHIVE) +COMPONENT_BUGDB= library/libssh2 + +TPNO= 11357 + +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk + +CONFIGURE_OPTIONS += CFLAGS="$(CFLAGS)" +CONFIGURE_OPTIONS += --enable-shared +CONFIGURE_OPTIONS += --disable-static + +# Adjust the .so line in the libssh2_sftp_fstatvfs man page to correctly find +# the file it references (as we place it in the man3ssh2 section on Solaris). +# +COMPONENT_POST_INSTALL_ACTION += \ + $(GSED) -i -e 's|3|3ssh2|g' \ + $(PROTOUSRSHAREMAN3DIR)/libssh2_sftp_fstatvfs.3; + +# common targets +build: $(BUILD_32_and_64) + +install: $(INSTALL_32_and_64) + +test: $(TEST_32_and_64) + +REQUIRED_PACKAGES += library/security/openssl +REQUIRED_PACKAGES += library/zlib +REQUIRED_PACKAGES += system/library diff -r 03a3a267d872 -r c85859d16ccb components/libssh2/libssh2.license --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libssh2/libssh2.license Wed Jan 06 11:02:48 2016 -0800 @@ -0,0 +1,41 @@ +/* Copyright (c) 2004-2007 Sara Golemon + * Copyright (c) 2005,2006 Mikhail Gusarov + * Copyright (c) 2006-2007 The Written Word, Inc. + * Copyright (c) 2007 Eli Fant + * Copyright (c) 2009 Daniel Stenberg + * Copyright (C) 2008, 2009 Simon Josefsson + * All rights reserved. + * + * Redistribution and use in source and binary forms, + * with or without modification, are permitted provided + * that the following conditions are met: + * + * Redistributions of source code must retain the above + * copyright notice, this list of conditions and the + * following disclaimer. + * + * Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * Neither the name of the copyright holder nor the names + * of any other contributors may be used to endorse or + * promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE + * USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + */ diff -r 03a3a267d872 -r c85859d16ccb components/libssh2/libssh2.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/libssh2/libssh2.p5m Wed Jan 06 11:02:48 2016 -0800 @@ -0,0 +1,216 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# +# Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> +# Put all the libssh2 man3 man pages under /usr/share/man/man3ssh2 + \ + set action.hash usr/share/man/man3/%<1> > +set name=pkg.fmri \ + value=pkg:/library/libssh2@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="libssh2 - client-side C library implementing the SSH2 protocol" +set name=pkg.description \ + value="libssh2 is a client-side C library implementing the SSH2 protocol. It can be used to permit file transfer using SCP or SFTP, to communicate with a program that runs on the remote host, or to tunnel TCP connections through the secure transport offered by SSH." +set name=com.oracle.info.description value="the libssh2 client-side C library" +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification value=org.opensolaris.category.2008:System/Security +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2012/341 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/include/libssh2.h +file path=usr/include/libssh2_publickey.h +file path=usr/include/libssh2_sftp.h +link path=usr/lib/$(MACH64)/libssh2.so target=libssh2.so.1.0.1 +link path=usr/lib/$(MACH64)/libssh2.so.1 target=libssh2.so.1.0.1 +file path=usr/lib/$(MACH64)/libssh2.so.1.0.1 +file path=usr/lib/$(MACH64)/pkgconfig/libssh2.pc +link path=usr/lib/libssh2.so target=libssh2.so.1.0.1 +link path=usr/lib/libssh2.so.1 target=libssh2.so.1.0.1 +file path=usr/lib/libssh2.so.1.0.1 +file path=usr/lib/pkgconfig/libssh2.pc +file path=usr/share/man/man3ssh2/libssh2_agent_connect.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_disconnect.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_get_identity.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_list_identities.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_agent_userauth.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_banner_set.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_base64_decode.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_close.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_direct_tcpip.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_direct_tcpip_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_eof.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_exec.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_flush.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_flush_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_flush_stderr.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_forward_accept.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_forward_cancel.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_forward_listen.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_forward_listen_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_get_exit_signal.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_get_exit_status.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_handle_extended_data.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_handle_extended_data2.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_ignore_extended_data.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_open_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_open_session.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_process_startup.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_read.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_read_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_read_stderr.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_receive_window_adjust.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_receive_window_adjust2.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_request_pty.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_request_pty_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_request_pty_size.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_request_pty_size_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_send_eof.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_set_blocking.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_setenv.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_setenv_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_shell.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_subsystem.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_wait_closed.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_wait_eof.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_window_read.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_window_read_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_window_write.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_window_write_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_write.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_write_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_write_stderr.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_x11_req.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_channel_x11_req_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_exit.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_hostkey_hash.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_keepalive_config.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_keepalive_send.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_add.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_addc.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_check.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_checkp.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_del.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_get.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_readfile.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_readline.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_writefile.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_knownhost_writeline.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_poll.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_poll_channel_read.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_add.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_add_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_list_fetch.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_list_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_remove.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_remove_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_publickey_shutdown.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_scp_recv.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_scp_send.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_scp_send64.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_scp_send_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_abstract.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_banner_get.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_banner_set.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_block_directions.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_callback_set.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_disconnect.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_disconnect_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_flag.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_free.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_get_blocking.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_get_timeout.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_hostkey.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_init_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_last_errno.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_last_error.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_method_pref.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_methods.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_set_blocking.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_set_timeout.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_startup.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_session_supported_algs.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_close.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_close_handle.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_closedir.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_fsetstat.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_fstat.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_fstat_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_fstatvfs.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_get_channel.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_init.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_last_error.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_lstat.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_mkdir.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_mkdir_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_open.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_open_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_opendir.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_read.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_readdir.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_readdir_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_readlink.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_realpath.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_rename.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_rename_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_rewind.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_rmdir.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_rmdir_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_seek.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_seek64.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_setstat.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_shutdown.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_stat.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_stat_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_statvfs.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_symlink.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_symlink_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_tell.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_tell64.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_unlink.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_unlink_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_sftp_write.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_trace.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_trace_sethandler.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_authenticated.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_hostbased_fromfile.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_hostbased_fromfile_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_keyboard_interactive.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_keyboard_interactive_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_list.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_password.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_password_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_publickey.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_publickey_fromfile.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_userauth_publickey_fromfile_ex.3ssh2 +file path=usr/share/man/man3ssh2/libssh2_version.3ssh2 +license libssh2.license license=BSD