From d4264671d6819f741077ccdffe00b9a1d132843b Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Fri, 21 Apr 2023 07:52:46 +0200 Subject: update to 1.4 --- PHPINFO | 6 ++--- REFLECTION | 74 +++++++++++++++++++++++++++++++++--------------------- php-pecl-ssh2.spec | 33 ++++++++---------------- 3 files changed, 59 insertions(+), 54 deletions(-) diff --git a/PHPINFO b/PHPINFO index d6dc779..3295136 100644 --- a/PHPINFO +++ b/PHPINFO @@ -2,6 +2,6 @@ ssh2 SSH2 support => enabled -extension version => 1.3.1 -libssh2 version => 1.9.0 -banner => SSH-2.0-libssh2_1.9.0 +extension version => 1.4 +libssh2 version => 1.10.0 +banner => SSH-2.0-libssh2_1.10.0 diff --git a/REFLECTION b/REFLECTION index 1f040fa..56976ff 100644 --- a/REFLECTION +++ b/REFLECTION @@ -1,4 +1,4 @@ -Extension [ extension #121 ssh2 version 1.3.1 ] { +Extension [ extension #122 ssh2 version 1.4 ] { - Constants [21] { Constant [ int SSH2_FINGERPRINT_MD5 ] { 0 } @@ -29,9 +29,9 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [4] { Parameter #0 [ $host ] - Parameter #1 [ $port ] - Parameter #2 [ $methods ] - Parameter #3 [ $callbacks ] + Parameter #1 [ $port = ] + Parameter #2 [ $methods = ] + Parameter #3 [ $callbacks = ] } } Function [ function ssh2_disconnect ] { @@ -50,7 +50,7 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [2] { Parameter #0 [ $session ] - Parameter #1 [ $flags ] + Parameter #1 [ $flags = ] } } Function [ function ssh2_auth_none ] { @@ -75,7 +75,17 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { Parameter #1 [ $username ] Parameter #2 [ $pubkeyfile ] Parameter #3 [ $privkeyfile ] - Parameter #4 [ $passphrase ] + Parameter #4 [ $passphrase = ] + } + } + Function [ function ssh2_auth_pubkey ] { + + - Parameters [5] { + Parameter #0 [ $session ] + Parameter #1 [ $username ] + Parameter #2 [ $pubkey ] + Parameter #3 [ $privkey ] + Parameter #4 [ $passphrase = ] } } Function [ function ssh2_auth_hostbased_file ] { @@ -86,8 +96,8 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { Parameter #2 [ $hostname ] Parameter #3 [ $pubkeyfile ] Parameter #4 [ $privkeyfile ] - Parameter #5 [ $passphrase ] - Parameter #6 [ $local_username ] + Parameter #5 [ $passphrase = ] + Parameter #6 [ $local_username = ] } } Function [ function ssh2_forward_listen ] { @@ -95,27 +105,27 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [4] { Parameter #0 [ $session ] Parameter #1 [ $port ] - Parameter #2 [ $host ] - Parameter #3 [ $max_connections ] + Parameter #2 [ $host = ] + Parameter #3 [ $max_connections = ] } } Function [ function ssh2_forward_accept ] { - Parameters [3] { Parameter #0 [ $listener ] - Parameter #1 [ &$host ] - Parameter #2 [ $port ] + Parameter #1 [ &$host = ] + Parameter #2 [ $port = ] } } Function [ function ssh2_shell ] { - Parameters [6] { Parameter #0 [ $session ] - Parameter #1 [ $termtype ] - Parameter #2 [ $env ] - Parameter #3 [ $width ] - Parameter #4 [ $height ] - Parameter #5 [ $width_height_type ] + Parameter #1 [ $termtype = ] + Parameter #2 [ $env = ] + Parameter #3 [ $width = ] + Parameter #4 [ $height = ] + Parameter #5 [ $width_height_type = ] } } Function [ function ssh2_exec ] { @@ -123,11 +133,11 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [7] { Parameter #0 [ $session ] Parameter #1 [ $command ] - Parameter #2 [ $pty ] - Parameter #3 [ $env ] - Parameter #4 [ $width ] - Parameter #5 [ $height ] - Parameter #6 [ $width_height_type ] + Parameter #2 [ $pty = ] + Parameter #3 [ $env = ] + Parameter #4 [ $width = ] + Parameter #5 [ $height = ] + Parameter #6 [ $width_height_type = ] } } Function [ function ssh2_tunnel ] { @@ -152,7 +162,7 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { Parameter #0 [ $session ] Parameter #1 [ $local_file ] Parameter #2 [ $remote_file ] - Parameter #3 [ $create_mode ] + Parameter #3 [ $create_mode = ] } } Function [ function ssh2_fetch_stream ] { @@ -166,7 +176,7 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [2] { Parameter #0 [ &$polldes ] - Parameter #1 [ $timeout ] + Parameter #1 [ $timeout = ] } } Function [ function ssh2_send_eof ] { @@ -175,6 +185,14 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { Parameter #0 [ $channel ] } } + Function [ function ssh2_shell_resize ] { + + - Parameters [3] { + Parameter #0 [ $session ] + Parameter #1 [ $width ] + Parameter #2 [ $height ] + } + } Function [ function ssh2_sftp ] { - Parameters [1] { @@ -201,8 +219,8 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { - Parameters [4] { Parameter #0 [ $sftp ] Parameter #1 [ $dirname ] - Parameter #2 [ $mode ] - Parameter #3 [ $recursive ] + Parameter #2 [ $mode = ] + Parameter #3 [ $recursive = ] } } Function [ function ssh2_sftp_rmdir ] { @@ -268,8 +286,8 @@ Extension [ extension #121 ssh2 version 1.3.1 ] { Parameter #0 [ $pkey ] Parameter #1 [ $algoname ] Parameter #2 [ $blob ] - Parameter #3 [ $overwrite ] - Parameter #4 [ $attributes ] + Parameter #3 [ $overwrite = ] + Parameter #4 [ $attributes = ] } } Function [ function ssh2_publickey_remove ] { diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec index 098d168..28c0cf4 100644 --- a/php-pecl-ssh2.spec +++ b/php-pecl-ssh2.spec @@ -1,7 +1,7 @@ # remirepo spec file for php-pecl-ssh2 # with SCL compatibility # -# Copyright (c) 2011-2022 Remi Collet +# Copyright (c) 2011-2023 Remi Collet # # Fedora spec file for php-pecl-ssh2 # @@ -9,10 +9,7 @@ # # Please, preserve the changelog entries # -%if 0%{?scl:1} -%global sub_prefix %{scl_prefix} -%scl_package php-pecl-ssh2 -%endif +%{?scl:%scl_package php-pecl-ssh2} # See https://github.com/php/pecl-networking-ssh2/commits/master %global gh_commit 50d97a52c39166d59e59222a20e841f3f3ce594d @@ -25,18 +22,18 @@ %global ini_name 40-%{pecl_name}.ini %global buildver %(pkg-config --silence-errors --modversion libssh2 2>/dev/null || echo 65536) -Name: %{?sub_prefix}php-pecl-ssh2 +Name: %{?scl_prefix}php-pecl-ssh2 Summary: Bindings for the libssh2 library -Version: 1.3.1 +Version: 1.4 %if 0%{?gh_date} Release: 0.9.%{gh_date}git%{gh_short}%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://github.com/%{gh_owner}/%{gh_project}/archive/%{gh_commit}/%{gh_project}-%{version}%{?prever}-%{gh_short}.tar.gz %else -Release: 3%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} Source0: https://pecl.php.net/get/%{pecl_name}-%{version}.tgz %endif -License: PHP +License: PHP-3.01 URL: https://pecl.php.net/package/%{pecl_name} BuildRequires: make @@ -65,12 +62,8 @@ Provides: %{?scl_prefix}php-%{pecl_name} = %{version} Provides: %{?scl_prefix}php-%{pecl_name}%{?_isa} = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name}) = %{version} Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} -%if "%{?scl_prefix}" != "%{?sub_prefix}" -Provides: %{?scl_prefix}php-pecl-%{pecl_name} = %{version}-%{release} -Provides: %{?scl_prefix}php-pecl-%{pecl_name}%{?_isa} = %{version}-%{release} -%endif -%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} +%if "%{?packager}" == "Remi Collet" && 0%{!?scl:1} && 0%{?rhel} == 7 # Other third party repo stuff Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} @@ -82,15 +75,6 @@ Obsoletes: php72u-pecl-%{pecl_name} <= %{version} %if "%{php_version}" > "7.3" Obsoletes: php73-pecl-%{pecl_name} <= %{version} %endif -%if "%{php_version}" > "7.4" -Obsoletes: php74-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.0" -Obsoletes: php80-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "8.1" -Obsoletes: php81-pecl-%{pecl_name} <= %{version} -%endif %endif %if %{move_to_opt} @@ -254,6 +238,9 @@ fi %changelog +* Thu Apr 20 2023 Remi Collet - 1.4-1 +- update to 1.4 + * Sun Jun 26 2022 Remi Collet - 1.3.1-3 - rebuild againt remi-libssh2 on EL-7 and EL-8 -- cgit