up to 1.1.2
authorElan Ruusamäe <glen@pld-linux.org>
Tue, 13 Aug 2019 15:11:15 +0000 (18:11 +0300)
committerElan Ruusamäe <glen@pld-linux.org>
Tue, 13 Aug 2019 15:12:59 +0000 (18:12 +0300)
bug-73524.patch [deleted file]
php-pecl-ssh2.spec

diff --git a/bug-73524.patch b/bug-73524.patch
deleted file mode 100644 (file)
index 91c9175..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-From 093906ec1c065e86ad1cd4dabbc89b1ccae11938 Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Thu, 10 Nov 2016 09:16:02 +0100
-Subject: [PATCH] fix for PHP 7.0.13 where php_url_parse fails
-
----
- ssh2_fopen_wrappers.c | 17 ++++++++++++-----
- 1 file changed, 12 insertions(+), 5 deletions(-)
-
-diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c
-index 8472ddd..89b34eb 100644
---- a/ssh2_fopen_wrappers.c
-+++ b/ssh2_fopen_wrappers.c
-@@ -198,10 +198,20 @@ php_url *php_ssh2_fopen_wraper_parse_path(       char *path, char *type, php_stream_co
-       php_url *resource;
-       zval *methods = NULL, *callbacks = NULL, zsession, **tmpzval;
-       long resource_id;
--      char *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
-+      char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL;
-       int username_len = 0, password_len = 0;
--      resource = php_url_parse(path);
-+      h = strstr(path, "Resource id #");
-+      if (h) {
-+              /* Starting with 5.6.28, 7.0.13 need to be clean, else php_url_parse will fail */
-+              char *tmp = estrdup(path);
-+
-+              strncpy(tmp + (h-path), h + sizeof("Resource id #")-1, strlen(tmp)-sizeof("Resource id #"));
-+              resource = php_url_parse(tmp);
-+              efree(tmp);
-+      } else {
-+              resource = php_url_parse(path);
-+      }
-       if (!resource || !resource->path) {
-               return NULL;
-       }
-@@ -232,9 +242,6 @@ php_url *php_ssh2_fopen_wraper_parse_path( char *path, char *type, php_stream_co
-       /* Look for a resource ID to reuse a session */
-       s = resource->host;
--      if (strncmp(resource->host, "Resource id #", sizeof("Resource id #") - 1) == 0) {
--              s = resource->host + sizeof("Resource id #") - 1;
--      }
-       if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) {
-               php_ssh2_sftp_data *sftp_data;
index 46d74958a90eca0e21e086acb113c115fa5916e7..c5862f1b98a845d88152e9becf02cb82e46e0df7 100644 (file)
@@ -3,13 +3,12 @@
 Summary:       %{modname} - bindings for the libssh2 library
 Summary(pl.UTF-8):     %{modname} - dowiązania do biblioteki libssh2
 Name:          %{php_name}-pecl-%{modname}
-Version:       0.13
+Version:       1.1.2
 Release:       1
 License:       PHP
 Group:         Development/Languages/PHP
-Source0:       http://pecl.php.net/get/%{modname}-%{version}.tgz
-# Source0-md5: e35f8438b3f6177066166c8c1916f44e
-Patch0:                bug-73524.patch
+Source0:       https://pecl.php.net/get/%{modname}-%{version}.tgz
+# Source0-md5: 0bb1b02ae6d1d1a86134959e9b45ae69
 URL:           https://pecl.php.net/package/ssh2
 BuildRequires: %{php_name}-devel >= 4:5.0.4
 BuildRequires: libssh2-devel >= 1.2.9
@@ -31,7 +30,6 @@ implementującej protokół SSH2.
 %prep
 %setup -qc
 mv %{modname}-%{version}/* .
-%patch0 -p1
 
 %build
 phpize
This page took 0.056611 seconds and 4 git commands to generate.