[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: c48e05dfee5c3f23b0287b64e31c223f57205869
Author: Sam James gentoo org>
AuthorDate: Thu Jan 18 07:51:44 2024 +
Commit: Sam James gentoo org>
CommitDate: Thu Jan 18 07:51:44 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c48e05df
dev-php/pecl-zmq: cleanup php8-0
Signed-off-by: Sam James gentoo.org>
dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild | 4 ++--
dev-php/pecl-zmq/pecl-zmq-.ebuild| 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
index da00ab3f0753..388d3f04fa55 100644
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
inherit php-ext-pecl-r3
if [[ ${PV} == "" ]]; then
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index 4f64d3099527..d08160059b57 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="8"
-USE_PHP="php8-0 php8-1"
+USE_PHP="php8-1"
inherit php-ext-pecl-r3
if [[ ${PV} == "" ]]; then
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: 482f36d2e8dff0c6452d6862c6b09a7c7f4ca58e
Author: Brian Evans gentoo org>
AuthorDate: Mon Apr 11 18:27:49 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Apr 11 18:27:49 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=482f36d2
dev-php/pecl-zmq: Add new snapshot; Update live targets
Signed-off-by: Brian Evans gentoo.org>
dev-php/pecl-zmq/Manifest| 1 +
...{pecl-zmq-.ebuild => pecl-zmq-1.1.3_p20211103.ebuild} | 12 +---
dev-php/pecl-zmq/pecl-zmq-.ebuild| 6 +++---
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index da2d71c9c60d..bbe7c0f90654 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1 +1,2 @@
+DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B
5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e
SHA512
762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873
DIST zmq-1.1.3.tgz 82397 BLAKE2B
5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0
SHA512
0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
similarity index 62%
copy from dev-php/pecl-zmq/pecl-zmq-.ebuild
copy to dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.ebuild
index a0147e05ff53..3263a4973133 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3_p20211103.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"
inherit php-ext-pecl-r3
if [[ ${PV} == "" ]]; then
@@ -16,6 +16,9 @@ else
KEYWORDS="~amd64 ~x86"
fi
+SNAPSHOT="ee5fbc693f07b2d6f0d9fd748f131be82310f386"
+SRC_URI="https://github.com/zeromq/php-zmq/archive/${SNAPSHOT}.tar.gz ->
${P}.tar.gz"
+
DESCRIPTION="PHP Bindings for ZeroMQ messaging"
LICENSE="BSD"
SLOT="0"
@@ -24,3 +27,6 @@ IUSE=""
BDEPEND="virtual/pkgconfig"
DEPEND="net-libs/zeromq"
RDEPEND="net-libs/zeromq:="
+
+S="${WORKDIR}/php-zmq-${SNAPSHOT}"
+PHP_EXT_S="${S}"
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index a0147e05ff53..d5bd392cbce7 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.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"
inherit php-ext-pecl-r3
if [[ ${PV} == "" ]]; then
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/files/, dev-php/pecl-zmq/
commit: a914b1e3640bea056e6b8a4c5b0849df7185ca57
Author: Brian Evans gentoo org>
AuthorDate: Mon Apr 11 18:28:51 2022 +
Commit: Brian Evans gentoo org>
CommitDate: Mon Apr 11 18:28:51 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a914b1e3
dev-php/pecl-zmq: Drop old
Signed-off-by: Brian Evans gentoo.org>
dev-php/pecl-zmq/Manifest | 1 -
.../pecl-zmq-1.1.3-php7-3-compatibility.patch | 265 -
dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild | 28 ---
3 files changed, 294 deletions(-)
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
index bbe7c0f90654..c909e27a8844 100644
--- a/dev-php/pecl-zmq/Manifest
+++ b/dev-php/pecl-zmq/Manifest
@@ -1,2 +1 @@
DIST pecl-zmq-1.1.3_p20211103.tar.gz 104608 BLAKE2B
5217c77353cf36eb10fbb4825a77e16293770b58ee92aeec3487816c713982c67e1964e3da40b152952abe7a1e2be1dab3e67f53798849bfa1a52f3c47f2884e
SHA512
762ecc78fda2e94d7bec57dc329741e0a4a6442e76a8a0bb367576b961e96482f43698e36adc7c8e6a585c914e696e6a17056a1ea680caa96f69faefc604d873
-DIST zmq-1.1.3.tgz 82397 BLAKE2B
5c221abf614bcc33c4c69e64308508d544f790371549c421fe2fcdedd67f2e843b2b82d96f517ea9413ffedd128838725e9afc18f0d4048b270d4982571874d0
SHA512
0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
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
deleted file mode 100644
index 2de703039b07..
--- a/dev-php/pecl-zmq/files/pecl-zmq-1.1.3-php7-3-compatibility.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-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 _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, , 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", _threads,
_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
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: ff1f10fb1c3d10c6b2e0f8fbc6c28814106e861e
Author: Brian Evans gentoo org>
AuthorDate: Thu Apr 15 16:36:01 2021 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Apr 15 16:36:01 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff1f10fb
dev-php/pecl-zmq: Bump targets on live ebuild
Signed-off-by: Brian Evans gentoo.org>
dev-php/pecl-zmq/pecl-zmq-.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index 538ecc14c75..a0147e05ff5 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="7"
-USE_PHP="php7-2 php7-3 php7-4"
+USE_PHP="php7-3 php7-4 php8-0"
inherit php-ext-pecl-r3
if [[ ${PV} == "" ]]; then
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: f305b8dd7a0ccca48dc96554b2d7ce075d3aedc9
Author: Thomas Deutschmann gentoo org>
AuthorDate: Tue Nov 24 13:11:17 2020 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Thu Nov 26 13:26:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f305b8dd
dev-php/pecl-zmq: drop USE=czmq
gentoo.org>
dev-php/pecl-zmq/metadata.xml | 3 ---
dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild | 25 -
dev-php/pecl-zmq/pecl-zmq-1.1.3-r3.ebuild | 28
dev-php/pecl-zmq/pecl-zmq-.ebuild | 26 +-
4 files changed, 41 insertions(+), 41 deletions(-)
diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml
index 0a03180aed3..b86acf66c75 100644
--- a/dev-php/pecl-zmq/metadata.xml
+++ b/dev-php/pecl-zmq/metadata.xml
@@ -5,7 +5,4 @@
php-b...@gentoo.org
PHP
-
- Use the czmq high level bindings
-
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
deleted file mode 100644
index 5e4b0582a2a..000
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 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 php7-4"
-
-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? ( https://github.com/mkoppanen/php-zmq.git;
+ EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
+
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="PHP Bindings for ZeroMQ messaging"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/zeromq"
+RDEPEND="net-libs/zeromq:="
+
+PATCHES=( "${FILESDIR}"/${PN}-1.1.3-php7-3-compatibility.patch )
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index 945516fcd0c..538ecc14c75 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild
@@ -4,23 +4,23 @@
EAPI="7"
USE_PHP="php7-2 php7-3 php7-4"
+inherit php-ext-pecl-r3
-inherit php-ext-pecl-r3 git-r3
+if [[ ${PV} == "" ]]; then
+ SRC_URI=""
+ EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git;
+ EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
-KEYWORDS=""
+ inherit git-r3
+else
+ KEYWORDS="~amd64 ~x86"
+fi
DESCRIPTION="PHP Bindings for ZeroMQ messaging"
LICENSE="BSD"
SLOT="0"
-IUSE="czmq"
+IUSE=""
-RDEPEND="net-libs/zeromq czmq? ( net-libs/czmq:= )"
-DEPEND="${RDEPEND} virtual/pkgconfig"
-SRC_URI=""
-EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git;
-EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
-
-src_configure() {
- local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
- php-ext-source-r3_src_configure
-}
+BDEPEND="virtual/pkgconfig"
+DEPEND="net-libs/zeromq"
+RDEPEND="net-libs/zeromq:="
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: 5c89d4f3c5d554219a3fb2ae76e074e70378d6de Author: Thomas Deutschmann gentoo org> AuthorDate: Fri May 8 22:48:13 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri May 8 22:49:05 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c89d4f3 dev-php/pecl-zmq: subscribe to net-libs/czmq subslot Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild | 4 ++-- dev-php/pecl-zmq/pecl-zmq-.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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 index d8afdd68c13..5e4b0582a2a 100644 --- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI="7" @@ -14,7 +14,7 @@ LICENSE="BSD" SLOT="0" IUSE="czmq" -RDEPEND="net-libs/zeromq czmq? ( https://github.com/mkoppanen/php-zmq.git;
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: c9e69f488e8a44792589d432f5cb16803fa05214 Author: Brian Evans gentoo org> AuthorDate: Thu Jan 23 17:59:32 2020 + Commit: Brian Evans gentoo org> CommitDate: Thu Jan 23 18:38:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9e69f48 dev-php/pecl-zmq: Drop unsupported PHP slots from live build Signed-off-by: Brian Evans gentoo.org> dev-php/pecl-zmq/pecl-zmq-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild b/dev-php/pecl-zmq/pecl-zmq-.ebuild index 2c4f8e58f71..9f9e778eb90 100644 --- a/dev-php/pecl-zmq/pecl-zmq-.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild @@ -3,7 +3,7 @@ EAPI="7" -USE_PHP="php5-6 php7-0 php7-1 php7-2 php7-3 php7-4" +USE_PHP="php7-2 php7-3 php7-4" inherit php-ext-pecl-r3 git-r3
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: e9fdea341f79c035cb5ef56a6b1d4f12871590fc Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 29 12:36:34 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 29 12:36:34 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9fdea34 dev-php/pecl-zmq: drop old Package-Manager: Portage-2.3.80, Repoman-2.3.19 Signed-off-by: Thomas Deutschmann gentoo.org> dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild | 23 --- 1 file changed, 23 deletions(-) diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild deleted file mode 100644 index f11a7b1e8df..000 --- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.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 - -KEYWORDS="~amd64 ~x86" - -DESCRIPTION="PHP Bindings for ZeroMQ messaging" -LICENSE="BSD" -SLOT="0" -IUSE="czmq" - -RDEPEND="net-libs/zeromq czmq? (
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: 7e3e852eb7e84b8cf539e79752e374aa3f67b517 Author: Thomas Deutschmann gentoo org> AuthorDate: Fri Nov 29 12:36:11 2019 + Commit: Thomas Deutschmann gentoo org> CommitDate: Fri Nov 29 12:36:11 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e3e852e dev-php/pecl-zmq: 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-zmq/pecl-zmq-1.1.3-r2.ebuild | 2 +- dev-php/pecl-zmq/pecl-zmq-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index 32a8fed8aad..d8afdd68c13 100644 --- a/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r2.ebuild @@ -3,7 +3,7 @@ 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 diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild b/dev-php/pecl-zmq/pecl-zmq-.ebuild index cafe2beba8f..2c4f8e58f71 100644 --- a/dev-php/pecl-zmq/pecl-zmq-.ebuild +++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild @@ -3,7 +3,7 @@ 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 git-r3
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/, dev-php/pecl-zmq/files/
commit: 5eca691ea3bd543916e7e78c27622fc04c43030e
Author: Thomas Deutschmann gentoo org>
AuthorDate: Fri Jun 7 12:55:34 2019 +
Commit: Thomas Deutschmann gentoo org>
CommitDate: Fri Jun 7 14:07:57 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5eca691e
dev-php/pecl-zmq: add PHP 7.3 support
Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Thomas Deutschmann gentoo.org>
.../pecl-zmq-1.1.3-php7-3-compatibility.patch | 265 +
...cl-zmq-.ebuild => pecl-zmq-1.1.3-r2.ebuild} | 15 +-
dev-php/pecl-zmq/pecl-zmq-.ebuild | 6 +-
3 files changed, 275 insertions(+), 11 deletions(-)
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 000..2de703039b0
--- /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 _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, , 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", _threads,
_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() = 1;
++ GC_SET_REFCOUNT(, 1);
+
+ plist_key
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: bb52ad3c42af02c2578532d6280dcaaf424c6368
Author: Brian Evans gentoo org>
AuthorDate: Tue Apr 10 16:03:44 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Tue Apr 10 16:03:44 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb52ad3c
dev-php/pecl-zmq: Revbump for PHP 7.2 support; update live build
Package-Manager: Portage-2.3.28, Repoman-2.3.9
dev-php/pecl-zmq/{pecl-zmq-1.1.3.ebuild => pecl-zmq-1.1.3-r1.ebuild} | 4 ++--
dev-php/pecl-zmq/pecl-zmq-.ebuild| 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
similarity index 83%
rename from dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
rename to dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
index 13dbe35d525..f11a7b1e8df 100644
--- a/dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# 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"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
inherit php-ext-pecl-r3
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index 3cf1f7076c2..0045fcc8b0a 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-USE_PHP="php5-6 php7-0 php7-1"
+USE_PHP="php5-6 php7-0 php7-1 php7-2"
inherit php-ext-pecl-r3 git-r3
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: e47970f462679b12296b4214782b5e900eb8
Author: Brian Evans gentoo org>
AuthorDate: Tue Mar 13 00:33:36 2018 +
Commit: Brian Evans gentoo org>
CommitDate: Thu Mar 22 01:28:15 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e479
dev-php/pecl-zmq: Remove src_unpack as changes to eclass make it obsolete
dev-php/pecl-zmq/pecl-zmq-.ebuild | 7 +--
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/dev-php/pecl-zmq/pecl-zmq-.ebuild
b/dev-php/pecl-zmq/pecl-zmq-.ebuild
index 9e61585d5f6..3cf1f7076c2 100644
--- a/dev-php/pecl-zmq/pecl-zmq-.ebuild
+++ b/dev-php/pecl-zmq/pecl-zmq-.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,11 +20,6 @@ SRC_URI=""
EGIT_REPO_URI="https://github.com/mkoppanen/php-zmq.git;
EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
-src_unpack() {
- git-r3_src_unpack
- php-ext-source-r3_src_unpack
-}
-
src_configure() {
local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
php-ext-source-r3_src_configure
[gentoo-commits] repo/gentoo:master commit in: dev-php/pecl-zmq/
commit: 27fe16de0780e579db056596b937f7425f7bc267
Author: Brian Evans gentoo org>
AuthorDate: Fri Jul 7 14:28:16 2017 +
Commit: Brian Evans gentoo org>
CommitDate: Fri Jul 7 14:39:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27fe16de
dev-php/pecl-zmq: New package wrt Bug 325351
Package-Manager: Portage-2.3.6, Repoman-2.3.2
dev-php/pecl-zmq/Manifest | 1 +
dev-php/pecl-zmq/metadata.xml | 13 +
dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild | 23 +++
dev-php/pecl-zmq/pecl-zmq-.ebuild | 31 +++
4 files changed, 68 insertions(+)
diff --git a/dev-php/pecl-zmq/Manifest b/dev-php/pecl-zmq/Manifest
new file mode 100644
index 000..65b6c63be16
--- /dev/null
+++ b/dev-php/pecl-zmq/Manifest
@@ -0,0 +1 @@
+DIST zmq-1.1.3.tgz 82397 SHA256
c492375818bd51b355352798fb94f04d6828c6aeda41ba813849624af74144ce SHA512
0f03016e315a6c6a1e1d6eca1e20564834d2a924cef06af1b38693933f1e5a094c37e9c432705a64f61d95e82655f61358fc7783e7a6f06c7dd9ad84fc6f7bbc
WHIRLPOOL
3bfab5d373e52686c236a48d57280a99d7e87e018722003787a8d458a8a503f536cd89bf7cf11d8c6fb5db910d9fd45168caba6cc15032ecda9db08a7f57a95b
diff --git a/dev-php/pecl-zmq/metadata.xml b/dev-php/pecl-zmq/metadata.xml
new file mode 100644
index 000..2a821e97a9c
--- /dev/null
+++ b/dev-php/pecl-zmq/metadata.xml
@@ -0,0 +1,13 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ php-b...@gentoo.org
+ PHP
+
+
+
+
+ Use the czmq high level bindings
+
+
diff --git a/dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
b/dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
new file mode 100644
index 000..13dbe35d525
--- /dev/null
+++ b/dev-php/pecl-zmq/pecl-zmq-1.1.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_PHP="php5-6 php7-0 php7-1"
+
+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? ( https://github.com/mkoppanen/php-zmq.git;
+EGIT_CHECKOUT_DIR="${PHP_EXT_S}"
+
+src_unpack() {
+ git-r3_src_unpack
+ php-ext-source-r3_src_unpack
+}
+
+src_configure() {
+ local PHP_EXT_ECONF_ARGS=( $(use_with czmq) )
+ php-ext-source-r3_src_configure
+}
