diff options
| -rw-r--r-- | REFLECTION-PHP7 | 270 | ||||
| -rw-r--r-- | php-pecl-ssh2-php7.spec | 77 | ||||
| -rw-r--r-- | php-pecl-ssh2.spec | 2 |
3 files changed, 315 insertions, 34 deletions
diff --git a/REFLECTION-PHP7 b/REFLECTION-PHP7 new file mode 100644 index 0000000..f1949ba --- /dev/null +++ b/REFLECTION-PHP7 @@ -0,0 +1,270 @@ +Extension [ <persistent> extension #68 ssh2 version 0.13-dev ] { + + - Constants [21] { + Constant [ integer SSH2_FINGERPRINT_MD5 ] { 0 } + Constant [ integer SSH2_FINGERPRINT_SHA1 ] { 1 } + Constant [ integer SSH2_FINGERPRINT_HEX ] { 0 } + Constant [ integer SSH2_FINGERPRINT_RAW ] { 2 } + Constant [ integer SSH2_TERM_UNIT_CHARS ] { 0 } + Constant [ integer SSH2_TERM_UNIT_PIXELS ] { 1 } + Constant [ string SSH2_DEFAULT_TERMINAL ] { vanilla } + Constant [ integer SSH2_DEFAULT_TERM_WIDTH ] { 80 } + Constant [ integer SSH2_DEFAULT_TERM_HEIGHT ] { 25 } + Constant [ integer SSH2_DEFAULT_TERM_UNIT ] { 0 } + Constant [ integer SSH2_STREAM_STDIO ] { 0 } + Constant [ integer SSH2_STREAM_STDERR ] { 1 } + Constant [ integer SSH2_POLLIN ] { 1 } + Constant [ integer SSH2_POLLEXT ] { 2 } + Constant [ integer SSH2_POLLOUT ] { 4 } + Constant [ integer SSH2_POLLERR ] { 8 } + Constant [ integer SSH2_POLLHUP ] { 16 } + Constant [ integer SSH2_POLLNVAL ] { 32 } + Constant [ integer SSH2_POLL_SESSION_CLOSED ] { 16 } + Constant [ integer SSH2_POLL_CHANNEL_CLOSED ] { 128 } + Constant [ integer SSH2_POLL_LISTENER_CLOSED ] { 128 } + } + + - Functions { + Function [ <internal:ssh2> function ssh2_connect ] { + + - Parameters [2] { + Parameter #0 [ <required> $host ] + Parameter #1 [ <required> $port ] + } + } + Function [ <internal:ssh2> function ssh2_methods_negotiated ] { + + - Parameters [1] { + Parameter #0 [ <required> $resource ] + } + } + Function [ <internal:ssh2> function ssh2_fingerprint ] { + + - Parameters [2] { + Parameter #0 [ <required> $resource ] + Parameter #1 [ <required> $flags ] + } + } + Function [ <internal:ssh2> function ssh2_auth_none ] { + + - Parameters [2] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $username ] + } + } + Function [ <internal:ssh2> function ssh2_auth_password ] { + + - Parameters [3] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $username ] + Parameter #2 [ <required> $password ] + } + } + Function [ <internal:ssh2> function ssh2_auth_pubkey_file ] { + + - Parameters [5] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $username ] + Parameter #2 [ <required> $pubkeyfile ] + Parameter #3 [ <required> $privkeyfile ] + Parameter #4 [ <optional> $passphrase ] + } + } + Function [ <internal:ssh2> function ssh2_auth_hostbased_file ] { + + - Parameters [7] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $username ] + Parameter #2 [ <required> $hostname ] + Parameter #3 [ <required> $pubkeyfile ] + Parameter #4 [ <required> $privkeyfile ] + Parameter #5 [ <optional> $passphrase ] + Parameter #6 [ <optional> $local_username ] + } + } + Function [ <internal:ssh2> function ssh2_forward_listen ] { + } + Function [ <internal:ssh2> function ssh2_forward_accept ] { + } + 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 ] + } + } + Function [ <internal:ssh2> function ssh2_exec ] { + + - 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 ] + } + } + Function [ <internal:ssh2> function ssh2_tunnel ] { + + - Parameters [3] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $host ] + Parameter #2 [ <required> $port ] + } + } + Function [ <internal:ssh2> function ssh2_scp_recv ] { + + - Parameters [3] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $remote_file ] + Parameter #2 [ <required> $local_file ] + } + } + Function [ <internal:ssh2> function ssh2_scp_send ] { + + - Parameters [4] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $remote_file ] + Parameter #2 [ <required> $local_file ] + Parameter #3 [ <optional> $create_mode ] + } + } + Function [ <internal:ssh2> function ssh2_fetch_stream ] { + + - Parameters [2] { + Parameter #0 [ <required> $channel ] + Parameter #1 [ <required> $stream_id ] + } + } + Function [ <internal:ssh2> function ssh2_poll ] { + + - Parameters [1] { + Parameter #0 [ <required> &$param0 ] + } + } + Function [ <internal:ssh2> function ssh2_sftp ] { + + - Parameters [1] { + Parameter #0 [ <required> $session ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_rename ] { + + - Parameters [3] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $from ] + Parameter #2 [ <required> $to ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_unlink ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $filename ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_mkdir ] { + + - Parameters [4] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $dirname ] + Parameter #2 [ <optional> $mode ] + Parameter #3 [ <optional> $recursive ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_rmdir ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $dirname ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_chmod ] { + + - Parameters [3] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $filename ] + Parameter #2 [ <required> $mode ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_stat ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $path ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_lstat ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $path ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_symlink ] { + + - Parameters [3] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $target ] + Parameter #2 [ <required> $link ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_readlink ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $link ] + } + } + Function [ <internal:ssh2> function ssh2_sftp_realpath ] { + + - Parameters [2] { + Parameter #0 [ <required> $sftp ] + Parameter #1 [ <required> $filename ] + } + } + Function [ <internal:ssh2> function ssh2_publickey_init ] { + + - Parameters [1] { + Parameter #0 [ <required> $session ] + } + } + Function [ <internal:ssh2> function ssh2_publickey_add ] { + + - Parameters [5] { + Parameter #0 [ <required> $pkey ] + Parameter #1 [ <required> $algoname ] + Parameter #2 [ <required> $blob ] + Parameter #3 [ <optional> $overwrite ] + Parameter #4 [ <optional> $attributes ] + } + } + Function [ <internal:ssh2> function ssh2_publickey_remove ] { + + - Parameters [3] { + Parameter #0 [ <required> $pkey ] + Parameter #1 [ <required> $algoname ] + Parameter #2 [ <required> $blob ] + } + } + Function [ <internal:ssh2> function ssh2_publickey_list ] { + + - Parameters [1] { + Parameter #0 [ <required> $pkey ] + } + } + Function [ <internal:ssh2> function ssh2_auth_agent ] { + + - Parameters [2] { + Parameter #0 [ <required> $session ] + Parameter #1 [ <required> $username ] + } + } + } +} + diff --git a/php-pecl-ssh2-php7.spec b/php-pecl-ssh2-php7.spec index 75dca21..3f6b20e 100644 --- a/php-pecl-ssh2-php7.spec +++ b/php-pecl-ssh2-php7.spec @@ -10,29 +10,33 @@ # Please, preserve the changelog entries # %if 0%{?scl:1} -%if "%{scl}" == "rh-php56" -%global sub_prefix more-php56- -%else %global sub_prefix %{scl_prefix} %endif -%endif %{?scl: %scl_package php-pecl-ssh2} %{!?php_inidir: %global php_inidir %{_sysconfdir}/php.d} %{!?__pecl: %global __pecl %{_bindir}/pecl} %{!?__php: %global __php %{_bindir}/php} -%global with_zts 0%{?__ztsphp:1} -%global pecl_name ssh2 -%if "%{php_version}" < "5.6" -%global ini_name %{pecl_name}.ini -%else -%global ini_name 40-%{pecl_name}.ini -%endif +# See https://github.com/php/pecl-networking-ssh2/commits/master +%global gh_commit 50d97a52c39166d59e59222a20e841f3f3ce594d +%global gh_short %(c=%{gh_commit}; echo ${c:0:7}) +%global gh_date 20160113 +%global gh_owner php +%global gh_project pecl-networking-ssh2 +%global with_zts 0%{!?_without_zts:%{?__ztsphp:1}} +%global pecl_name ssh2 +%global ini_name 40-%{pecl_name}.ini Name: %{?sub_prefix}php-pecl-ssh2 -Version: 0.12 +Version: 0.13 +%if 0%{?gh_date} +Release: 0.1.%{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: 6%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} +Source0: http://pecl.php.net/get/ssh2-%{version}.tgz +%endif Summary: Bindings for the libssh2 library %global buildver %(pkg-config --silence-errors --modversion libssh2 2>/dev/null || echo 65536) @@ -40,12 +44,10 @@ Summary: Bindings for the libssh2 library License: PHP Group: Development/Languages URL: http://pecl.php.net/package/ssh2 -Source0: http://pecl.php.net/get/ssh2-%{version}.tgz -Source2: php-pecl-ssh2-0.10-README BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libssh2-devel >= 1.2 -BuildRequires: %{?scl_prefix}php-devel +BuildRequires: %{?scl_prefix}php-devel > 7 BuildRequires: %{?scl_prefix}php-pear Requires: %{?scl_prefix}php(zend-abi) = %{php_zend_api} @@ -60,18 +62,16 @@ Provides: %{?scl_prefix}php-pecl(%{pecl_name})%{?_isa} = %{version} %if "%{?vendor}" == "Remi Collet" && 0%{!?scl:1} # Other third party repo stuff -Obsoletes: php53-pecl-%{pecl_name} <= %{version} +Obsoletes: php53-pecl-%{pecl_name} <= %{version} Obsoletes: php53u-pecl-%{pecl_name} <= %{version} -Obsoletes: php54-pecl-%{pecl_name} <= %{version} +Obsoletes: php54-pecl-%{pecl_name} <= %{version} Obsoletes: php54w-pecl-%{pecl_name} <= %{version} -%if "%{php_version}" > "5.5" Obsoletes: php55u-pecl-%{pecl_name} <= %{version} Obsoletes: php55w-pecl-%{pecl_name} <= %{version} -%endif -%if "%{php_version}" > "5.6" Obsoletes: php56u-pecl-%{pecl_name} <= %{version} Obsoletes: php56w-pecl-%{pecl_name} <= %{version} -%endif +Obsoletes: php70u-pecl-%{pecl_name} <= %{version} +Obsoletes: php70w-pecl-%{pecl_name} <= %{version} %endif %if 0%{?fedora} < 20 && 0%{?rhel} < 7 @@ -88,27 +88,34 @@ a secure cryptographic transport. Documentation: http://php.net/ssh2 -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. %prep %setup -c -q - -# http://git.php.net/?p=pecl/networking/ssh2.git;a=commit;h=febf5a78b761ad3c8da06dfb6e94ac54708d2fa1 -sed -e '/LICENSE/s/"src"/"doc"/' \ - -i package.xml - +%if 0%{?gh_date} +mv %{gh_project}-%{gh_commit} NTS +%{__php} -r ' + $pkg = simplexml_load_file("NTS/package.xml"); + $pkg->date = substr("%{gh_date}",0,4)."-".substr("%{gh_date}",4,2)."-".substr("%{gh_date}",6,2); + $pkg->version->release = "%{version}dev"; + $pkg->stability->release = "devel"; + $pkg->asXML("package.xml"); +' +%else mv %{pecl_name}-%{version} NTS +%endif + +# Don't install/register tests +sed -e 's/role="test"/role="src"/' -i package.xml extver=$(sed -n '/#define PHP_SSH2_VERSION/{s/.* "//;s/".*$//;p}' NTS/php_ssh2.h) -if test "x${extver}" != "x%{version}"; then - : Error: Upstream PDO ABI version is now ${extver}, expecting %{version}. +if test "x${extver}" != "x%{version}%{?gh_date:-dev}"; then + : Error: Upstream version is now ${extver}, expecting %{version}%{?gh_date:-dev}. : Update the pdover macro and rebuild. exit 1 fi -cp %{SOURCE2} README - cat > %{ini_name} << 'EOF' ; Enable ssh2 extension module extension=ssh2.so @@ -151,8 +158,6 @@ install -Dpm644 %{ini_name} %{buildroot}%{php_ztsinidir}/%{ini_name} %endif # Documentation -install -Dpm 644 README %{buildroot}%{pecl_docdir}/%{pecl_name}/README - for i in $(grep 'role="doc"' package.xml | sed -e 's/^.*name="//;s/".*$//') do install -Dpm 644 NTS/$i %{buildroot}%{pecl_docdir}/%{pecl_name}/$i done @@ -183,6 +188,9 @@ fi # posttrans as pear can be installed after us %posttrans +%if 0%{?gh_date} +echo -e "\n** %{name} is an experimental package, built from a development sources snapshot **\n" +%endif if [ -x %{__pecl} ] ; then %{pecl_install} %{pecl_xmldir}/%{name}.xml >/dev/null || : fi @@ -213,6 +221,9 @@ rm -rf %{buildroot} %changelog +* Wed Jan 13 2016 Remi Collet <remi@fedoraproject.org> - 0.13-0.1.20160113git50d97a5 +- update to 0.13-dev, git snapshot, for PHP 7 + * Tue Jun 23 2015 Remi Collet <remi@fedoraproject.org> - 0.12-6 - allow build against rh-php56 (as more-php56) - drop runtime dependency on pear, new scriptlets diff --git a/php-pecl-ssh2.spec b/php-pecl-ssh2.spec index 75dca21..6a86be0 100644 --- a/php-pecl-ssh2.spec +++ b/php-pecl-ssh2.spec @@ -88,7 +88,7 @@ a secure cryptographic transport. Documentation: http://php.net/ssh2 -Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl})}. +Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')%{?scl: as Software Collection (%{scl} by %{?scl_vendor}%{!?scl_vendor:rh})}. %prep |