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-oauth/Manifest | 8 --- dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch | 26 -------- dev-php/pecl-oauth/files/1.2.3-withcurl.patch | 71 ---------------------- .../pecl-oauth/files/2.0.2-compare_segfault.patch | 48 --------------- dev-php/pecl-oauth/metadata.xml | 8 --- dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild | 56 ----------------- dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild | 56 ----------------- 7 files changed, 273 deletions(-) delete mode 100644 dev-php/pecl-oauth/Manifest delete mode 100644 dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch delete mode 100644 dev-php/pecl-oauth/files/1.2.3-withcurl.patch delete mode 100644 dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch delete mode 100644 dev-php/pecl-oauth/metadata.xml delete mode 100644 dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild delete mode 100644 dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild (limited to 'dev-php/pecl-oauth') diff --git a/dev-php/pecl-oauth/Manifest b/dev-php/pecl-oauth/Manifest deleted file mode 100644 index ec6fcaf766e7..000000000000 --- a/dev-php/pecl-oauth/Manifest +++ /dev/null @@ -1,8 +0,0 @@ -AUX 1.2.3-prce.h-check.patch 757 BLAKE2B 75c725cc7b73d260c1168deb524581ad2d745e57fa780a0579970cde706fdae1aac5c0b3b11afead865a075d8b596c9f9b934dd06d982d70cbebc7641d759cd1 SHA512 e3f3ba2f60ec65e6dd80bb0e6980f2597b746ae6bad302fca4a295eb3fb7da9448d756ff1106fe0543151b90c50d4f4dd01ccccd1ee61455544046b2ca15b79b -AUX 1.2.3-withcurl.patch 2099 BLAKE2B cbbc746f5e233830a7c2fc81ddcaf4a3a9ca25afa6cd2168d82b656d80c26f9297e4fadfca8e6680027069bd9f5b1e75f9068448b331585692e2e0d229919504 SHA512 f40d0d48a35f54b09d6eb2c44af1c191416840e922cb030b27b95501558e356252793a43f02ade85eecc498968aff85c7498fef546e7d24e94c583a88b14c2e5 -AUX 2.0.2-compare_segfault.patch 1664 BLAKE2B 099aa3f78002d734306673d817e21d75bcbf6e5ece41f9c8290ebfaa1ec68d944de86f4dc3af8139143392121ec73b00c481f77599fb541c3ae5b7d435e6c0b3 SHA512 1d8da5be1648738b4a03f5e8b47b016418096a38571d6aa518c486ff799e09152af1a33c39ad9d0c8d81ee2d5500d58aa78dcc4f46e1e746a4a9bc688dcd08e1 -DIST oauth-1.2.3.tgz 45531 BLAKE2B 10fb5a3d1a46ee17fef7b129b3c29d67d565d296579aff63d8309f4efc5b881450249fb8e6d25703a33ad53e336775abc73f3d8e489f78c00c8988219b02ae1b SHA512 ca61dbec8fa51679accb31eab90b8699c7780f2d60a83566ce05667148ee44b7dc70fd8235414d6a3a996b252ad4a236b3e8a549685fd7e890e0874029c455e1 -DIST oauth-2.0.2.tgz 49115 BLAKE2B 292c8c2d7fa3728aa6a73cdb65ee1c603f341cd24596d64b910f495ef649adb1f90ba4dfdab5ce1802dee9e8a0e3a6af502da340ed467de6e8c5d83df18abc7d SHA512 b7aa9459542ec390a5420127d75607702ae6df6254f4e39acb62d35c6a39b8b7990499c279df07ce681081e455b55219c51df42fd516321f317465badf6d459d -EBUILD pecl-oauth-1.2.3-r5.ebuild 1147 BLAKE2B ccab8eb759914ca9d30e73e8d23a829f3ab0ef120f7c9ecd70466f16658ef8e02763ffb64ed33b7cb4b797c3dbbbb9e3980bc93e3bb08d349dda02930545a48b SHA512 2b30cde4d028f636becc2f1d61e0c56a55c021910567fa78bb387ba0c83949d3d104026d917fbe63836850b374e8a1c1bc1f91bbaf102029a1ffb60e469a9e3d -EBUILD pecl-oauth-2.0.2-r2.ebuild 1407 BLAKE2B f048f3a75f5511e0ef9efc9a5e0428f0d30ae98e3ffb3664b417a87e9725f6db34ac9b959cad9b12941962849f03199525022d119d768722769340ecfaa92567 SHA512 08f2136c40fbe88a7ca94a27ca09ccd8fcac6a0367c32a28272b472243ff036192202adec19bb401b7274c65e2b1eb63911a07ab5ca76741d15b0e24a937aaa8 -MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch b/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch deleted file mode 100644 index 995ef51f28ca..000000000000 --- a/dev-php/pecl-oauth/files/1.2.3-prce.h-check.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f12e2bd72b238da2dbf3bd0f882d977073cca282 Mon Sep 17 00:00:00 2001 -From: John Jawed -Date: Thu, 24 Jul 2014 15:19:18 +0000 -Subject: [PATCH] Bug #67658 (configure does not detect missing pcre.h) - -git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@334377 c90b9560-bf6c-de11-be94-00142212c4b1 ---- - config.m4 | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/config.m4 b/config.m4 -index 48e2608..53a5ea8 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -14,6 +14,8 @@ if test "$PHP_OAUTH" != "no"; then - PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared) - CFLAGS="$CFLAGS -Wall -g" - -+ AC_CHECK_HEADERS(pcre.h) -+ - AS_IF([test "x$with_curl" != "xno"], - [ - AC_MSG_CHECKING(for cURL in default path) --- -2.1.4 - diff --git a/dev-php/pecl-oauth/files/1.2.3-withcurl.patch b/dev-php/pecl-oauth/files/1.2.3-withcurl.patch deleted file mode 100644 index 5069ae92b146..000000000000 --- a/dev-php/pecl-oauth/files/1.2.3-withcurl.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 1b68ce035883f1ae186d82682fbbc5ea7d1834b3 Mon Sep 17 00:00:00 2001 -From: John Jawed -Date: Fri, 18 Jan 2013 20:28:05 +0000 -Subject: [PATCH] Bug 64025 (patch via mattsch at gmail dot com) - -git-svn-id: https://svn.php.net/repository/pecl/oauth/trunk@329234 c90b9560-bf6c-de11-be94-00142212c4b1 ---- - config.m4 | 40 ++++++++++++++++++++++++++-------------- - 1 file changed, 26 insertions(+), 14 deletions(-) - -diff --git a/config.m4 b/config.m4 -index 832c577..48e2608 100644 ---- a/config.m4 -+++ b/config.m4 -@@ -5,27 +5,39 @@ dnl - PHP_ARG_ENABLE(oauth, for oauth support, - [ --enable-oauth Include oauth support]) - -+AC_ARG_WITH([curl], -+ AS_HELP_STRING([--without-curl], [Ignore presence of cURL and disable it])) -+ - if test "$PHP_OAUTH" != "no"; then - PHP_SUBST(OAUTH_SHARED_LIBADD) - - PHP_NEW_EXTENSION(oauth, oauth.c provider.c, $ext_shared) - CFLAGS="$CFLAGS -Wall -g" - -- AC_MSG_CHECKING(for cURL in default path) -- for i in /usr/local /usr; do -- if test -r $i/include/curl/easy.h; then -- CURL_DIR=$i -- AC_MSG_RESULT(found in $i) -- break -- fi -- done -+ AS_IF([test "x$with_curl" != "xno"], -+ [ -+ AC_MSG_CHECKING(for cURL in default path) -+ have_curl=no -+ for i in /usr/local /usr; do -+ if test -r $i/include/curl/easy.h; then -+ have_curl=yes -+ CURL_DIR=$i -+ AC_MSG_RESULT(found in $i) -+ break -+ fi -+ done -+ ], -+ [have_curl=no]) - -- if test -z "$CURL_DIR"; then -- AC_MSG_RESULT(cURL not found, cURL support disabled) -- else -- PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD) -- AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used]) -- fi -+ AS_IF([test "x$have_curl" = "xyes"], -+ [ -+ PHP_ADD_LIBRARY(curl,,OAUTH_SHARED_LIBADD) -+ AC_DEFINE(OAUTH_USE_CURL, 1, [Whether cURL is present and should be used]) -+ ], -+ [AS_IF([test "x$with_curl" = "xyes"], -+ [AC_MSG_ERROR([cURL requested but not found]) -+ ]) -+ ]) - - PHP_ADD_EXTENSION_DEP(oauth, hash) - fi --- -2.1.4 - diff --git a/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch b/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch deleted file mode 100644 index f0b8d7ae216f..000000000000 --- a/dev-php/pecl-oauth/files/2.0.2-compare_segfault.patch +++ /dev/null @@ -1,48 +0,0 @@ -From f1a5b6dea1982dab03c810edd321ca57907d41fe Mon Sep 17 00:00:00 2001 -From: Adam Saponara -Date: Fri, 24 Feb 2017 17:20:51 -0500 -Subject: [PATCH] Fix bug #74163: Segfault in oauth_compare_value - -Credit to @russpos for finding this bug ---- - oauth.c | 4 ++-- - tests/oauth_sbs.phpt | 4 ++++ - 2 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/oauth.c b/oauth.c -index 62522bd..198e2cb 100644 ---- a/oauth.c -+++ b/oauth.c -@@ -374,8 +374,8 @@ static int oauth_strcmp(zval *first, zval *second) - static int oauth_compare_value(const void *a, const void *b) - { - Bucket *f, *s; -- f = *(Bucket **)a; -- s = *(Bucket **)b; -+ f = (Bucket *)a; -+ s = (Bucket *)b; - - return oauth_strcmp(&f->val, &s->val); - } -diff --git a/tests/oauth_sbs.phpt b/tests/oauth_sbs.phpt -index a49d2b4..4e9269e 100644 ---- a/tests/oauth_sbs.phpt -+++ b/tests/oauth_sbs.phpt -@@ -21,6 +21,8 @@ echo "-- putting oauth_signature inside by mistake --\n"; - echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/',array('oauth_signature'=>'hello world')),"\n"; - echo "-- merging url query and extra params --\n"; - echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script?arg1=1',array('arg2' => '2')),"\n"; -+echo "-- with array value --\n"; -+echo oauth_get_sbs('GET', 'http://127.0.0.1:12342/script',array('arg2' => [1, 2, 3])),"\n"; - - ?> - --EXPECTF-- -@@ -44,3 +46,5 @@ GET&http%3A%2F%2F127.0.0.1%3A12342%2F&test%3D - GET&http%3A%2F%2F127.0.0.1%3A12342%2F& - -- merging url query and extra params -- - GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg1%3D1%26arg2%3D2 -+-- with array value -- -+GET&http%3A%2F%2F127.0.0.1%3A12342%2Fscript&arg2%3D1%26arg2%3D2%26arg2%3D3 --- -2.1.4 - diff --git a/dev-php/pecl-oauth/metadata.xml b/dev-php/pecl-oauth/metadata.xml deleted file mode 100644 index b86acf66c756..000000000000 --- a/dev-php/pecl-oauth/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - php-bugs@gentoo.org - PHP - - diff --git a/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild b/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild deleted file mode 100644 index 460f2c39256c..000000000000 --- a/dev-php/pecl-oauth/pecl-oauth-1.2.3-r5.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PHP_EXT_NAME="oauth" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1" - -inherit php-ext-pecl-r3 - -# Really only build for 5.6 -USE_PHP="php5-6" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="OAuth is an authorization protocol built on top of HTTP" -LICENSE="BSD" -SLOT="0" -IUSE="+curl examples" - -DEPEND="php_targets_php5-6? ( dev-lang/php:5.6[hash] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) -" -RDEPEND="${DEPEND} php_targets_php7-0? ( ${CATEGORY}/${PN}:7[php_targets_php7-0(-)?] ) - php_targets_php7-1? ( ${CATEGORY}/${PN}:7[php_targets_php7-1(-)?] )" - -src_prepare() { - if use php_targets_php5-6 ; then - local PATCHES=( - "${FILESDIR}/${PV}-withcurl.patch" - "${FILESDIR}/${PV}-prce.h-check.patch" - ) - php-ext-source-r3_src_prepare - else - eapply_user - fi -} - -src_configure() { - if use php_targets_php5-6 ; then - local PHP_EXT_ECONF_ARGS=( - --enable-oauth - $(use_with curl) - ) - - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php5-6 ; then - php-ext-pecl-r3_src_install - fi -} diff --git a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild b/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild deleted file mode 100644 index 987a87b85ee0..000000000000 --- a/dev-php/pecl-oauth/pecl-oauth-2.0.2-r2.ebuild +++ /dev/null @@ -1,56 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PHP_EXT_NAME="oauth" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -# Really only build for 7.0 -USE_PHP="php7-0 php7-1 php7-2" - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="OAuth is an authorization protocol built on top of HTTP" -LICENSE="BSD" -SLOT="7" -IUSE="+curl examples" - -DEPEND="php_targets_php7-0? ( dev-lang/php:7.0[hash] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) - php_targets_php7-1? ( dev-lang/php:7.1[hash] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) - php_targets_php7-2? ( dev-lang/php:7.2[hash] - dev-libs/libpcre:3= curl? ( net-misc/curl:0= ) ) -" -RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0[php_targets_php5-6(-)?] )" - -src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then - local PATCHES=( "${FILESDIR}/${PV}-compare_segfault.patch" ) - php-ext-source-r3_src_prepare - else - eapply_user - fi -} - -src_configure() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then - local PHP_EXT_ECONF_ARGS=( - --enable-oauth - $(use_with curl) - ) - - php-ext-source-r3_src_configure - fi -} - -src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then - php-ext-pecl-r3_src_install - fi -} -- cgit v1.2.3