From 1798c4aeca70ac8d0a243684d6a798fbc65735f8 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 14 Jul 2018 20:57:42 +0100 Subject: gentoo resync : 14.07.2018 --- dev-php/pecl-ssh2/Manifest | 9 ----- dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch | 49 ------------------------ dev-php/pecl-ssh2/metadata.xml | 8 ---- dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild | 32 ---------------- dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild | 30 --------------- dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild | 30 --------------- dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild | 31 --------------- 7 files changed, 189 deletions(-) delete mode 100644 dev-php/pecl-ssh2/Manifest delete mode 100644 dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch delete mode 100644 dev-php/pecl-ssh2/metadata.xml delete mode 100644 dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild delete mode 100644 dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild delete mode 100644 dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild delete mode 100644 dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild (limited to 'dev-php/pecl-ssh2') diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest deleted file mode 100644 index 55c2573f4f28..000000000000 --- a/dev-php/pecl-ssh2/Manifest +++ /dev/null @@ -1,9 +0,0 @@ -AUX 0.13-parse_url-fix.patch 1777 BLAKE2B db7f6bd23cbe6552fce870044b1839eadba5c9089ffee2da52c1c998856083636c221d7386f52ba689f9796807e2abce447541dfb247c6d20f7898254e0f0dc7 SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205 -DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0 -DIST ssh2-1.1.1.tgz 27551 BLAKE2B 5e8e32c790a1d8646497ea6c4893694b2cc511a9a4753d66788c618ce7f8cb04d37fcd54a21c59dda918ba6ef27a1abd1b32c2d515d07c0925ab26e9a7e58941 SHA512 92cc40627a6114a4b0e7b8437e5e0b219b49dfbed9668937e7d0d37492a101c9f25381b5a1533f91c0530fdebe66af7bcb68ff4231a7ecd806b99d8a04f74d79 -DIST ssh2-1.1.2.tgz 32057 BLAKE2B 88ffb3fb608687a086bbe345677982e944210791acc100312ba56ac7c35188a52cde5529d78caf473d19710e9965fba853ea9ff046715413a0b488ae2d8b690c SHA512 36793191448745b8a9b3cc628fe9fb431480792c7a2ff0bf2eccd58cda1cf944933be1d301c455d4a6f3dabf7e04ffef248bc402a8ff99bfafcba0deddb25c36 -EBUILD pecl-ssh2-0.13-r3.ebuild 707 BLAKE2B 9a32418bac7fd95bbc56f316ff4b8a09f61aa009bc5ce6262b52224672ef2ec6ccef102e1fa6ca15982c736ac1640b57c912d33e555e71f4eeafc17b1e002b5b SHA512 05ee3824bb54b54940f982d4b96bfb9ceb546f40b55067bfb1df24123c662786f87faf12905b58cc24188160f0af4f06e0c150a6c32f5e0b93f1343ea64b179a -EBUILD pecl-ssh2-1.1.1.ebuild 653 BLAKE2B 4625ade7081cf94d3aadd7f5ecbd299ff962e08547d793a82ecab8e6b167e3ead768a9b4b6141d9790647dc2d0a49af18544165938119bad02145426eacb0dcf SHA512 4e86a46a4d758326de99069c925e46acebb92ab9867b62623c7b90c5a15763dc3900530a4d2d868bd99edb4c5dc5285b493333bae1ba76a635253cbce61e6bea -EBUILD pecl-ssh2-1.1.2.ebuild 695 BLAKE2B 13cf11fe0e7896048ac96adf5b1be5047b0b04fe038f25ab7e8a21da7024196d3b4d40281819d52c175a69584d9874ec33d5b02329a6674ca305d87ae226ce19 SHA512 47a9bf5e8cf5a56772741aaddf2521fe67a31f5e151b27d3f92d4840d47bf8be77b4cb594ca0f0aecba67e4b6528ad78ea92722b088ddc2184a6ffe54367db4c -EBUILD pecl-ssh2-9999.ebuild 744 BLAKE2B ea9fe3fe4b516c25fed214c1a48eb5fb0221048f96540090ea50136489cc91c4dde2407289175b44d4169d71dd723163a8814f784290ee4cfd67d23484903720 SHA512 970871b295857af4ccd1bb68680b883c677c161189025326e32d317aef6867261b34343371003152d60fe7bf40c19a3130bd5f8b748d7d7ba263e70f6fd22e55 -MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 diff --git a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch b/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch deleted file mode 100644 index c9c052fd32db..000000000000 --- a/dev-php/pecl-ssh2/files/0.13-parse_url-fix.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 093906ec1c065e86ad1cd4dabbc89b1ccae11938 Mon Sep 17 00:00:00 2001 -From: Remi Collet -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; - --- -2.1.4 - diff --git a/dev-php/pecl-ssh2/metadata.xml b/dev-php/pecl-ssh2/metadata.xml deleted file mode 100644 index aca42932b833..000000000000 --- a/dev-php/pecl-ssh2/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - diff --git a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild deleted file mode 100644 index 25a9a72ff7ce..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-0.13-r3.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-0 php7-1" - -inherit php-ext-pecl-r3 - -USE_PHP="php5-6" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="" -KEYWORDS="amd64 x86" -# Upstream notes say there are errors with gcrypt backend -DEPEND="net-libs/libssh2[-gcrypt]" -RDEPEND="${DEPEND}" -PDEPEND="php_targets_php7-0? ( dev-php/pecl-ssh2:7 ) - php_targets_php7-1? ( dev-php/pecl-ssh2:7 )" - -src_prepare(){ - if use php_targets_php5-6 ; then - local PATCHES=( "${FILESDIR}/0.13-parse_url-fix.patch" ) - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild deleted file mode 100644 index 2c2f92bed940..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.1.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-0 php7-1" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-0 php7-1" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="7" -IUSE="" -KEYWORDS="amd64 x86" -# Upstream notes say there are errors with gcrypt backend -DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild deleted file mode 100644 index 09e08c191229..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -USE_PHP="php7-0 php7-1 php7-2" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="7" -IUSE="" -KEYWORDS="~amd64 ~x86" -# Upstream notes say there are errors with gcrypt backend -DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild deleted file mode 100644 index e493a7b71a86..000000000000 --- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="ssh2" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" -EGIT_REPO_URI="https://git.php.net/repository/pecl/networking/ssh2.git" - -inherit php-ext-source-r3 git-r3 - -USE_PHP="php7-0 php7-1 php7-2" - -DESCRIPTION="PHP bindings for the libssh2 library" -LICENSE="PHP-3.01" -SLOT="7" -IUSE="" -KEYWORDS="" -DEPEND=">=net-libs/libssh2-1.2" -RDEPEND="${DEPEND} - php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" -HOMEPAGE="https://pecl.php.net/package/ssh2" - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then - php-ext-source-r3_src_prepare - else - default_src_prepare - fi -} -- cgit v1.2.3