From 73c318acdaf6f8309d68bd266051e6dd1f1bd787 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 8 Jun 2019 09:04:53 +0100 Subject: gentoo resync : 08.06.2019 --- dev-php/Manifest.gz | Bin 40596 -> 40589 bytes dev-php/geos-php/Manifest | 2 +- dev-php/geos-php/geos-php-1.0.0.ebuild | 6 +- dev-php/igbinary/Manifest | 4 +- dev-php/igbinary/igbinary-2.0.8.ebuild | 4 +- dev-php/igbinary/igbinary-3.0.1.ebuild | 2 +- dev-php/libvirt-php/Manifest | 4 +- dev-php/libvirt-php/libvirt-php-0.5.4.ebuild | 6 +- dev-php/libvirt-php/libvirt-php-9999.ebuild | 6 +- dev-php/maxmind-db-reader/Manifest | 2 + .../maxmind-db-reader-1.4.1.ebuild | 77 +++ dev-php/ming-php/Manifest | 5 +- dev-php/ming-php/files/ming-php-54.patch | 479 ------------- dev-php/ming-php/ming-php-0.4.7.ebuild | 46 -- dev-php/ming-php/ming-php-0.4.8.ebuild | 2 +- dev-php/pecl-apcu_bc/Manifest | 2 + dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild | 44 ++ dev-php/pecl-crack/Manifest | 2 +- dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild | 14 +- dev-php/pecl-dbase/Manifest | 2 + dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild | 44 ++ dev-php/pecl-dio/Manifest | 2 +- dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild | 6 +- dev-php/pecl-event/Manifest | 2 + dev-php/pecl-event/pecl-event-2.5.2.ebuild | 52 ++ dev-php/pecl-gnupg/Manifest | 3 +- dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild | 28 - dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r2.ebuild | 4 +- dev-php/pecl-http/Manifest | 6 +- dev-php/pecl-http/pecl-http-3.1.0-r2.ebuild | 15 +- dev-php/pecl-http/pecl-http-3.2.0.ebuild | 15 +- dev-php/pecl-http/pecl-http-3.2.1.ebuild | 75 +++ dev-php/pecl-imagick/Manifest | 7 +- .../pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch | 18 - dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild | 25 - .../pecl-imagick-3.4.3_p20181129.ebuild | 32 - dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild | 2 +- dev-php/pecl-memcached/Manifest | 3 +- .../pecl-memcached/pecl-memcached-3.1.3-r1.ebuild | 75 +++ dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild | 4 +- dev-php/pecl-ncurses/Manifest | 3 +- .../files/pecl-ncurses-1.0.2-php7.3.patch | 175 +++++ dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild | 23 - dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild | 23 + dev-php/pecl-pam/Manifest | 2 +- dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild | 6 +- dev-php/pecl-propro/Manifest | 2 +- dev-php/pecl-propro/pecl-propro-2.1.0.ebuild | 12 +- dev-php/pecl-ps/Manifest | 2 +- dev-php/pecl-ps/pecl-ps-1.4.1.ebuild | 14 +- dev-php/pecl-radius/Manifest | 2 +- .../pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild | 8 +- dev-php/pecl-raphf/Manifest | 2 +- dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild | 12 +- dev-php/pecl-rrd/Manifest | 2 +- dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild | 18 +- dev-php/pecl-ssh2/Manifest | 6 +- .../files/pecl-ssh2-1.1.2-fix-php7-port.patch | 746 +++++++++++++++++++++ ...1.1.2-fix-php_url-fields-usage-for-php7-3.patch | 302 +++++++++ dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild | 15 +- dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild | 10 +- dev-php/pecl-taint/Manifest | 2 + dev-php/pecl-taint/pecl-taint-2.0.5.ebuild | 19 + dev-php/pecl-timezonedb/Manifest | 10 +- .../pecl-timezonedb/pecl-timezonedb-2016.10.ebuild | 19 - .../pecl-timezonedb/pecl-timezonedb-2017.3.ebuild | 19 - .../pecl-timezonedb/pecl-timezonedb-2018.7.ebuild | 19 - .../pecl-timezonedb/pecl-timezonedb-2018.9.ebuild | 19 - .../pecl-timezonedb/pecl-timezonedb-2019.1.ebuild | 19 + dev-php/pecl-translit/Manifest | 2 + dev-php/pecl-translit/pecl-translit-0.6.3.ebuild | 30 + dev-php/pecl-uploadprogress/Manifest | 2 +- .../pecl-uploadprogress-1.0.3.1-r4.ebuild | 4 +- dev-php/pecl-uuid/Manifest | 2 +- dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild | 4 +- dev-php/pecl-xdiff/Manifest | 2 +- dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild | 13 +- dev-php/pecl-zmq/Manifest | 4 +- .../pecl-zmq-1.1.3-php7-3-compatibility.patch | 265 ++++++++ dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild | 25 + dev-php/pecl-zmq/pecl-zmq-9999.ebuild | 6 +- dev-php/xdebug-client/Manifest | 6 +- .../xdebug-client/xdebug-client-2.7.0_rc1.ebuild | 40 -- .../xdebug-client/xdebug-client-2.7.0_rc2.ebuild | 40 -- dev-php/xdebug-client/xdebug-client-2.7.2.ebuild | 40 ++ dev-php/xdebug/Manifest | 6 +- dev-php/xdebug/xdebug-2.7.0_rc1.ebuild | 42 -- dev-php/xdebug/xdebug-2.7.0_rc2.ebuild | 42 -- dev-php/xdebug/xdebug-2.7.2.ebuild | 42 ++ 89 files changed, 2212 insertions(+), 1043 deletions(-) create mode 100644 dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild delete mode 100644 dev-php/ming-php/files/ming-php-54.patch delete mode 100644 dev-php/ming-php/ming-php-0.4.7.ebuild create mode 100644 dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild create mode 100644 dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild create mode 100644 dev-php/pecl-event/pecl-event-2.5.2.ebuild delete mode 100644 dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild create mode 100644 dev-php/pecl-http/pecl-http-3.2.1.ebuild delete mode 100644 dev-php/pecl-imagick/files/pecl-imagick-3.4.3-tsrm_ls-is-undeclared.patch delete mode 100644 dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild delete mode 100644 dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild create mode 100644 dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild create mode 100644 dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch delete mode 100644 dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild create mode 100644 dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild create mode 100644 dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch create mode 100644 dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch create mode 100644 dev-php/pecl-taint/pecl-taint-2.0.5.ebuild delete mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild delete mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild delete mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild delete mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2018.9.ebuild create mode 100644 dev-php/pecl-timezonedb/pecl-timezonedb-2019.1.ebuild create mode 100644 dev-php/pecl-translit/pecl-translit-0.6.3.ebuild create mode 100644 dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch create mode 100644 dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild delete mode 100644 dev-php/xdebug-client/xdebug-client-2.7.0_rc1.ebuild delete mode 100644 dev-php/xdebug-client/xdebug-client-2.7.0_rc2.ebuild create mode 100644 dev-php/xdebug-client/xdebug-client-2.7.2.ebuild delete mode 100644 dev-php/xdebug/xdebug-2.7.0_rc1.ebuild delete mode 100644 dev-php/xdebug/xdebug-2.7.0_rc2.ebuild create mode 100644 dev-php/xdebug/xdebug-2.7.2.ebuild (limited to 'dev-php') diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz index 24449abbe478..8eaecdc8f9cc 100644 Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ diff --git a/dev-php/geos-php/Manifest b/dev-php/geos-php/Manifest index c8f6b1a380f5..42a5894d436d 100644 --- a/dev-php/geos-php/Manifest +++ b/dev-php/geos-php/Manifest @@ -1,3 +1,3 @@ DIST geos-php-1.0.0.tar.gz 40870 BLAKE2B c6d526470bdb7e4aecce6ce5f2132f90a6c40e5a2b3a8169bbb7ae101394340aad8a23309130c7f1421e19162b5559f9e87e58fb704e91b1fc03b612543551e8 SHA512 4ceb9e1152d0b534bc3a5e372be0b98770b1883ec4dda1177c9399d95d947b9feee412accf003d27b55b1a901c90259a9b38792b453dac11cb8af26af3cd91ec -EBUILD geos-php-1.0.0.ebuild 720 BLAKE2B 8e989a4b1277dcf561c9dd855b99519bade40e5447e1d3910f1f6eeb15070d8ca21cec1473212802b4ea4fe840a1ba274cef5fededf1c0f15934308c6bd683cc SHA512 a5e0623566f780cfc2ab39d4e9abdb339733ca27e85847a47775cc19de47c38f5f28169c4ac0ff28f67d15dd245f861aee4d3236e160be05c491a9fa4b162b0b +EBUILD geos-php-1.0.0.ebuild 724 BLAKE2B 5e0a1b8ee71ccb88c72dfde4f2d59d2380d14f4434f2e9e1ec5b13936ea1e93e59eaaefce9036598f0ed8b7d825179790b36d1b5a88a7fb40933c70d11ff1e22 SHA512 7b0e3399f6c606b906ce28debc3d695c541d1d8a8861686b4ef41ecbb31d6eaeea04c9390c45edde2c0e7e8ad3257134aca1493396c584e77d8ced0aafbbeea2 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/geos-php/geos-php-1.0.0.ebuild b/dev-php/geos-php/geos-php-1.0.0.ebuild index 848afdf5d7f0..b126efe75093 100644 --- a/dev-php/geos-php/geos-php-1.0.0.ebuild +++ b/dev-php/geos-php/geos-php-1.0.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PHP_EXT_NAME="geos" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" MY_PV="${PV/_/}" MY_PV="${MY_PV/rc/RC}" diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest index 5bd20234d20a..ae3d58b2fc9b 100644 --- a/dev-php/igbinary/Manifest +++ b/dev-php/igbinary/Manifest @@ -7,7 +7,7 @@ DIST igbinary-3.0.1.tar.gz 170957 BLAKE2B 2250ef228b059d5d87615412ffae3242cd757d EBUILD igbinary-2.0.5.ebuild 584 BLAKE2B 6c928e2f63bc4af2255092a71c39e916db15b1ece4f1aa171719ad31a744231aedc099e938a66eaca37c9b936d607e060fb1ac19e0519c186c6988ae11a8ed23 SHA512 ae02b0f4099d8f65f796d60ccb11c8aa05b7d7218b6b7eae137229f5269d6168a0caea1e5215795cb12a1379442b7e7ac3ffff3dcb391154951a5da643aa285a EBUILD igbinary-2.0.6.ebuild 586 BLAKE2B 06ab30e3024877c2be0acb740bdedb378b8ffe84f3c03888a1bf4363b27faa9ce2fb30143dd9c1d33ad6dd90d2bb7ed9a13257a6179dd5cddd0a0aa9a4ab2a93 SHA512 b79d6efcca26e1d0d9f55af8bbc1e7eed3309dfcb081878a70f54fcf610065ae41ccecf0da72e2ecb61b36bbfd25d97848c1b51df9eeb977a003d71bb9e78f25 EBUILD igbinary-2.0.7.ebuild 599 BLAKE2B 96eb591d71584c6b8c2cc56b258db4f59c4ca9a2df834b4af4db1b25a11a4e28ef3991c338ac3cf3f033b85d4ee6c60126d8f4d993b936846963b49617e8c23e SHA512 128bc5df0c7e708d9715aa036ee223b1bb4ce9a2330eac25340ebef3583dc4326df8c757c4a08cf54daa607171163fd344378061d5c87443e883a78cf690f8a3 -EBUILD igbinary-2.0.8.ebuild 596 BLAKE2B 2ddb5fc941667de65395e66a68511d36912044cbfb9aebfeb7b71e2ccd7b56bcdb1fce058dffd353b95a69404e3abcc656de5069f3629765cfe9cd565f341589 SHA512 ec7ea30601e0fe0602c4923aadb46810dcb441fd65edc95212b496bc43d875da875df1677b0cfc43ee1c9401e6af5cde8b29970dc12d6c19d6eecb58e7389d07 +EBUILD igbinary-2.0.8.ebuild 595 BLAKE2B b0f67337c61a227c463bcf981825acbb05cd96351094659515b68caacce60182e88deabf82025a1d0713ad916a683ea3b4cba27ab2bc917bc2ebfffcb37caff8 SHA512 a1682369c1b776ca9c7f25292cce1706c8455801b0181d3438e06d5708aa890e6fdacd449aec4187ae591eb53218c67a7ce6b64f5edcdf01f9847a9bb798398c EBUILD igbinary-3.0.0.ebuild 582 BLAKE2B a796005fffd6db66a81e250168e1be8026eb739b3e9dfb85c19aee68c079a7331982df376dbe629236fa81655da0feea999fcca99d21f29fbd08a914d592a074 SHA512 4a1529d1c50c311fa7aa34aa14ad34fb36e54703e0588a13e0ff90b226561bdf04badd9eda4b1b366612ad2c9db70824bffbb3162c92aa1ea8e87c8235f47947 -EBUILD igbinary-3.0.1.ebuild 582 BLAKE2B a796005fffd6db66a81e250168e1be8026eb739b3e9dfb85c19aee68c079a7331982df376dbe629236fa81655da0feea999fcca99d21f29fbd08a914d592a074 SHA512 4a1529d1c50c311fa7aa34aa14ad34fb36e54703e0588a13e0ff90b226561bdf04badd9eda4b1b366612ad2c9db70824bffbb3162c92aa1ea8e87c8235f47947 +EBUILD igbinary-3.0.1.ebuild 581 BLAKE2B 0d1c430b3df6d0ea2d8e1a1c9d3c139a741e75ad6ae370589bed02e5249588f19ecd54a5d0cf40f536101324a258e52132356f39296fd326810446ab13d0163e SHA512 58eddb834c16853a9060b85445ceb5a9219ede652a5ff5a3dc986d8e6d4bba9ec67ce18b3ea9be562605af0d57b650003bea9ce7025e577354c24397b041d09b MISC metadata.xml 331 BLAKE2B 4187300236aa128879679c7cb4a8ddfa19dfd512a76466e835224c30323f2fafd55189228bdced507ababd5b90f561f6bb44c1554392eb0682b6ba5c7a20b681 SHA512 86f467f549b36915940e45a4e151742f2925293106dd3da2958e6153aaa8fed378b2eb563bf69da0d38101409858a4abe308f608bd94de6b4517daf9da092405 diff --git a/dev-php/igbinary/igbinary-2.0.8.ebuild b/dev-php/igbinary/igbinary-2.0.8.ebuild index 28d06b6bdff5..863d70591ea0 100644 --- a/dev-php/igbinary/igbinary-2.0.8.ebuild +++ b/dev-php/igbinary/igbinary-2.0.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -12,7 +12,7 @@ USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-source-r3 -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" HOMEPAGE="https://github.com/igbinary/igbinary" diff --git a/dev-php/igbinary/igbinary-3.0.1.ebuild b/dev-php/igbinary/igbinary-3.0.1.ebuild index d4b0a06b0119..5dd3c7a28384 100644 --- a/dev-php/igbinary/igbinary-3.0.1.ebuild +++ b/dev-php/igbinary/igbinary-3.0.1.ebuild @@ -12,7 +12,7 @@ USE_PHP="php7-1 php7-2 php7-3" inherit php-ext-source-r3 -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 ~arm x86" DESCRIPTION="A fast drop-in replacement for the standard PHP serialize" HOMEPAGE="https://github.com/igbinary/igbinary" diff --git a/dev-php/libvirt-php/Manifest b/dev-php/libvirt-php/Manifest index f967e1fe8e12..b9ca922ed8c0 100644 --- a/dev-php/libvirt-php/Manifest +++ b/dev-php/libvirt-php/Manifest @@ -2,6 +2,6 @@ AUX remove-imagick-check.patch 331 BLAKE2B 2d9c164055c3f54baf259326abe22d5aa4781 DIST libvirt-php-0.5.3.tar.gz 778604 BLAKE2B 40fe4bb2f1e3fd81f1aaf09b8b92c509e79186a1a6c0dc97aa55c7164ed36cc0088141ed46c3d82cf277e25eaf3b017edac9466684e1060b5a22c18aaa7a576f SHA512 b4cbfd8840d8f114fde762b5d6ada155ebdb231b554e28e8526a7af45a802a18f28e90fa52f3d7ca9f616996fe0a8289b70c2d14dca51a52a7bf8a501c3ff44f DIST libvirt-php-0.5.4.tar.gz 780793 BLAKE2B 8bb4577c26cc0ef8f2a0ae813ade7f5fdea9a2a7d70c97cab1033fde21d9a1c27b8c2ad7a8284096e143e955202bb564767b4d7e1a4bb9e15993895adc119288 SHA512 b5b204549e6810668203d1df8404a5cb71f646ae7e01ea223c6e9b9eec9b1f6500cc5bb4559859959d821a213ff992f22a97e4b683da2c683be3732710943487 EBUILD libvirt-php-0.5.3.ebuild 1395 BLAKE2B 647e79ece9175fd70fc2dbecc0de440ac4db17e5ff4a19621d78d1c1e508047233fd2311df550d2da492676b97d328cef3e92aaa66cbfc924a0c97ce01afb8a2 SHA512 aa855f216e4a71fc69be4214a70cbe2dabcc5871100c0e90a3911de1a88958ed40a53a19584d406ce7777911889166535d838ffe9d25dd8596f170e8e6bd1f0e -EBUILD libvirt-php-0.5.4.ebuild 1424 BLAKE2B d83e13647fb36600aeb664a73ace71cc9a752c2b69e7b4b0853b97d6ad5c78f2e8e076f6ec810677af0851e15efedc11f6e121232a33c7b3d8ffb50cb8a8ab14 SHA512 68e05b6f4a2ba831eb325361f67fb115e93b6997447f861e33a1227d07bf79c696637d36957490a4ae703677d4acce3c3152fde5392cae0dcc0dc0a39d2976c1 -EBUILD libvirt-php-9999.ebuild 1402 BLAKE2B ae61aae3c201ed542e8548500f087d57b0f001abaf2ddd38608f01a97864ba0ffd838d7a159656151edfb32a28956b331c99a1c990fbc7e44dd688c578068d06 SHA512 623610c0736c1b306cc7fcd93030b9a29e6f08f3200cce93f8a7bdc614b669440fc1e5fd8a86fd2d19e1b4f370b0f9e9dd7f06ebe912f688117e13a3eb47bfa1 +EBUILD libvirt-php-0.5.4.ebuild 1430 BLAKE2B 03a918a8f68b1a6cdbb0b5947497c6af1c8d94de78bd92c6444e57acd7b47a48c6faf4e4d4e0e6737659c8b5276c378fae8d710537031f0c9a3b620fece3de8e SHA512 73025d7466fc468dc74154ead58ddd8149e4c8d0dd8358512a565ddddfe873e16ba066ce943a4a8e383e15f90a6700242ab9ee4e73fc82d828e9667fc154bb01 +EBUILD libvirt-php-9999.ebuild 1408 BLAKE2B 062400c1e7bbde79f96886ca109132828c42ef0cef05cc736932d356570df9c6f8afe31b4f71c97f4984f49dc7115130ef07d414831a7d72f22461f7a1b5505e SHA512 fd8cb6510188be21be61e2399bf1edbd2aca3a9945ddc1f63f4aae6bed4977d46659ae5cdc1b79dfa8d5eae041f857a5713e1beef9ae7c416e5624b4fe6f42e4 MISC metadata.xml 482 BLAKE2B cc2209c8b662f3b122bcc87896f43a37767539e7cb4c2d4f5aa6dfceee8104f63b4af24a17cc05e0775e3dd2bddac36a341a7b0f8044821cc888dee594bf75bb SHA512 a1a8469c2e56cb1d32673057a3919a8f4799a921b67568a6109c60f5bacf61b879e7c07055d6b8d1b0c67faa5f7c1b468080875b7b2ce857b8e1af199d193547 diff --git a/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild b/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild index 12877cef46ef..70b89e90a22c 100644 --- a/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild +++ b/dev-php/libvirt-php/libvirt-php-0.5.4.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" PHP_EXT_ECONF_ARGS=() inherit php-ext-source-r3 autotools diff --git a/dev-php/libvirt-php/libvirt-php-9999.ebuild b/dev-php/libvirt-php/libvirt-php-9999.ebuild index 862fc523ecbb..066640b361aa 100644 --- a/dev-php/libvirt-php/libvirt-php-9999.ebuild +++ b/dev-php/libvirt-php/libvirt-php-9999.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="libvirt-php" PHP_EXT_SKIP_PHPIZE="yes" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" PHP_EXT_ECONF_ARGS=() inherit php-ext-source-r3 git-r3 autotools diff --git a/dev-php/maxmind-db-reader/Manifest b/dev-php/maxmind-db-reader/Manifest index 4490f781faa4..8226eea05b0c 100644 --- a/dev-php/maxmind-db-reader/Manifest +++ b/dev-php/maxmind-db-reader/Manifest @@ -1,6 +1,8 @@ AUX autoload.php 199 BLAKE2B 617ed826e95ec3cd03a8686cb3f2ffecc2eee748ccde58f0caf0d89f71187235cad969694c1f7a5fc7e16e1fc53178bf26dc3e7515b13fa264a639cc9fa2e968 SHA512 bb53c3edbab856787432d085f35af4b0388a46489ad910bce4d2e070537b5b1652da6ed7260fa5b1c0fb7f808c5e8a66b9fce0282bc0d62f3e80d1eb2284a905 DIST MaxMind-DB-Reader-php-1.2.0.tar.gz 17488 BLAKE2B 2a511f84091ade374eb5b9a975fa6dafe75d69c4c057113790492840acfb9b8e50137bf4927814d8d77b2e17f4e0a7fe1ffda511f7c599a604bc69d4f38af406 SHA512 2965c5348ec787e503c04322961b00fe7806cd95c5f711efd9833adc0acb21f0c40cab1983868f8ea0bb4e8576186d83e1e1913b203aab999f3870ea298a9b2a DIST MaxMind-DB-Reader-php-1.3.0.tar.gz 18573 BLAKE2B 6f093b4343438d37a44639dd47d4c149bcfdd351b9fe68eb19c1b739a28e7c7605728e47471cc7d5d257d56df5da37b5ffd32c275cb705befe9e6d60a137ac46 SHA512 480fb38122d1700b18bb0b85d8062397ddc7f003897829f3533901c12a409d76eea9d499ffc0fdd1bfaf4d35b954a30606a053b78e787eda27771995e2a1800b +DIST MaxMind-DB-Reader-php-1.4.1.tar.gz 19667 BLAKE2B b397eb1bb7fa00c3382c7ee7c019c401d390c88d9bccd7742873445e95cb87d780ac17affe5cd1ec98e6f60d16660784dc5fdb188f8e4d2956df816397a9c251 SHA512 2407f3d1af10830078c9f5ba93ee74761084b06e630242eff0f707b98bdb78e6e87dabc999c36b29780ba9c8c38aec0225700005b66d95b3707bdc06875c6dd5 EBUILD maxmind-db-reader-1.2.0.ebuild 2219 BLAKE2B 60b3a8de3e439e2ae603c49f88bb87f56fcbb052d7a41a0dda046f031e1e6151512f38f9eb86ef4e5274969d5d850a952aa103effba739125b1dfaa45356bc7c SHA512 657716fbf85bb2502230786d10488386d0b89ded10c2981cec1e211422dbcd5ace29182ff0b537786408c088e5c1a61ecbeb2c8d15bdd33e91823cac21111c46 EBUILD maxmind-db-reader-1.3.0.ebuild 2160 BLAKE2B b73d6b15b781e04c5f23ff5c776e03b761695074dc19a7b74b97f6ae09d273ec53854a9c7ba6af0ecb2b07c9dd885f01aa95b1d389fc145a3d8b5e20b373cd5a SHA512 2232a93f07adf6dae4627c6332e7fd011aa776f1114fc10a987508787b4fc8bff6d3893f973281652754d7f305fb14da9ca66265c0706b5ed840417f4b60114a +EBUILD maxmind-db-reader-1.4.1.ebuild 2166 BLAKE2B bf9499aaf5e2fcbfadd6d2bb0b4afc22dccf96191e2f6600a2f5e10ed1b31b61f7528e134365a34ceb9b880fbd0f116c2272f87c3766fb526c4a0c1b00fbc809 SHA512 669be8a904368f73942e6b4c8ceef994893ab5191f6f4e735e72a3d74a65341616d0497ff477d7f94abf4696498a3d3acb5b2ba8d65e9ae71b96d0e7e467f40c MISC metadata.xml 472 BLAKE2B eafb00cbc65f3b5363ee77c111deaab80e04072ff4669de2ee80a669b1c81f72e8dfb567de682c4b2b5597d731f1bd4480a73e0b9f3b1ee32e02b1f72ced1180 SHA512 7522517bc559e5309dce0bfa525c80f0d00ca57f03d7a6c771fc1ac20281c09efb142bfdafd56633edfa3e2a878943d6bd3c16ea3f93f0b5ca8ba11a5f28cf8d diff --git a/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild new file mode 100644 index 000000000000..e5bac06988f7 --- /dev/null +++ b/dev-php/maxmind-db-reader/maxmind-db-reader-1.4.1.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +MY_PN="MaxMind-DB-Reader-php" +MY_P="${MY_PN}-${PV}" +S="${WORKDIR}/${MY_P}" +PHP_EXT_S="${S}/ext" +PHP_EXT_NAME="maxminddb" +PHP_EXT_OPTIONAL_USE="extension" + +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" + +inherit php-ext-source-r3 + +DESCRIPTION="PHP reader for the MaxMind database format" +HOMEPAGE="https://github.com/maxmind/${MY_PN}" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${MY_P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64" +IUSE="extension test" + +DEPEND="extension? ( dev-libs/libmaxminddb )" +RDEPEND="${DEPEND}" + +src_prepare(){ + # We need to call eapply_user ourselves, because it may be skipped + # if either the "extension" USE flag is not set, or if the user's + # PHP_TARGETS is essentially empty. In the latter case, the eclass + # src_prepare does nothing. We only call the eclass phase conditionally + # because the correct version of e.g. "phpize" may not be there + # unless USE=extension is set. + if use extension ; then + php-ext-source-r3_src_prepare + else + default + fi +} + +src_configure() { + # The eclass phase will try to run the ./configure script even if it + # doesn't exist (in contrast to the default src_configure), so we + # need to skip it if the eclass src_prepare (that creates said + # script) is not run. + use extension && php-ext-source-r3_src_configure +} + +src_compile() { + # Avoids the same problem as in src_configure. + use extension && php-ext-source-r3_src_compile +} + +src_install() { + dodoc CHANGELOG.md README.md + insinto /usr/share/php + doins -r src/MaxMind + insinto /usr/share/php/MaxMind/Db + doins autoload.php + + use extension && php-ext-source-r3_src_install +} + +src_test() { + # The PHP API has its own set of tests that isn't shipped with the + # release tarballs at the moment (github issues 55). + use extension && php-ext-source-r3_src_test +} + +pkg_postinst(){ + elog "${PN} has been installed in /usr/share/php/MaxMind/Db/." + elog "To use it in a script, require('MaxMind/Db/autoload.php')," + elog "and then most of the examples in the documentation should" + elog "work without further modification." +} diff --git a/dev-php/ming-php/Manifest b/dev-php/ming-php/Manifest index 37bc890e24b5..86e926c9e6dc 100644 --- a/dev-php/ming-php/Manifest +++ b/dev-php/ming-php/Manifest @@ -1,7 +1,4 @@ -AUX ming-php-54.patch 17282 BLAKE2B 9f17a2ee92252ca2ff4bf29e4412a4493b49d4eb918772d6c931b0417ae84e22a7b138f76da989ae36a1d7f6f212e606d8232959242e86ea3515adc3ad405d3b SHA512 79aeea313bbc2b17e170998df37a0e526125ba7752533ca312f18bf31cc66ea79d6fcffd84dfccb9c7714c16345a1cb0f3107914f6ecad01702ad550145391e7 AUX php_ext-config.m4 2939 BLAKE2B cb3e65a0397b753fb6675425e3eaab0c68349b7d14f387160133312b96f5a8101cea87125d03eafbfdef7ede77b2a85dd0b32d428e6c78019a4a3d2c84f9cd05 SHA512 88e3eb6f42c38d66c050c3e6c956e239861b8c17ed7f7c4867be00b06c9b48b806af3254bd8fbd4c7349a4ff41981bfcb1c7256d671dc5b8bf6d0089d8bf62cc -DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0 -EBUILD ming-php-0.4.7.ebuild 1332 BLAKE2B 4eb3cb1d05c52660df43e15e172154564754261cc0630669f212c31a5d551fd389966bac27becca64e5ab531a8039feb5b2cd214bd970ef21a5772f1410ad648 SHA512 0793f4410f866ae8fbe38e083c5c0a828d9e0d643aeeb1973d9b644854e336fbe3fa2f812e4a26948474af242ba7bf202c3f8dbfb4c3ad1ca63f74c4a10c3b28 -EBUILD ming-php-0.4.8.ebuild 1385 BLAKE2B 5c750a25ebcbcfcf79efaf5bd5c8d22b0289e0c58faaf3283b557eebd8896f3e8280d7d5e0c7b4a4132ee219fd5f65de48076f189ea8221151342ea13dea8e01 SHA512 4dfdc96e0c56bd023fce96f5933e9e50183a950d81de9f89a17a127467d60a6105d82b6d0e4eecd4d763340a22e2af5976cad1d7fd9d97699ee9ab8a4b8ccac1 +EBUILD ming-php-0.4.8.ebuild 1392 BLAKE2B fbb2e06a7b56daf644275d3bd1bb22a87ae9fb96ee74b4f66136221559b92b1853cf43a9091d6e7aa1617b7399226c71ac575814bf7d575d6e802f337abf39a3 SHA512 0374a19eb15598b2c9a2e753f3b1b59431de81a0137554bcef45d180e45df98646bafe134ab5fba5f4e2ea356f7783d5d03188636fb31e2593459aea8afba1c8 MISC metadata.xml 475 BLAKE2B 3f1db2ece7aef5e9f24e7fc1b2649422102cacb521ba830ae36a7cb7683957bcb89366d980c305fb9ad2a7fee9ecb87176e934f6ba328a6a2039d36f9c3ca207 SHA512 f5586b50f459b96dd287bb1ee2d1a166cb8086584c76f5b5b68cf1d8271afe22903f77d8641aee3c2d68ffd2b41441aed5f641a303b6f43243d67d65d41748c4 diff --git a/dev-php/ming-php/files/ming-php-54.patch b/dev-php/ming-php/files/ming-php-54.patch deleted file mode 100644 index 79e167406800..000000000000 --- a/dev-php/ming-php/files/ming-php-54.patch +++ /dev/null @@ -1,479 +0,0 @@ ---- a/ming.c 2015-01-19 21:46:35.299042679 -0500 -+++ b/ming.c 2015-01-19 21:52:00.566380663 -0500 -@@ -370,7 +370,7 @@ - - input = newSWFInput_file(file); - zend_list_addref(Z_LVAL_P(zfile)); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - return input; - } - /* }}} */ -@@ -410,7 +410,7 @@ - - input = newSWFInput_bufferCopy((unsigned char *)data, data_len); - -- ret = zend_list_insert(input, le_swfinputp); -+ ret = zend_list_insert(input, le_swfinputp TSRMLS_CC); - object_init_ex(getThis(), input_class_entry_ptr); - add_property_resource(getThis(), "input", ret); - zend_list_addref(ret); -@@ -449,7 +449,7 @@ - - fc = newSWFFontCollection_fromFile(filename); - if(fc) { -- ret = zend_list_insert(fc, le_swffontcollectionp); -+ ret = zend_list_insert(fc, le_swffontcollectionp TSRMLS_CC); - object_init_ex(getThis(), fontcollection_class_entry_ptr); - add_property_resource(getThis(), "fontcollection", ret); - zend_list_addref(ret); -@@ -479,7 +479,7 @@ - font = SWFFontCollection_getFont(getFontCollection(getThis() TSRMLS_CC), index); - - if(font != NULL) { -- ret = zend_list_insert(font, le_swffontp); -+ ret = zend_list_insert(font, le_swffontp TSRMLS_CC); - object_init_ex(return_value, font_class_entry_ptr); - add_property_resource(return_value, "font", ret); - zend_list_addref(ret); -@@ -527,7 +527,7 @@ - - font = newSWFBrowserFont(name); - if(font) { -- ret = zend_list_insert(font, le_swfbrowserfontp); -+ ret = zend_list_insert(font, le_swfbrowserfontp TSRMLS_CC); - object_init_ex(getThis(), browserfont_class_entry_ptr); - add_property_resource(getThis(), "browserfont", ret); - zend_list_addref(ret); -@@ -573,7 +573,7 @@ - WRONG_PARAM_COUNT; - } - -- ret = zend_list_insert(cx, le_swfcxformp); -+ ret = zend_list_insert(cx, le_swfcxformp TSRMLS_CC); - object_init_ex(getThis(), cxform_class_entry_ptr); - add_property_resource(getThis(), "cx", ret); - zend_list_addref(ret); -@@ -736,7 +736,7 @@ - init = newSWFInitAction_withId(getAction(zaction TSRMLS_CC), id); - } - -- ret = zend_list_insert(init, le_swfinitactionp); -+ ret = zend_list_insert(init, le_swfinitactionp TSRMLS_CC); - object_init_ex(getThis(), initaction_class_entry_ptr); - add_property_resource(getThis(), "initaction", ret); - zend_list_addref(ret); -@@ -785,7 +785,7 @@ - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Couldn't compile actionscript"); - } - -- ret = zend_list_insert(action, le_swfactionp); -+ ret = zend_list_insert(action, le_swfactionp TSRMLS_CC); - - object_init_ex(getThis(), action_class_entry_ptr); - add_property_resource(getThis(), "action", ret); -@@ -863,7 +863,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening bitmap file failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -884,7 +884,7 @@ - maskinput = newSWFInput_filename(Z_STRVAL_P(zmask)); - if(maskinput == NULL) - php_error(E_ERROR, "opening mask file failed"); -- zend_list_addref(zend_list_insert(maskinput, le_swfinputp)); -+ zend_list_addref(zend_list_insert(maskinput, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -895,7 +895,7 @@ - /* XXX: this is very optimistic! is it really a JPEG ?!? */ - bitmap_alpha = newSWFJpegWithAlpha_fromInput(input, maskinput); - if(bitmap_alpha) { -- ret = zend_list_insert(bitmap_alpha, le_swfbitmapp); -+ ret = zend_list_insert(bitmap_alpha, le_swfbitmapp TSRMLS_CC); - object_init_ex(getThis(), bitmap_class_entry_ptr); - add_property_resource(getThis(), "bitmap", ret); - zend_list_addref(ret); -@@ -903,7 +903,7 @@ - } else { - bitmap = newSWFBitmap_fromInput(input); - if(bitmap) { -- ret = zend_list_insert(bitmap, le_swfbitmapp); -+ ret = zend_list_insert(bitmap, le_swfbitmapp TSRMLS_CC); - object_init_ex(getThis(), bitmap_class_entry_ptr); - add_property_resource(getThis(), "bitmap", ret); - zend_list_addref(ret); -@@ -1164,7 +1164,7 @@ - PHP_METHOD(swfbutton, __construct) - { - SWFButton button = newSWFButton(); -- int ret = zend_list_insert(button, le_swfbuttonp); -+ int ret = zend_list_insert(button, le_swfbuttonp TSRMLS_CC); - - object_init_ex(getThis(), button_class_entry_ptr); - add_property_resource(getThis(), "button", ret); -@@ -1297,7 +1297,7 @@ - - if(record != NULL) - { -- ret = zend_list_insert(record, le_swfbuttonrecordp); -+ ret = zend_list_insert(record, le_swfbuttonrecordp TSRMLS_CC); - object_init_ex(return_value, buttonrecord_class_entry_ptr); - add_property_resource(return_value, "buttonrecord", ret); - zend_list_addref(ret); -@@ -1384,7 +1384,7 @@ - - if(item != NULL) { - /* try and create a soundinstance object */ -- ret = zend_list_insert(item, le_swfsoundinstancep); -+ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC); - object_init_ex(return_value, soundinstance_class_entry_ptr); - add_property_resource(return_value, "soundinstance", ret); - zend_list_addref(ret); -@@ -1971,7 +1971,7 @@ - m = SWFDisplayItem_getMatrix(getDisplayItem(getThis() TSRMLS_CC)); - if(m != NULL) - { -- ret = zend_list_insert(m, le_swfmatrixp); -+ ret = zend_list_insert(m, le_swfmatrixp TSRMLS_CC); - object_init_ex(return_value, matrix_class_entry_ptr); - add_property_resource(return_value, "matrix", ret); - zend_list_addref(ret); -@@ -1992,7 +1992,7 @@ - c = SWFDisplayItem_getCharacter(getDisplayItem(getThis() TSRMLS_CC)); - if(c != NULL) - { -- ret = zend_list_insert(c, le_swfcharacterp); -+ ret = zend_list_insert(c, le_swfcharacterp TSRMLS_CC); - object_init_ex(return_value, character_class_entry_ptr); - add_property_resource(return_value, "character", ret); - zend_list_addref(ret); -@@ -2366,7 +2366,7 @@ - - if(font) - { -- ret = zend_list_insert(font, le_swffontp); -+ ret = zend_list_insert(font, le_swffontp TSRMLS_CC); - object_init_ex(getThis(), font_class_entry_ptr); - add_property_resource(getThis(), "font", ret); - zend_list_addref(ret); -@@ -2537,7 +2537,7 @@ - - matrix = newSWFFilterMatrix(cols, rows, values); - free(values); /* array is copied by libming */ -- ret = zend_list_insert(matrix, le_swffiltermatrixp); -+ ret = zend_list_insert(matrix, le_swffiltermatrixp TSRMLS_CC); - object_init_ex(getThis(), filtermatrix_class_entry_ptr); - add_property_resource(getThis(), "filtermatrix", ret); - zend_list_addref(ret); -@@ -2582,7 +2582,7 @@ - } - - shadow = newSWFShadow(angle, distance, strength); -- ret = zend_list_insert(shadow, le_swfshadowp); -+ ret = zend_list_insert(shadow, le_swfshadowp TSRMLS_CC); - object_init_ex(getThis(), shadow_class_entry_ptr); - add_property_resource(getThis(), "shadow", ret); - zend_list_addref(ret); -@@ -2628,7 +2628,7 @@ - } - - blur = newSWFBlur(blurX, blurY, passes); -- ret = zend_list_insert(blur, le_swfblurp); -+ ret = zend_list_insert(blur, le_swfblurp TSRMLS_CC); - object_init_ex(getThis(), blur_class_entry_ptr); - add_property_resource(getThis(), "blur", ret); - zend_list_addref(ret); -@@ -2665,7 +2665,7 @@ - PHP_METHOD(swfgradient, __construct) - { - SWFGradient gradient = newSWFGradient(); -- int ret = zend_list_insert(gradient, le_swfgradientp); -+ int ret = zend_list_insert(gradient, le_swfgradientp TSRMLS_CC); - - object_init_ex(getThis(), gradient_class_entry_ptr); - add_property_resource(getThis(), "gradient", ret); -@@ -3076,7 +3076,7 @@ - if(filter == NULL) - WRONG_PARAM_COUNT; - -- ret = zend_list_insert(filter, le_swffilterp); -+ ret = zend_list_insert(filter, le_swffilterp TSRMLS_CC); - object_init_ex(getThis(), filter_class_entry_ptr); - add_property_resource(getThis(), "filter", ret); - zend_list_addref(ret); -@@ -3115,7 +3115,7 @@ - PHP_METHOD(swfmorph, __construct) - { - SWFMorph morph = newSWFMorphShape(); -- int ret = zend_list_insert(morph, le_swfmorphp); -+ int ret = zend_list_insert(morph, le_swfmorphp TSRMLS_CC); - - object_init_ex(getThis(), morph_class_entry_ptr); - add_property_resource(getThis(), "morph", ret); -@@ -3147,7 +3147,7 @@ - { - SWFMorph morph = getMorph(getThis() TSRMLS_CC); - SWFShape shape = SWFMorph_getShape1(morph); -- int ret = zend_list_insert(shape, le_swfshapep); -+ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC); - - object_init_ex(return_value, shape_class_entry_ptr); - add_property_resource(return_value, "shape", ret); -@@ -3161,7 +3161,7 @@ - { - SWFMorph morph = getMorph(getThis() TSRMLS_CC); - SWFShape shape = SWFMorph_getShape2(morph); -- int ret = zend_list_insert(shape, le_swfshapep); -+ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC); - - object_init_ex(return_value, shape_class_entry_ptr); - add_property_resource(return_value, "shape", ret); -@@ -3205,7 +3205,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening sound file failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -3216,7 +3216,7 @@ - sound = newSWFSoundStream_fromInput(input); - - if(sound) { -- ret = zend_list_insert(sound, le_swfsoundstreamp); -+ ret = zend_list_insert(sound, le_swfsoundstreamp TSRMLS_CC); - object_init_ex(getThis(), soundstream_class_entry_ptr); - add_property_resource(getThis(), "soundstream", ret); - zend_list_addref(ret); -@@ -3331,7 +3331,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening sound file failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -3343,7 +3343,7 @@ - - if(sound != NULL) - { -- ret = zend_list_insert(sound, le_swfsoundp); -+ ret = zend_list_insert(sound, le_swfsoundp TSRMLS_CC); - object_init_ex(getThis(), sound_class_entry_ptr); - add_property_resource(getThis(), "sound", ret); - zend_list_addref(ret); -@@ -3479,7 +3479,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening sound video failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -3496,7 +3496,7 @@ - } - - if(stream) { -- ret = zend_list_insert(stream, le_swfvideostreamp); -+ ret = zend_list_insert(stream, le_swfvideostreamp TSRMLS_CC); - object_init_ex(getThis(), videostream_class_entry_ptr); - add_property_resource(getThis(), "videostream", ret); - zend_list_addref(ret); -@@ -3646,7 +3646,7 @@ - bd = newSWFBinaryData((unsigned char *)data, data_len); - - if(bd) { -- ret = zend_list_insert(bd, le_swfbinarydatap); -+ ret = zend_list_insert(bd, le_swfbinarydatap TSRMLS_CC); - object_init_ex(getThis(), binarydata_class_entry_ptr); - add_property_resource(getThis(), "binarydata", ret); - zend_list_addref(ret); -@@ -3704,7 +3704,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening prebuilt clip file failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -3715,7 +3715,7 @@ - clip = newSWFPrebuiltClip_fromInput(input); - - if(clip) { -- ret = zend_list_insert(clip, le_swfprebuiltclipp); -+ ret = zend_list_insert(clip, le_swfprebuiltclipp TSRMLS_CC); - object_init_ex(getThis(), prebuiltclip_class_entry_ptr); - add_property_resource(getThis(), "prebuiltclip", ret); - zend_list_addref(ret); -@@ -3768,7 +3768,7 @@ - movie = newSWFMovie(); /* default version 4 */ - } - -- ret = zend_list_insert(movie, le_swfmoviep); -+ ret = zend_list_insert(movie, le_swfmoviep TSRMLS_CC); - - object_init_ex(getThis(), movie_class_entry_ptr); - add_property_resource(getThis(), "movie", ret); -@@ -3880,7 +3880,7 @@ - item = SWFMovie_add_internal(movie, ublock); - if (item != NULL) { - /* try and create a displayitem object */ -- ret = zend_list_insert(item, le_swfdisplayitemp); -+ ret = zend_list_insert(item, le_swfdisplayitemp TSRMLS_CC); - object_init_ex(return_value, displayitem_class_entry_ptr); - add_property_resource(return_value, "displayitem", ret); - zend_list_addref(ret); -@@ -4242,7 +4242,7 @@ - php_error(E_ERROR, "opening mp3 file failed"); - } - -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - default: -@@ -4327,7 +4327,7 @@ - if(item != NULL) - { - /* try and create a soundinstance object */ -- ret = zend_list_insert(item, le_swfsoundinstancep); -+ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC); - object_init_ex(return_value, soundinstance_class_entry_ptr); - add_property_resource(return_value, "soundinstance", ret); - zend_list_addref(ret); -@@ -4369,7 +4369,7 @@ - character = SWFMovie_importCharacter(movie, libswf, name); - if(character != NULL) - { -- ret = zend_list_insert(character, le_swfcharacterp); -+ ret = zend_list_insert(character, le_swfcharacterp TSRMLS_CC); - object_init_ex(return_value, character_class_entry_ptr); - add_property_resource(return_value, "character", ret); - zend_list_addref(ret); -@@ -4397,7 +4397,7 @@ - if(res != NULL) - { - /* try and create a fontchar object */ -- ret = zend_list_insert(res, le_swffontcharp); -+ ret = zend_list_insert(res, le_swffontcharp TSRMLS_CC); - object_init_ex(return_value, fontchar_class_entry_ptr); - add_property_resource(return_value, "fontcharacter", ret); - zend_list_addref(ret); -@@ -4424,7 +4424,7 @@ - if(res != NULL) - { - /* try and create a fontchar object */ -- ret = zend_list_insert(res, le_swffontcharp); -+ ret = zend_list_insert(res, le_swffontcharp TSRMLS_CC); - object_init_ex(return_value, fontchar_class_entry_ptr); - add_property_resource(return_value, "fontcharacter", ret); - zend_list_addref(ret); -@@ -4509,7 +4509,7 @@ - PHP_METHOD(swfshape, __construct) - { - SWFShape shape = newSWFShape(); -- int ret = zend_list_insert(shape, le_swfshapep); -+ int ret = zend_list_insert(shape, le_swfshapep TSRMLS_CC); - - object_init_ex(getThis(), shape_class_entry_ptr); - add_property_resource(getThis(), "shape", ret); -@@ -4575,7 +4575,7 @@ - } - - /* return an SWFFill object */ -- ret = zend_list_insert(fill, le_swffillp); -+ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC); - object_init_ex(return_value, fill_class_entry_ptr); - add_property_resource(return_value, "fill", ret); - zend_list_addref(ret); -@@ -4618,7 +4618,7 @@ - } - - /* return an SWFFill object */ -- ret = zend_list_insert(fill, le_swffillp); -+ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC); - object_init_ex(return_value, fill_class_entry_ptr); - add_property_resource(return_value, "fill", ret); - zend_list_addref(ret); -@@ -4664,7 +4664,7 @@ - } - - /* return an SWFFill object */ -- ret = zend_list_insert(fill, le_swffillp); -+ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC); - object_init_ex(return_value, fill_class_entry_ptr); - add_property_resource(return_value, "fill", ret); - zend_list_addref(ret); -@@ -4719,7 +4719,7 @@ - } - - /* return an SWFFill object */ -- ret = zend_list_insert(fill, le_swffillp); -+ ret = zend_list_insert(fill, le_swffillp TSRMLS_CC); - object_init_ex(return_value, fill_class_entry_ptr); - add_property_resource(return_value, "fill", ret); - zend_list_addref(ret); -@@ -5209,7 +5209,7 @@ - PHP_METHOD(swfsprite, __construct) - { - SWFMovieClip sprite = newSWFMovieClip(); -- int ret = zend_list_insert(sprite, le_swfspritep); -+ int ret = zend_list_insert(sprite, le_swfspritep TSRMLS_CC); - - object_init_ex(getThis(), sprite_class_entry_ptr); - add_property_resource(getThis(), "sprite", ret); -@@ -5259,7 +5259,7 @@ - - if (item != NULL) { - /* try and create a displayitem object */ -- ret = zend_list_insert(item, le_swfdisplayitemp); -+ ret = zend_list_insert(item, le_swfdisplayitemp TSRMLS_CC); - object_init_ex(return_value, displayitem_class_entry_ptr); - add_property_resource(return_value, "displayitem", ret); - zend_list_addref(ret); -@@ -5342,7 +5342,7 @@ - - if(item != NULL) { - /* try and create a displayitem object */ -- ret = zend_list_insert(item, le_swfsoundinstancep); -+ ret = zend_list_insert(item, le_swfsoundinstancep TSRMLS_CC); - object_init_ex(return_value, soundinstance_class_entry_ptr); - add_property_resource(return_value, "soundinstance", ret); - zend_list_addref(ret); -@@ -5400,7 +5400,7 @@ - input = newSWFInput_filename(Z_STRVAL_P(zfile)); - if(input == NULL) - php_error(E_ERROR, "opening sound file failed"); -- zend_list_addref(zend_list_insert(input, le_swfinputp)); -+ zend_list_addref(zend_list_insert(input, le_swfinputp TSRMLS_CC)); - break; - - } -@@ -5521,7 +5521,7 @@ - text = newSWFText2(); - } - -- int ret = zend_list_insert(text, le_swftextp); -+ int ret = zend_list_insert(text, le_swftextp TSRMLS_CC); - object_init_ex(getThis(), text_class_entry_ptr); - add_property_resource(getThis(), "text", ret); - zend_list_addref(ret); -@@ -5794,7 +5794,7 @@ - { - long flags = 0; - SWFTextField field = newSWFTextField(); -- int ret = zend_list_insert(field, le_swftextfieldp); -+ int ret = zend_list_insert(field, le_swftextfieldp TSRMLS_CC); - - object_init_ex(getThis(), textfield_class_entry_ptr); - add_property_resource(getThis(), "textfield", ret); diff --git a/dev-php/ming-php/ming-php-0.4.7.ebuild b/dev-php/ming-php/ming-php-0.4.7.ebuild deleted file mode 100644 index 3c335f1e51c2..000000000000 --- a/dev-php/ming-php/ming-php-0.4.7.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME=ming -MY_P="${PHP_EXT_NAME}-${PV//./_}" -USE_PHP="php5-6" -PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" -inherit flag-o-matic php-ext-source-r3 - -DESCRIPTION="PHP extension for the ming Flash movie generation library" -HOMEPAGE="http://ming.sourceforge.net/" -SRC_URI="https://github.com/libming/libming/archive/${MY_P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="" - -RDEPEND="media-libs/ming" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/libming-${MY_P}" -PATCHES=( "${FILESDIR}/ming-php-54.patch" ) - -src_prepare() { - local libdir=$(get_libdir) - cp "${FILESDIR}/php_ext-config.m4" "${PHP_EXT_S}/config.m4" || \ - die "Failed to copy config.m4 to target" - rm "${PHP_EXT_S}/Makefile.am" || die "Failed to remove Makefile.am for ${slot}" - # Fix for SYMYLINK_LIB=no - if [[ ${libdir} != 'lib' ]] ; then - sed -i -e "s~PHP_LIBDIR=lib~PHP_LIBDIR=${libdir}~" "${PHP_EXT_S}/config.m4" \ - || die "Failed to update lib directory" - fi - php-ext-source-r3_src_prepare -} - -src_configure() { - # build is sensitive to -O3 (bug #297437) - replace-flags -O3 -O2 - - local PHP_EXT_EXTRA_ECONF="--with-ming=${S}" - php-ext-source-r3_src_configure -} diff --git a/dev-php/ming-php/ming-php-0.4.8.ebuild b/dev-php/ming-php/ming-php-0.4.8.ebuild index 656761cd0b1d..91e42cafa688 100644 --- a/dev-php/ming-php/ming-php-0.4.8.ebuild +++ b/dev-php/ming-php/ming-php-0.4.8.ebuild @@ -5,7 +5,7 @@ EAPI=6 PHP_EXT_NAME=ming MY_P="${PHP_EXT_NAME}-${PV//./_}" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" PHP_EXT_S="${WORKDIR}/libming-${MY_P}/php_ext" inherit flag-o-matic php-ext-source-r3 diff --git a/dev-php/pecl-apcu_bc/Manifest b/dev-php/pecl-apcu_bc/Manifest index 1aba692f733b..cb620c1202e0 100644 --- a/dev-php/pecl-apcu_bc/Manifest +++ b/dev-php/pecl-apcu_bc/Manifest @@ -1,4 +1,6 @@ DIST apcu_bc-1.0.4.tgz 7406 BLAKE2B c7099f13bfe589c9752fb7fa8454f16094a13d63924ceef614db1fef11d37265673e745383241836685dcabca8ae83af3c71ba2f2d8a77b4ab213db209924f12 SHA512 633ae74c4be3ee0c2c98540f696dc440f3f345c52811e856cb46c65c6b6fa8fa9f06ecb1d784cd990cf8b5219b65e14a29b97e57828dc6e7aa6b91d2475e6a0e +DIST apcu_bc-1.0.5.tgz 7415 BLAKE2B d86c5a4949239d9196b4bfc22c19f97ff66b47ec87962540295a0d9f08c72c0f1213439dd6c4006355a73c7fa3dbdcc51e9f897b289f134116d33d9eb2c67cb7 SHA512 60ee1540c31873d7963fd8efa6293006eae19cb6c7815cea1f3b50b197a982840472a1e632cc7af5666f6af5522008bec30e48cd764920240a6c5a0d0eb0e6e0 EBUILD pecl-apcu_bc-1.0.4-r1.ebuild 1156 BLAKE2B 7fdf5cd9441b17f937644a326f6039d25c7fea9f651a7959d51fc1adb1b92c00a404c2c531e885b0f3e288150c5cabb73b67ca67bf9c9741b9222ff6a72cabae SHA512 9458838b228b4b0cfb7930b4d2f288dd40a1c0613ac5a8e12a1d41348b6d34dead4c7b8f80cffb5d0e132bda8a47080dc38d55bf0e0b9ee9496d414b8b73d6d1 EBUILD pecl-apcu_bc-1.0.4.ebuild 1154 BLAKE2B 1cd0dde4480b764156c1ce0dfbf43a8ef9854301b403047a720b4408bcbb12b189623766f76d315c5c1326171e0ee121e78884f9ab3cbad348c1f61bfeb4d7ba SHA512 8624329b8c1bf082c2bfd5f9f4e4f04230d995fd46a6f0adf801e40152a2a550f3c2a962cf77274a271b8f7a2dbaab74aedc6ff4bda54ac48ddd7445a225add6 +EBUILD pecl-apcu_bc-1.0.5.ebuild 1158 BLAKE2B 5b7cda1440ebfa3d4e4ce3cc7f6c926bf3e8bb3c8184a00da69057203d4f8eb3e53f9b505ed4ec73bc4ef4c4f1be53680bff9c9aab9b13904fb22cd870e7aa9c SHA512 a775215e281c38f44c715a546e12ce5c1217e5063db2f731bd7d079efd3ffe3f142666499db7769175aaf0d702bc0cbdb13c1289b7965edcc7472675ab03de9d MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild new file mode 100644 index 000000000000..2e08b7e24a57 --- /dev/null +++ b/dev-php/pecl-apcu_bc/pecl-apcu_bc-1.0.5.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_INI_NAME="bc_apc" +PHP_EXT_NAME="apc" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +PHP_EXT_EXTRA_ECONF="" +DOCS=( README.md ) + +USE_PHP="php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 multilib + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="Provides APC backwards compatibility functions via APCu" +LICENSE="PHP-3.01" +SLOT="0" +IUSE="" + +DEPEND="dev-php/pecl-apcu:7[php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?]" +RDEPEND="${DEPEND}" + +src_test() { + # This fixed version is necessary to have apcu load + # from the install before the tested apc. + # It is intentional to specify phpoptions twice. + # This mimics the Makefile. + local slot phpoptions + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + ln -s "${EXT_DIR}/apcu$(get_libname)" \ + "modules/" || die + phpoptions=( -n -d extension_dir="${PHP_EXT_S}/modules" + -d extension=apcu$(get_libname) + -d extension=apc$(get_libname) ) + NO_INTERACTION="yes" TEST_PHP_EXECUTABLE="${PHPCLI}" \ + "${PHPCLI}" "${phpoptions[@]}" \ + run-tests.php "${phpoptions[@]}" || die + done +} diff --git a/dev-php/pecl-crack/Manifest b/dev-php/pecl-crack/Manifest index cb264dcb27f2..cbf29e1a87a8 100644 --- a/dev-php/pecl-crack/Manifest +++ b/dev-php/pecl-crack/Manifest @@ -3,5 +3,5 @@ AUX fix-pecl-bug-5765.patch 375 BLAKE2B 6664659603006d260b578fc1169465007a600eb1 AUX fix-php-5-4-support.patch 674 BLAKE2B 5b2ce7a76aca15d6ff626ebced6e8844bac3d1fb959903c9882e1e59bdfc06027c6993431552deceb09df8d35e57e338818fa9b5ac11b31d4484369d3bd9d1e3 SHA512 ca2475557dc1d2f23a1e5745e7f3bac70855d0916a9d37d1a7efcd04e3bb973220b87aa2cc7ba8315473a2fd16dfd142c5c01608e94c595541ff15838c1e1d44 DIST crack-0.4.tgz 25524 BLAKE2B 99e2289413a672d4dc3d8f9d70866efb499902a0d27379ac7b59d2873013c918d535851d8c3dbf2592596d6483f2abafe2f7bbd31fff40ce9827c7a97e16b8bc SHA512 0dec64d1ce859bb3d7e2b834e4bcc4ef8c6f3e88e5b61884e40dddc366a992a7c85bfad4227224d4401aad7f26843678709f29acd2dcc75563658040b8067d7f EBUILD pecl-crack-0.4-r6.ebuild 581 BLAKE2B 04f52129dce7e4ec373a17fd4a68b256981743d568723f428dbae41883e511ca8adad3dfd155ebd3f56feb04162b8cecde4b9619814a990ab50870be7fc9764e SHA512 7d305dc22b4972335d32906f25582b35bedaef94b0b9b53d69683f41f5f9c4011b6c5aa75f23f4f7b1eba5c8f277c77a8fc78b013669a7a96d0922e2bbdc0a27 -EBUILD pecl-crack-0.4-r7.ebuild 585 BLAKE2B 29c477f8edd07f00f7f442ab27d674d877ed79630d47182b5b886580d3a9527025d011e6a236a63058e796f392a26692ae511c635aad0ff4f41877b9754de4ab SHA512 79a512e5d11dfc96587278bec8b2a3eddeb3298e8bbc0d97fd8e140cff54353be6f9ce77de635224f727f3e750368502ddda32d65c98f8151b1fc7b2eb05fc13 +EBUILD pecl-crack-0.4-r7.ebuild 598 BLAKE2B e5beb88c4c530e7a031eefc2e94d24ed0b360df3497c10d22a626068b32d9b0be88b7cdd89a5b3390187288af2162f5b574d059b3fa6664dd5eca163e08b8644 SHA512 764614c418e68fc4504258093f2d6afc401b9c22d505003d4aeef576781f7068c6426b21b87b0425019937c8eeae071160e737d89dc3a5ea7f0a57403bfac8bd MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild index 08d5e3ea1c16..841669f34fda 100644 --- a/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild +++ b/dev-php/pecl-crack/pecl-crack-0.4-r7.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="crack" PHP_EXT_INI="yes" @@ -9,7 +9,7 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_EXTRA_ECONF="" DOCS=( EXPERIMENTAL ) -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 @@ -19,8 +19,10 @@ DESCRIPTION="PHP interface to the cracklib libraries" LICENSE="PHP-3 CRACKLIB" SLOT="0" IUSE="" + # Patch for http://pecl.php.net/bugs/bug.php?id=5765 -PATCHES=( "${FILESDIR}/fix-php-5-4-support.patch" -"${FILESDIR}/fix-pecl-bug-5765.patch" -"${FILESDIR}/${PV}-php7.patch" +PATCHES=( + "${FILESDIR}/fix-php-5-4-support.patch" + "${FILESDIR}/fix-pecl-bug-5765.patch" + "${FILESDIR}/${PV}-php7.patch" ) diff --git a/dev-php/pecl-dbase/Manifest b/dev-php/pecl-dbase/Manifest index b23a037b8ff8..fab988a8e977 100644 --- a/dev-php/pecl-dbase/Manifest +++ b/dev-php/pecl-dbase/Manifest @@ -1,5 +1,7 @@ DIST dbase-5.1.1.tgz 20751 BLAKE2B 36b7f3e0d03cfd3852333b2ed062dc5c408c29db7c5c05b1f6e57744ea651e291d958ec6216804a4328bb344b8188f6db29ffdcf9134ed7938640a08885c4a71 SHA512 52dac3e253f88de898c43864e8aff62990b33eb770fb27534bd25896c3eb330ca05e0205a1f387296637e553cf6de16a3f7b3eff082e1403a56c60decfbce33f +DIST dbase-7.0.0.tgz 32845 BLAKE2B c3a0e838b365fb998de8ccd47f5849fc41f8a9fc4b6acebd82e8823be252f52e9b730d1fd558f0d0db5e9c4d0794ebaf727a03d0ba4e53e2d2bfe86eaed0f3aa SHA512 3e092cd641220228313867d3e7a9ec95f89ccb73d13267509fb30657f95d661f81bb1ecae0d3a86618d453a41e2f727bb7740ad25248721d0144d1ce11548bb0 DIST dbase-7.0.0beta1.tgz 16206 BLAKE2B 3921257aacb915deaad854ab54c8263646561dc2593bb4c5706fd9f27659cb1d22c0df9f88cbc7acf115d3358c25b366e5c3d1ef48eee2af17049094808113bd SHA512 623222e826509fa9b3f65353a66479fe4a5924de1b6dd4e73c106f2179f8af59740c758cf90ed8d0e9c61c31a7e5bef434cd858cde074f983b1dda69927442af EBUILD pecl-dbase-5.1.1.ebuild 775 BLAKE2B 35a3ab094b0a14a33c672d59ef605803bbbf5e18d09b65030107f1c79dce4bdbcbf4b5c6556639e3289c4c90cb2f6315da54e8784a42e252aef0d1cb1883aa2b SHA512 7d431710fe8a380d085bde23b49c10906677d3444ef9af999a269c371296f3396df7ccaa5d52cac9bf571f6ae4477445587ceaab4abd8c457dae6bbd10db11d8 +EBUILD pecl-dbase-7.0.0.ebuild 1161 BLAKE2B 0e29015161cfb237e602551a9ab0b87639be6dc727c314ff5f142d48f1ae679c16c210bf7d412f54accfe3bca2f2a7a29ad6fd1b3ef26ab5ec818f1801f57b58 SHA512 7277612dba51c2a717990dbd14425dedaddcf07afba170c1c89842fe42348b11a7a50b359ee2a08bb7c07e613701bbe40ea07a6bef4715c15ed50d930aa27f96 EBUILD pecl-dbase-7.0.0_beta1-r1.ebuild 1070 BLAKE2B 0cb69e3a4bf7f1c06fdb7967690cf74a97852568b2e55856a84c2ab8a9292dc5b200d827eec4e1d3cf6b04cf585318362fead248023bdee7bd8438f86d034abd SHA512 7eef9511bc14644ab5cc4b81a4a5bcd424a12f53a251c2a464c0aae00c8e9e9b6207fa398dd9f56d1f651a340bb789894f539e05404f9299c589459b1a16deb4 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild b/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild new file mode 100644 index 000000000000..0eecaf7babb8 --- /dev/null +++ b/dev-php/pecl-dbase/pecl-dbase-7.0.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +# Define 5.6 here so we get the USE and REQUIRED_USE from the eclass +# This allows us to depend on the other slot +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 + +# However, we only really build for 7.x; so redefine it here +USE_PHP="php7-0 php7-1 php7-2 php7-3" + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="dBase database file access functions" +LICENSE="PHP-3.01" +SLOT="7" +IUSE="" + +DEPEND="" +RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-dbase:0[php_targets_php5-6] )" + +src_prepare() { + if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then + 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 || use php_targets_php7-3 ; then + local PHP_EXT_ECONF_ARGS=( ) + 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 || use php_targets_php7-3 ; then + php-ext-pecl-r3_src_install + fi +} diff --git a/dev-php/pecl-dio/Manifest b/dev-php/pecl-dio/Manifest index 4931d94064da..36f3137bc2c6 100644 --- a/dev-php/pecl-dio/Manifest +++ b/dev-php/pecl-dio/Manifest @@ -1,3 +1,3 @@ DIST dio-0.1.0.tgz 36960 BLAKE2B 0a2c1fd6289cc9606c44c81216ce8d0f63d4bbddfae554e65499f586f5aa17f419a048e97723ff365407260740d28e36ec5dae8a45e18422a7bd900ec88b60fd SHA512 6fca1c3f2d6247f5e0c52a27b49d80a6d13f9630772956ff7aa73ad45e445686502edd956346c43955cb2f858c0c0259af86c3f92b6f93309a2b90583ad8ea05 -EBUILD pecl-dio-0.1.0-r1.ebuild 427 BLAKE2B 46ca4e8726e71e69bd0507d3758a3ac078e16caef8d5cbae26549ab93d84a75a23540eecf9a00d89a72b8e258491c95800a019cb15f869d7065de4779438f9b9 SHA512 10a00712558d362109c1fb6ec624730a037cb072fff06edb0c27dd87729b95f027f91f5917718f5a47b634d6b9060eced56f7eb0e4b8e38c3e87276bd8899c2a +EBUILD pecl-dio-0.1.0-r1.ebuild 424 BLAKE2B 66dcdf3274edbbb820949fa82ad9037476f7b422372b7973df3d5eb3dcbf65cd0dc06e8a12939bf5974ae6a1aa54a53dd731806377b058f86c35a6aef8a1f7c9 SHA512 bcd6275af1a216332bcf0fdd3a050668566e9b607e40f969f9e6d8291612f79fbdb3eef2adcb4d0d139f4c2a50e602eb65c587e43fcc8a519c82e39c93a930c8 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 diff --git a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild index 113db6ef9fb0..323457f98765 100644 --- a/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild +++ b/dev-php/pecl-dio/pecl-dio-0.1.0-r1.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PHP_EXT_NAME="dio" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" MY_PV=${PV/_rc/RC} PHP_EXT_S="${WORKDIR}/${PN/pecl-/}-${MY_PV}" diff --git a/dev-php/pecl-event/Manifest b/dev-php/pecl-event/Manifest index fa42c4dadd0a..c39bf508d07d 100644 --- a/dev-php/pecl-event/Manifest +++ b/dev-php/pecl-event/Manifest @@ -3,9 +3,11 @@ DIST event-2.3.0.tgz 135401 BLAKE2B a068142854ed908cc482ec48a249a5d213c1806652cf DIST event-2.4.0.tgz 139646 BLAKE2B fe672b5d1f4eabd06456ffb14f11ed978a23a15eba06bc01b22d1784d71d5859e71e3914ab64856dd33a1cccb6618b5926bab446a112d8bf106081c2ab41bc74 SHA512 d238b72764461cf338d20618e4dee80ed8e8519350d17a6c789a68d749d2f4adae991ee43928ab09321caaff321fa21aaa4b5fac6f827974b2f8e9295e948293 DIST event-2.4.1.tgz 139675 BLAKE2B 47b78868bad327778c917e026456dbbb8955f4910d1b6092132101618e348b064ee33766e7e8a2aec6c6c8bdb5e79a09fbbc7ef841dca0b16826fcc1737dd028 SHA512 d115fa12dfefe164532b39b6a79f01c2c00e2718967c3d675584a0dd193b155cdc74a632f6327239e201720fbabd440b9434bde5de4a9e30373595636dafad94 DIST event-2.4.3.tgz 139788 BLAKE2B 428e8df15d4d8e9ff731ae4cd3f8dd0a5dc7d0bc7c5dbbe3575cfaeb596fec1c97c89d6aca19b2385ad09cf9bc36492f193e6264a238b71c4595d9e9a145877c SHA512 6f0ed8803e013ef96a14d7e89d037c31d78ddb3a386d0c7527d378b9ef9dc877c1c5642de7551363e5264b4e9f73975bd9ecd60936ac54dc2ccb5abf9f918ffd +DIST event-2.5.2.tgz 140689 BLAKE2B 19a2c70048f895762250138236e536da22a608825ca4873a4981fea5a1d0ad40b79bb4ef61b8879710603a16f7eff9d673029a58b1aa618a090e8a5c0ca6509d SHA512 432988461bde5684f3d833f5763a8f1b21e4c21c9b043ce90a1cb8fc16c68f16be80af90123319da7839704ce19c41d4a97de414ffe7825d9a66dc856550e242 EBUILD pecl-event-2.2.1.ebuild 934 BLAKE2B 43790a9ae06ee9db90ea7e1fecf6726f326e10539d12cf59dc01c4d6a2edb5d6455e68d13a23c7d434dbf1da6ff42e68a31fb8c672a5f2744c63bf5c597608b6 SHA512 22f28502553ad020b1a762aaf3d439d1ded788f77cdc71ba49bd2ad7d95844ddd70866983c95cc6ad65c740ae63a3397bb70c3345c6d9c756bbe0c320b62b89e EBUILD pecl-event-2.3.0-r1.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613 EBUILD pecl-event-2.4.0.ebuild 1241 BLAKE2B cbe352d8b0c84bdd33510dbd1c9b7680934fddc6a5fca23ef52d8d5b673be2a68a82ca9c589a114690f5eb3ce8996518f45cad6b5ef234b64aaf45e0ee61842e SHA512 d8bf4c16f864d662c573141146a0256030732e72af5e1e64066dec58c3a491f56589431704f78f0292fe3a12406199c17064954c9bc6b15ed57791c1314bc613 EBUILD pecl-event-2.4.1.ebuild 1300 BLAKE2B f79690078d2f841c465d20d576941eca88f85ab38001463d6319e0b7470483724cecf24e409008053d754593f8f3697b7700ac3f5ba402980b195822b78ba582 SHA512 f7112bace3fc41db52dcb153bf71cad1ef54785ec8589fd6c16336351bdf094c3b2e61f7f6fa5d330d6ad34f0efa1cd409a63656ddd0ab0573cb999094b31014 EBUILD pecl-event-2.4.3.ebuild 1297 BLAKE2B 6076f916ebae71364f02aed42036916f007625595f7761ab5a626a485a5bc38d99b40a803044502b2c13503a41868e588ee00f97d0249c95be0bdb97f505711f SHA512 42718934533a23a5ea942ab9efd8794050abcbec8d9d02b9fc875c6e721bb12f54f5fcaa5df34a64806e0c9f245ee0c5861bac992522a5c48396bde00b9a5787 +EBUILD pecl-event-2.5.2.ebuild 1238 BLAKE2B f4746848a03ace2274e150905f9555e63315716daa78b516d8629ece6bdbb132eec4e4ab848bf9d3404052faf229ed58094f5f367fc7b39795714c2076cc3570 SHA512 4be3dfeb064b0a23bccff5d4119869560301deb975739a8ce19da6d390660d0528aef37ce5c91165209be2186c9ac4cf891da49b1948d164a5fd0637dae68864 MISC metadata.xml 431 BLAKE2B 25421824761cdcc90c610236ac4acfd85e18fb63e4f92ff3fa5e51698a7e2004812a7193ced70646baf02bacd0bc896a5959ee88bd88dd5de68db729661ad02f SHA512 6349913306ea30f9ee6cd5ad862e0323d143815f4db47da14e5d54d0dcfb604118e3845f664f2a9b8527797b262c9567bbf5f189426f9becbd169be0ec111056 diff --git a/dev-php/pecl-event/pecl-event-2.5.2.ebuild b/dev-php/pecl-event/pecl-event-2.5.2.ebuild new file mode 100644 index 000000000000..adee9104380b --- /dev/null +++ b/dev-php/pecl-event/pecl-event-2.5.2.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="event" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" +DOCS=( README.md ) + +USE_PHP="php5-6 php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~ia64 ~x86" +LICENSE="PHP-3.01" + +DESCRIPTION="PHP wrapper for libevent2" +LICENSE="PHP-3" +SLOT="0" + +DEPEND=" + >=dev-libs/libevent-2.0.2 + ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) + php_targets_php5-6? ( dev-lang/php:5.6[sockets?] ) + php_targets_php7-1? ( dev-lang/php:7.1[sockets?] ) + php_targets_php7-2? ( dev-lang/php:7.2[sockets?] ) + php_targets_php7-3? ( dev-lang/php:7.3[sockets?] )" + +RDEPEND="${DEPEND} !dev-php/pecl-libevent" + +IUSE="debug examples +extra libressl +sockets +ssl threads" + +src_configure() { + local PHP_EXT_ECONF_ARGS=( + --with-event-core + $(use_enable debug event-debug) + $(use_with extra event-extra) + $(use_with ssl event-openssl) + $(use_with threads event-pthreads) + $(use_enable sockets event-sockets) + ) + php-ext-source-r3_src_configure +} + +src_test() { + local slot + for slot in $(php_get_slots); do + php_init_slot_env "${slot}" + SKIP_ONLINE_TESTS="yes" NO_INTERACTION="yes" emake test + done +} diff --git a/dev-php/pecl-gnupg/Manifest b/dev-php/pecl-gnupg/Manifest index f4af14c3027a..79c48a3ebb12 100644 --- a/dev-php/pecl-gnupg/Manifest +++ b/dev-php/pecl-gnupg/Manifest @@ -1,5 +1,4 @@ AUX 1.3.2/01-large_file_system.patch 260 BLAKE2B 21c52e406ee1d28c8ad0fef1cac7a4c7bb486b856a55423108daca9113416b2e906ae398ac081ce2b813f110e9cc4ce5a20ec04646c4247fe3427aa7440988f9 SHA512 095c5dc8e321c771c8a62054255f3616f3651dae470b78d47cd6032dd8ac76450a366b6a2988ca2cd510102dcedab86c05cd8cd84dbe65d6eca515e487d6dbb5 DIST gnupg-1.4.0.tgz 28349 BLAKE2B d023746b104db38bcf7617d79570aa3c38d318879d34b1d4df7fc0c28b4e435deadc2a1a4827922cc14a8068b578896e297c8fe8461afebd2768ffb63ddc502d SHA512 70fa1d2956bc5caedbeadf556f9f40a7b963d3b519d6574b0c7695d9fb4c7f9d612306f475a90a1125661407c11de97040e54b158f38d71f239c1fe436d48018 -EBUILD pecl-gnupg-1.4.0-r1.ebuild 593 BLAKE2B bdbfadef80ea8dd5860519af401a9439da0ed78322bdd39c3dd083744b706caf6b020ad6beb0c3651f77d104efce6bca3731f66b49cd3f5374017dd1f0ea3fa0 SHA512 b5fb12744536e077bd03110587cf43bd7607158631750ec886f0183055b495f4236b10673a7bf1d8da167d4c1de4f3f6e0b79cc433509329b3cabe8599d0776a -EBUILD pecl-gnupg-1.4.0-r2.ebuild 751 BLAKE2B 9cfdec77c1d6545ca8b0b9577a2197a5a418b9dbc36dcc4d45c45914a7273e324dd43ebd5947785046d68528727e16a2c5b25ea3ca55b06e1ca5bf7f65240c91 SHA512 4eca2d888a240d33196ef1dd56c951bc3fa809d3d168ae5757bc9d4a006a344aa8ea0ae05dbb930513e5eba2b9f7ff0d946c476e2df3273d7c6e96c3afe262a5 +EBUILD pecl-gnupg-1.4.0-r2.ebuild 748 BLAKE2B 47fc28a6b74240f5affd6a064f9c5ee0132e21b9408aca1ea7dd8ed342c53979fc6a2720d2091214fae5316221315f83aea9392d97db3facabc6bd4d38104a71 SHA512 b2ece0027c9ba18a242b4e17dfd6b182044315127e0bd0a7921400ab3607491aabb11929240d7b1c23cd28fa03bb76b76d16c7dbe2839e0ed8a79c98cf5dea32 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 diff --git a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild b/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild deleted file mode 100644 index ab2811be5020..000000000000 --- a/dev-php/pecl-gnupg/pecl-gnupg-1.4.0-r1.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" - -MY_P="${PN/pecl-/}-${PV/_rc/RC}" -PHP_EXT_NAME="gnupg" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" -PHP_EXT_PECL_FILENAME="${MY_P}.tgz" -PHP_EXT_S="${WORKDIR}/${MY_P}" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -S="${PHP_EXT_S}" - -KEYWORDS="~amd64 ~x86" -DESCRIPTION="PHP wrapper around the gpgme library" -LICENSE="BSD-2" -SLOT="0" -IUSE="" - -DEPEND="app-crypt/gpgme = 50600 - // This suppresses an 'unused parameter' warning. - (void)tsrm_ls; - #endif -+#endif - #endif - - if (type == ImagickReadImage) { diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild deleted file mode 100644 index 2552562115d0..000000000000 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.3.ebuild +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_PV="${PV/rc/RC}" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -KEYWORDS="amd64 x86" - -DESCRIPTION="PHP wrapper for the ImageMagick library" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="examples test" - -# imagemagick[-openmp] is needed wrt bug 547922 and upstream -# https://github.com/mkoppanen/imagick#openmp -RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]" -DEPEND="${RDEPEND} - test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )" - -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX}/usr" diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild deleted file mode 100644 index e1c86fc73437..000000000000 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.3_p20181129.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="6" -PHP_EXT_NAME="imagick" - -MY_COMMIT="d57a444766a321fa226266f51f1f42ee2cc29cc7" - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" - -S="${WORKDIR}/imagick-${MY_COMMIT}" - -inherit php-ext-source-r3 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP wrapper for the ImageMagick library" -HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick" -SRC_URI="https://github.com/mkoppanen/imagick/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" -LICENSE="PHP-3.01" -SLOT="0" -IUSE="examples test" - -# imagemagick[-openmp] is needed wrt bug 547922 and upstream -# https://github.com/mkoppanen/imagick#openmp -RDEPEND=">=media-gfx/imagemagick-6.2.4:=[-openmp]" -DEPEND="${RDEPEND} - test? ( >=media-gfx/imagemagick-6.2.4:=[jpeg,png,truetype] )" - -PATCHES=( "${FILESDIR}"/${PN}-3.4.3-tsrm_ls-is-undeclared.patch ) - -PHP_EXT_ECONF_ARGS="--with-imagick=${EPREFIX%/}/usr" diff --git a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild index 3e6ae079e530..5a9c17a0c090 100644 --- a/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild +++ b/dev-php/pecl-imagick/pecl-imagick-3.4.4.ebuild @@ -8,7 +8,7 @@ USE_PHP="php5-6 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" DESCRIPTION="PHP wrapper for the ImageMagick library" HOMEPAGE="https://pecl.php.net/imagick https://github.com/mkoppanen/imagick" diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest index e19fa4506b93..637b0410c93e 100644 --- a/dev-php/pecl-memcached/Manifest +++ b/dev-php/pecl-memcached/Manifest @@ -3,5 +3,6 @@ DIST memcached-3.0.4.tgz 78776 BLAKE2B ce2539e2e4960217d9ee3b50ed5625214d4b22c4d DIST memcached-3.1.3.tgz 82673 BLAKE2B ccb9267cbd974337b7cd8836ab6e35c4fd9398d731dcd333bcb664b91037d1775651e6bb5d00b602767834681289064ede678ea2e6e3641631bba4990a380dee SHA512 9c09648c26011c5e749bee1a556c976e6e5e648dc65580e7caa296dab79e3764edf1408f96edcaca5efb0229320c86fcfa0422e55d486beb6466892f7e08c4a3 EBUILD pecl-memcached-2.2.0-r2.ebuild 1326 BLAKE2B 5e8263a0affd9dd1fe3ddab2fb0e40ae9b7b7b93241d785facde7941164dcc85d4b1fb7c55c7690df75b2d6f3ec2fd2296963183763b1397036de12687cf095f SHA512 91b5c873c5a4e484c56e9ab3080972fd4bcd553c7e1630eabb7f552747a9004a3bdb3cf74993d214d6281358b4e0fde6ba3af1a8e55d0603f3828b579f499434 EBUILD pecl-memcached-3.0.4.ebuild 1576 BLAKE2B cb1e70517c9470e28826a52819c0f4fe99905e3b46eb2f18120206ae8e111d41b83f0d09064f2a7c8dfab150884ae9137fcbecc74bf3020300b7e6a1ec1e8239 SHA512 de5d39a48266e9f393daaa88844b29d923e5bb3d58053b097023fd79045b5958930b3d8beb7b987a87d6460b2db2a0a14ddacafc7b80400806afaee612ee8701 -EBUILD pecl-memcached-3.1.3.ebuild 2350 BLAKE2B 936bba35400475d9b7bdf81d362de77e9332931c339f816e6f1a80b15930ddf72be2fea363426969623fc3d72072a5ebc1005d5d438910d744afad2c2efa5410 SHA512 011787060ca0a80c3f9308764a572e7fe09ec94912bb607f0f5827f5e9c98b5aef648293078e6527a34cba974c7ecb8d50f8c7ec32ea660fe4d55609ffeb39f9 +EBUILD pecl-memcached-3.1.3-r1.ebuild 2147 BLAKE2B 2f524041231d596eba2232bb4547f3a4f9d948518b464a1cecaac56ad257f6a097f6ef330172d4a888642e00a00c5f592d6bcc4ec22a288af70511535c27b2c4 SHA512 afe35045cd5f57ee74de13cc6348d16ed522f6bae80382c2378b19354dffbd2642e85b3cb588572fd874e58d2baa050bc3cdcaddd244c90457a05d06a6b80798 +EBUILD pecl-memcached-3.1.3.ebuild 2361 BLAKE2B f244c38640a95786ae9c28e042921888b5f4aa7ff7b24eae130591306d1279ba9d9abac56b402188b1cfdfbcfdddf4d414c4148e637050d7667eb39aeec0de2d SHA512 38d3fb0c6f66e88844b31a41b8683193b27d1115b829f54681e51f28c2eae2ac2c8687a45205acbd6fc30de18d8dcbcb47a6bbafea6cc505356a7531b43da664 MISC metadata.xml 568 BLAKE2B f99b2eb530ffd87100256bb477bfbd50e48b28283bc01147b0cb1e3dd7dbfb940cd8e16e24c68723fe764df0cbdb1ecb0b995e151c67a37673a19a2cfeb1bcfa SHA512 9fb2c3ea2dba6b4b1cdda8acc02afa006a95651b4fdb5011b15e4046bc44742cc5306d20db070f4f1977352873576040a34ed24a660ec2c640e118115359f2c6 diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild new file mode 100644 index 000000000000..93d54cc2a7a8 --- /dev/null +++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3-r1.ebuild @@ -0,0 +1,75 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PHP_EXT_NAME="memcached" +DOCS=( ChangeLog README.markdown ) + +USE_PHP="php5-6 php7-1 php7-2 php7-3" # Pretend to support all four targets... +inherit php-ext-pecl-r3 +USE_PHP="php7-1 php7-2 php7-3" # But only truly build for these three. + +DESCRIPTION="Interface PHP with memcached via libmemcached library" +LICENSE="PHP-3" +SLOT="7" +KEYWORDS="amd64 x86" +IUSE="examples igbinary json sasl +session test" + +COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?] + sys-libs/zlib +" + +RDEPEND=" + php_targets_php7-1? ( + ${COMMON_DEPEND} dev-lang/php:7.1[session?,json?] + igbinary? ( dev-php/igbinary[php_targets_php7-1(-)] ) + ) + php_targets_php7-2? ( + ${COMMON_DEPEND} dev-lang/php:7.2[session?,json?] + igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] ) + ) + php_targets_php7-3? ( + ${COMMON_DEPEND} dev-lang/php:7.3[session?,json?] + igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) + )" +DEPEND="${RDEPEND} test? ( net-misc/memcached )" +RDEPEND="${RDEPEND} php_targets_php5-6? ( dev-php/pecl-memcached:0[php_targets_php5-6(-)] )" + +src_prepare(){ + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then + php-ext-source-r3_src_prepare + else + default_src_prepare + fi +} + +src_configure() { + local PHP_EXT_ECONF_ARGS="--enable-memcached + $(use_enable session memcached-session) + $(use_enable sasl memcached-sasl) + $(use_enable json memcached-json) + $(use_enable igbinary memcached-igbinary)" + + php-ext-source-r3_src_configure +} + +src_test() { + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then + local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 ) + [[ ${EUID} == 0 ]] && memcached_opts+=( -u portage ) + memcached "${memcached_opts[@]}" || die "Can't start memcached test server" + + local exit_status + php-ext-source-r3_src_test + exit_status=$? + + kill "$(<"${T}/memcached.pid")" + return ${exit_status} + fi +} + +src_install(){ + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then + php-ext-source-r3_src_install + fi +} diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild index a9f98652d5fb..29089ab19505 100644 --- a/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild +++ b/dev-php/pecl-memcached/pecl-memcached-3.1.3.ebuild @@ -12,12 +12,12 @@ USE_PHP="php7-0 php7-1 php7-2 php7-3" # But only truly build for these three. DESCRIPTION="Interface PHP with memcached via libmemcached library" LICENSE="PHP-3" SLOT="7" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 x86" IUSE="examples igbinary json sasl +session test" COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl?] sys-libs/zlib - igbinary? ( dev-php/igbinary[php_targets_php7-0?,php_targets_php7-1?,php_targets_php7-2?,php_targets_php7-3?] ) + igbinary? ( dev-php/igbinary[php_targets_php7-0(-)?,php_targets_php7-1(-)?,php_targets_php7-2(-)?,php_targets_php7-3(-)?] ) " DEPEND=" diff --git a/dev-php/pecl-ncurses/Manifest b/dev-php/pecl-ncurses/Manifest index 92ae23d02bfd..868a42598d71 100644 --- a/dev-php/pecl-ncurses/Manifest +++ b/dev-php/pecl-ncurses/Manifest @@ -1,4 +1,5 @@ +AUX pecl-ncurses-1.0.2-php7.3.patch 4739 BLAKE2B f12e64c0f3615ee9b58ca7d410031fdde63d08cb8221e71826136fdb98005f6ee4552e9e46ae4085cd00a563e47807728d93c20f4b03277d3a8f866af1b3504b SHA512 731ed4e80f248dffffb675f96b9137abc7734fa32540014e0660810f95a82c4b785ca4c01628705556b7516be942da8ce37d66f6f4abf1788ce9514b881430ac DIST ncurses-1.0.2.tgz 16226 BLAKE2B 2b50fb953594f71e8ba2c93cc8ac1443168ea360c5c752eb4ebb941cdbd4e576bd6d5516722bbe06f31a5dd4732bf47c6fd740599af161cb33cbcb45493bbc5d SHA512 e1f684dcab2aa4dd3fded79fed02c78de1525f0384027fe64ad08759617f13ca6fb11742e3407723eecc431ed99847c0c98ae559797dc98ce373a01ba8413bf2 DIST pecl-ncurses-1.0.2-php7.patch.xz 5096 BLAKE2B 8034121b97cc1769534923570c929444c0cd01238615e51c47845b9b10db4b62353a853a17d8ddd44c8ad47e68c44363321f7d08c2dfdd0e2948ddc7d33b2b9d SHA512 1f1dcaaa61033d7db55048f97e48029a335d5d191447038324eb170c9877da62a7b03cec20ea7496c073b76d7ba1009b4374b088c87e1838ee2dc433749c41fa -EBUILD pecl-ncurses-1.0.2-r4.ebuild 507 BLAKE2B 275b0b12f0bc566b2a79146a41f096f5d1b8637c2c8ce92101ff342580459e7f44637dd99cf2e86df23bdf1d63a871647e0fd6873fb7b14962715c47f07885ea SHA512 8369d7f22e6209d7d4d6917a531bacb9ed8a98afc2613f767bcca390ead79036fec5fd1dcfd23cf024c20343fa2c45d44c2213e6235182708b93433e4b6273c3 +EBUILD pecl-ncurses-1.0.2-r5.ebuild 536 BLAKE2B ec27a61d9bbc8e946357cc720b348a1182134946610a5b5a7e87d672782576dc9cc4e126f7bdb92f4142cef1c8289f2a12f536ca69405b107ca1c7b117b59b3c SHA512 fd900683d8199365c9c5fcec2993d25e85cd1374eff1548e42a36738ce74e57c083febf2701e134e796f359f2cf303728961ee458e635f9c35e7713aaa5e9974 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch b/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch new file mode 100644 index 000000000000..9b4f8a6274b5 --- /dev/null +++ b/dev-php/pecl-ncurses/files/pecl-ncurses-1.0.2-php7.3.patch @@ -0,0 +1,175 @@ +diff -aurN a/ncurses_fe.c b/ncurses_fe.c +--- a/ncurses_fe.c 2012-06-16 13:05:19.000000000 -0400 ++++ b/ncurses_fe.c 2019-02-06 10:41:09.000000000 -0500 +@@ -123,7 +123,9 @@ + PHP_FE(ncurses_savetty, NULL) + PHP_FE(ncurses_termattrs, NULL) + PHP_FE(ncurses_use_default_colors, NULL) ++#ifdef HAVE_NCURSES_SLK_ATTR + PHP_FE(ncurses_slk_attr, NULL) ++#endif + PHP_FE(ncurses_slk_clear, NULL) + PHP_FE(ncurses_slk_noutrefresh, NULL) + PHP_FE(ncurses_slk_refresh, NULL) +@@ -191,7 +193,9 @@ + #ifdef HAVE_NCURSES_ASSUME_DEFAULT_COLORS + PHP_FE(ncurses_assume_default_colors, NULL) + #endif ++#ifdef HAVE_NCURSES_DEFINE_KEY + PHP_FE(ncurses_define_key, NULL) ++#endif + PHP_FE(ncurses_hline, NULL) + PHP_FE(ncurses_vline, NULL) + PHP_FE(ncurses_keyok, NULL) +@@ -205,6 +209,10 @@ + PHP_FE(ncurses_waddstr, NULL) + PHP_FE(ncurses_wnoutrefresh, NULL) + PHP_FE(ncurses_wclear, NULL) ++ PHP_FE(ncurses_wscrl, NULL) ++ PHP_FE(ncurses_wsetscrreg, NULL) ++ PHP_FE(ncurses_scrollok, NULL) ++ + #ifdef HAVE_NCURSES_COLOR_SET + PHP_FE(ncurses_wcolor_set, NULL) + #endif +diff -aurN a/ncurses_functions.c b/ncurses_functions.c +--- a/ncurses_functions.c 2019-06-07 11:00:54.713250845 -0400 ++++ b/ncurses_functions.c 2019-02-06 10:41:09.000000000 -0500 +@@ -163,16 +163,25 @@ + *pscr = stdscr; + zscr = zend_register_resource(pscr, le_ncurses_windows); + ZVAL_RES(&c.value, zscr); ++#if PHP_VERSION_ID < 70300 + c.flags = CONST_CS; ++#endif + c.name = zend_string_init("STDSCR", sizeof("STDSCR")-1, 0); + zend_register_constant(&c); + ++#if PHP_VERSION_ID < 70300 + #define PHP_NCURSES_DEF_CONST(x) \ + ZVAL_LONG(&c.value, x); \ + c.flags = CONST_CS; \ + c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \ + zend_register_constant(&c) + #else ++#define PHP_NCURSES_DEF_CONST(x) \ ++ ZVAL_LONG(&c.value, x); \ ++ c.name = zend_string_init("NCURSES_" #x, sizeof("NCURSES_" #x)-1, 0); \ ++ zend_register_constant(&c) ++#endif ++#else + zval *zscr; + + *pscr = stdscr; +@@ -188,7 +197,6 @@ + /* we need this "interesting" arrangement because the + * underlying values of the ACS_XXX defines are not + * initialized until after ncurses has been initialized */ +- + #define PHP_NCURSES_DEF_CONST(x) \ + ZVAL_LONG(zscr, x); \ + c.value = *zscr; \ +@@ -1904,6 +1912,66 @@ + } + /* }}} */ + ++/* {{{ proto int ncurses_wscrl(resource window, int count) ++ Scrolls window content up or down without changing current position */ ++PHP_FUNCTION(ncurses_wscrl) ++{ ++ zval *handle; ++ zend_long intarg; ++ WINDOW **w; ++ ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &handle, &intarg) == FAILURE) { ++ return; ++ } ++ ++ IS_NCURSES_INITIALIZED(); ++ ++ FETCH_WINRES(w, &handle); ++ ++ RETURN_LONG(wscrl(*w, intarg)); ++} ++/* }}} */ ++ ++/* {{{ proto int ncurses_wsetscrreg(resource window, int top, int bot) ++ Set region for scrolling */ ++PHP_FUNCTION(ncurses_wsetscrreg) ++{ ++ zval *handle; ++ zend_long top, bot; ++ WINDOW **w; ++ ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &handle, &top, &bot) == FAILURE) { ++ return; ++ } ++ ++ IS_NCURSES_INITIALIZED(); ++ ++ FETCH_WINRES(w, &handle); ++ ++ RETURN_LONG(wsetscrreg(*w, top, bot)); ++} ++/* }}} */ ++ ++/* {{{ proto int ncurses_scrollok(resource window, bool bf) ++ Enable or disable scrolling of window content */ ++PHP_FUNCTION(ncurses_scrollok) ++{ ++ zval *handle; ++ zend_bool bf; ++ WINDOW **w; ++ ++ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rb", &handle, &bf) == FAILURE) { ++ return; ++ } ++ ++ IS_NCURSES_INITIALIZED(); ++ ++ FETCH_WINRES(w, &handle); ++ ++ RETURN_LONG(scrollok(*w, bf)); ++} ++/* }}} */ ++ + /* {{{ proto string ncurses_termname(void) + Returns terminal name */ + PHP_FUNCTION(ncurses_termname) +@@ -2609,7 +2677,11 @@ + if (above) { + #if PHP_MAJOR_VERSION >= 7 + zend_resource *id = (zend_resource *)panel_userptr(above); ++#if PHP_VERSION_ID < 70300 + GC_REFCOUNT(id)++; ++#else ++ GC_ADDREF(id); ++#endif + RETURN_RES(id); + #else + long id = (long)panel_userptr(above); +@@ -2643,7 +2715,11 @@ + if (below) { + #if PHP_MAJOR_VERSION >= 7 + zend_resource *id = (zend_resource *)panel_userptr(below); ++#if PHP_VERSION_ID < 70300 + GC_REFCOUNT(id)++; ++#else ++ GC_ADDREF(id); ++#endif + RETURN_RES(id); + #else + long id = (long)panel_userptr(below); +diff -aurN a/php_ncurses_fe.h b/php_ncurses_fe.h +--- a/php_ncurses_fe.h 2012-06-16 13:05:19.000000000 -0400 ++++ b/php_ncurses_fe.h 2019-02-06 10:41:09.000000000 -0500 +@@ -158,6 +158,9 @@ + PHP_FUNCTION(ncurses_prefresh); + PHP_FUNCTION(ncurses_pnoutrefresh); + ++PHP_FUNCTION(ncurses_wscrl); ++PHP_FUNCTION(ncurses_wsetscrreg); ++PHP_FUNCTION(ncurses_scrollok); + PHP_FUNCTION(ncurses_wstandout); + PHP_FUNCTION(ncurses_wstandend); + PHP_FUNCTION(ncurses_wattrset); diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild deleted file mode 100644 index eb953b941e90..000000000000 --- a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r4.ebuild +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -SRC_URI+=" https://dev.gentoo.org/~grknight/distfiles/${P}-php7.patch.xz" - -DESCRIPTION="Terminal screen handling and optimization package" - -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -DEPEND="sys-libs/ncurses:0=" -RDEPEND="${DEPEND}" - -PHP_EXT_ECONF_ARGS=( --enable-ncursesw ) -PATCHES=( "${WORKDIR}/${P}-php7.patch" ) diff --git a/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild new file mode 100644 index 000000000000..929d4af52969 --- /dev/null +++ b/dev-php/pecl-ncurses/pecl-ncurses-1.0.2-r5.ebuild @@ -0,0 +1,23 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_PHP="php5-6 php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 + +SRC_URI+=" https://dev.gentoo.org/~grknight/distfiles/${P}-php7.patch.xz" + +DESCRIPTION="Terminal screen handling and optimization package" + +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +DEPEND="sys-libs/ncurses:0=" +RDEPEND="${DEPEND}" + +PHP_EXT_ECONF_ARGS=( --enable-ncursesw ) +PATCHES=( "${WORKDIR}/${P}-php7.patch" "${FILESDIR}/${P}-php7.3.patch" ) diff --git a/dev-php/pecl-pam/Manifest b/dev-php/pecl-pam/Manifest index 402a39c18f24..23259394df80 100644 --- a/dev-php/pecl-pam/Manifest +++ b/dev-php/pecl-pam/Manifest @@ -1,4 +1,4 @@ AUX 1.0.3-php7.patch 3519 BLAKE2B 649f278a88e12ecbf895ab372aaa97c9f1f7cdcf4724eeda63368daefc89e89c3e5aae9e09cb7026058ca18aa4569423d75ee125795b56d8e2d372ccc93123f1 SHA512 9877b6bede71f402166253521aec667e4f9da99fbbf4fc0e74b9a5c48e498df717f869969b5d7a6432427a50030370771774f77ecb876ef133288eab174c9289 DIST pam-1.0.3.tgz 6671 BLAKE2B f416fd0e47d3fda6a1d86e44a7ca17fc9a0428f976f18e2b663a2fd1e09b790cd069ca16d930d6dca6554762ca59bda987929e52365ed813949c1a93291c1dcc SHA512 3580582f1456b31be30a713cadaaca106527f2d4f3f12032b5d3617cc361aaf49539a9db3dd27221ce40320187abaac0f6ad4e23cdfe5eaa94436e3eaef3fb9c -EBUILD pecl-pam-1.0.3-r3.ebuild 820 BLAKE2B 60fc2dd45e6390ffcc7b97ddffc3c93574184df28dd14231b4232549cd13a9e5ceff152419ced823248506ee7919f117643d0c2b6d6691fa5b403ae0fe8eddbe SHA512 24d6a9c2cce0b83d418f436826716aa5506520dbff58c37fe2d69331929cf0fdd803fb9d2b380e6218befcc8597538333254fa8dec2f91a48d8168ad105468dc +EBUILD pecl-pam-1.0.3-r3.ebuild 826 BLAKE2B b1bbc8467fca0bc7a8aa9177e7981f39d99dd1e048189b87349ec5e20411d4f86ad9615ba7a313f04eac8f79a36eca4a216247f16c9d8ae90781e1e4e5c563c7 SHA512 edec7dc70b1c2ae736995670e2afadc553d0d34c7882cd0b5c9562c6a12617bd9436378456d011ff95ba5148f54b13d54e1051261b32f864b17935d44b00eea4 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild index db57bd508765..b01c985412fd 100644 --- a/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild +++ b/dev-php/pecl-pam/pecl-pam-1.0.3-r3.ebuild @@ -1,14 +1,14 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="pam" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" DOCS=( README ) -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 pam diff --git a/dev-php/pecl-propro/Manifest b/dev-php/pecl-propro/Manifest index 9e80850ac90a..2480fee7f843 100644 --- a/dev-php/pecl-propro/Manifest +++ b/dev-php/pecl-propro/Manifest @@ -4,5 +4,5 @@ DIST propro-2.1.0.tgz 14253 BLAKE2B 44c9bde831486fa41520ce75b313865b90a057acd0d5 EBUILD pecl-propro-1.0.2-r1.ebuild 735 BLAKE2B 7dff63db99c42ef41175493c6b2a754ec2b5ced16ca5594161a0ddaa20317be54e00c08ae04fc16337582c79403986e84c395b1740a95930dc3e7344b0c96aa5 SHA512 1333f462b538f9cd7f2b3ed27a7c01741bff390fb63dcd94238c5af75d0ffc247fb1485fe2aaedb3e984f7fb01aba5cb68d59100e0e5d734f02ae1d090c40a43 EBUILD pecl-propro-1.0.2-r2.ebuild 836 BLAKE2B c8be1849bebd99025649f1758ab1d12484b53b6f19b2b51a379fa11030bc208b8d1a2f78533eeafac1c9c0c3dc058f94ef339ba852146b52494600691a7bb093 SHA512 7df406dd15a07b47b449c70559f2645eecb65fe62f46b4528805b2e02eaff51444d37373ae30689ebd852583c0e04fd1e4acca36fdb5fc097f961271af01f0ed EBUILD pecl-propro-2.0.1-r1.ebuild 750 BLAKE2B 36855ce79ce527a94d0e7177e5c1ca98723078713be9351a8cb38364f0091988b11bfe96afe6d35bd7870fe268e1998c5c794b3206bf25ea38fc5033f674622c SHA512 842c94056e314877518f017231827f74bbaee853e1c69fbdd7e74a1092a196a07c174cfa1e36f7934b8f881573e5c7de859c3ef212fd1eb165ca74969d982f25 -EBUILD pecl-propro-2.1.0.ebuild 852 BLAKE2B 072d8c80981db40997b5d4e40ca603e3ff186320bb6258ae0d292796888319fa1fcfa8d6579f79fc889fbc56a51c8744e8007c5f2997e0568f923548b00d01c6 SHA512 8fd7d2ce6e863450466cbb99cde4f25e1f5b74428b3513056d31caa29b1063e19d921ed99909fc08fd2fe382cda444aadab81550b8c2ec046fb3eb7910a72674 +EBUILD pecl-propro-2.1.0.ebuild 849 BLAKE2B 9b23c1403f62b889dabf371b576d7f9750b218aabaac63eb2fe4de86062b1584e76857dd92430b45f524fa572339576e609152c65c295e5eac82c673a334ec97 SHA512 02dfabc0f134382d9e91eaabc784b00476a95f5f4c5cea7b5d2e04271294602562510942710b559e7812b146bc83fcf723ef4081a2097a033aaf2463b79487eb MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild index 1c8c99bad920..ba645a7a2b18 100644 --- a/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild +++ b/dev-php/pecl-propro/pecl-propro-2.1.0.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PHP_EXT_NAME="propro" PHP_EXT_INI="yes" @@ -9,12 +9,12 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_ECONF_ARGS="" PHP_INI_NAME="30-${PHP_EXT_NAME}" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 # Only really build for 7.x -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-1 php7-2 php7-3" KEYWORDS="~amd64 ~x86" @@ -26,7 +26,7 @@ IUSE="" RDEPEND="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 + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-source-r3_src_prepare else default_src_prepare @@ -34,7 +34,7 @@ src_prepare() { } src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-pecl-r3_src_install fi } diff --git a/dev-php/pecl-ps/Manifest b/dev-php/pecl-ps/Manifest index 9707556bed62..663740d4eae3 100644 --- a/dev-php/pecl-ps/Manifest +++ b/dev-php/pecl-ps/Manifest @@ -4,5 +4,5 @@ DIST ps-1.4.1.tgz 578991 BLAKE2B 549fae78ffb6e91f39b6292d969b9b80adba1a5911fb52e EBUILD pecl-ps-1.3.7-r1.ebuild 360 BLAKE2B eaec0c769677b48b4676606004b950f477b0c4b6d208111bffcceb9b785bad45c9a1a6e316e286bd8cf464f96925ef1f9fd8b1a9b9b3b3b53f05232249d8b232 SHA512 60096699ced3e3b021827c5e0c866b8466ad21a99daa72028e5191d06353081e6ee338869bfa3aabb05972155fa1f85592ee994ead0144c21b62c7ffeea84149 EBUILD pecl-ps-1.3.7-r2.ebuild 878 BLAKE2B 2db2c23d2c933d2e48872dd1799e06ccf08bb1702c4149390a71c6b09e5c4284803df36cbf6f47768234f14c1b0ed2472f4352db4f5c0626849fe9f2d1baeacf SHA512 c5b73568c4aae62ea5a46d936ba40a93062cfc2ff8d9b02e937091256d2d2d28d65a9d829c0a1ce6ce64a26aa340792042dabcafe68c71ab310c27a69ee7488b EBUILD pecl-ps-1.4.0.ebuild 614 BLAKE2B 8279b0d1eb3c38107771e49b130600c2d3dad22060878b8d287677dbd8db56f43739673fdf88579e558103ea55bfb3bbbe70ed2cf14990698a73c185545efa01 SHA512 b0ceba0358fbf105ecaed96ff76e69cdba3014511af83f9dfd8791e714b6a775b9d01d98ae4087f8ed4042265b9b9f2cf2f75f7a2a0c2902e54f8b6531be00b8 -EBUILD pecl-ps-1.4.1.ebuild 937 BLAKE2B 8300f3fd0db96b04ff6cf5378881f264b183edf31fb0193ff269cad1be37f33fed7dcaa02070768c187fd1f955bf81e829fe646134a52ff7717b12082bbfac75 SHA512 fdbc7cf5d3f257dfef6d2066cebd60a63e17b95857e68b3e336019b092d974da6f1cb2ca04b43e555079441b64d4867d2de02c26b579d518d87a2d2e5f90313c +EBUILD pecl-ps-1.4.1.ebuild 936 BLAKE2B 9bd57a944f991c6bad2d41171b2f89e257db0bb199057cfccdd12071823123fec5afd9fd6ee24c4e058fbef4b8c2ac4444d89ac454e31dcf8512eff80229e9bb SHA512 8433c6ff7dd4b20c6d148680171d351184b7c0d839abeff3f706916a21ebe24e95f69111ca20e2c083be55c555b842e691b96327bb1ebf2a2d4ff169ba3c2738 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild index e9eca43623d7..ed4909097c9b 100644 --- a/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild +++ b/dev-php/pecl-ps/pecl-ps-1.4.1.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="ps" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 # Only really build for >=7.0 -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-1 php7-2 php7-3" KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" @@ -19,15 +19,15 @@ SLOT="7" IUSE="examples" DEPEND=" - php_targets_php7-0? ( dev-libs/pslib ) php_targets_php7-1? ( dev-libs/pslib ) php_targets_php7-2? ( dev-libs/pslib ) + php_targets_php7-3? ( dev-libs/pslib ) " RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ps:0[php_targets_php5-6] )" PHP_EXT_ECONF_ARGS="" src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-source-r3_src_prepare else default_src_prepare @@ -35,7 +35,7 @@ src_prepare() { } src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-pecl-r3_src_install fi } diff --git a/dev-php/pecl-radius/Manifest b/dev-php/pecl-radius/Manifest index 2fcd4c997c92..38ec07dd981b 100644 --- a/dev-php/pecl-radius/Manifest +++ b/dev-php/pecl-radius/Manifest @@ -1,5 +1,5 @@ DIST radius-1.3.0.tgz 43060 BLAKE2B e348ca5693872a7af142f2f60dd91613980046ff1479894518591a9db4229147963bfc70dd7f2797ace070d89015096b7877915df18decc03ae3cc092d8d02c6 SHA512 79126a852701e77f782283b0cf2ad99cb05418c69ed39d70608f62021f3da06f5e5867ac5b09cc75806feeb3d1a06f24eeb6ff4e56cb2fde5f05bcd198b5a661 DIST radius-1.4.0b1.tgz 50953 BLAKE2B 1f6f2a4c4cfa7600a37b8bc30e4d263b899a687becac83fd01bac2466de08cad4233984ca694dc73eaf20b64ef94e1e6a6ca7f843474c8f0c9de2c39df9d9705 SHA512 db6ebe928673db1ff4c565338010ef5acf6029844994eb240f2e8eaeda4aff734ed300a7ddf16c09e245671aad377283f99cf1c485569b3bad0c7c7b24a19664 EBUILD pecl-radius-1.3.0-r1.ebuild 445 BLAKE2B 3afb0fe648378416f7377c872a201effb1cac2802b064edbe332a6be18bdafc8645dedbedba2d8853b899d260eddb3c33b5be683f0a85eed5b4668622d159334 SHA512 b7ecd2945d33352f62bef13b7a91feebf1968ddc4fca208c8c040bbe6e8c15628a8f1e8dff0721f16117f6be862fc7629ccadccb9af064bd46c4bee2c2d91c49 -EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 766 BLAKE2B fa265218acc35154f9489e0698fccb7dea5c1352762628ae5e01a038b92d88307e960dc95267e5f5fa82232d0e264f289b564ac533fb22a145bd513ef39d45ea SHA512 26c1a13e77f07c2fb0c127e7db88db661ae4c10478545c18ac0c3c61b9ff49300fb98cdcc9d44b5e256574dc4389c54226a00005fe716ee88c41a907d8ba9d50 +EBUILD pecl-radius-1.4.0_beta1-r2.ebuild 765 BLAKE2B 528d655a9ec455460a283bcf9aa1b15fbb9d43db094df533f38f9fbef0eadc12388608389a05bee9dada5b9a2bca7f5724cfafca037c0b65cb39c3650a4e4d79 SHA512 ee8a5bb86cfcec12b3342a3ee9f8b07bcee817e1f9a14093ee3f9cb1125b9ac8476675cedc8b52aace45665c5de6377d24a20262e5399c2cd985864532ff128d MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild index 318f7f3641bf..12aaad4b9dd3 100644 --- a/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild +++ b/dev-php/pecl-radius/pecl-radius-1.4.0_beta1-r2.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="radius" PHP_EXT_INI="yes" PHP_EXT_ZENDEXT="no" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" PHP_EXT_PECL_FILENAME="${PN/pecl-/}-${PV/_beta/b}.tgz" PHP_EXT_S="${WORKDIR}/${PHP_EXT_PECL_FILENAME%.tgz}" @@ -24,7 +24,7 @@ S="${PHP_EXT_S}" RDEPEND=" php_targets_php5-6? ( dev-lang/php:5.6[pcntl,sockets] ) - php_targets_php7-0? ( dev-lang/php:7.0[pcntl,sockets] ) php_targets_php7-1? ( dev-lang/php:7.1[pcntl,sockets] ) php_targets_php7-2? ( dev-lang/php:7.2[pcntl,sockets] ) + php_targets_php7-3? ( dev-lang/php:7.3[pcntl,sockets] ) " diff --git a/dev-php/pecl-raphf/Manifest b/dev-php/pecl-raphf/Manifest index 267d78f86c94..68a63e7a9cc6 100644 --- a/dev-php/pecl-raphf/Manifest +++ b/dev-php/pecl-raphf/Manifest @@ -3,5 +3,5 @@ DIST raphf-2.0.0.tgz 15715 BLAKE2B bab2997d9ce8358efaa69f2e633f49e4dd16f640e8d30 EBUILD pecl-raphf-1.1.2-r1.ebuild 748 BLAKE2B 062779c09b82c1145df97742a6d970ddc0c687248b336995217f93c7c3ed7d7eaa500888e4818cfa8176dae10f7b74fa6bd90f9688bfc1d2f0744b49d0b90a0f SHA512 5d9a4f730c469b06822e7af96db120a28f4353d59b2200c2b68849c956999a574592326594749533c5d3ddb423d206822d7c8eb157ffae541cd7117c20537400 EBUILD pecl-raphf-1.1.2-r2.ebuild 857 BLAKE2B 45d170823d7f9bcd8944f56241c17a6922ee813deec961c5b2dd7e0c659f08d56295e28ed3d187ab21b3c50d0d641c104ca19fc6f329a887cae4c4345bb82b55 SHA512 b2b4994345835fa4c68b07eb0102b0e041d0b7c4c7adea6da13fd5a7bd20cd998defcb759f91690776d81be00f8df0e8ef6bf022d0cebaf2b88de9e7348413dd EBUILD pecl-raphf-2.0.0-r1.ebuild 766 BLAKE2B 58af3a334c323199b9494c17bbb119aafcaa53e7b7d98f98aa42837777418bd3d920c6422ff35546a45b1aad84943e21c2eaebddf3af89e4726d578e4d1c2955 SHA512 9d12d7141ce035e9d8a901ee847d313b580192b4d71f441aa77d0ac501113eefada26186696ee9ab820b64eb635fb529b025e72a0400914f5085f0263514659e -EBUILD pecl-raphf-2.0.0-r2.ebuild 866 BLAKE2B 6be9b487787e3c36bde27fd24fad12925d910d5b9a824e79027379d6dae3c795f35df6e34ae572ea4fcba059ff658c6f36d1e8678deddb9bc18b84e792115b87 SHA512 b8c9842082fcfc253f04dde3382bd6538a4672d0c5dd4bcac4d6b962e7585fb15eff68a23bc43285f38fcd92da4240aee1d66e48f448952ac5daeaf73073ac53 +EBUILD pecl-raphf-2.0.0-r2.ebuild 870 BLAKE2B 6c77a40ffbec3f51cc787bd889118910197f0829927bb66c97e465aedbfd83800e78f202e9a1474dc1d62fe089e6264f7e9414136c8f48a2b2a461fe9d98b22f SHA512 c1f6fe551f063d69b39cc1e22a19749001639005a295e0111c4cc9480cfe20ad237288dae5593776d1db3d67b5dfd80f3deb10b854b292a6e55bde1843e98633 MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild index 51817913cb68..f28c7a6bb551 100644 --- a/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild +++ b/dev-php/pecl-raphf/pecl-raphf-2.0.0-r2.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="6" +EAPI="7" PHP_EXT_NAME="raphf" PHP_EXT_INI="yes" @@ -9,12 +9,12 @@ PHP_EXT_ZENDEXT="no" PHP_EXT_ECONF_ARGS="" PHP_INI_NAME="30-${PHP_EXT_NAME}" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 # Only really build for 7.x -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-1 php7-2 php7-3" KEYWORDS="~amd64 ~x86" @@ -26,7 +26,7 @@ IUSE="" RDEPEND="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 + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then php-ext-source-r3_src_prepare else default_src_prepare @@ -34,7 +34,7 @@ src_prepare() { } src_install() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then php-ext-pecl-r3_src_install fi } diff --git a/dev-php/pecl-rrd/Manifest b/dev-php/pecl-rrd/Manifest index 1df13739c55b..6b86f96710bc 100644 --- a/dev-php/pecl-rrd/Manifest +++ b/dev-php/pecl-rrd/Manifest @@ -1,5 +1,5 @@ DIST rrd-1.1.3.tgz 19229 BLAKE2B 14bbc97ec52be8f1b99471380cc1408c81056841d932818681868e31badc1a0abefc0d155e594a05492b86b826f21b8dadb0a0dcb43313f48863c64fd8e88a71 SHA512 356264de1b967af0f78e25e3c0afcbec704dd3e49d828e08d21d744d5fcdc46f4cd7f7c118b4e283c20bcaf2a4c29e0ac9437c7f66ca0d260a76fddf7b9d3242 DIST rrd-2.0.1.tgz 18880 BLAKE2B c3fb65e95aece39690085830ec1c43ba173e173591215d6a66145ac71079f8d5ba5b097acd9018c86d2342550001334f8e1c98e22204d94a24aee5cc086295ca SHA512 b6f7173f54fcf49bf014cc6c78263c169cdf53dac66c12f5f88db7e01b49ea74da84a55f61deb25c866e6e2e74275ec48fc4a3d1b46719f66b5b7b7eb000b6b3 EBUILD pecl-rrd-1.1.3-r2.ebuild 792 BLAKE2B 6ea7717d68feaf96d919f4d7e29cf10185588a29a687e068ae768555f340deb8bd93fad6111720248d8fb389fab95f6a8235af50736b54928067cbfd8f8dcdf8 SHA512 b00f02cc0ed6678df78eed5fd0a2417daf2423cf04a524429b1da116babc0baa2d45c90458ec26e71bbb5b843c1a86eee6b34ae410706f5e3fe85e4dd2580dfd -EBUILD pecl-rrd-2.0.1-r3.ebuild 1367 BLAKE2B 2ac6444ff160545e5ce4635337729ba95dc98304a70b22c9347d7fb0042b863c5af6f572391450ea2cff1cf965d24be122a23a3627a93f42d54bdb4374ab50a5 SHA512 7f5a17ce552a015eeb4a4ca9cb1d1203dff03ad49ce6f592e674a8eaf82d10e407cba1e0a7566d3178c720232686e8a60be06b78d3b504e3f943e0b95c7311b0 +EBUILD pecl-rrd-2.0.1-r3.ebuild 1366 BLAKE2B cdf8b4986acafb26cb3d768177be1297c6a8436eb37c2e592b580f356bc8c6d6f88e07eae5c73b15b5d1ef97a4fcae417159e64ac9ca0043afb05bc32a79a7df SHA512 2d9abcf47452d5a820bb28ef303756fccbe217422c58c83b2b03f4dcef5b848a0ded367629627147ee785ade44d6a5db7d3698fb8a1a92053ddbd2a67b864f2a MISC metadata.xml 239 BLAKE2B 9b7c5dcb74289073481cf07031b7a92f32496cc1097becb074d74a8fbb8133de429ce1baf284e446e44132943c8b32e6b824570f15828588e42ea49ef5661f00 SHA512 2181b874bfe8cd31e7730d8207e26cfd2f272eaf2d1b57ae0faff126347a5298fa1c506d9107e1da9736c8a0ed9c8c339e4d9509a8726b79dbe86e073c12dee0 diff --git a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild index 8a4100b18f95..19278bc6f6d8 100644 --- a/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild +++ b/dev-php/pecl-rrd/pecl-rrd-2.0.1-r3.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" # Define 5.6 here to have the {I,REQUIRED_}USE generated -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 # But we really only build 7.0 -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-1 php7-2 php7-3" DESCRIPTION="RRDtool bindings for PHP" LICENSE="BSD" @@ -17,14 +17,14 @@ SLOT="7" KEYWORDS="~amd64 ~x86" DEPEND=" - php_targets_php7-0? ( net-analyzer/rrdtool[graph] ) php_targets_php7-1? ( net-analyzer/rrdtool[graph] ) php_targets_php7-2? ( net-analyzer/rrdtool[graph] ) + php_targets_php7-3? ( net-analyzer/rrdtool[graph] ) " RDEPEND="${DEPEND} php_targets_php5-6? ( ${CATEGORY}/${PN}:0 )" src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-source-r3_src_prepare else default @@ -32,21 +32,21 @@ src_prepare() { } src_configure() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then local PHP_EXT_ECONF_ARGS=() 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 + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-pecl-r3_src_install fi } src_test() { local slot - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then for slot in $(php_get_slots); do php_init_slot_env "${slot}" # Prepare test data diff --git a/dev-php/pecl-ssh2/Manifest b/dev-php/pecl-ssh2/Manifest index 34449332aab8..c00edc33ca1e 100644 --- a/dev-php/pecl-ssh2/Manifest +++ b/dev-php/pecl-ssh2/Manifest @@ -1,7 +1,9 @@ AUX 0.13-parse_url-fix.patch 1777 BLAKE2B db7f6bd23cbe6552fce870044b1839eadba5c9089ffee2da52c1c998856083636c221d7386f52ba689f9796807e2abce447541dfb247c6d20f7898254e0f0dc7 SHA512 9628c0cd1d09d64be3824485ec54ad9bb477a18b9178a120b8fc17ca5e5f2055d23019495741d7e85841f9e0b5f7dc991fb14ead04cc60f95127099e3e5fb205 +AUX pecl-ssh2-1.1.2-fix-php7-port.patch 27860 BLAKE2B 23054187608bdcf79f53ce638e37c646f44297aa7d1e8f7a7c85fd922977ab835b915d541fbae327a30d2e863b503ed4822a82c1b242346290ceb94d49c97020 SHA512 1c2ecc990323a77fb2b69be0d6649f96dd7ad2d06c62f4fcb79a9ef4f89e066d463301668a044d37d717c99837c5d7d3f621f61119543445bd05c3229d9270e9 +AUX pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch 11461 BLAKE2B 62b07aa1c70c14ed3a1bebb633c47a39f39be120df29ad85e6abacd276fef214cfd85ec07d8504b51c423cc7971fe4eb293e9fb6c8423a3505323f6535a01655 SHA512 86f460c280a83718e195bb255ef686a3632e98ab598ebcb7fa05b5e5727800729c91de9efd60dc19884f015c06d0a7675beecc296d259f493b2f697aaf143e34 DIST ssh2-0.13.tgz 28984 BLAKE2B 3c18cb7aba146801325eeaca3ffb6e3780675a7ce6d78aea5fbc16f75662284f7773de2161789f68af0b5499e9cb813f4046d674758c138849eb6735344249f9 SHA512 c031e22853bf5cf8ee59dc5b99d9e7e60af1507a22e7d0a9e2f54b8f1758a03a6cea91c539e0f667d48ec66185fdc8a28c47e5a1e10a72220c0cb16b3948e1d0 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.2.ebuild 690 BLAKE2B f97b6c145f9a76863c01ebfa5d8d9096142989d280de7b9b1e6a6b18f45d9696e07c5350f899ff0bc6bcde246e810a375be2dbb1d9a715af55d42d75278f7961 SHA512 3954445c53c7e3d9b3c14723eee375718e4b7c41a17c9deee475a0dcd8534d3259d710791fbb9158969edafacc14053f87b14f23c41ddae3853926427f3e419e -EBUILD pecl-ssh2-9999.ebuild 744 BLAKE2B ea9fe3fe4b516c25fed214c1a48eb5fb0221048f96540090ea50136489cc91c4dde2407289175b44d4169d71dd723163a8814f784290ee4cfd67d23484903720 SHA512 970871b295857af4ccd1bb68680b883c677c161189025326e32d317aef6867261b34343371003152d60fe7bf40c19a3130bd5f8b748d7d7ba263e70f6fd22e55 +EBUILD pecl-ssh2-1.1.2.ebuild 807 BLAKE2B cf68352b3b686837294c7996b0684b27e640f1b24eab513de1134fef0a8597db65a9ccb8867a8e245a75b8a5825bbf0570343532d06e1f2cd9cc07eecf9da99b SHA512 1fe74ed851795f46ae3832ff2b54005846d9c33df6d38946414e82c6f2136854167c005931b030ab6f825494d5c4322b41c2be87da80afa387422e5a26268030 +EBUILD pecl-ssh2-9999.ebuild 743 BLAKE2B 88db431941cd00131aa45ff2ef274bf44eea972fb4ddc1ef215b3dd74dd7980782bbe5373e34da5cacc777586bf25eefc60caa013ef59b59f0111d207fc113b8 SHA512 d118bcd807d2dffda9bd29bc021d9357d4d2c0b6ade7c05b9e2e0e18ae8048b36cf8c7061222b2d113a3ed7cc7fe078d998232ce53067418cbf8e8006579bfa0 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64 diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch new file mode 100644 index 000000000000..9d4f9bd166ec --- /dev/null +++ b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php7-port.patch @@ -0,0 +1,746 @@ +From 073067ba96ac99ed5696d27f13ca6c8124986e74 Mon Sep 17 00:00:00 2001 +From: Jan-E +Date: Thu, 28 Jun 2018 08:43:48 +0200 +Subject: [PATCH] @dstogov Fixed PHP7 port. Restored commented reference + counting. + +--- + php_ssh2.h | 14 +++--- + ssh2.c | 26 +++++----- + ssh2_fopen_wrappers.c | 129 ++++++++++++++++++++++---------------------------- + ssh2_sftp.c | 59 ++++++++++------------- + 4 files changed, 102 insertions(+), 126 deletions(-) + +diff --git a/php_ssh2.h b/php_ssh2.h +index d010ff9..2bbaa26 100644 +--- a/php_ssh2.h ++++ b/php_ssh2.h +@@ -73,14 +73,14 @@ typedef struct _php_ssh2_sftp_data { + LIBSSH2_SESSION *session; + LIBSSH2_SFTP *sftp; + +- int session_rsrcid; ++ zend_resource *session_rsrc; + } php_ssh2_sftp_data; + + typedef struct _php_ssh2_listener_data { + LIBSSH2_SESSION *session; + LIBSSH2_LISTENER *listener; + +- int session_rsrcid; ++ zend_resource *session_rsrc; + } php_ssh2_listener_data; + + #include "libssh2_publickey.h" +@@ -89,7 +89,7 @@ typedef struct _php_ssh2_pkey_subsys_data { + LIBSSH2_SESSION *session; + LIBSSH2_PUBLICKEY *pkey; + +- int session_rsrcid; ++ zend_resource *session_rsrc; + } php_ssh2_pkey_subsys_data; + + #define SSH2_FETCH_NONAUTHENTICATED_SESSION(session, zsession) \ +@@ -118,8 +118,8 @@ typedef struct _php_ssh2_channel_data { + char is_blocking; + long timeout; + +- /* Resource ID */ +- int session_rsrcid; ++ /* Resource */ ++ zend_resource *session_rsrc; + + /* Allow one stream to be closed while the other is kept open */ + unsigned char *refcount; +@@ -151,8 +151,8 @@ PHP_FUNCTION(ssh2_sftp_realpath); + LIBSSH2_SESSION *php_ssh2_session_connect(char *host, int port, zval *methods, zval *callbacks); + void php_ssh2_sftp_dtor(zend_resource *rsrc); + php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context, +- LIBSSH2_SESSION **psession, int *presource_id, +- LIBSSH2_SFTP **psftp, int *psftp_rsrcid); ++ LIBSSH2_SESSION **psession, zend_resource **presource, ++ LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc); + + extern php_stream_ops php_ssh2_channel_stream_ops; + +diff --git a/ssh2.c b/ssh2.c +index e73867e..849766b 100644 +--- a/ssh2.c ++++ b/ssh2.c +@@ -772,9 +772,8 @@ PHP_FUNCTION(ssh2_forward_listen) + + data = emalloc(sizeof(php_ssh2_listener_data)); + data->session = session; +- data->session_rsrcid = Z_LVAL_P(zsession); +- //TODO Sean-Der +- //zend_list_addref(data->session_rsrcid); ++ data->session_rsrc = Z_RES_P(zsession); ++ Z_ADDREF_P(zsession); + data->listener = listener; + + RETURN_RES(zend_register_resource(data, le_ssh2_listener)); +@@ -810,7 +809,7 @@ PHP_FUNCTION(ssh2_forward_accept) + channel_data->channel = channel; + channel_data->streamid = 0; + channel_data->is_blocking = 0; +- channel_data->session_rsrcid = data->session_rsrcid; ++ channel_data->session_rsrc = data->session_rsrc; + channel_data->refcount = NULL; + + stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); +@@ -820,8 +819,12 @@ PHP_FUNCTION(ssh2_forward_accept) + libssh2_channel_free(channel); + RETURN_FALSE; + } +- //TODO Sean-Der +- //zend_list_addref(channel_data->session_rsrcid); ++ ++#if PHP_VERSION_ID < 70300 ++ GC_REFCOUNT(channel_data->session_rsrc)++; ++#else ++ GC_ADDREF(channel_data->session_rsrc); ++#endif + + php_stream_to_zval(stream, return_value); + } +@@ -975,9 +978,8 @@ PHP_FUNCTION(ssh2_publickey_init) + + data = emalloc(sizeof(php_ssh2_pkey_subsys_data)); + data->session = session; +- data->session_rsrcid = Z_RES_P(zsession)->handle; +- //TODO Sean-Der +- //zend_list_addref(data->session_rsrcid); ++ data->session_rsrc = Z_RES_P(zsession); ++ Z_ADDREF_P(zsession); + data->pkey = pkey; + + RETURN_RES(zend_register_resource(data, le_ssh2_pkey_subsys)); +@@ -1280,8 +1282,7 @@ static void php_ssh2_listener_dtor(zend_resource *rsrc) + LIBSSH2_LISTENER *listener = data->listener; + + libssh2_channel_forward_cancel(listener); +- // TODO Sean-Der +- //zend_list_delete(data->session_rsrcid); ++ zend_list_delete(data->session_rsrc); + efree(data); + } + +@@ -1291,8 +1292,7 @@ static void php_ssh2_pkey_subsys_dtor(zend_resource *rsrc) + LIBSSH2_PUBLICKEY *pkey = data->pkey; + + libssh2_publickey_shutdown(pkey); +- // TODO Sean-Der +- //zend_list_delete(data->session_rsrcid); ++ zend_list_delete(data->session_rsrc); + efree(data); + } + +diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c +index f2f3475..c4eb9dc 100644 +--- a/ssh2_fopen_wrappers.c ++++ b/ssh2_fopen_wrappers.c +@@ -47,11 +47,9 @@ static size_t php_ssh2_channel_stream_write(php_stream *stream, const char *buf, + php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract; + size_t writestate; + LIBSSH2_SESSION *session; +- zval *zresource; + + libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking); +- zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid); +- session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); ++ session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); + + + +@@ -90,12 +88,10 @@ static size_t php_ssh2_channel_stream_read(php_stream *stream, char *buf, size_t + php_ssh2_channel_data *abstract = (php_ssh2_channel_data*)stream->abstract; + ssize_t readstate; + LIBSSH2_SESSION *session; +- zval *zresource; + + stream->eof = libssh2_channel_eof(abstract->channel); + libssh2_channel_set_blocking(abstract->channel, abstract->is_blocking); +- zresource = php_ssh2_zval_from_resource_handle(abstract->session_rsrcid); +- session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); ++ session = (LIBSSH2_SESSION *)zend_fetch_resource(abstract->session_rsrc, PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); + + #ifdef PHP_SSH2_SESSION_TIMEOUT + if (abstract->is_blocking) { +@@ -137,8 +133,7 @@ static int php_ssh2_channel_stream_close(php_stream *stream, int close_handle) + } + libssh2_channel_eof(abstract->channel); + libssh2_channel_free(abstract->channel); +- //TODO Sean-Der +- //zend_list_delete(abstract->session_rsrcid); ++ zend_list_delete(abstract->session_rsrc); + } + efree(abstract); + +@@ -207,8 +202,8 @@ php_stream_ops php_ssh2_channel_stream_ops = { + * Parse an ssh2.*:// path + */ + php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stream_context *context, +- LIBSSH2_SESSION **psession, int *presource_id, +- LIBSSH2_SFTP **psftp, int *psftp_rsrcid) ++ LIBSSH2_SESSION **psession, zend_resource **presource, ++ LIBSSH2_SFTP **psftp, zend_resource **psftp_rsrc) + { + php_ssh2_sftp_data *sftp_data = NULL; + LIBSSH2_SESSION *session; +@@ -283,11 +278,10 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(zresource), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp); + if (sftp_data) { + /* Want the sftp layer */ +- //TODO Sean-Der +- //zend_list_addref(resource_id); +- *psftp_rsrcid = resource_id; ++ Z_ADDREF_P(zresource); ++ *psftp_rsrc = Z_RES_P(zresource); + *psftp = sftp_data->sftp; +- *presource_id = sftp_data->session_rsrcid; ++ *presource = sftp_data->session_rsrc; + *psession = sftp_data->session; + return resource; + } +@@ -305,18 +299,16 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); + sftp_data->sftp = sftp; + sftp_data->session = session; +- sftp_data->session_rsrcid = resource_id; +- //TODO Sean-Der +- //zend_list_addref(resource_id); +- *psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle; ++ sftp_data->session_rsrc = Z_RES_P(zresource); ++ Z_ADDREF_P(zresource); ++ *psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp); + *psftp = sftp; +- *presource_id = resource_id; ++ *presource = Z_RES_P(zresource); + *psession = session; + return resource; + } +- //TODO Sean-Der +- //zend_list_addref(resource_id); +- *presource_id = resource_id; ++ Z_ADDREF_P(zresource); ++ *presource = Z_RES_P(zresource); + *psession = session; + return resource; + } +@@ -330,9 +322,9 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + sftp_data = (php_ssh2_sftp_data *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SFTP_RES_NAME, le_ssh2_sftp); + if (sftp_data) { + Z_ADDREF_P(tmpzval); +- *psftp_rsrcid = Z_LVAL_P(tmpzval); ++ *psftp_rsrc = Z_RES_P(tmpzval); + *psftp = sftp_data->sftp; +- *presource_id = sftp_data->session_rsrcid; ++ *presource = sftp_data->session_rsrc; + *psession = sftp_data->session; + return resource; + } +@@ -354,17 +346,17 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); + sftp_data->sftp = sftp; + sftp_data->session = session; +- sftp_data->session_rsrcid = Z_LVAL_P(tmpzval); ++ sftp_data->session_rsrc = Z_RES_P(tmpzval); + Z_ADDREF_P(tmpzval); +- *psftp_rsrcid = zend_register_resource(sftp_data, le_ssh2_sftp)->handle; ++ *psftp_rsrc = zend_register_resource(sftp_data, le_ssh2_sftp); + *psftp = sftp; +- *presource_id = Z_RES_P(tmpzval)->handle; ++ *presource = Z_RES_P(tmpzval); + *psession = session; + return resource; + } + Z_ADDREF_P(tmpzval); + *psession = session; +- *presource_id = Z_LVAL_P(tmpzval); ++ *presource = Z_RES_P(tmpzval); + return resource; + } + } +@@ -465,8 +457,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + + /* Auth failure */ + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(Z_LVAL(zsession)); ++ zend_list_delete(Z_RES(zsession)); + return NULL; + + session_authed: +@@ -480,24 +471,22 @@ session_authed: + sftp = libssh2_sftp_init(session); + if (!sftp) { + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(Z_LVAL(zsession)); ++ zend_list_delete(Z_RES(zsession)); + return NULL; + } + + sftp_data = emalloc(sizeof(php_ssh2_sftp_data)); + sftp_data->session = session; + sftp_data->sftp = sftp; +- sftp_data->session_rsrcid = Z_LVAL(zsession); ++ sftp_data->session_rsrc = Z_RES(zsession); + + //TODO Sean-Der + //ZEND_REGISTER_RESOURCE(sftp_data, le_ssh2_sftp); +- *psftp_rsrcid = Z_LVAL(zsftp); ++ *psftp_rsrc = Z_RES(zsftp); + *psftp = sftp; + } + +- //TODO may be undefined +- *presource_id = Z_LVAL(zsession); ++ *presource = Z_RES(zsession); + *psession = session; + + return resource; +@@ -511,7 +500,7 @@ session_authed: + /* {{{ php_ssh2_shell_open + * Make a stream from a session + */ +-static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id, char *term, int term_len, zval *environment, long width, long height, long type) ++static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, zend_resource *resource, char *term, int term_len, zval *environment, long width, long height, long type) + { + LIBSSH2_CHANNEL *channel; + php_ssh2_channel_data *channel_data; +@@ -578,7 +567,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id + channel_data->streamid = 0; + channel_data->is_blocking = 0; + channel_data->timeout = 0; +- channel_data->session_rsrcid = resource_id; ++ channel_data->session_rsrc = resource; + channel_data->refcount = NULL; + + stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); +@@ -599,11 +588,12 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con + zend_long width = PHP_SSH2_DEFAULT_TERM_WIDTH; + zend_long height = PHP_SSH2_DEFAULT_TERM_HEIGHT; + zend_long type = PHP_SSH2_DEFAULT_TERM_UNIT; +- int resource_id = 0, terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1; ++ zend_resource *rsrc = NULL; ++ int terminal_len = sizeof(PHP_SSH2_DEFAULT_TERMINAL) - 1; + php_url *resource; + char *s; + +- resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &resource_id, NULL, NULL); ++ resource = php_ssh2_fopen_wraper_parse_path(path, "shell", context, &session, &rsrc, NULL, NULL); + if (!resource || !session) { + return NULL; + } +@@ -677,10 +667,9 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con + /* TODO: Accept resolution and environment vars as URL style parameters + * ssh2.shell://hostorresource/terminal/99x99c?envvar=envval&envvar=envval.... + */ +- stream = php_ssh2_shell_open(session, resource_id, terminal, terminal_len, environment, width, height, type); ++ stream = php_ssh2_shell_open(session, rsrc, terminal, terminal_len, environment, width, height, type); + if (!stream) { +- //TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + } + php_url_free(resource); + +@@ -730,7 +719,7 @@ PHP_FUNCTION(ssh2_shell) + + SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); + +- stream = php_ssh2_shell_open(session, Z_RES_P(zsession)->handle, term, term_len, environment, width, height, type); ++ stream = php_ssh2_shell_open(session, Z_RES_P(zsession), term, term_len, environment, width, height, type); + if (!stream) { + RETURN_FALSE; + } +@@ -749,7 +738,7 @@ PHP_FUNCTION(ssh2_shell) + /* {{{ php_ssh2_exec_command + * Make a stream from a session + */ +-static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_id, char *command, char *term, int term_len, zval *environment, long width, long height, long type) ++static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, zend_resource *rsrc, char *command, char *term, int term_len, zval *environment, long width, long height, long type) + { + LIBSSH2_CHANNEL *channel; + php_ssh2_channel_data *channel_data; +@@ -819,7 +808,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_ + channel_data->streamid = 0; + channel_data->is_blocking = 0; + channel_data->timeout = 0; +- channel_data->session_rsrcid = resource_id; ++ channel_data->session_rsrc = rsrc; + channel_data->refcount = NULL; + + stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); +@@ -836,7 +825,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons + LIBSSH2_SESSION *session = NULL; + php_stream *stream; + zval *tmpzval, *environment = NULL; +- int resource_id = 0; ++ zend_resource *rsrc = NULL; + php_url *resource; + char *terminal = NULL; + int terminal_len = 0; +@@ -844,14 +833,13 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons + long height = PHP_SSH2_DEFAULT_TERM_HEIGHT; + long type = PHP_SSH2_DEFAULT_TERM_UNIT; + +- resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &resource_id, NULL, NULL); ++ resource = php_ssh2_fopen_wraper_parse_path(path, "exec", context, &session, &rsrc, NULL, NULL); + if (!resource || !session) { + return NULL; + } + if (!resource->path) { + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + return NULL; + } + +@@ -893,10 +881,9 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons + zval_ptr_dtor(copyval); + } + +- stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); ++ stream = php_ssh2_exec_command(session, rsrc, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); + if (!stream) { +- // TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + } + php_url_free(resource); + +@@ -963,7 +950,7 @@ PHP_FUNCTION(ssh2_exec) + + SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); + +- stream = php_ssh2_exec_command(session, Z_RES_P(zsession)->handle, command, term, term_len, environment, width, height, type); ++ stream = php_ssh2_exec_command(session, Z_RES_P(zsession), command, term, term_len, environment, width, height, type); + if (!stream) { + RETURN_FALSE; + } +@@ -982,7 +969,7 @@ PHP_FUNCTION(ssh2_exec) + /* {{{ php_ssh2_scp_xfer + * Make a stream from a session + */ +-static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, char *filename) ++static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, zend_resource *rsrc, char *filename) + { + LIBSSH2_CHANNEL *channel; + php_ssh2_channel_data *channel_data; +@@ -1002,7 +989,7 @@ static php_stream *php_ssh2_scp_xfer(LIBSSH2_SESSION *session, int resource_id, + channel_data->streamid = 0; + channel_data->is_blocking = 0; + channel_data->timeout = 0; +- channel_data->session_rsrcid = resource_id; ++ channel_data->session_rsrc = rsrc; + channel_data->refcount = NULL; + + stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r"); +@@ -1018,28 +1005,26 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const + { + LIBSSH2_SESSION *session = NULL; + php_stream *stream; +- int resource_id = 0; ++ zend_resource *rsrc = NULL; + php_url *resource; + + if (strchr(mode, '+') || strchr(mode, 'a') || strchr(mode, 'w')) { + return NULL; + } + +- resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &resource_id, NULL, NULL); ++ resource = php_ssh2_fopen_wraper_parse_path(path, "scp", context, &session, &rsrc, NULL, NULL); + if (!resource || !session) { + return NULL; + } + if (!resource->path) { + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + return NULL; + } + +- stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path)); ++ stream = php_ssh2_scp_xfer(session, rsrc, SSH2_URL_STR(resource->path)); + if (!stream) { +- //TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + } + php_url_free(resource); + +@@ -1231,7 +1216,7 @@ PHP_FUNCTION(ssh2_scp_send) + /* {{{ php_ssh2_direct_tcpip + * Make a stream from a session + */ +-static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_id, char *host, int port) ++static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, zend_resource *rsrc, char *host, int port) + { + LIBSSH2_CHANNEL *channel; + php_ssh2_channel_data *channel_data; +@@ -1251,7 +1236,7 @@ static php_stream *php_ssh2_direct_tcpip(LIBSSH2_SESSION *session, int resource_ + channel_data->streamid = 0; + channel_data->is_blocking = 0; + channel_data->timeout = 0; +- channel_data->session_rsrcid = resource_id; ++ channel_data->session_rsrc = rsrc; + channel_data->refcount = NULL; + + stream = php_stream_alloc(&php_ssh2_channel_stream_ops, channel_data, 0, "r+"); +@@ -1270,9 +1255,9 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co + php_url *resource; + char *host = NULL; + int port = 0; +- int resource_id = 0; ++ zend_resource *rsrc; + +- resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &resource_id, NULL, NULL); ++ resource = php_ssh2_fopen_wraper_parse_path(path, "tunnel", context, &session, &rsrc, NULL, NULL); + if (!resource || !session) { + return NULL; + } +@@ -1303,15 +1288,13 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co + if ((port <= 0) || (port > 65535) || !host || (strlen(host) == 0)) { + /* Invalid connection criteria */ + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + return NULL; + } + +- stream = php_ssh2_direct_tcpip(session, resource_id, host, port); ++ stream = php_ssh2_direct_tcpip(session, rsrc, host, port); + if (!stream) { +- // TODO Sean-Der +- //zend_list_delete(resource_id); ++ zend_list_delete(rsrc); + } + php_url_free(resource); + +@@ -1352,7 +1335,7 @@ PHP_FUNCTION(ssh2_tunnel) + + SSH2_FETCH_AUTHENTICATED_SESSION(session, zsession); + +- stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession)->handle, host, port); ++ stream = php_ssh2_direct_tcpip(session, Z_RES_P(zsession), host, port); + if (!stream) { + RETURN_FALSE; + } +diff --git a/ssh2_sftp.c b/ssh2_sftp.c +index 6332be8..256fc70 100644 +--- a/ssh2_sftp.c ++++ b/ssh2_sftp.c +@@ -40,8 +40,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc) + + libssh2_sftp_shutdown(data->sftp); + +- // TODO Sean-Der +- //zend_list_delete(data->session_rsrcid); ++ zend_list_delete(data->session_rsrc); + + efree(data); + } +@@ -50,7 +49,7 @@ void php_ssh2_sftp_dtor(zend_resource *rsrc) + * SFTP File Ops * + ***************** */ + +-inline unsigned long php_ssh2_parse_fopen_modes(char *openmode) { ++unsigned long php_ssh2_parse_fopen_modes(char *openmode) { + unsigned long flags = 0; + + if (strchr(openmode, 'a')) { +@@ -101,7 +100,7 @@ inline int php_ssh2_sftp_attr2ssb(php_stream_statbuf *ssb, LIBSSH2_SFTP_ATTRIBUT + typedef struct _php_ssh2_sftp_handle_data { + LIBSSH2_SFTP_HANDLE *handle; + +- long sftp_rsrcid; ++ zend_resource *sftp_rsrc; + } php_ssh2_sftp_handle_data; + + /* {{{ php_ssh2_sftp_stream_write +@@ -139,8 +138,7 @@ static int php_ssh2_sftp_stream_close(php_stream *stream, int close_handle) + php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract; + + libssh2_sftp_close(data->handle); +- //TODO Sean-Der +- //zend_list_delete(data->sftp_rsrcid); ++ zend_list_delete(data->sftp_rsrc); + efree(data); + + return 0; +@@ -226,12 +224,12 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons + LIBSSH2_SFTP *sftp = NULL; + LIBSSH2_SFTP_HANDLE *handle; + php_stream *stream; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + unsigned long flags; + long perms = 0644; + +- resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp) { + return NULL; + } +@@ -242,20 +240,18 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons + if (!handle) { + php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(sftp_rsrcid); ++ zend_list_delete(sftp_rsrc); + return NULL; + } + + data = emalloc(sizeof(php_ssh2_sftp_handle_data)); + data->handle = handle; +- data->sftp_rsrcid = sftp_rsrcid; ++ data->sftp_rsrc = sftp_rsrc; + + stream = php_stream_alloc(&php_ssh2_sftp_stream_ops, data, 0, mode); + if (!stream) { + libssh2_sftp_close(handle); +- // TODO Sean-Der +- //zend_list_delete(sftp_rsrcid); ++ zend_list_delete(sftp_rsrc); + efree(data); + } + php_url_free(resource); +@@ -303,8 +299,7 @@ static int php_ssh2_sftp_dirstream_close(php_stream *stream, int close_handle) + php_ssh2_sftp_handle_data *data = (php_ssh2_sftp_handle_data*)stream->abstract; + + libssh2_sftp_close(data->handle); +- //TODO Sean_der +- //zend_list_delete(data->sftp_rsrcid); ++ zend_list_delete(data->sftp_rsrc); + efree(data); + + return 0; +@@ -333,10 +328,10 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c + LIBSSH2_SFTP *sftp = NULL; + LIBSSH2_SFTP_HANDLE *handle; + php_stream *stream; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + +- resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(filename, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp) { + return NULL; + } +@@ -345,20 +340,18 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c + if (!handle) { + php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); + php_url_free(resource); +- //TODO Sean-Der +- //zend_list_delete(sftp_rsrcid); ++ zend_list_delete(sftp_rsrc); + return NULL; + } + + data = emalloc(sizeof(php_ssh2_sftp_handle_data)); + data->handle = handle; +- data->sftp_rsrcid = sftp_rsrcid; ++ data->sftp_rsrc = sftp_rsrc; + + stream = php_stream_alloc(&php_ssh2_sftp_dirstream_ops, data, 0, mode); + if (!stream) { + libssh2_sftp_close(handle); +- //TODO Sean-Der +- //zend_list_delete(sftp_rsrcid); ++ zend_list_delete(sftp_rsrc); + efree(data); + } + php_url_free(resource); +@@ -378,10 +371,10 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i + LIBSSH2_SFTP_ATTRIBUTES attrs; + LIBSSH2_SESSION *session = NULL; + LIBSSH2_SFTP *sftp = NULL; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + +- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp || !resource->path) { + return -1; + } +@@ -408,11 +401,11 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in + { + LIBSSH2_SESSION *session = NULL; + LIBSSH2_SFTP *sftp = NULL; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + int result; + +- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp || !resource->path) { + if (resource) { + php_url_free(resource); +@@ -436,7 +429,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro + { + LIBSSH2_SESSION *session = NULL; + LIBSSH2_SFTP *sftp = NULL; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource, *resource_to; + int result; + +@@ -453,7 +446,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro + return 0; + } + +- resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(url_from, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp || !resource->path) { + if (resource) { + php_url_free(resource); +@@ -479,11 +472,11 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int + { + LIBSSH2_SESSION *session = NULL; + LIBSSH2_SFTP *sftp = NULL; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + int result; + +- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp || !resource->path) { + if (resource) { + php_url_free(resource); +@@ -515,11 +508,11 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int + { + LIBSSH2_SESSION *session = NULL; + LIBSSH2_SFTP *sftp = NULL; +- int resource_id = 0, sftp_rsrcid = 0; ++ zend_resource *rsrc = NULL, *sftp_rsrc = NULL; + php_url *resource; + int result; + +- resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &resource_id, &sftp, &sftp_rsrcid); ++ resource = php_ssh2_fopen_wraper_parse_path(url, "sftp", context, &session, &rsrc, &sftp, &sftp_rsrc); + if (!resource || !session || !sftp || !resource->path) { + if (resource) { + php_url_free(resource); +@@ -591,7 +584,7 @@ PHP_FUNCTION(ssh2_sftp) + data = emalloc(sizeof(php_ssh2_sftp_data)); + data->session = session; + data->sftp = sftp; +- data->session_rsrcid = Z_RES_P(zsession)->handle; ++ data->session_rsrc = Z_RES_P(zsession); + Z_ADDREF_P(zsession); + + RETURN_RES(zend_register_resource(data, le_ssh2_sftp)); +-- +2.1.4 + diff --git a/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch new file mode 100644 index 000000000000..1f1352564220 --- /dev/null +++ b/dev-php/pecl-ssh2/files/pecl-ssh2-1.1.2-fix-php_url-fields-usage-for-php7-3.patch @@ -0,0 +1,302 @@ +From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001 +From: Remi Collet +Date: Thu, 28 Jun 2018 07:10:35 +0200 +Subject: [PATCH] fix php_url fields usage for PHP 7.3 + +--- + php_ssh2.h | 8 ++++++++ + ssh2_fopen_wrappers.c | 55 ++++++++++++++++++++++++++++++++------------------- + ssh2_sftp.c | 20 +++++++++---------- + 3 files changed, 53 insertions(+), 30 deletions(-) + +diff --git a/php_ssh2.h b/php_ssh2.h +index 734b795..d010ff9 100644 +--- a/php_ssh2.h ++++ b/php_ssh2.h +@@ -166,6 +166,14 @@ extern php_stream_wrapper php_ssh2_sftp_wrapper; + extern int le_ssh2_session; + extern int le_ssh2_sftp; + ++#if PHP_VERSION_ID < 70300 ++#define SSH2_URL_STR(a) (a) ++#define SSH2_URL_LEN(a) strlen(a) ++#else ++#define SSH2_URL_STR(a) ZSTR_VAL(a) ++#define SSH2_URL_LEN(a) ZSTR_LEN(a) ++#endif ++ + #endif /* PHP_SSH2_H */ + + /* +diff --git a/ssh2_fopen_wrappers.c b/ssh2_fopen_wrappers.c +index 2f96ca4..f2f3475 100644 +--- a/ssh2_fopen_wrappers.c ++++ b/ssh2_fopen_wrappers.c +@@ -215,7 +215,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + php_url *resource; + zval *methods = NULL, *callbacks = NULL, zsession, *tmpzval; + zend_long resource_id; +- char *h, *s, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL; ++ char *h, *username = NULL, *password = NULL, *pubkey_file = NULL, *privkey_file = NULL; + int username_len = 0, password_len = 0; + + h = strstr(path, "Resource id #"); +@@ -233,13 +233,13 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + return NULL; + } + +- if (strncmp(resource->scheme, "ssh2.", sizeof("ssh2.") - 1)) { ++ if (strncmp(SSH2_URL_STR(resource->scheme), "ssh2.", sizeof("ssh2.") - 1)) { + /* Not an ssh wrapper */ + php_url_free(resource); + return NULL; + } + +- if (strcmp(resource->scheme + sizeof("ssh2.") - 1, type)) { ++ if (strcmp(SSH2_URL_STR(resource->scheme) + sizeof("ssh2.") - 1, type)) { + /* Wrong ssh2. wrapper type */ + php_url_free(resource); + return NULL; +@@ -253,13 +253,27 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + Find resource->path in the path string, then copy the entire string from the original path. + This includes ?query#fragment in the path string + */ ++// TODO copy seems uneeded ++#if PHP_VERSION_ID < 70300 ++ { ++ char * s; ++ + s = resource->path; + resource->path = estrdup(strstr(path, resource->path)); + efree(s); ++ } ++#else ++ { ++ zend_string *tmp; ++ ++ tmp = resource->path; ++ resource->path = zend_string_init(ZSTR_VAL(resource->path), ZSTR_LEN(resource->path), 0); ++ zend_string_release(tmp); ++ } ++#endif + + /* Look for a resource ID to reuse a session */ +- s = resource->host; +- if (is_numeric_string(s, strlen(s), &resource_id, NULL, 0) == IS_LONG) { ++ if (is_numeric_string(SSH2_URL_STR(resource->host), SSH2_URL_LEN(resource->host), &resource_id, NULL, 0) == IS_LONG) { + php_ssh2_sftp_data *sftp_data; + zval *zresource; + +@@ -309,7 +323,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + } + + /* Fallback on finding it in the context */ +- if (resource->host[0] == 0 && context && psftp && ++ if (SSH2_URL_STR(resource->host)[0] == 0 && context && psftp && + (tmpzval = php_stream_context_get_option(context, "ssh2", "sftp")) != NULL && + Z_TYPE_P(tmpzval) == IS_RESOURCE) { + php_ssh2_sftp_data *sftp_data; +@@ -323,7 +337,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + return resource; + } + } +- if (resource->host[0] == 0 && context && ++ if (SSH2_URL_STR(resource->host)[0] == 0 && context && + (tmpzval = php_stream_context_get_option(context, "ssh2", "session")) != NULL && + Z_TYPE_P(tmpzval) == IS_RESOURCE) { + session = (LIBSSH2_SESSION *)zend_fetch_resource(Z_RES_P(tmpzval), PHP_SSH2_SESSION_RES_NAME, le_ssh2_session); +@@ -399,19 +413,19 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + } + + if (resource->user) { +- int len = strlen(resource->user); ++ int len = SSH2_URL_LEN(resource->user); + + if (len) { +- username = resource->user; ++ username = SSH2_URL_STR(resource->user); + username_len = len; + } + } + + if (resource->pass) { +- int len = strlen(resource->pass); ++ int len = SSH2_URL_LEN(resource->pass); + + if (len) { +- password = resource->pass; ++ password = SSH2_URL_STR(resource->pass); + password_len = len; + } + } +@@ -422,7 +436,7 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre + return NULL; + } + +- session = php_ssh2_session_connect(resource->host, resource->port, methods, callbacks); ++ session = php_ssh2_session_connect(SSH2_URL_STR(resource->host), resource->port, methods, callbacks); + if (!session) { + /* Unable to connect! */ + php_url_free(resource); +@@ -482,6 +496,7 @@ session_authed: + *psftp = sftp; + } + ++ //TODO may be undefined + *presource_id = Z_LVAL(zsession); + *psession = session; + +@@ -527,7 +542,7 @@ static php_stream *php_ssh2_shell_open(LIBSSH2_SESSION *session, int resource_id + zval_copy_ctor(©val); + convert_to_string(©val); + if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) { +- php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval)); ++ php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval)); + } + zval_dtor(©val); + } +@@ -631,7 +646,7 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con + zval_ptr_dtor(©val); + } + +- s = resource->path ? resource->path : NULL; ++ s = resource->path ? SSH2_URL_STR(resource->path) : NULL; + + if (s && s[0] == '/') { + /* Terminal type encoded into URL overrides context terminal type */ +@@ -766,7 +781,7 @@ static php_stream *php_ssh2_exec_command(LIBSSH2_SESSION *session, int resource_ + zval_copy_ctor(©val); + convert_to_string(©val); + if (libssh2_channel_setenv_ex(channel, key->val, key->len, Z_STRVAL(copyval), Z_STRLEN(copyval))) { +- php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", key, Z_STRVAL(copyval)); ++ php_error_docref(NULL, E_WARNING, "Failed setting %s=%s on remote end", ZSTR_VAL(key), Z_STRVAL(copyval)); + } + zval_dtor(©val); + } +@@ -878,7 +893,7 @@ static php_stream *php_ssh2_fopen_wrapper_exec(php_stream_wrapper *wrapper, cons + zval_ptr_dtor(copyval); + } + +- stream = php_ssh2_exec_command(session, resource_id, resource->path + 1, terminal, terminal_len, environment, width, height, type); ++ stream = php_ssh2_exec_command(session, resource_id, SSH2_URL_STR(resource->path) + 1, terminal, terminal_len, environment, width, height, type); + if (!stream) { + // TODO Sean-Der + //zend_list_delete(resource_id); +@@ -1021,7 +1036,7 @@ static php_stream *php_ssh2_fopen_wrapper_scp(php_stream_wrapper *wrapper, const + return NULL; + } + +- stream = php_ssh2_scp_xfer(session, resource_id, resource->path); ++ stream = php_ssh2_scp_xfer(session, resource_id, SSH2_URL_STR(resource->path)); + if (!stream) { + //TODO Sean-Der + //zend_list_delete(resource_id); +@@ -1147,7 +1162,7 @@ PHP_FUNCTION(ssh2_scp_send) + char *error_msg = NULL; + + last_error = libssh2_session_last_error(session, &error_msg, NULL, 0); +- php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s", error_msg); ++ php_error_docref(NULL, E_WARNING, "Failure creating remote file: %s (%d)", error_msg, last_error); + php_stream_close(local_file); + RETURN_FALSE; + } +@@ -1262,10 +1277,10 @@ static php_stream *php_ssh2_fopen_wrapper_tunnel(php_stream_wrapper *wrapper, co + return NULL; + } + +- if (resource->path && resource->path[0] == '/') { ++ if (resource->path && SSH2_URL_STR(resource->path)[0] == '/') { + char *colon; + +- host = resource->path + 1; ++ host = SSH2_URL_STR(resource->path) + 1; + if (*host == '[') { + /* IPv6 Encapsulated Format */ + host++; +diff --git a/ssh2_sftp.c b/ssh2_sftp.c +index 13f89f0..6332be8 100644 +--- a/ssh2_sftp.c ++++ b/ssh2_sftp.c +@@ -238,7 +238,7 @@ static php_stream *php_ssh2_sftp_stream_opener(php_stream_wrapper *wrapper, cons + + flags = php_ssh2_parse_fopen_modes((char *)mode); + +- handle = libssh2_sftp_open(sftp, resource->path, flags, perms); ++ handle = libssh2_sftp_open(sftp, SSH2_URL_STR(resource->path), flags, perms); + if (!handle) { + php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); + php_url_free(resource); +@@ -341,7 +341,7 @@ static php_stream *php_ssh2_sftp_dirstream_opener(php_stream_wrapper *wrapper, c + return NULL; + } + +- handle = libssh2_sftp_opendir(sftp, resource->path); ++ handle = libssh2_sftp_opendir(sftp, SSH2_URL_STR(resource->path)); + if (!handle) { + php_error_docref(NULL, E_WARNING, "Unable to open %s on remote host", filename); + php_url_free(resource); +@@ -386,7 +386,7 @@ static int php_ssh2_sftp_urlstat(php_stream_wrapper *wrapper, const char *url, i + return -1; + } + +- if (libssh2_sftp_stat_ex(sftp, resource->path, strlen(resource->path), ++ if (libssh2_sftp_stat_ex(sftp, SSH2_URL_STR(resource->path), SSH2_URL_LEN(resource->path), + (flags & PHP_STREAM_URL_STAT_LINK) ? LIBSSH2_SFTP_LSTAT : LIBSSH2_SFTP_STAT, &attrs)) { + php_url_free(resource); + //zend_list_delete(sftp_rsrcid); +@@ -420,7 +420,7 @@ static int php_ssh2_sftp_unlink(php_stream_wrapper *wrapper, const char *url, in + return 0; + } + +- result = libssh2_sftp_unlink(sftp, resource->path); ++ result = libssh2_sftp_unlink(sftp, SSH2_URL_STR(resource->path)); + php_url_free(resource); + + //zend_list_delete(sftp_rsrcid); +@@ -462,7 +462,7 @@ static int php_ssh2_sftp_rename(php_stream_wrapper *wrapper, const char *url_fro + return 0; + } + +- result = libssh2_sftp_rename(sftp, resource->path, resource_to->path); ++ result = libssh2_sftp_rename(sftp, SSH2_URL_STR(resource->path), SSH2_URL_STR(resource_to->path)); + php_url_free(resource); + php_url_free(resource_to); + +@@ -493,13 +493,13 @@ static int php_ssh2_sftp_mkdir(php_stream_wrapper *wrapper, const char *url, int + + if (options & PHP_STREAM_MKDIR_RECURSIVE) { + /* Just attempt to make every directory, some will fail, but we only care about the last success/failure */ +- char *p = resource->path; ++ char *p = SSH2_URL_STR(resource->path); + while ((p = strchr(p + 1, '/'))) { +- libssh2_sftp_mkdir_ex(sftp, resource->path, p - resource->path, mode); ++ libssh2_sftp_mkdir_ex(sftp, SSH2_URL_STR(resource->path), p - SSH2_URL_STR(resource->path), mode); + } + } + +- result = libssh2_sftp_mkdir(sftp, resource->path, mode); ++ result = libssh2_sftp_mkdir(sftp, SSH2_URL_STR(resource->path), mode); + php_url_free(resource); + + //zend_list_delete(sftp_rsrcid); +@@ -527,7 +527,7 @@ static int php_ssh2_sftp_rmdir(php_stream_wrapper *wrapper, const char *url, int + return 0; + } + +- result = libssh2_sftp_rmdir(sftp, resource->path); ++ result = libssh2_sftp_rmdir(sftp, SSH2_URL_STR(resource->path)); + php_url_free(resource); + + //zend_list_delete(sftp_rsrcid); +@@ -836,7 +836,7 @@ PHP_FUNCTION(ssh2_sftp_readlink) + } + + if ((targ_len = libssh2_sftp_symlink_ex(data->sftp, link->val, link->len, targ, 8192, LIBSSH2_SFTP_READLINK)) < 0) { +- php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", link); ++ php_error_docref(NULL, E_WARNING, "Unable to read link '%s'", ZSTR_VAL(link)); + RETURN_FALSE; + } + +-- +2.1.4 + diff --git a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild index 619e242eff17..7001e2010d53 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-1.1.2.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="ssh2" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-1 php7-2 php7-3" DESCRIPTION="PHP bindings for the libssh2 library" LICENSE="PHP-3.01" @@ -21,8 +21,13 @@ DEPEND=">=net-libs/libssh2-1.2[-gcrypt]" RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-ssh2:0[php_targets_php5-6] )" +PATCHES=( + "${FILESDIR}"/${P}-fix-php_url-fields-usage-for-php7-3.patch + "${FILESDIR}"/${P}-fix-php7-port.patch +) + src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2; then + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3; then php-ext-source-r3_src_prepare else default_src_prepare diff --git a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild index e493a7b71a86..72ef46fdff15 100644 --- a/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild +++ b/dev-php/pecl-ssh2/pecl-ssh2-9999.ebuild @@ -1,16 +1,16 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="7" PHP_EXT_NAME="ssh2" -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-1 php7-2 php7-3" 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" +USE_PHP="php7-1 php7-2 php7-3" DESCRIPTION="PHP bindings for the libssh2 library" LICENSE="PHP-3.01" @@ -23,7 +23,7 @@ RDEPEND="${DEPEND} 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 + if use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-source-r3_src_prepare else default_src_prepare diff --git a/dev-php/pecl-taint/Manifest b/dev-php/pecl-taint/Manifest index 85f03a82274e..11687b25aa69 100644 --- a/dev-php/pecl-taint/Manifest +++ b/dev-php/pecl-taint/Manifest @@ -1,5 +1,7 @@ DIST taint-2.0.2.tgz 18550 BLAKE2B 70bd0425ab179c5313108a363b24310ed0c438a208ec15158d8c760cc8e2514b1031554827ced569c71cdb5109634463f75ca583fcc5cad56946947ab569fe25 SHA512 fe1375062f716a32b093942d173cf78024ed457fb5980ec8b50852ca922d8e15ec82696be2478cbbf8b9cd0620be0c2f88b18de55dec4dacec5be664b95c7108 DIST taint-2.0.4.tgz 18063 BLAKE2B 1ef1d44cc3dac5e25aeeac86b04d491e050174ed9ced1424729b29531917baf0776c8a6d78bc2d7b42bc768ba6744833d08c8df525d5fdd962b590b2d4c2a009 SHA512 d1c265e0fa4293b2aeb0f7413b852e85c6c321c67e31ff8fd51afefd157af4b733dfdf1452f50bcf3b05c1b5f26de9ebabe4ebe862657a05c4b6abc6770c2c7f +DIST taint-2.0.5.tgz 18203 BLAKE2B 1e7d31f5a4eee810923420606892f2cd672d4fdcaf6decda1966d0ad44f779cf019a624c0f5971a44e8ceadf37159359f41ff52f523157eace26d7335405bad6 SHA512 625809e553d782dc6bb41b4dace1a32bf47157e3438430b3717e0ca692959625b293011220e47f95f4b484558e39454138b0760806fcd1e4ae42f608ab290b31 EBUILD pecl-taint-2.0.2.ebuild 425 BLAKE2B 229e8816bd226a259ca73d97a3796cb5f1217fe059333dd47bf961bae498582d04ec1888895610fda229513b8e02f373b36e752330838f0c098ef6ec67e87d83 SHA512 bc62f5828f98be1bbfad72e58aac0a7d6f12bb21fd632b684841231879b0726db19d47cc9d488318e13ffa035863915d5e743976ec7404c54496d5f83988b0b9 EBUILD pecl-taint-2.0.4.ebuild 432 BLAKE2B 3af9a1e629f986dc10764a5fb1c39cc41862c2998fd88ca51009adf0978f6a26d6343bd1abc8081d487398e1e31172dc238451bc592762900744ec155b61086a SHA512 50d97b6e65260e210bc457a668d9a25766d3496591ca4456fddb87a97e09669d7459c1bbc51043aadc58940feea221383b2ea06a039f4d1d045e33ac5ae51768 +EBUILD pecl-taint-2.0.5.ebuild 431 BLAKE2B 9bbaa821a7f976b4548bd2f516b6fd948e2a7e96baf33dd8344a36e69ff677ade9ae050accfbd339d190dd58e956d9e2f26045c2c304ee13071ddaa26912b97c SHA512 beb8c6819462f93efa3a22931f18ac128ef3fcbd6f33bf0d69d4236b74b2b019a6ac978f0b2bb7d2e5e906830f7ebb5ba76bba2e56fb3325213f1fd52259f898 MISC metadata.xml 345 BLAKE2B 1bce954b00c4fe92867211caee4fc891eee89ebea7550eef40e775794fd13b285f3b00e1ad25f5b8c967b946bf3545a661053068a2c077e8051bd30915b55049 SHA512 f6c8ba5b96f05f24c3e2b7245fc72b9ee34ddc61a335081cf50d4e0f9915d3891599ff9e086d52f7d19a44c633d9a880941d8a18c5a583659c410de2086b6717 diff --git a/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild b/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild new file mode 100644 index 000000000000..916d01e54270 --- /dev/null +++ b/dev-php/pecl-taint/pecl-taint-2.0.5.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php7-1 php7-2 php7-3" +inherit php-ext-pecl-r3 + +DESCRIPTION="Extension used for detecting XSS code (tainted strings)" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +pkg_postinst() { + elog 'To enable this extension, add' + elog ' taint.enable=1' + elog 'to /etc/php/-/ext/taint.ini' +} diff --git a/dev-php/pecl-timezonedb/Manifest b/dev-php/pecl-timezonedb/Manifest index 862a662b1ca2..382450452c38 100644 --- a/dev-php/pecl-timezonedb/Manifest +++ b/dev-php/pecl-timezonedb/Manifest @@ -1,9 +1,3 @@ -DIST timezonedb-2016.10.tgz 421824 BLAKE2B 900bc7a7e3450a3da119262bb67815dbec921d9f730c37bdc9859ad3a7f87ed4b1e9379e08ba7ede018737a4b5fd998cb2f740c1c7367aeb0c4036224274aa6b SHA512 062c5cec18ba091a1b38fcf07059b42b2aad1205fd4b83e87f2a6b59ab68b9a2906a46a9f24214b7feeb802f126282b612cb866870a31f58c7c7e30f54040731 -DIST timezonedb-2017.3.tgz 421152 BLAKE2B 1d2579d88d1c1f5a00d46488d54606ba24a63d4b7c267121bdd7cc725e3dbc7d7484a9988fdbaff186bbceda130bb31e6e8f01c45d53c25d61c4b55092c8a390 SHA512 5f6064064a71bf973f7581d452cad909ca2203c4c8773ca7cb31307c3cbe63613adf972cfc6c7b0800215018e2fb3c4b7a2d7d0df171243319ab63047e9099fc -DIST timezonedb-2018.7.tgz 417137 BLAKE2B e2a886b7621167c422b8001d3cff74ca2b09f4a46450ebb1e727274afa5147f748bc21310153570a07d0ce8a991c7406590ab8ff88f687bddcfc432615311419 SHA512 fb8f79a53f5b10a6c01a3a43b33bdefe371ca8c6f5725b28f9efbbe009d2dd089a1747ef20ba1b8694e240ef4133dea8d6d09e8c483127f5d6932a9468106654 -DIST timezonedb-2018.9.tgz 421071 BLAKE2B 2baba263520b1ce166c222c1a800c4d54e872e3ca96787e574a5f2d968317e7b3735f23b410f9e583a31c5be9e22364f85d7a68dc4c99a8236bcbc7b8c5c0b9d SHA512 77fabe3aa0283900ea2d3d20caaf7c4b9bac1859249c9df4f0225c203fc92310dfe9b4144640af034a4ba86ba78a748a39980ff796affc67edc99ec874867e06 -EBUILD pecl-timezonedb-2016.10.ebuild 441 BLAKE2B f91b956ea57b0c77c4d135fcfbde816f9f5f6b284791442f6579eabc4f6d4eb426a072af4ffc65e85d5fc695140a8cc45e69626f448357e58646503037d0123f SHA512 8cae37b48ea29ea53f9c26c6d835c1a13810669398e98069651ab9c0913646dbe5b6f7f0e9c3ea7c76bdd1470490b8cf5314d9cb24360f38a5308e8d715bacde -EBUILD pecl-timezonedb-2017.3.ebuild 455 BLAKE2B 37eca70ef8e6b10c32e31f39a7d1c6d1ea0814178007d4f9d5016e07f3e2a5543d5e187df2a9329043d8f520f5b92d7171f088b520c5d9268e5f0e7f0ca77d77 SHA512 69ac53b3324ec436a02645eb847452cc3e2a3c9c6db30d4b68011f73d56d885c26728fb64f61add6d2dda2c4606817d8d8874f031c677a167edb53e267981dd1 -EBUILD pecl-timezonedb-2018.7.ebuild 459 BLAKE2B 138c06a03b3a8e3bd2ed8d51def05698c9a86f9b0714fba2754fd59add20a7a7c5e7fc35e6ffbd5d33fa8f5cc0c8330ad3d192103954441489db4da105d7f6a1 SHA512 ad079c3ee82eff43543b6374404b8f1664be148038eace5771a50b534eb0669ee485537b5da6e256a299e6f34d571930e1dec1bf294e7946f9315dbfc53ca8bf -EBUILD pecl-timezonedb-2018.9.ebuild 454 BLAKE2B c3ebd7cd1f0299aacf633f08b6dc6364161f0f24307815833c92facba41b24c9969b93512c67cb5d5467ed16016a734c5e32a70bb6c80fbd9a610e6e9becff5e SHA512 b05fe3563b0cdaaf875a8671dcce9289c96254ecf8e443b49aef93f1c7b03d18a7c5664f46a7a07e632224b7a33af29f6f4d7c702e9e07f87e9e0ebebd8fe913 +DIST timezonedb-2019.1.tgz 421301 BLAKE2B d7f13a399d81592538ef9910219b36ce8ed16e0450a711abc966f4d82165be671e34666d565912974bf7e065349ce6a59696e2f9d5d1b3a207915a6ec4381cc2 SHA512 c813f74461b3e4f1cbd6efad41918e632bbcc6481a48c33d677cb5132ff0ef8964995a6f47e8cbcf276f02c48c9a27f3f0301a1d41522405f28ae7dc627db504 +EBUILD pecl-timezonedb-2019.1.ebuild 454 BLAKE2B c3ebd7cd1f0299aacf633f08b6dc6364161f0f24307815833c92facba41b24c9969b93512c67cb5d5467ed16016a734c5e32a70bb6c80fbd9a610e6e9becff5e SHA512 b05fe3563b0cdaaf875a8671dcce9289c96254ecf8e443b49aef93f1c7b03d18a7c5664f46a7a07e632224b7a33af29f6f4d7c702e9e07f87e9e0ebebd8fe913 MISC metadata.xml 635 BLAKE2B 9c3fa685e184fdb85fd630b9bbbd69bfc20569455f1fa84f147b2d2404739077f5bffbe2c4e5d1a1ff28a9f2ec36bb04d7d55952c7cee4cc5ee3dbc1b11bbc40 SHA512 3b06142a7f995b5859650fa156973deb5cf783be8ee123dc2820f1c4a0d8588d6c73a739a3fe547a3b450ee544a0a69abd260c44d53c87ba0c9911cd68e539dc diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild deleted file mode 100644 index 896160f9e570..000000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2016.10.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="timezonedb" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Timezone Database to be used with PHP's date and time functions" -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild deleted file mode 100644 index 5726f88a5132..000000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2017.3.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="timezonedb" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1 php7-2" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Timezone Database to be used with PHP's date and time functions" -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild deleted file mode 100644 index b1218beaf0a3..000000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2018.7.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PHP_EXT_NAME="timezonedb" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Timezone Database to be used with PHP's date and time functions" -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2018.9.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2018.9.ebuild deleted file mode 100644 index 415e14ad0f0c..000000000000 --- a/dev-php/pecl-timezonedb/pecl-timezonedb-2018.9.ebuild +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -PHP_EXT_NAME="timezonedb" -PHP_EXT_INI="yes" -PHP_EXT_ZENDEXT="no" - -USE_PHP="php5-6 php7-1 php7-2 php7-3" - -inherit php-ext-pecl-r3 - -DESCRIPTION="Timezone Database to be used with PHP's date and time functions" -LICENSE="PHP-3" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" -IUSE="" -PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-timezonedb/pecl-timezonedb-2019.1.ebuild b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.1.ebuild new file mode 100644 index 000000000000..415e14ad0f0c --- /dev/null +++ b/dev-php/pecl-timezonedb/pecl-timezonedb-2019.1.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="timezonedb" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php5-6 php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 + +DESCRIPTION="Timezone Database to be used with PHP's date and time functions" +LICENSE="PHP-3" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86" +IUSE="" +PHP_EXT_ECONF_ARGS="" diff --git a/dev-php/pecl-translit/Manifest b/dev-php/pecl-translit/Manifest index 6add2621160b..82bb7c1e3b03 100644 --- a/dev-php/pecl-translit/Manifest +++ b/dev-php/pecl-translit/Manifest @@ -1,3 +1,5 @@ DIST pecl-translit-0.6.2.tar.gz 226445 BLAKE2B c5fbf99134b7f933f1d8209ebffa97a28c927b8db917319a9308debfa4275d8e6e3e0c261cfb0661c8202f25c0cdf5a888bc90f356cd80a2ab788366c4c3cb85 SHA512 1d5229ceb2c06f5e4a9e3f7e1e760fc2974c01b732f8e220b9b1ddd49a82c932f4237fb6a19c82017270614881156f9637cffbe7896132e4a07e7a6547915ebb +DIST pecl-translit-0.6.3.tar.gz 227419 BLAKE2B ebff291a00d61bb4f8e2c47e26baef4278f317be8acd7e5265d3056f8992e6b7e792718c86633277c4a0af5403e253b317241a71aba9b73079a8efb53389ab30 SHA512 5b5e3097a972e45424696abea4d4698fc6c7b6598f1a76754224a4b66776752a01b3bad52bc14afb8cc6e75d36c4558677e609a379898cdd91a5b0a652155cd1 EBUILD pecl-translit-0.6.2-r2.ebuild 774 BLAKE2B 0721d8d612cf3326fc3975cb350bfcf435eaab1d5c2154c006e3b9db70a419017040a5dbf816400a7ce5cef9880e1b019bccd1ea3a5fdf00ff6d431aab73ab2a SHA512 a59ef148f8a099b043df99d0fedad0a8f2e5eb5d560a722165365c92366d0eff71724e1e7b67ee0fbe71571a4e5bdd1a24abda69c8456cc1312f4f3f0c5cea7f +EBUILD pecl-translit-0.6.3.ebuild 697 BLAKE2B b6026afc2fde1479aa86e8802579e8c77410c9068c050c0368a02749cc93dd87b9b2509671ef17e514231f31663f04f5ae82e06e89e8e5972125f26c32ed9271 SHA512 6e7559b18f73e91a485cc06280ea98f4b00809be26300c09f19e95e311ece8c9041b615b39e23739fe0c63ccb48f8592bb226a88eec1b66b9ad3b6cc8454da46 MISC metadata.xml 325 BLAKE2B a089699f9d6ab5df97554c8ff39057077aa28eb48f636adf1d2f85eafb3a4952d7c1dc5b86e1bf1e147bf020ed27119a3567c23b7fcd562ca44966970addbbc5 SHA512 b81117beceea889e292daa2bfad712b51f40a2e12e826388bc0d0f2ae2455dacbcdb4a041fdc72bdbfcc123af11c87346643fd0298b0c2bc726c13ede3a2ea5e diff --git a/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild new file mode 100644 index 000000000000..b0b109824d15 --- /dev/null +++ b/dev-php/pecl-translit/pecl-translit-0.6.3.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PHP_EXT_NAME="translit" +PHP_EXT_INI="yes" +PHP_EXT_ZENDEXT="no" + +USE_PHP="php7-1 php7-2 php7-3" +PHP_EXT_NAME="translit" + +inherit php-ext-source-r3 + +SRC_URI="https://github.com/derickr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +KEYWORDS="~amd64 ~x86" +HOMEPAGE="https://github.com/derickr/pecl-translit" + +DESCRIPTION="Transliterates non-latin character sets to latin" +LICENSE="BSD-2" +SLOT="0" +IUSE="" +PHP_EXT_ECONF_ARGS=() + +src_test() { + for slot in $(php_get_slots); do + php_init_slot_env ${slot} + NO_INTERACTION="yes" emake test || die "emake test failed for slot ${slot}" + done +} diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index 878b07617bb2..f37a865017aa 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1,4 +1,4 @@ AUX 1.0.3.1-php7.patch 4948 BLAKE2B 12ee139944a17989429e696e7457a3926d18f4300bf5bc2f9bfab2a036be88a47ea03ca64f06e378bb2811fdaba390e29a905eae87362c4a979c17407de53f3c SHA512 5b913ac4c006cee917ddb7140dd2e34dee6da9fac11001e6ee9f41ac0b65e3caa493c81612b05ef8ff99fec9c9a4cd4a2c2c275fc6124223d04648d43cae4fe4 DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb -EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 563 BLAKE2B fcc84e59b3228d4b94707e58bf56c1fdc9e189ce8b314fd2c4f80fc8dd1d8d5d4dab978ad94570c31f92713f281146c4057e07c45f9f01819da222dc26039294 SHA512 e9aa81d47e2d1b5e253bf2aea06f0989ee429e11df963115f34f1c8d2ced49ff9c6e7ba6d4fd0534965a447ecb6f9fd0b62235621b67a047a73cfe4185c2d4e0 +EBUILD pecl-uploadprogress-1.0.3.1-r4.ebuild 567 BLAKE2B c9b42950b4ba8007c3ac5bbcc0ea4cac02a5a15cf36184eb4cf4d223af6ed160a33c1322d9e17fcc00840fa6609daeeff51de5219473b7fcd2d1f009c939cb0b SHA512 67bc7efe35098a542f2728010bb814540a4652377346ea164079b880726bc5a3807b6f1fd73968d5ff216c3be51e4e00e989fad785ad0feb7b66792a5716005c MISC metadata.xml 526 BLAKE2B 719015d4f11e9af4765f71ca1b8706fdf93c214ac7390f72579068151adebe0c39a29019201323aff6668ca2c7b31daeab247a867262138358a29034238a875a SHA512 18d72c569825f9dfd79a69d4ad1bc824f99001f2b1545aaaf6777a67050d9812dd81737c9e74bc9520aa5b375db4d94c5219f359eeaa5c8d7ae0a6437c96ec56 diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild index 062036ebd698..2567eab87ec1 100644 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-uuid/Manifest b/dev-php/pecl-uuid/Manifest index 239510e1f7f8..bafe51b01887 100644 --- a/dev-php/pecl-uuid/Manifest +++ b/dev-php/pecl-uuid/Manifest @@ -1,3 +1,3 @@ DIST uuid-1.0.4.tgz 14900 BLAKE2B d653329fbac1bec66d842e048b290ac6b0382f78e6ccd6f2158bafaaa375ae4e951f794d4b70c139b23a28d6ddbc1f44be47cf2af0bd2fd09de33beb17b0f837 SHA512 989d993f8158a13026b8e5c02f4aa50489b1a946d12da81dd1fff6091839a45b180562f74c8af368a498c495477374ec9e1d536e7de0178c1f288e3abe360164 -EBUILD pecl-uuid-1.0.4-r2.ebuild 425 BLAKE2B 87a37601431502d73fc71875098d26d302093c78821035f21d51fe00205cb440bca2145660a6f87ff61bbeb550cc8bfe331d656d67e6a7d6570fe8c31ef073fb SHA512 e64de3ff12aa08ea9a5a43659cbba984622d5ebda5d20a1d2a74a27a6163b1f631583e6a1126ec66cbb1498da3467459a5641fdf2830c369d8f7856694e0e9a1 +EBUILD pecl-uuid-1.0.4-r2.ebuild 429 BLAKE2B f3b29ba51fbab965afb4d1116a2f232428e2646c78c239cabdef25a3ac5a65052a19a1f887de02f21e49ab08425f740b902f0f35f0d4124e5c5a4d8fc0506f3c SHA512 36c1dec21c6709ba2ad8a73b54d3a6bdd5464150eac9b5c44c74cfef9f486f47cb6f98ff10613a4be603c641416719544df677ef398eb1ae9f0d1f6f1ff8f4df MISC metadata.xml 362 BLAKE2B 013c34069d2045f4a178b6f9bfbb4eed8ce99d7a9776ab75fc6004827108079a9ee7f844d49df36459118b3c3179d19b0f97073ce4bcfdbbb2384759d01de4fa SHA512 05766bb146f375f58fbb7d3fa384e7da07be02502f3958fc0141e7e4da622d59212af71a8fd89c24304e8b2c2ce517b51851875e5d58b9a080dab4a3a002a873 diff --git a/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild index 7a7a10100158..9a414430df37 100644 --- a/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild +++ b/dev-php/pecl-uuid/pecl-uuid-1.0.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="6" @@ -8,7 +8,7 @@ PHP_EXT_INIT="yes" PHP_EXT_ZENDEXT="no" DOCS=( CREDITS ) -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 diff --git a/dev-php/pecl-xdiff/Manifest b/dev-php/pecl-xdiff/Manifest index 214910ac01cb..474795e38dbb 100644 --- a/dev-php/pecl-xdiff/Manifest +++ b/dev-php/pecl-xdiff/Manifest @@ -1,5 +1,5 @@ DIST xdiff-1.5.2.tgz 9275 BLAKE2B c22ab9e6263392251f6465e2f7583da0f6b5de430ba82b7e3df1949b77b727c01e84e6d405bc09f931e14094f72d915f47002014e8a1c3d6790a7eda821c3548 SHA512 738d9624155b6d77b01fdef59eb0d34de6b4a8f757d2c0ccb6dd0140d021b6c88388312d6a43197dc5c24f8e643069c3a265fc0d17246e25e8104b00facf2dd0 DIST xdiff-2.0.1.tgz 10418 BLAKE2B d80afd629db788343e5804925fb8a9971cb0df2db6462be5adcace7e15e9b7fb2bf52cbb49f900878659fcf5e91c69b721c01e01f04876e8245ecc8094f0be61 SHA512 43f2bddac82ac19ac688ae7dad3fef65b0d8887c0e6adefd1fc15236582c31d78a54538903760270dee294ca8b8ba3def48bfa9b1d44160bcc450f5c6516402a EBUILD pecl-xdiff-1.5.2-r5.ebuild 897 BLAKE2B 9d8ae6c86f8dbb6dc016f803011cd6040203dff50243b9db5319a15f0081c27d4770a7a4c35ad6b248aa98050a649669d90db00c178d4e90eb4cfb8e57038e3e SHA512 0c51ffd14bf599e5d28857597044977acbec8bcc06b9b94fa16a1519a58368534df40b6a77c40b4d6f793ee7a5b3c878a59e9c98cd335c3a2dae4753828684a5 -EBUILD pecl-xdiff-2.0.1-r2.ebuild 1086 BLAKE2B 2ec26d4ad32ae587fb3a6afea97e63b26afe39b6fa23d798601178652a8d1a9d342b3f81abd13da12199b15142b7fedf776e3461d6b12a685d94f14f2cf1101f SHA512 731aaefc3526500f53c590607ad7b0a114aab4a1024a3c64fea3a9f0a886162928f9a3dc7ac19f1d9538c6223a2b5221ecfb9596a11309b3589339bc0709c2b8 +EBUILD pecl-xdiff-2.0.1-r2.ebuild 1218 BLAKE2B 8f94fd817877faee6a5c3293c14679936c10b5a414a414857479298178a95fa085c30def9f79c1f37ed371b0b8b683bb7a3412741b10e5ef083cab6cc1ea3d46 SHA512 7daae986a6e22de05bf3737d38e1936f2c7064d3e9c893c4810eddbb0bfe8a53ba923ce7cef63fe2c9c2196d30f15b375fd7510d8edfe640464929853cde4d71 MISC metadata.xml 333 BLAKE2B dd00945bd203358c600ca21b80034f9d42bf71a8ecc2fdef73bcd871a87addd962e82357f274e35bbc31bc3debf329283adff20870f56f54116800df5d6ca7d4 SHA512 c91d330b2363fbc4286bd17dfdf5883e1cb3c111a68c0f7cf795967775b4a45a00907c7c85a8ff70f59d379c7ccd2d4ad909235e0b4ace619602cc068e99a599 diff --git a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild index 5bc4d42fc327..f8bd2e2c845c 100644 --- a/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild +++ b/dev-php/pecl-xdiff/pecl-xdiff-2.0.1-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -7,11 +7,11 @@ PHP_EXT_NAME="xdiff" PHP_EXT_PECL_PKG="xdiff" DOCS=( README.API ) -USE_PHP="php5-6 php7-0 php7-1 php7-2" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" inherit php-ext-pecl-r3 -USE_PHP="php7-0 php7-1 php7-2" +USE_PHP="php7-0 php7-1 php7-2 php7-3" KEYWORDS="~amd64 ~x86" @@ -23,11 +23,12 @@ DEPEND=" php_targets_php7-0? ( dev-libs/libxdiff ) php_targets_php7-1? ( dev-libs/libxdiff ) php_targets_php7-2? ( dev-libs/libxdiff ) + php_targets_php7-3? ( dev-libs/libxdiff ) " RDEPEND="${DEPEND} php_targets_php5-6? ( dev-php/pecl-xdiff:0[php_targets_php5-6] )" src_prepare() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-source-r3_src_prepare else eapply_user @@ -35,14 +36,14 @@ src_prepare() { } src_configure() { - if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 ; then + if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then local PHP_EXT_ECONF_ARGS=() 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 + if use php_targets_php7-0 || use php_targets_php7-1 || use php_targets_php7-2 || use php_targets_php7-3 ; then php-ext-pecl-r3_src_install fi } diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest index c096fb1c065c..fec24be3d181 100644 --- a/dev-php/pecl-zmq/Manifest +++ b/dev-php/pecl-zmq/Manifest @@ -1,4 +1,6 @@ +AUX pecl-zmq-1.1.3-php7-3-compatibility.patch 9970 BLAKE2B af8c1d546da1786bef6564b42afd731f0ceade8c2d425dfb5910748b4248cc910aa41f5f53fed7ab65394d7da201cc6d3a47b065e45f3f362c9968ab9b229f8f SHA512 d39ab0cce3397a851aa7662664e1f09fbd4096a4942e2172ed66d53292043f808c82d8f13ea8b5bf918ccdcdef9f254324b318e36150a6d76dfb7d051da3fed4 DIST zmq-1.1.3.tgz 82397 BLAKE2B 5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0 SHA512 0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc EBUILD pecl-zmq-1.1.3-r1.ebuild 480 BLAKE2B 93811446ab4f8a932491441f33a5a7766c36d9c95de8bd8616e5e35a57e702a01862cf0cee3c6834a3767110d68e7573c8eacbd8fd3d812fca814c919aeecdf3 SHA512 f7a9f300d5869334ea00e7cef1747420ebd5941aab24dd522e7061d6ab9f79d81cb8504a01de6165b2927aae787fe588ff6a35cf13c4680fd717d72d19201954 -EBUILD pecl-zmq-9999.ebuild 577 BLAKE2B 4182d8b9a05520ca0790a381f72dc73496e5b315bef721c43415aeb137a79525917acf2990778c42d202118eef84e8465c8e45b7af12325f31ca3064f397ee07 SHA512 2626d87bb6ceb4f56c6185c8e2b3c54c164faeb8e9e21af61d8cdd34b5b64d05032731772f3c1f2343c4c7e5722db9b6133b91d51d0ff17f3f0661c85d3bf4c7 +EBUILD pecl-zmq-1.1.3-r2.ebuild 545 BLAKE2B 82bb46499d914d9437cb40c46baa67161ab5f1e6c30befb4e19cba85a112ac8d02ffd30a5745af8e2eef7109569a59b75463cb3d4111ead33eea08dc5fe2689e SHA512 2f9aed9759f81ce2c49ef1e6389d72d38b3e27841e3c6384703d6fc876caaa379579491cb8d5dea0c7ca489ec03385b6bec17449902e54448761b2c186d72785 +EBUILD pecl-zmq-9999.ebuild 583 BLAKE2B 2a41bd55c4afdcf9b62c424f9823f28a0aa6cbc7839eac42d8acdbf10943ef888409312f0438910f66e3af18f8de61b527cc5966d374268dd76cac636451e4f0 SHA512 1e1185ab181d32c6960fe9e216da2accbf077daa5ba041aa694036d6afd849861f0318fb3ab82cdde380502d2c75f14b8bab2d5b2982379aa18f8a8d76ea52ab MISC metadata.xml 314 BLAKE2B 91b4ef1c9615ad2dac01ed638378dc0de90a173047cab6f9ec0875bbd66b97c8c6442a305ef7ff9791a5ccc67ec789440a26b3e65b05b3b76052cb8ba06c39db SHA512 40085d291b0f504d6253df236db0e3d3a0886e9a49b39330130c9578e25290cb11aba524b383186ee72c60f2adb0cea18d27bf3523d7651ba5f711f5cc2b1853 diff --git a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch b/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch new file mode 100644 index 000000000000..2de703039b07 --- /dev/null +++ b/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch @@ -0,0 +1,265 @@ +From af02bde61c2a5af1ae64cac09ffe2b25237aa58e Mon Sep 17 00:00:00 2001 +From: Alex/AT +Date: Mon, 10 Dec 2018 06:02:27 +0300 +Subject: [PATCH] PHP 7.3 compatibility and bugfixes + +- Define new GC_ADDREF/DELREF/SET_REFCOUNT macros for older PHP versions and use them instead of direct GC reference counter access + +- Fixup all necessary 'long' type parameters to 'zend_long', PHP 7.3 makes it mandatory, also fixup some direct function implementations to accept the same + +- In php_zmq_recv(), zend_string_init() was wrongly called with third parameter as '1', marking new string with IS_STR_PERSISTENT, this caused heap corruption and/or segfaults with PHP 7.3 and could possibly cause other sorts of bugs under any 7.x version + With ZVAL_STRINGL macro, this last '1' parameter meant to copy the string and was seemingly erroneously moved to zend_string_init(). zend_string_init() copies string by default, and last parameter has totally different meaning here + +- In poll(), flag ZVAL separation on passed arrays (PHP 7.3 makes it mandatory) + +- Test 19 (exception on connect callback with forced reference parameter): skip on PHP 7.1 and higher, PHP >= 7.1 started to fallback to passing argument by value instead of failing + +- Test 21 (warning generation from callback): it is ok, but PHP 7.3 uses 'int' instead of 'integer' for constants, so allow any word in place of the word 'integer' +--- + php_zmq.h | 6 ++++ + tests/019-callbackinvalidsignature.phpt | 3 +- + tests/021-callbackwarning.phpt | 2 +- + zmq.c | 40 ++++++++++++------------- + zmq_sockopt.c | 4 +-- + 5 files changed, 30 insertions(+), 25 deletions(-) + +diff --git a/php_zmq.h b/php_zmq.h +index ef50bfb..3833967 100644 +--- a/php_zmq.h ++++ b/php_zmq.h +@@ -44,6 +44,12 @@ + + #include "php.h" + ++#if PHP_VERSION_ID < 70300 ++#define GC_ADDREF(p) ++GC_REFCOUNT(p) ++#define GC_DELREF(p) --GC_REFCOUNT(p) ++#define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc ++#endif ++ + extern zend_module_entry zmq_module_entry; + #define phpext_zmq_ptr &zmq_module_entry + +diff --git a/tests/019-callbackinvalidsignature.phpt b/tests/019-callbackinvalidsignature.phpt +index 753de31..b5bb20c 100644 +--- a/tests/019-callbackinvalidsignature.phpt ++++ b/tests/019-callbackinvalidsignature.phpt +@@ -1,7 +1,8 @@ + --TEST-- + Test callback edge-cases + --SKIPIF-- +- ++= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?> + --FILE-- + val, plist_key->len, &le, sizeof(le)) == NULL) { +@@ -369,7 +369,7 @@ PHP_METHOD(zmq, curvekeypair) + PHP_METHOD(zmqcontext, __construct) + { + php_zmq_context_object *intern; +- long io_threads = 1; ++ zend_long io_threads = 1; + zend_bool is_persistent = 1; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|lb", &io_threads, &is_persistent) == FAILURE) { +@@ -495,7 +495,7 @@ PHP_METHOD(zmqcontext, getOpt) + Create a new zmq socket + */ + static +-php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool is_persistent) ++php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, zend_long type, zend_bool is_persistent) + { + php_zmq_socket *zmq_sock; + +@@ -503,7 +503,7 @@ php_zmq_socket *php_zmq_socket_new(php_zmq_context *context, int type, zend_bool + zmq_sock->z_socket = zmq_socket(context->z_ctx, type); + zmq_sock->pid = getpid(); + zmq_sock->ctx = context; +- zmq_sock->socket_type = type; ++ zmq_sock->socket_type = type; + + if (!zmq_sock->z_socket) { + pefree(zmq_sock, is_persistent); +@@ -535,7 +535,7 @@ void php_zmq_socket_store(php_zmq_socket *zmq_sock_p, zend_long type, zend_strin + le.type = php_zmq_socket_list_entry(); + le.ptr = zmq_sock_p; + +- GC_REFCOUNT(&le) = 1; ++ GC_SET_REFCOUNT(&le, 1); + + plist_key = php_zmq_socket_plist_key(type, persistent_id, use_shared_ctx); + +@@ -796,7 +796,7 @@ PHP_METHOD(zmqsocket, __construct) + + /* {{{ static zend_bool php_zmq_send(php_zmq_socket_object *intern, char *message_param, long flags) + */ +-static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, long flags) ++static zend_bool php_zmq_send(php_zmq_socket_object *intern, zend_string *message_param, zend_long flags) + { + int rc, errno_; + zmq_msg_t message; +@@ -828,7 +828,7 @@ static void php_zmq_sendmsg_impl(INTERNAL_FUNCTION_PARAMETERS) + { + php_zmq_socket_object *intern; + zend_string *message_param; +- long flags = 0; ++ zend_long flags = 0; + zend_bool ret; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "S|l", &message_param, &flags) == FAILURE) { +@@ -890,7 +890,7 @@ PHP_METHOD(zmqsocket, sendmulti) + zval *messages; + php_zmq_socket_object *intern; + int to_send, ret = 0; +- long flags = 0; ++ zend_long flags = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "a|l", &messages, &flags) == FAILURE) { + return; +@@ -910,7 +910,7 @@ PHP_METHOD(zmqsocket, sendmulti) + /* {{{ static zend_bool php_zmq_recv(php_zmq_socket_object *intern, long flags, zval *return_value) + */ + static +-zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags) ++zend_string *php_zmq_recv(php_zmq_socket_object *intern, zend_long flags) + { + int rc, errno_; + zmq_msg_t message; +@@ -933,7 +933,7 @@ zend_string *php_zmq_recv(php_zmq_socket_object *intern, long flags) + return NULL; + } + +- str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 1); ++ str = zend_string_init(zmq_msg_data(&message), zmq_msg_size(&message), 0); + zmq_msg_close(&message); + return str; + } +@@ -943,7 +943,7 @@ static void php_zmq_recvmsg_impl(INTERNAL_FUNCTION_PARAMETERS) + { + zend_string *str = NULL; + php_zmq_socket_object *intern; +- long flags = 0; ++ zend_long flags = 0; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|l", &flags) == FAILURE) { + return; +@@ -974,7 +974,7 @@ PHP_METHOD(zmqsocket, recvmulti) + { + php_zmq_socket_object *intern; + size_t value_len; +- long flags = 0; ++ zend_long flags = 0; + #if ZMQ_VERSION_MAJOR < 3 + int64_t value; + #else +@@ -1303,7 +1303,7 @@ PHP_METHOD(zmqpoll, add) + { + php_zmq_poll_object *intern; + zval *object; +- long events; ++ zend_long events; + int error; + zend_string *key; + +@@ -1423,10 +1423,10 @@ PHP_METHOD(zmqpoll, poll) + php_zmq_poll_object *intern; + zval *r_array, *w_array; + +- long timeout = -1; ++ zend_long timeout = -1; + int rc; + +- if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!a!|l", &r_array, &w_array, &timeout) == FAILURE) { ++ if (zend_parse_parameters(ZEND_NUM_ARGS(), "a!/a!/|l", &r_array, &w_array, &timeout) == FAILURE) { + return; + } + +@@ -1592,7 +1592,7 @@ void s_clear_device_callback (php_zmq_device_cb_t *cb) + } + + static +-void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, long timeout, zval *user_data) ++void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend_fcall_info_cache *fci_cache, zend_long timeout, zval *user_data) + { + memcpy (&cb->fci, fci, sizeof (zend_fcall_info)); + memcpy (&cb->fci_cache, fci_cache, sizeof (zend_fcall_info_cache)); +@@ -1615,7 +1615,7 @@ void s_init_device_callback (php_zmq_device_cb_t *cb, zend_fcall_info *fci, zend + PHP_METHOD(zmqdevice, setidletimeout) + { + php_zmq_device_object *intern; +- long timeout; ++ zend_long timeout; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) { + return; +@@ -1644,7 +1644,7 @@ PHP_METHOD(zmqdevice, getidletimeout) + PHP_METHOD(zmqdevice, settimertimeout) + { + php_zmq_device_object *intern; +- long timeout; ++ zend_long timeout; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "l", &timeout) == FAILURE) { + return; +@@ -1676,7 +1676,7 @@ PHP_METHOD(zmqdevice, setidlecallback) + zval *user_data = NULL; + zend_fcall_info fci; + zend_fcall_info_cache fci_cache; +- long timeout = 0; ++ zend_long timeout = 0; + + if (ZEND_NUM_ARGS() == 2) { + php_error_docref(NULL, E_DEPRECATED, "The signature for setIdleCallback has changed, please update your code"); +@@ -1718,7 +1718,7 @@ PHP_METHOD(zmqdevice, settimercallback) + zval *user_data = NULL; + zend_fcall_info fci; + zend_fcall_info_cache fci_cache; +- long timeout; ++ zend_long timeout; + + if (zend_parse_parameters(ZEND_NUM_ARGS(), "fl|z!", &fci, &fci_cache, &timeout, &user_data) == FAILURE) { + return; +diff --git a/zmq_sockopt.c b/zmq_sockopt.c +index 1357032..3a00421 100644 +--- a/zmq_sockopt.c ++++ b/zmq_sockopt.c +@@ -1,5 +1,3 @@ +- +- + /* + +-----------------------------------------------------------------------------------+ + | ZMQ extension for PHP | +@@ -2033,7 +2031,7 @@ PHP_METHOD(zmqsocket, getsockopt) + PHP_METHOD(zmqsocket, setsockopt) + { + php_zmq_socket_object *intern; +- long key; ++ zend_long key; + zval *zv; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "lz/", &key, &zv) == FAILURE) { diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild new file mode 100644 index 000000000000..32a8fed8aad3 --- /dev/null +++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild @@ -0,0 +1,25 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" + +inherit php-ext-pecl-r3 + +KEYWORDS="~amd64 ~x86" + +DESCRIPTION="PHP Bindings for ZeroMQ messaging" +LICENSE="BSD" +SLOT="0" +IUSE="czmq" + +RDEPEND="net-libs/zeromq czmq? (