[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: d02137793df8fa48e4bebcea951eeabfdd27d9f0 Author: Sam James gentoo org> AuthorDate: Sun May 5 15:45:15 2024 + Commit: Sam James gentoo org> CommitDate: Sun May 5 15:45:15 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0213779 dev-php/pecl-uploadprogress: Stabilize 2.0.2-r1 amd64, #931243 Signed-off-by: Sam James gentoo.org> dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild index 0c9d9f1e1d73..8f0ce73861dc 100644 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2-r1.ebuild @@ -11,7 +11,7 @@ inherit php-ext-pecl-r3 DESCRIPTION="An extension to track progress of a file upload" LICENSE="PHP-3.01" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 ~x86" IUSE="examples" PATCHES=( "${FILESDIR}/php-debug-testfix.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/, dev-php/pecl-uploadprogress/files/
commit: 149dee72b9bfab759a40fdf116590033c4dbca34 Author: Michael Orlitzky gentoo org> AuthorDate: Mon May 22 14:30:09 2023 + Commit: Michael Orlitzky gentoo org> CommitDate: Mon May 22 14:36:50 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=149dee72 dev-php/pecl-uploadprogress: fix tests with PHP's --enable-debug. A few of the tests for pecl-uploadprogress throw a fatal error if PHP was build with USE=debug. We skip the tests for now; a better long-term solution was proposed upstream (GH issue #17). In addition, the extension seems to work fine with php-8.2, so I've taken the opportunity to enable it. Closes: https://bugs.gentoo.org/906691 Signed-off-by: Michael Orlitzky gentoo.org> .../files/php-debug-testfix.patch | 74 ++ ebuild => pecl-uploadprogress-2.0.2-r1.ebuild} | 7 +- 2 files changed, 79 insertions(+), 2 deletions(-) diff --git a/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch b/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch new file mode 100644 index ..febc989ab79b --- /dev/null +++ b/dev-php/pecl-uploadprogress/files/php-debug-testfix.patch @@ -0,0 +1,74 @@ +From 57f3c17c684a4e5607a322a24be306eb98d340ac Mon Sep 17 00:00:00 2001 +From: Michael Orlitzky +Date: Mon, 22 May 2023 10:18:29 -0400 +Subject: [PATCH 1/1] tests: skip tests that fail with --enable-debug. + +With PHP debugging enabled, a few tests fail. The root cause of this +is that uploadprogress_get_contents() can return FALSE to indicate +that an error has occurred, but its declared type is string. It +would probably be better if the function raised an error rather +than abusing the return value, but that's a decision upstream +would have to agree too (see: Github issue 17). For now we just +skip the tests if PHP_DEBUG is defined. +--- + tests/uploadprogress_get_contents_error001.phpt | 2 ++ + tests/uploadprogress_get_contents_error003.phpt | 2 ++ + tests/uploadprogress_get_contents_variation002.phpt | 2 ++ + tests/uploadprogress_get_contents_variation006.phpt | 2 ++ + 4 files changed, 8 insertions(+) + +diff --git a/tests/uploadprogress_get_contents_error001.phpt b/tests/uploadprogress_get_contents_error001.phpt +index 63f4f5d..c3e10d9 100644 +--- a/tests/uploadprogress_get_contents_error001.phpt b/tests/uploadprogress_get_contents_error001.phpt +@@ -5,6 +5,8 @@ uploadprogress_get_contents - Warns when function is disabled +
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: b4e05680f19fe2449e291442e1bed17f4af4ad64 Author: Brian Evans gentoo org> AuthorDate: Fri Mar 18 17:00:54 2022 + Commit: Brian Evans gentoo org> CommitDate: Fri Mar 18 17:00:54 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4e05680 dev-php/pecl-uploadprogress: Drop old; update targets Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-uploadprogress/Manifest| 2 -- .../pecl-uploadprogress-1.1.3-r1.ebuild | 20 .../pecl-uploadprogress-2.0.1.ebuild| 21 - .../pecl-uploadprogress-2.0.2.ebuild| 8 4 files changed, 4 insertions(+), 47 deletions(-) diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index b0c3e60a90c0..b6abb05fe048 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1,3 +1 @@ -DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686 -DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0 DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild deleted file mode 100644 index dabf3dddf33b.. --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_PHP="php7-2 php7-3 php7-4" - -inherit php-ext-pecl-r3 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - php_targets_php7-2? ( dev-lang/php:7.2[apache2] ) - php_targets_php7-3? ( dev-lang/php:7.3[apache2] ) - php_targets_php7-4? ( dev-lang/php:7.4[apache2] ) -" diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild deleted file mode 100644 index 6bc6174856b0.. --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -USE_PHP="php7-3 php7-4 php8-0" -PHP_EXT_SAPIS="apache2 fpm" - -inherit php-ext-pecl-r3 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="examples" - -RDEPEND=" - php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) - php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) - php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) -" diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild index 6bc6174856b0..99572c452134 100644 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 -USE_PHP="php7-3 php7-4 php8-0" +USE_PHP="php7-4 php8-0 php8-1" PHP_EXT_SAPIS="apache2 fpm" inherit php-ext-pecl-r3 @@ -15,7 +15,7 @@ KEYWORDS="~amd64 ~x86" IUSE="examples" RDEPEND=" - php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) + php_targets_php8-1? ( || ( dev-lang/php:8.1[apache2(-),fileinfo(-)] dev-lang/php:8.1[fileinfo(-),fpm(-)] ) ) "
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 3464c96f311e29cc1f387dc80e82d4e4e0d5810d Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Oct 15 14:03:52 2021 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Oct 15 14:33:00 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3464c96f dev-php/pecl-uploadprogress: bump to v2.0.2 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-uploadprogress/Manifest| 1 + .../pecl-uploadprogress-2.0.2.ebuild| 21 + 2 files changed, 22 insertions(+) diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index 75b4f98a95e..b0c3e60a90c 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1,2 +1,3 @@ DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686 DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0 +DIST uploadprogress-2.0.2.tgz 19969 BLAKE2B 148cac83b00eb6b4f23861a04829280346957cdfc5bdbe94d687d0efb5da97b5f48162c59b07e0830a67350c7a2aa9a3085a4575f07b32016b01845301f04843 SHA512 b9ee5a09c3de78d58abd34da2d25d7b0cad38416309a9a69192f07e0c3fe2259de261bb3dee571e64e042753f861738ebcd67fa7fafeb595ec32ed3034c773cd diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild new file mode 100644 index 000..6bc6174856b --- /dev/null +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.2.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_PHP="php7-3 php7-4 php8-0" +PHP_EXT_SAPIS="apache2 fpm" + +inherit php-ext-pecl-r3 + +DESCRIPTION="An extension to track progress of a file upload" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND=" + php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) + php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) + php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) +"
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 30267ee9d5ac88b2396e52b3e09c89a256a6e8c1 Author: Brian Evans gentoo org> AuthorDate: Wed Sep 29 18:24:50 2021 + Commit: Brian Evans gentoo org> CommitDate: Wed Sep 29 18:24:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30267ee9 dev-php/pecl-uploadprogress: Update long description in metadata Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-uploadprogress/metadata.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml index ed31cf5f523..bde040ec7af 100644 --- a/dev-php/pecl-uploadprogress/metadata.xml +++ b/dev-php/pecl-uploadprogress/metadata.xml @@ -11,8 +11,8 @@ An extension to track the progress of a file upload. See -http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for -an example. It is only known to work on apache with mod_php; other -SAPI implementations unfortunately still have issues. +https://github.com/php/pecl-php-uploadprogress/tree/master/examples for +examples. It is known to work on apache with mod_php and, beginning with 2.0, +php-fpm with apache and nginx; other servers and SAPIs are not known to work.
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 8bd0a67211af60980f7fa58ffafcc2a8b4a4e3a8 Author: Brian Evans gentoo org> AuthorDate: Wed Sep 29 18:22:21 2021 + Commit: Brian Evans gentoo org> CommitDate: Wed Sep 29 18:22:21 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bd0a672 dev-php/pecl-uploadprogress: Version bump for 2.0.1 Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-uploadprogress/Manifest| 1 + .../pecl-uploadprogress-2.0.1.ebuild| 21 + 2 files changed, 22 insertions(+) diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index ce8d10d0aef..75b4f98a95e 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1 +1,2 @@ DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686 +DIST uploadprogress-2.0.1.tgz 19459 BLAKE2B 10143285da73a2fe1854c68d5f20ac6543695ccdf47835ff16f39b69e357e2ca32d2560ca1ced9238c6d21fb29379817b8a682d6aa24bf8c83b563127d2745a9 SHA512 81c846ea6e87c7c0621c22ee903b0937d533285bd0e3195de85803321260d4562e4c598332591afc7e985da57ed9422e37ed1c2927090474ddb7ec27314f1ae0 diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild new file mode 100644 index 000..6bc6174856b --- /dev/null +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-2.0.1.ebuild @@ -0,0 +1,21 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +USE_PHP="php7-3 php7-4 php8-0" +PHP_EXT_SAPIS="apache2 fpm" + +inherit php-ext-pecl-r3 + +DESCRIPTION="An extension to track progress of a file upload" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="examples" + +RDEPEND=" + php_targets_php7-3? ( || ( dev-lang/php:7.3[apache2(-),fileinfo(-)] dev-lang/php:7.3[fileinfo(-),fpm(-)] ) ) + php_targets_php7-4? ( || ( dev-lang/php:7.4[apache2(-),fileinfo(-)] dev-lang/php:7.4[fileinfo(-),fpm(-)] ) ) + php_targets_php8-0? ( || ( dev-lang/php:8.0[apache2(-),fileinfo(-)] dev-lang/php:8.0[fileinfo(-),fpm(-)] ) ) +"
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: cb00d4919abbe0770e4164ed0db55f427210a1e6 Author: Brian Evans gentoo org> AuthorDate: Thu May 21 16:20:56 2020 + Commit: Brian Evans gentoo org> CommitDate: Thu May 21 16:20:56 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb00d491 dev-php/pecl-uploadprogress: Revbump to fix missing installation files Closes: https://bugs.gentoo.org/724460 Signed-off-by: Brian Evans gentoo.org> ...loadprogress-1.1.3.ebuild => pecl-uploadprogress-1.1.3-r1.ebuild} | 5 - 1 file changed, 5 deletions(-) diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild similarity index 88% rename from dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3.ebuild rename to dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild index a19bb78b273..dabf3dddf33 100644 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3.ebuild +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.1.3-r1.ebuild @@ -18,8 +18,3 @@ RDEPEND=" php_targets_php7-3? ( dev-lang/php:7.3[apache2] ) php_targets_php7-4? ( dev-lang/php:7.4[apache2] ) " - -src_install() { - default - use examples && dodoc -r examples -}
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/, dev-php/pecl-uploadprogress/files/
commit: 6ad0e787c9a3e8cddbc787b1420dc9551cbc55e1 Author: Michael Orlitzky gentoo org> AuthorDate: Fri Mar 6 17:14:21 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Fri Mar 6 17:14:37 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ad0e787 dev-php/pecl-uploadprogress: new version 1.1.3. This new version supports all newer slots of PHP, making our custom patches obsolete. Thanks to Reuben Farrelly for the heads-up! Closes: https://bugs.gentoo.org/711658 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Michael Orlitzky gentoo.org> dev-php/pecl-uploadprogress/Manifest | 2 +- .../pecl-uploadprogress/files/1.0.3.1-php7.patch | 148 - ...-r4.ebuild => pecl-uploadprogress-1.1.3.ebuild} | 15 ++- 3 files changed, 9 insertions(+), 156 deletions(-) diff --git a/dev-php/pecl-uploadprogress/Manifest b/dev-php/pecl-uploadprogress/Manifest index fe1058ee715..ce8d10d0aef 100644 --- a/dev-php/pecl-uploadprogress/Manifest +++ b/dev-php/pecl-uploadprogress/Manifest @@ -1 +1 @@ -DIST uploadprogress-1.0.3.1.tgz 9040 BLAKE2B b926ee0cc7d40276425ea8eed86c5934c35ff2436b5785888394927a145620caa335d4eae87fd85bd754f8a67c1562f3b8d23a2c626f0d0ca4bed4bf4872e465 SHA512 c317a30ed81430184b643e2755867cdccf9848312aa31a5527e4fe229ac19ee3099121de8e253207b55dd7e788c28720bd3c477663c4ca15100478647a6dc1bb +DIST uploadprogress-1.1.3.tgz 14798 BLAKE2B 5edda3e8672bb0e0829d100284240fcceac26be695386225a18446c742f59edfd906a9ae2f17b594816d3cddea02eb648db01a3352d7f8bd764ad2f6b2e03628 SHA512 2202f419be852a71eadae47eaa83909a032e5a6bbe4ce17ae5d45ea4e9f6d9c9edceb2111630d1f0e277b531d463accf540288ecbcca9bf154fe01754f225686 diff --git a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch deleted file mode 100644 index c90f4bd9539..000 --- a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch +++ /dev/null @@ -1,148 +0,0 @@ -From 7a4d6b3ac3575caedf9429940f54688411cbf5e9 Mon Sep 17 00:00:00 2001 -From: Jan-E -Date: Sun, 19 Apr 2015 18:49:48 +0200 -Subject: [PATCH 1/2] PHP7 compatibility - - uploadprogress.c | 36 +--- - 1 file changed, 33 insertions(+), 3 deletions(-) - -diff --git a/uploadprogress.c b/uploadprogress.c -index 30f6758..7a52ba7 100644 a/uploadprogress.c -+++ b/uploadprogress.c -@@ -71,7 +71,7 @@ PHPAPI extern int (*php_rfc1867_callback)(unsigned int , void *, void ** TSRMLS_ - */ - static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data, void **data TSRMLS_DC) - { --zval handler; -+//zval handler; - char *callable = NULL; - uploadprogress_data * progress; - int read_bytes; -@@ -157,7 +157,11 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data - - if (get_contents) { - php_stream *stream; -+#if defined(ZEND_ENGINE_3) -+int options = 0; -+#else - int options = ENFORCE_SAFE_MODE; -+#endif - - stream = php_stream_open_wrapper(progress->data_filename, "ab", options, NULL); - if (stream) { -@@ -301,7 +305,7 @@ PHP_FUNCTION(uploadprogress_get_info) - { - char * id; - int id_lg; --char method; -+//char method; - - if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", , _lg) == FAILURE) { - return; -@@ -417,7 +421,11 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value) - v[index] = 0; - } - } -+#if defined(ZEND_ENGINE_3) -+add_assoc_string( return_value, k, v ); -+#else - add_assoc_string( return_value, k, v, 1 ); -+#endif - } - fclose(F); - } -@@ -432,10 +440,22 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value) - */ - static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long maxlen, zval *return_value) - { -+#if defined(ZEND_ENGINE_3) -+char *filename, *template, *data_identifier; -+zend_string *contents; -+#else - char *filename, *template, *contents, *data_identifier; -+#endif - php_stream *stream; -+#if defined(ZEND_ENGINE_3) -+int options = 0; -+#else - int options = ENFORCE_SAFE_MODE; --int len, newlen; -+#endif -+int len; -+#if PHP_API_VERSION < 20100412 -+int newlen; -+#endif - TSRMLS_FETCH(); - - template = INI_STR("uploadprogress.file.contents_template"); -@@ -455,7 +475,13 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long - } - - /* uses mmap if possible */ -+#if defined(ZEND_ENGINE_3) -+contents = php_stream_copy_to_mem(stream, maxlen, 0); -+len = contents->len; -+if (contents && len > 0) { -+#else - if ((len = php_stream_copy_to_mem(stream, , maxlen, 0)) > 0) { -+#endif - -
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 15dfb8111f1eb9180f225628b93ff334d2d6ec62 Author: Michael Orlitzky gentoo org> AuthorDate: Tue Jan 21 23:42:53 2020 + Commit: Michael Orlitzky gentoo org> CommitDate: Tue Jan 21 23:42:53 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=15dfb811 dev-php/pecl-uploadprogress: add myself as maintainer, clean up a bit. Package-Manager: Portage-2.3.79, Repoman-2.3.16 Signed-off-by: Michael Orlitzky gentoo.org> dev-php/pecl-uploadprogress/metadata.xml | 19 +-- 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/dev-php/pecl-uploadprogress/metadata.xml b/dev-php/pecl-uploadprogress/metadata.xml index 5f21917bcc4..ce710ecbb07 100644 --- a/dev-php/pecl-uploadprogress/metadata.xml +++ b/dev-php/pecl-uploadprogress/metadata.xml @@ -1,11 +1,18 @@ http://www.gentoo.org/dtd/metadata.dtd;> - - php-b...@gentoo.org - PHP - -An extension to track progress of a file upload. -See http://cvs.php.net/viewvc.cgi/pecl/uploadprogress/examples/ for a little example. It is only known to work on Apache with mod_php, other SAPI implementations unfortunately still have issues. + +php-b...@gentoo.org +PHP + + +m...@gentoo.org +Michael Orlitzky + + +An extension to track the progress of a file upload. See +http://svn.php.net/viewvc/pecl/uploadprogress/trunk/examples/ for +an example. It is only known to work on apache with mod_php; other +SAPI implementations unfortunately still have issues.
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 2660f92d6c7d730b26a5af105b16d865ebb3ef4b Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 29 12:55:32 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 29 12:55:32 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2660f92d dev-php/pecl-uploadprogress: add PHP 7.4 support Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) 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 2567eab87ec..a11f8d2eeea 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-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3" +USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 @@ -18,5 +18,7 @@ RDEPEND=" php_targets_php7-0? ( dev-lang/php:7.0[apache2] ) php_targets_php7-1? ( dev-lang/php:7.1[apache2] ) php_targets_php7-2? ( dev-lang/php:7.2[apache2] ) + php_targets_php7-3? ( dev-lang/php:7.3[apache2] ) + php_targets_php7-4? ( dev-lang/php:7.4[apache2] ) " PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 9ad6a0946cae13291bb8b09f2b93bf462901d137 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Jun 7 11:52:58 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Jun 7 14:07:45 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9ad6a094 dev-php/pecl-uploadprogress: add PHP 7.3 support Closes: https://bugs.gentoo.org/675172 Package-Manager: Portage-2.3.67, Repoman-2.3.14 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 062036ebd69..2567eab87ec 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
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 12f83f7b9c07a8aa37b88548f09f7adccb18b790 Author: Michael Orlitzky gentoo org> AuthorDate: Sun Jan 21 16:17:07 2018 + Commit: Michael Orlitzky gentoo org> CommitDate: Sun Jan 21 16:17:28 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12f83f7b dev-php/pecl-uploadprogress: new revision with php-7.1 and php-7.2 support. Package-Manager: Portage-2.3.19, Repoman-2.3.6 .../pecl-uploadprogress-1.0.3.1-r3.ebuild | 29 -- .../pecl-uploadprogress-1.0.3.1-r4.ebuild | 22 2 files changed, 22 insertions(+), 29 deletions(-) diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r3.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r3.ebuild deleted file mode 100644 index e1542ba36df..000 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r3.ebuild +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -USE_PHP="php5-6 php7-0" - -inherit php-ext-pecl-r3 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -for target in ${USE_PHP}; do - slot=${target/php} - slot=${slot/-/.} - PHPUSEDEPEND="${PHPUSEDEPEND} - php_targets_${target}? ( dev-lang/php:${slot}[apache2] )" -done - -RDEPEND="${PHPUSEDEPEND}" -PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" ) -PHP_EXT_ECONF_ARGS=() - -pkg_postinst() { - elog "This extension is only known to work on Apache with mod_php." -} 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 new file mode 100644 index 000..062036ebd69 --- /dev/null +++ b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r4.ebuild @@ -0,0 +1,22 @@ +# 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 + +DESCRIPTION="An extension to track progress of a file upload" +LICENSE="PHP-3.01" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +RDEPEND=" + php_targets_php5-6? ( dev-lang/php:5.6[apache2] ) + php_targets_php7-0? ( dev-lang/php:7.0[apache2] ) + php_targets_php7-1? ( dev-lang/php:7.1[apache2] ) + php_targets_php7-2? ( dev-lang/php:7.2[apache2] ) +" +PATCHES=( "${FILESDIR}/1.0.3.1-php7.patch" )
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/files/, dev-php/pecl-uploadprogress/
commit: 86a8ddd66627c6f138fd887dad1cd3e8b0df079f Author: Brian Evans gentoo org> AuthorDate: Wed Dec 7 16:20:42 2016 + Commit: Brian Evans gentoo org> CommitDate: Wed Dec 7 16:22:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=86a8ddd6 dev-php/pecl-uploadprogress: Revbump to drop php 5.4 and 5.5 adding 7.0 Upstream patch included to make this extension compile on 7.0 Also add small fprintf fix to eliminate format warnings Package-Manager: portage-2.3.2 .../pecl-uploadprogress/files/1.0.3.1-php7.patch | 148 + .../pecl-uploadprogress-1.0.3.1-r3.ebuild | 30 + 2 files changed, 178 insertions(+) diff --git a/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch new file mode 100644 index ..c90f4bd --- /dev/null +++ b/dev-php/pecl-uploadprogress/files/1.0.3.1-php7.patch @@ -0,0 +1,148 @@ +From 7a4d6b3ac3575caedf9429940f54688411cbf5e9 Mon Sep 17 00:00:00 2001 +From: Jan-E+Date: Sun, 19 Apr 2015 18:49:48 +0200 +Subject: [PATCH 1/2] PHP7 compatibility + +--- + uploadprogress.c | 36 +--- + 1 file changed, 33 insertions(+), 3 deletions(-) + +diff --git a/uploadprogress.c b/uploadprogress.c +index 30f6758..7a52ba7 100644 +--- a/uploadprogress.c b/uploadprogress.c +@@ -71,7 +71,7 @@ PHPAPI extern int (*php_rfc1867_callback)(unsigned int , void *, void ** TSRMLS_ + */ + static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data, void **data TSRMLS_DC) + { +-zval handler; ++//zval handler; + char *callable = NULL; + uploadprogress_data * progress; + int read_bytes; +@@ -157,7 +157,11 @@ static int uploadprogress_php_rfc1867_file(unsigned int event, void *event_data + + if (get_contents) { + php_stream *stream; ++#if defined(ZEND_ENGINE_3) ++int options = 0; ++#else + int options = ENFORCE_SAFE_MODE; ++#endif + + stream = php_stream_open_wrapper(progress->data_filename, "ab", options, NULL); + if (stream) { +@@ -301,7 +305,7 @@ PHP_FUNCTION(uploadprogress_get_info) + { + char * id; + int id_lg; +-char method; ++//char method; + + if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", , _lg) == FAILURE) { + return; +@@ -417,7 +421,11 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value) + v[index] = 0; + } + } ++#if defined(ZEND_ENGINE_3) ++add_assoc_string( return_value, k, v ); ++#else + add_assoc_string( return_value, k, v, 1 ); ++#endif + } + fclose(F); + } +@@ -432,10 +440,22 @@ static void uploadprogress_file_php_get_info(char * id, zval * return_value) + */ + static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long maxlen, zval *return_value) + { ++#if defined(ZEND_ENGINE_3) ++char *filename, *template, *data_identifier; ++zend_string *contents; ++#else + char *filename, *template, *contents, *data_identifier; ++#endif + php_stream *stream; ++#if defined(ZEND_ENGINE_3) ++int options = 0; ++#else + int options = ENFORCE_SAFE_MODE; +-int len, newlen; ++#endif ++int len; ++#if PHP_API_VERSION < 20100412 ++int newlen; ++#endif + TSRMLS_FETCH(); + + template = INI_STR("uploadprogress.file.contents_template"); +@@ -455,7 +475,13 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long + } + + /* uses mmap if possible */ ++#if defined(ZEND_ENGINE_3) ++contents = php_stream_copy_to_mem(stream, maxlen, 0); ++len = contents->len; ++if (contents && len > 0) { ++#else + if ((len = php_stream_copy_to_mem(stream, , maxlen, 0)) > 0) { ++#endif + + #if PHP_API_VERSION < 20100412 + if (PG(magic_quotes_runtime)) { +@@ -463,7 +489,11 @@ static void uploadprogress_file_php_get_contents(char *id, char *fieldname, long + len = newlen; + } + #endif ++#if defined(ZEND_ENGINE_3) ++RETVAL_STR(contents); ++#else + RETVAL_STRINGL(contents, len, 0); ++#endif + } else if (len == 0) { + RETVAL_EMPTY_STRING(); + } else { +-- +2.1.4 + + +From 95d8a0fd4554e10c215d3ab301e901bd8f99c5d9 Mon Sep 17 00:00:00 2001 +From: Jan-E +Date: Mon, 20 Apr 2015 22:20:40 +0200 +Subject: [PATCH 2/2] int id_lg should be size_t id_lg + +--- + uploadprogress.c | 4 + 1 file changed, 4 insertions(+) + +diff --git a/uploadprogress.c b/uploadprogress.c +index 7a52ba7..3d73d15 100644 +--- a/uploadprogress.c b/uploadprogress.c +@@ -304,7 +304,11 @@ PHP_MINFO_FUNCTION(uploadprogress) + PHP_FUNCTION(uploadprogress_get_info) + { + char * id; ++#if defined(ZEND_ENGINE_3)
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: d8ee0f2f638ae193ea26edad3efd397c08c9942e Author: Brian Evans gentoo org> AuthorDate: Wed Dec 7 16:21:47 2016 + Commit: Brian Evans gentoo org> CommitDate: Wed Dec 7 16:22:41 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8ee0f2f dev-php/pecl-uploadprogress: Drop old Package-Manager: portage-2.3.2 .../pecl-uploadprogress-1.0.3.1-r2.ebuild | 28 -- 1 file changed, 28 deletions(-) diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r2.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r2.ebuild deleted file mode 100644 index 2850bc4.. --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r2.ebuild +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_PHP="php5-6 php5-5 php5-4" - -inherit php-ext-pecl-r2 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -for target in ${USE_PHP}; do - slot=${target/php} - slot=${slot/-/.} - PHPUSEDEPEND="${PHPUSEDEPEND} - php_targets_${target}? ( dev-lang/php:${slot}[apache2] )" -done - -RDEPEND="${PHPUSEDEPEND}" - -pkg_postinst() { - elog "This extension is only known to work on Apache with mod_php." -}
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-uploadprogress/
commit: 1e1409ff497299402599fbb7d7e2dfbc0863ef82 Author: Brian Evans gentoo org> AuthorDate: Thu Jul 14 20:58:51 2016 + Commit: Brian Evans gentoo org> CommitDate: Thu Jul 14 21:03:33 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e1409ff dev-php/pecl-uploadprogress: Drop old Package-Manager: portage-2.3.0 .../pecl-uploadprogress-1.0.3.1-r1.ebuild | 21 - 1 file changed, 21 deletions(-) diff --git a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r1.ebuild b/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r1.ebuild deleted file mode 100644 index b08e9a9..000 --- a/dev-php/pecl-uploadprogress/pecl-uploadprogress-1.0.3.1-r1.ebuild +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=5 - -USE_PHP="php5-5 php5-4" - -inherit php-ext-pecl-r2 - -DESCRIPTION="An extension to track progress of a file upload" -LICENSE="PHP-3.01" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="" - -RDEPEND="dev-lang/php[apache2]" - -pkg_postinst() { - elog "This extension is only known to work on Apache with mod_php." -}