Skip to contentSkip to conversation

package/php-amqp: bump version to 1.10.2

PATCH New Adam Duskett 2 participants 12 messages Jun 29, 2021 – Jul 3, 2021

lore
Share & tools
lore
#0 lore raw

PATCH 1/11 package/php-amqp: bump version to 1.10.2

---
 package/php-amqp/php-amqp.hash | 4 ++--
 package/php-amqp/php-amqp.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/php-amqp/php-amqp.hash +2 -2
index c061efabb9..bce8ac0c9a 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 b66b8b8264749cb7a69ae4d09665dad1559b6c4f01430206c8e4187bcd8c782d  amqp-1.9.4.tgz
-sha256 ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8  LICENSE
+sha256  0ebc61052eb12406dddf5eabfe8749a12d52c566816b8aab04fb9916d0c26ed2  amqp-1.10.2.tgz
+sha256  ecd004e9ae3fcf54896b562d5e8008e36041f2620076effd58e5f4187299cee8  LICENSE
package/php-amqp/php-amqp.mk +1 -1
index c808ecdbd6..981f8274a9 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_AMQP_VERSION = 1.9.4
+PHP_AMQP_VERSION = 1.10.2
 PHP_AMQP_SOURCE = amqp-$(PHP_AMQP_VERSION).tgz
 PHP_AMQP_SITE = https://pecl.php.net/get
 PHP_AMQP_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 1 line
2.31.1
#1 lore raw

PATCH 2/11 package/php-gnupg: bump version to 1.5.0

Other changes:
- Change --with-gnupg=$(STAGING_DIR)/usr/include to --with-gnupg=$(STAGING_DIR)/usr as the make system appends /include to the gnupgp path now.

---
 package/php-gnupg/php-gnupg.hash | 2 +-
 package/php-gnupg/php-gnupg.mk   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
package/php-gnupg/php-gnupg.hash +1 -1
index 8d142cdaaf..99ffe87f46 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  35e16bee11345a7d6bf57bea3cadf45e371ad1ed4e0218b0c06f6f637e4e1772  gnupg-1.4.0.tgz
+sha256  d4f5f79aa483908f3df08e5b343ea3593c6d725b9ed2103e30242627659e0a64  gnupg-1.5.0.tgz
 sha256  da1136d4d9326317cbd320dadddf7e9b4b4edffd973eb083cb7b9754fb6a15d9  LICENSE
package/php-gnupg/php-gnupg.mk +2 -2
index ae0a781154..a89f0978af 100644
@@ -4,13 +4,13 @@
 #
 ################################################################################
 
-PHP_GNUPG_VERSION = 1.4.0
+PHP_GNUPG_VERSION = 1.5.0
 PHP_GNUPG_SOURCE = gnupg-$(PHP_GNUPG_VERSION).tgz
 PHP_GNUPG_SITE = https://pecl.php.net/get
 # phpize does the autoconf magic
 PHP_GNUPG_DEPENDENCIES = php libgpgme host-autoconf host-pkgconf
 PHP_GNUPG_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
-	--with-gnupg=$(STAGING_DIR)/usr/include --with-gpg=/usr/bin/gpg
+	--with-gnupg=$(STAGING_DIR)/usr --with-gpg=/usr/bin/gpg
 PHP_GNUPG_LICENSE = BSD-2-Clause
 PHP_GNUPG_LICENSE_FILES = LICENSE
 
Signature · 1 line
2.31.1
#2 lore raw

PATCH 3/11 package/php-imagick: bump version to 3.5.0

In reply to Adam Duskett
---
 package/php-imagick/php-imagick.hash | 2 +-
 package/php-imagick/php-imagick.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/php-imagick/php-imagick.hash +1 -1
index 8b62ed1d9a..e915808585 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  1f3c5b5eeaa02800ad22f506cd100e8889a66b2ec937e192eaaa30d74562567c  imagick-3.4.3.tgz
+sha256  795db7c36fbacd3d33a4f53ff2d38584c846e80a04dcd04c55e9e46c28f5d229  imagick-3.5.0.tgz
 sha256  b6e00df9cb3b91977c0d64a7c4db48cb6f5041f6eeda6583c236775f70a35b78  LICENSE
package/php-imagick/php-imagick.mk +1 -1
index 6fb43de0ca..2dc055f0b3 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_IMAGICK_VERSION = 3.4.3
+PHP_IMAGICK_VERSION = 3.5.0
 PHP_IMAGICK_SOURCE = imagick-$(PHP_IMAGICK_VERSION).tgz
 PHP_IMAGICK_SITE = http://pecl.php.net/get
 PHP_IMAGICK_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 1 line
2.31.1
#3 lore raw

PATCH 4/11 package/php-memcached: bump version to 3.1.5

In reply to Adam Duskett
---
 package/php-memcached/php-memcached.hash | 8 ++++----
 package/php-memcached/php-memcached.mk   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
package/php-memcached/php-memcached.hash +4 -4
index dd294f466a..7e918c17f6 100644
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256 20786213ff92cd7ebdb0d0ac10dde1e9580a2f84296618b666654fd76ea307d4  memcached-3.1.3.tgz
-sha256 24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0  LICENSE
-sha256 a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054  fastlz/LICENSE
-sha256 bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82  g_fmt.h
+sha256  b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd  memcached-3.1.5.tgz
+sha256  24e8e3a9529204ead9422fa17cf3ddd75d292a8763b87fdb20591964f2e6ebe0  LICENSE
+sha256  a453a7a272fbd24105b39959f76996d50dad80b22d1c310f6c67f74f62ae4054  fastlz/LICENSE
+sha256  bba8cb50c660842c5ca459c5004395bdef8f01c1b64f97a9978f1053f173cb82  g_fmt.h
package/php-memcached/php-memcached.mk +1 -1
index 4607d099f3..068fbb786b 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_MEMCACHED_VERSION = 3.1.3
+PHP_MEMCACHED_VERSION = 3.1.5
 PHP_MEMCACHED_SOURCE = memcached-$(PHP_MEMCACHED_VERSION).tgz
 PHP_MEMCACHED_SITE = https://pecl.php.net/get
 PHP_MEMCACHED_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 1 line
2.31.1
#4 lore raw

PATCH 5/11 package/php-ssh2: bump version to 1.3.1

In reply to Adam Duskett

Other changes:
- Remove both upstream patches

---
 ...fix-php_url-fields-usage-for-PHP-7-3.patch | 302 -------
 ...estored-commented-reference-counting.patch | 746 ------------------
 package/php-ssh2/php-ssh2.hash                |   2 +-
 package/php-ssh2/php-ssh2.mk                  |   2 +-
 4 files changed, 2 insertions(+), 1050 deletions(-)
 delete mode 100644 package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch
 delete mode 100644 package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch
package/php-ssh2/0001-fix-php_url-fields-usage-for-PHP-7-3.patch deleted +0 -302
deleted file mode 100644
index afc5de9915..0000000000
@@ -1,302 +0,0 @@
-From a8835aab2c15e794fce13bd927295719e384ad2d Mon Sep 17 00:00:00 2001
-From: Remi Collet <[email protected]>
-Date: Thu, 28 Jun 2018 07:10:35 +0200
-Subject: [PATCH] fix php_url fields usage for PHP 7.3
-
-Signed-off-by: Fabrice Fontaine <[email protected]>
-[Retrieved from:
-https://github.com/php/pecl-networking-ssh2/commit/a8835aab2c15e794fce13bd927295719e384ad2d]
----
- 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 @@ php_url *php_ssh2_fopen_wraper_parse_path(const char *path, char *type, php_stre
- 		*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(&copyval);
- 					convert_to_string(&copyval);
- 					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(&copyval);
- 				}
-@@ -631,7 +646,7 @@ static php_stream *php_ssh2_fopen_wrapper_shell(php_stream_wrapper *wrapper, con
- 		zval_ptr_dtor(&copyval);
- 	}
- 
--	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(&copyval);
- 					convert_to_string(&copyval);
- 					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(&copyval);
- 				}
-@@ -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;
- 	}
- 
package/php-ssh2/0002-dstogov-Fixed-PHP7-port-Restored-commented-reference-counting.patch deleted +0 -746

746 lines not on this page · raw message

package/php-ssh2/php-ssh2.hash +1 -1
index 36e04f471f..3fbb0b24c8 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  87618d6a0981afe8c24b36d6b38c21a0aa0237b62e60347d0170bd86b51f79fb  ssh2-1.1.2.tgz
+sha256  9093a1f8d24dc65836027b0e239c50de8d5eaebf8396bc3331fdd38c5d69afd9  ssh2-1.3.1.tgz
 sha256  ac7c56f1e416ce6e60abcf26269395128bc9e5a2e4f3293e5dcc124aac606508  LICENSE
package/php-ssh2/php-ssh2.mk +1 -1
index c9c13010dd..b79ac04179 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_SSH2_VERSION = 1.1.2
+PHP_SSH2_VERSION = 1.3.1
 PHP_SSH2_SOURCE = ssh2-$(PHP_SSH2_VERSION).tgz
 PHP_SSH2_SITE = https://pecl.php.net/get
 PHP_SSH2_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 1 line
2.31.1
#5 lore raw

PATCH 6/11 package/php-xdebug: bump version to 3.0.4

In reply to Adam Duskett
---
 package/php-xdebug/php-xdebug.hash | 4 ++--
 package/php-xdebug/php-xdebug.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/php-xdebug/php-xdebug.hash +2 -2
index 8b90352ebf..72bfac67ce 100644
@@ -1,3 +1,3 @@
 # Locally computed
-sha256 ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272  LICENSE
-sha256 e330c5ccb77890b06dd7bf093567051450b2438b79fed8e7e6c4834278d46092  php-xdebug-2.9.6.tar.gz
+sha256  7e4f28fc65c8b535de43b6d2ec57429476a6de1d53c4d440a9108ae8d28e01f4  php-xdebug-3.0.4.tar.gz
+sha256  ef479ee1a3da3f933e0d046ca8cd0c14601f29b2c0c41cc60c9388546a4e0272  LICENSE
package/php-xdebug/php-xdebug.mk +1 -1
index ab6ade4cb1..18ebc32592 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_XDEBUG_VERSION = 2.9.6
+PHP_XDEBUG_VERSION = 3.0.4
 PHP_XDEBUG_SITE = $(call github,xdebug,xdebug,$(PHP_XDEBUG_VERSION))
 PHP_XDEBUG_INSTALL_STAGING = YES
 PHP_XDEBUG_LICENSE = Xdebug License (PHP-3.0-like)
Signature · 1 line
2.31.1
#6 lore raw

PATCH 7/11 package/php-yaml: bump version to 2.2.1

In reply to Adam Duskett
---
 package/php-yaml/php-yaml.hash | 4 ++--
 package/php-yaml/php-yaml.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
package/php-yaml/php-yaml.hash +2 -2
index c29c3e66ad..e4f31cdad9 100644
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 9786b0386e648f12cc18a038358bd57bee4906e350a2e9ab776d6a5f18fc6680  yaml-2.0.4.tgz
-sha256 68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338  LICENSE
+sha256  e17ad04e752e25fd099bddd2df9d26dfef183c8d00c4179bc9d7a2e1c97d7819  yaml-2.2.1.tgz
+sha256  68d9700294396c72089bfc7bf38a5b3654a53ae415f3bd37768848c14e86f338  LICENSE
package/php-yaml/php-yaml.mk +1 -1
index e23d897978..ba16c9ac62 100644
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PHP_YAML_VERSION = 2.0.4
+PHP_YAML_VERSION = 2.2.1
 PHP_YAML_SOURCE = yaml-$(PHP_YAML_VERSION).tgz
 PHP_YAML_SITE = https://pecl.php.net/get
 PHP_YAML_CONF_OPTS = --with-php-config=$(STAGING_DIR)/usr/bin/php-config \
Signature · 1 line
2.31.1
#7 lore raw

PATCH 8/11 package/php-zmq: add upstream php8 compatibility patches

In reply to Adam Duskett

These patches are necessary for compiling against php8. These patches also retain the ability to compile against PHP7.2 and should be removed during the next version bump.

---
 ...1-PHP-7.3-compatibility-and-bugfixes.patch | 271 ------------------
 .../0001-updates-for-php7.4-and-php8.0.patch  | 230 +++++++++++++++
 package/php-zmq/0002-fix-for-php-7.3.patch    |  43 +++
 .../php-zmq/0003-fix-for-php-8.0.0beta2.patch |  40 +++
 4 files changed, 313 insertions(+), 271 deletions(-)
 delete mode 100644 package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch
 create mode 100644 package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch
 create mode 100644 package/php-zmq/0002-fix-for-php-7.3.patch
 create mode 100644 package/php-zmq/0003-fix-for-php-8.0.0beta2.patch
package/php-zmq/0001-PHP-7.3-compatibility-and-bugfixes.patch deleted +0 -271
deleted file mode 100644
index 83cdb04530..0000000000
@@ -1,271 +0,0 @@
-From 6ea688eff5157785267d2b671cf62d296288847f Mon Sep 17 00:00:00 2001
-From: Alex/AT <[email protected]>
-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'
-
-[Frank: backport from upstream PR https://github.com/mkoppanen/php-zmq/pull/195]
-Signed-off-by: Frank Hunleth <[email protected]>
----
- 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--
--<?php require_once(dirname(__FILE__) . '/skipif.inc'); ?>
-+<?php require_once(dirname(__FILE__) . '/skipif.inc');
-+if (PHP_VERSION_ID >= 70100) die("skip PHP 7.1 and higher fallback to passing argument by value even when forced to reference"); ?>
- --FILE--
- <?php
- 
-diff --git a/tests/021-callbackwarning.phpt b/tests/021-callbackwarning.phpt
-index 435743e..eba2ecf 100644
---- a/tests/021-callbackwarning.phpt
-+++ b/tests/021-callbackwarning.phpt
-@@ -13,5 +13,5 @@ function generate_warning($a, $b)
- $socket = new ZMQSocket(new ZMQContext(), ZMQ::SOCKET_REQ, 'persistent_socket', 'generate_warning');
- 
- --EXPECTF--
--Warning: in_array() expects parameter 2 to be array, integer given in %s on line %d
-+Warning: in_array() expects parameter 2 to be array, %s given in %s on line %d
- 
-diff --git a/zmq.c b/zmq.c
-index 942e69b..57ebd11 100644
---- a/zmq.c
-+++ b/zmq.c
-@@ -235,7 +235,7 @@ php_zmq_context *php_zmq_context_get(zend_long io_threads, zend_bool is_persiste
- 		le.type = php_zmq_context_list_entry();
- 		le.ptr  = context;
- 
--		GC_REFCOUNT(&le) = 1;
-+		GC_SET_REFCOUNT(&le, 1);
- 
- 		/* plist_key is not a persistent allocated key, thus we use str_update here */
- 		if (zend_hash_str_update_mem(&EG(persistent_list), plist_key->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) {
--- 
-2.17.1
-
package/php-zmq/0001-updates-for-php7.4-and-php8.0.patch new file +230 -0

230 lines not on this page · raw message

package/php-zmq/0002-fix-for-php-7.3.patch new file +43 -0

43 lines not on this page · raw message

package/php-zmq/0003-fix-for-php-8.0.0beta2.patch new file +40 -0
new file mode 100644
index 0000000000..c5aab16ab7
@@ -0,0 +1,40 @@
+From f0993f1fe973c4d359323ad1897ed7aa74f7e015 Mon Sep 17 00:00:00 2001
+From: Remi Collet <[email protected]>
+Date: Mon, 24 Aug 2020 15:55:54 +0200
+Subject: [PATCH] fix for PHP 8.0.0beta2
+
+Signed-off-by: Remi Collet <[email protected]>
+Signed-off-by: Adam Duskett <[email protected]>
+---
+ zmq.c        | 2 ++
+ zmq_device.c | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/zmq.c b/zmq.c
+index 89902f9..bd2401d 100644
+--- a/zmq.c
++++ b/zmq.c
+@@ -621,7 +621,9 @@ zend_bool php_zmq_connect_callback(zval *socket, zend_fcall_info *fci, zend_fcal
+ 	fci->params         = params;
+ 	fci->param_count    = 2;
+ 	fci->retval         = &retval;
++#if PHP_VERSION_ID < 80000
+ 	fci->no_separation  = 1;
++#endif
+ 
+ 	if (zend_call_function(fci, fci_cache) == FAILURE) {
+ 		if (!EG(exception)) {
+diff --git a/zmq_device.c b/zmq_device.c
+index 534f966..1c6aa3e 100644
+--- a/zmq_device.c
++++ b/zmq_device.c
+@@ -53,7 +53,9 @@ zend_bool s_invoke_device_cb (php_zmq_device_cb_t *cb, uint64_t current_ts)
+ 	cb->fci.param_count = 1;
+ 
+ 	/* Call the cb */
++#if PHP_VERSION_ID < 80000
+ 	cb->fci.no_separation  = 1;
++#endif
+ 	cb->fci.retval         = &fc_retval;
+ 
+ 	if (zend_call_function(&(cb->fci), &(cb->fci_cache)) == FAILURE) {
Signature · 1 line
2.31.1
#8 lore raw

PATCH 9/11 package/php-geoip: add php8 build support

In reply to Adam Duskett

Add a patch that allows php-geoip to compile against php8.

---
 .../0001-add-build-support-for-php8.patch     | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 package/php-geoip/0001-add-build-support-for-php8.patch
package/php-geoip/0001-add-build-support-for-php8.patch new file +35 -0
new file mode 100644
index 0000000000..5672b00ce8
@@ -0,0 +1,35 @@
+From 9500f9964a1ef03890376c61f1b17db88753c8e2 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <[email protected]>
+Date: Mon, 28 Jun 2021 12:24:59 -0700
+Subject: [PATCH] add build support for php8
+
+Signed-off-by: Adam Duskett <[email protected]>
+---
+ php_geoip.h | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/php_geoip.h b/php_geoip.h
+index 2f67cb6..d19d612 100644
+--- a/php_geoip.h
++++ b/php_geoip.h
+@@ -30,6 +30,17 @@ extern zend_module_entry geoip_module_entry;
+ typedef long zend_long;
+ #endif
+ 
++/* Small change to let it build after a major internal change for php8.0
++ * More info:
++ * https://github.com/php/php-src/blob/php-8.0.0/UPGRADING.INTERNALS#L47
++ */
++#if PHP_MAJOR_VERSION >= 8
++# define TSRMLS_DC
++# define TSRMLS_D
++# define TSRMLS_CC
++# define TSRMLS_C
++# endif
++
+ #ifdef PHP_WIN32
+ #define PHP_GEOIP_API __declspec(dllexport)
+ #else
+-- 
+2.31.1
+
Signature · 1 line
2.31.1
#9 lore raw

PATCH 10/11 package/php-amqp: add add upstream php8 compatibility patches

In reply to Adam Duskett

These patches are necessary for compiling against php8. These patches also retain the ability to compile against PHP7.2

---
 .../0001-add-build-support-for-php-8.patch    |   54 +
 .../php-amqp/0002-more-work-for-php-8.patch   | 1265 +++++++++++++++++
 2 files changed, 1319 insertions(+)
 create mode 100644 package/php-amqp/0001-add-build-support-for-php-8.patch
 create mode 100644 package/php-amqp/0002-more-work-for-php-8.patch
package/php-amqp/0001-add-build-support-for-php-8.patch new file +54 -0
new file mode 100644
index 0000000000..6fe09ad3bd
@@ -0,0 +1,54 @@
+From 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438 Mon Sep 17 00:00:00 2001
+From: mmokhi <[email protected]>
+Date: Thu, 30 Jul 2020 11:25:33 +0200
+Subject: [PATCH] Add build support for PHP8.0 (#381)
+
+From upstream commit: 96cd5cb5eddd3db2faaa3643dad2fe4677d7c438
+
+Signed-off-by: mmokhi <[email protected]>
+Signed-off-by: Adam Duskett <[email protected]>
+---
+ amqp_envelope.h |  7 +++++++
+ php7_support.h  | 11 +++++++++++
+ 2 files changed, 18 insertions(+)
+
+diff --git a/amqp_envelope.h b/amqp_envelope.h
+index e63a3a5..e315682 100644
+--- a/amqp_envelope.h
++++ b/amqp_envelope.h
+@@ -20,6 +20,13 @@
+   | - Jonathan Tansavatdi                                                |
+   +----------------------------------------------------------------------+
+ */
++
++#if PHP_MAJOR_VERSION >= 7
++        #include "php7_support.h"
++#else
++        #include "php5_support.h"
++#endif
++
+ extern zend_class_entry *amqp_envelope_class_entry;
+ 
+ void convert_amqp_envelope_to_zval(amqp_envelope_t *amqp_envelope, zval *envelope TSRMLS_DC);
+diff --git a/php7_support.h b/php7_support.h
+index 47ce983..c9e8f5b 100644
+--- a/php7_support.h
++++ b/php7_support.h
+@@ -101,6 +101,17 @@ typedef zval PHP5to7_zend_resource_le_t;
+ 
+ #define PHP5to7_ZEND_ACC_FINAL_CLASS ZEND_ACC_FINAL
+ 
++/* Small change to let it build after a major internal change for php8.0
++ * More info:
++ * https://github.com/php/php-src/blob/php-8.0.0alpha3/UPGRADING.INTERNALS#L47
++ */
++#if PHP_MAJOR_VERSION >= 8
++# define TSRMLS_DC
++# define TSRMLS_D
++# define TSRMLS_CC
++# define TSRMLS_C
++# endif
++
+ #endif //PHP_AMQP_PHP7_SUPPORT_H
+ 
+ /*
package/php-amqp/0002-more-work-for-php-8.patch new file +1265 -0

1,265 lines not on this page · raw message

Signature · 1 line
2.31.1
#10 lore raw

PATCH 11/11 package/php: bump version to 8.0.7

In reply to Adam Duskett

Other changes:
- Move BR2_PACKAGE_PHP_EXT_JSON to Config.in.legacy as the json extension is now an integral part of PHP and is no longer optional.

- Move BR2_PACKAGE_PHP_EXT_XMLRPC to Config.in.legacy as the extension has been removed. See https://wiki.php.net/rfc/unbundle_xmlprc for an explination.

- Add a new patch that allows for opcache to cross-compile with PHP8.

- Explicitly disable opcache-jit when opcache is enabled, as the JIT fails to cross-compile.

- --enable-maintainer-zts is now --enable-zts

---
 Config.in.legacy                              | 15 ++++++
 ...1-acinclude.m4-don-t-unset-variables.patch |  4 +-
 .../0002-iconv-tweak-iconv-detection.patch    | 48 +++----------------
 ...0003-configure-disable-the-phar-tool.patch |  6 +--
 .../0004-Call-apxs-with-correct-prefix.patch  |  8 ++--
 .../0005-allow-opcache-cross-compiling.patch  | 37 ++++++++++++++
 package/php/Config.ext                        | 12 -----
 package/php/php.hash                          |  2 +-
 package/php/php.mk                            | 16 ++-----
 9 files changed, 73 insertions(+), 75 deletions(-)
 create mode 100644 package/php/0005-allow-opcache-cross-compiling.patch
Config.in.legacy +15 -0
index a0c1a6898f..2865e4c58b 100644
@@ -146,6 +146,21 @@ endif
 
 comment "Legacy options removed in 2021.05"
 
+config BR2_PACKAGE_PHP_EXT_XMLRPC
+	bool "PHP XMLRPC extension removed"
+	select BR2_LEGACY
+	help
+	  The XMLRPC php extension was removed.
+	  See: https://wiki.php.net/rfc/unbundle_xmlprc
+
+config BR2_PACKAGE_PHP_EXT_JSON
+	bool "Optional PHP JSON extension removed"
+	select BR2_LEGACY
+	help
+	  The JSON extension is now an integral part of PHP and cannot
+	  be disabled as per RFC:
+	  https://wiki.php.net/rfc/always_enable_json
+
 config BR2_PACKAGE_UDISKS_LVM2
 	bool "udisks lvm2 support removed"
 	select BR2_LEGACY
package/php/0001-acinclude.m4-don-t-unset-variables.patch +2 -2
index 982857a357..2d15552783 100644
@@ -17,7 +17,7 @@ diff --git a/build/php.m4 b/build/php.m4
 index e91ef988..9586c490 100644
 --- a/build/php.m4
 +++ b/build/php.m4
-@@ -1587,8 +1587,6 @@ dnl PHP_CHECK_FUNC_LIB
+@@ -1568,8 +1568,6 @@ dnl PHP_CHECK_FUNC_LIB
  dnl
  AC_DEFUN([PHP_CHECK_FUNC_LIB],[
    ifelse($2,,:,[
@@ -26,7 +26,7 @@ index e91ef988..9586c490 100644
    unset found
    AC_CHECK_LIB($2, $1, [found=yes], [
      AC_CHECK_LIB($2, __$1, [found=yes], [found=no])
-@@ -1620,8 +1618,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
+@@ -1601,8 +1599,6 @@ dnl and as a fall back in the specified library. Defines HAVE_func and
  dnl HAVE_library if found and adds the library to LIBS.
  dnl
  AC_DEFUN([PHP_CHECK_FUNC],[
package/php/0002-iconv-tweak-iconv-detection.patch +7 -41

67 lines not on this page · raw message

package/php/0003-configure-disable-the-phar-tool.patch +3 -3
index 4a25ec05c1..cc4f55a8c8 100644
@@ -11,7 +11,7 @@ on the target.
 Signed-off-by: Gustavo Zacarias <[email protected]>
 [Gustavo: update for autoreconf/configure.in]
 Signed-off-by: Adam Duskett <[email protected]>
-[Aduskett: update for 7.3.0]
+[Aduskett: update for 8.0.7]
 Signed-off-by: Bernd Kuhls <[email protected]>
 [Bernd: rebased for 7.4.10 & 7.4.13]
 ---
@@ -22,8 +22,8 @@ diff --git a/configure.ac b/configure.ac
 index 0dfab302..6026fb66 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -1454,13 +1454,8 @@ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
- INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
+@@ -1423,13 +1423,8 @@ CFLAGS_CLEAN="$CFLAGS \$(PROF_FLAGS)"
+ CFLAGS="\$(CFLAGS_CLEAN) $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag \$(PROF_FLAGS)"
  
 -if test "$PHP_PHAR" != "no" && test "$PHP_CLI" != "no"; then
package/php/0004-Call-apxs-with-correct-prefix.patch +4 -4
index a0a0715789..3a1a580084 100644
@@ -7,7 +7,7 @@ php uses apache's apxs script from staging directory to install libphp
 dynamic library and update /etc/apache2/httpd.conf in the staging and target
 directories. Here is the full command line:
 "apxs -S LIBEXECDIR='$(INSTALL_ROOT)/usr/modules'
- -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php7"
+ -S SYSCONFDIR='$(INSTALL_ROOT)/etc/apache2' -i -a -n php"
 This does not work for target directory as apxs sets the full path of the
 library and not the relative one. Indeed, apxs is smart enough to substitute
 away the prefix specified in $(STAGING_DIR)/usr/build/config_vars.mk so
@@ -16,7 +16,7 @@ To fix this, add -S PREFIX='$(INSTALL_ROOT)/usr' to apxs call in configure
 
 Signed-off-by: Fabrice Fontaine <[email protected]>
 Signed-off-by: Adam Duskett <[email protected]>
-[aduskett at gmail.com: Update for 7.3.0]
+[aduskett at gmail.com: Update for 8.0.7]
 ---
  sapi/apache2handler/config.m4 | 3 +++
  1 file changed, 3 insertions(+)
@@ -35,7 +35,7 @@ index 55c16179..68ce66c0 100644
      INSTALL_IT="\$(mkinstalldirs) '$APXS_LIBEXECDIR' && \
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
 +                       -S PREFIX='$APXS_PREFIX' \
-                        -i -n php7"
+                        -i -n php"
    else
      APXS_SYSCONFDIR='$(INSTALL_ROOT)'`$APXS -q SYSCONFDIR`
 @@ -74,6 +76,7 @@ if test "$PHP_APXS2" != "no"; then
@@ -43,7 +43,7 @@ index 55c16179..68ce66c0 100644
                   $APXS -S LIBEXECDIR='$APXS_LIBEXECDIR' \
                         -S SYSCONFDIR='$APXS_SYSCONFDIR' \
 +                       -S PREFIX='$APXS_PREFIX' \
-                        -i -a -n php7"
+                        -i -a -n php"
    fi
  
 -- 
package/php/0005-allow-opcache-cross-compiling.patch new file +37 -0
new file mode 100644
index 0000000000..d168f71892
@@ -0,0 +1,37 @@
+From 9bb316c41a69935ee2072626467241889594bed4 Mon Sep 17 00:00:00 2001
+From: Adam Duskett <[email protected]>
+Date: Mon, 28 Jun 2021 11:12:36 -0700
+Subject: [PATCH] allow opcache cross-compiling
+
+Remove the check at the end of ext/opcache/config.m4 that prevents opcache from
+being enabled in a cross-compiled environment. We pass the following as a
+CFLAGS when opcache is enabled:
+  -DHAVE_SHM_IPC
+  -DHAVE_SHM_MMAP_ANON
+  -DHAVE_SHM_MMAP_ZERO
+  -DHAVE_SHM_MMAP_POSIX
+  -DHAVE_SHM_MMAP_FILE
+
+Signed-off-by: Adam Duskett <[email protected]>
+---
+ ext/opcache/config.m4 | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/ext/opcache/config.m4 b/ext/opcache/config.m4
+index 5492fd92..10c150ff 100644
+--- a/ext/opcache/config.m4
++++ b/ext/opcache/config.m4
+@@ -339,10 +339,6 @@ int main() {
+   PHP_ADD_BUILD_DIR([$ext_builddir/Optimizer], 1)
+   PHP_ADD_EXTENSION_DEP(opcache, pcre)
+ 
+-  if test "$have_shm_ipc" != "yes" && test "$have_shm_mmap_posix" != "yes" && test "$have_shm_mmap_anon" != "yes"; then
+-    AC_MSG_ERROR([No supported shared memory caching support was found when configuring opcache. Check config.log for any errors or missing dependencies.])
+-  fi
+-
+   if test "$PHP_OPCACHE_JIT" = "yes"; then
+     PHP_ADD_BUILD_DIR([$ext_builddir/jit], 1)
+     PHP_ADD_MAKEFILE_FRAGMENT($ext_srcdir/jit/Makefile.frag)
+-- 
+2.31.1
+
package/php/Config.ext +0 -12
index 1e8ca495a7..3a65f70b86 100644
@@ -273,11 +273,6 @@ config BR2_PACKAGE_PHP_EXT_GMP
 
 comment "Other basic extensions"
 
-config BR2_PACKAGE_PHP_EXT_JSON
-	bool "JSON"
-	help
-	  JavaScript Object Serialization support
-
 config BR2_PACKAGE_PHP_EXT_TOKENIZER
 	bool "Tokenizer"
 	help
@@ -363,13 +358,6 @@ config BR2_PACKAGE_PHP_EXT_SOAP
 	help
 	  SOAP support
 
-config BR2_PACKAGE_PHP_EXT_XMLRPC
-	bool "XML-RPC"
-	select BR2_PACKAGE_PHP_EXT_LIBXML2
-	select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE
-	help
-	  XML-RPC support
-
 comment "XML manipulation"
 
 config BR2_PACKAGE_PHP_EXT_DOM
package/php/php.hash +1 -1
index d91d6aec66..b1cb8f045e 100644
@@ -1,5 +1,5 @@
 # From https://www.php.net/downloads.php
-sha256  1fa46ca6790d780bf2cb48961df65f0ca3640c4533f0bca743cd61b71cb66335  php-7.4.20.tar.xz
+sha256  d5fc2e4fc780a32404d88c360e3e0009bc725d936459668e9c2ac992f2d83654  php-8.0.7.tar.xz
 
 # License file
 sha256  a188db807d711536f71e27b7d36879d63480f7994dc18adc08e624b3c5430fff  LICENSE
package/php/php.mk +4 -12
index 3e422c5ac1..af0b073d84 100644
@@ -4,8 +4,8 @@
 #
 ################################################################################
 
-PHP_VERSION = 7.4.20
-PHP_SITE = http://www.php.net/distributions
+PHP_VERSION = 8.0.7
+PHP_SITE = https://www.php.net/distributions
 PHP_SOURCE = php-$(PHP_VERSION).tar.xz
 PHP_INSTALL_STAGING = YES
 PHP_INSTALL_STAGING_OPTS = INSTALL_ROOT=$(STAGING_DIR) install
@@ -62,7 +62,7 @@ PHP_CXXFLAGS = $(TARGET_CXXFLAGS)
 # The OPcache extension isn't cross-compile friendly
 # Throw some defines here to avoid patching heavily
 ifeq ($(BR2_PACKAGE_PHP_EXT_OPCACHE),y)
-PHP_CONF_OPTS += --enable-opcache
+PHP_CONF_OPTS += --enable-opcache --disable-opcache-jit
 PHP_CONF_ENV += ac_cv_func_mprotect=yes
 PHP_CFLAGS += \
 	-DHAVE_SHM_IPC \
@@ -90,7 +90,7 @@ PHP_CONF_OPTS += --with-apxs2=$(STAGING_DIR)/usr/bin/apxs
 
 # Enable thread safety option if Apache MPM is event or worker
 ifeq ($(BR2_PACKAGE_APACHE_MPM_EVENT)$(BR2_PACKAGE_APACHE_MPM_WORKER),y)
-PHP_CONF_OPTS += --enable-maintainer-zts
+PHP_CONF_OPTS += --enable-zts
 endif
 endif
 
@@ -107,7 +107,6 @@ PHP_CONF_OPTS += \
 	$(if $(BR2_PACKAGE_PHP_EXT_XMLWRITER),--enable-xmlwriter) \
 	$(if $(BR2_PACKAGE_PHP_EXT_EXIF),--enable-exif) \
 	$(if $(BR2_PACKAGE_PHP_EXT_FTP),--enable-ftp) \
-	$(if $(BR2_PACKAGE_PHP_EXT_JSON),--enable-json) \
 	$(if $(BR2_PACKAGE_PHP_EXT_TOKENIZER),--enable-tokenizer) \
 	$(if $(BR2_PACKAGE_PHP_EXT_PCNTL),--enable-pcntl) \
 	$(if $(BR2_PACKAGE_PHP_EXT_SHMOP),--enable-shmop) \
@@ -161,13 +160,6 @@ PHP_CONF_OPTS += --enable-wddx --with-libexpat-dir=$(STAGING_DIR)/usr
 PHP_DEPENDENCIES += expat
 endif
 
-ifeq ($(BR2_PACKAGE_PHP_EXT_XMLRPC),y)
-PHP_CONF_OPTS += \
-	--with-xmlrpc \
-	$(if $(BR2_PACKAGE_LIBICONV),--with-iconv-dir=$(STAGING_DIR)/usr)
-PHP_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv)
-endif
-
 ifeq ($(BR2_PACKAGE_PHP_EXT_ZIP),y)
 PHP_DEPENDENCIES += libzip
 endif
Signature · 1 line
2.31.1
#11 lore raw

PATCH 1/11 package/php-amqp: bump version to 1.10.2

In reply to Adam Duskett
Quoted 5 lines · On Tue, 29 Jun 2021 09:50:44 -0700 Adam Duskett <[email protected]> wrote:
---
 package/php-amqp/php-amqp.hash | 4 ++--
 package/php-amqp/php-amqp.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

Thanks, I have applied the entire series to master. The only thing I changed was in PATCH 11/11: I did not keep BR2_PACKAGE_PHP_EXT_JSON in Config.in.legacy. Indeed, as it is now always enabled in PHP, there's no point in keeping a legacy entry: people who had the option enabled, will still have the feature, so there's no point in warning them about this.

Thanks a lot for this work! I hope php-amqp will soon make a new release to be able to drop the large patch.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com