update to 1.4

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 [ <persistent> extension #121 ssh2 version 1.3.1 ] {
+Extension [ <persistent> extension #122 ssh2 version 1.4 ] {
 
   - Constants [21] {
     Constant [ int SSH2_FINGERPRINT_MD5 ] { 0 }
@@ -29,9 +29,9 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
 
       - Parameters [4] {
         Parameter #0 [ <required> $host ]
-        Parameter #1 [ <optional> $port ]
-        Parameter #2 [ <optional> $methods ]
-        Parameter #3 [ <optional> $callbacks ]
+        Parameter #1 [ <optional> $port = <default> ]
+        Parameter #2 [ <optional> $methods = <default> ]
+        Parameter #3 [ <optional> $callbacks = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_disconnect ] {
@@ -50,7 +50,7 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
 
       - Parameters [2] {
         Parameter #0 [ <required> $session ]
-        Parameter #1 [ <optional> $flags ]
+        Parameter #1 [ <optional> $flags = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_auth_none ] {
@@ -75,7 +75,17 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
         Parameter #1 [ <required> $username ]
         Parameter #2 [ <required> $pubkeyfile ]
         Parameter #3 [ <required> $privkeyfile ]
-        Parameter #4 [ <optional> $passphrase ]
+        Parameter #4 [ <optional> $passphrase = <default> ]
+      }
+    }
+    Function [ <internal:ssh2> function ssh2_auth_pubkey ] {
+
+      - Parameters [5] {
+        Parameter #0 [ <required> $session ]
+        Parameter #1 [ <required> $username ]
+        Parameter #2 [ <required> $pubkey ]
+        Parameter #3 [ <required> $privkey ]
+        Parameter #4 [ <optional> $passphrase = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_auth_hostbased_file ] {
@@ -86,8 +96,8 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
         Parameter #2 [ <required> $hostname ]
         Parameter #3 [ <required> $pubkeyfile ]
         Parameter #4 [ <required> $privkeyfile ]
-        Parameter #5 [ <optional> $passphrase ]
-        Parameter #6 [ <optional> $local_username ]
+        Parameter #5 [ <optional> $passphrase = <default> ]
+        Parameter #6 [ <optional> $local_username = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_forward_listen ] {
@@ -95,27 +105,27 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
       - Parameters [4] {
         Parameter #0 [ <required> $session ]
         Parameter #1 [ <required> $port ]
-        Parameter #2 [ <optional> $host ]
-        Parameter #3 [ <optional> $max_connections ]
+        Parameter #2 [ <optional> $host = <default> ]
+        Parameter #3 [ <optional> $max_connections = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_forward_accept ] {
 
       - Parameters [3] {
         Parameter #0 [ <required> $listener ]
-        Parameter #1 [ <optional> &$host ]
-        Parameter #2 [ <optional> $port ]
+        Parameter #1 [ <optional> &$host = <default> ]
+        Parameter #2 [ <optional> $port = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_shell ] {
 
       - Parameters [6] {
         Parameter #0 [ <required> $session ]
-        Parameter #1 [ <optional> $termtype ]
-        Parameter #2 [ <optional> $env ]
-        Parameter #3 [ <optional> $width ]
-        Parameter #4 [ <optional> $height ]
-        Parameter #5 [ <optional> $width_height_type ]
+        Parameter #1 [ <optional> $termtype = <default> ]
+        Parameter #2 [ <optional> $env = <default> ]
+        Parameter #3 [ <optional> $width = <default> ]
+        Parameter #4 [ <optional> $height = <default> ]
+        Parameter #5 [ <optional> $width_height_type = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_exec ] {
@@ -123,11 +133,11 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
       - Parameters [7] {
         Parameter #0 [ <required> $session ]
         Parameter #1 [ <required> $command ]
-        Parameter #2 [ <optional> $pty ]
-        Parameter #3 [ <optional> $env ]
-        Parameter #4 [ <optional> $width ]
-        Parameter #5 [ <optional> $height ]
-        Parameter #6 [ <optional> $width_height_type ]
+        Parameter #2 [ <optional> $pty = <default> ]
+        Parameter #3 [ <optional> $env = <default> ]
+        Parameter #4 [ <optional> $width = <default> ]
+        Parameter #5 [ <optional> $height = <default> ]
+        Parameter #6 [ <optional> $width_height_type = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_tunnel ] {
@@ -152,7 +162,7 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
         Parameter #0 [ <required> $session ]
         Parameter #1 [ <required> $local_file ]
         Parameter #2 [ <required> $remote_file ]
-        Parameter #3 [ <optional> $create_mode ]
+        Parameter #3 [ <optional> $create_mode = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_fetch_stream ] {
@@ -166,7 +176,7 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
 
       - Parameters [2] {
         Parameter #0 [ <required> &$polldes ]
-        Parameter #1 [ <optional> $timeout ]
+        Parameter #1 [ <optional> $timeout = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_send_eof ] {
@@ -175,6 +185,14 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
         Parameter #0 [ <required> $channel ]
       }
     }
+    Function [ <internal:ssh2> function ssh2_shell_resize ] {
+
+      - Parameters [3] {
+        Parameter #0 [ <required> $session ]
+        Parameter #1 [ <required> $width ]
+        Parameter #2 [ <required> $height ]
+      }
+    }
     Function [ <internal:ssh2> function ssh2_sftp ] {
 
       - Parameters [1] {
@@ -201,8 +219,8 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
       - Parameters [4] {
         Parameter #0 [ <required> $sftp ]
         Parameter #1 [ <required> $dirname ]
-        Parameter #2 [ <optional> $mode ]
-        Parameter #3 [ <optional> $recursive ]
+        Parameter #2 [ <optional> $mode = <default> ]
+        Parameter #3 [ <optional> $recursive = <default> ]
       }
     }
     Function [ <internal:ssh2> function ssh2_sftp_rmdir ] {
@@ -268,8 +286,8 @@ Extension [ <persistent> extension #121 ssh2 version 1.3.1 ] {
         Parameter #0 [ <required> $pkey ]
         Parameter #1 [ <required> $algoname ]
         Parameter #2 [ <required> $blob ]
-        Parameter #3 [ <optional> $overwrite ]
-        Parameter #4 [ <optional> $attributes ]
+        Parameter #3 [ <optional> $overwrite = <default> ]
+        Parameter #4 [ <optional> $attributes = <default> ]
       }
     }
     Function [ <internal:ssh2> 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 <remi@remirepo.net> - 1.4-1
+- update to 1.4
+
 * Sun Jun 26 2022 Remi Collet <remi@remirepo.net> - 1.3.1-3
 - rebuild againt remi-libssh2 on EL-7 and EL-8