<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3a07c07b2d1ee9f62b97275a8325672a05209164">https://github.com/macports/macports-ports/commit/3a07c07b2d1ee9f62b97275a8325672a05209164</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3a07c07b2d1ee9f62b97275a8325672a05209164
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Sat Jan 18 23:25:27 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> php-memcached: Update to 3.1.5; add php74
</span>---
php/php-memcached/Portfile | 11 +++---
php/php-memcached/files/php73-memcached.patch | 50 ---------------------------
2 files changed, 5 insertions(+), 56 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-memcached/Portfile b/php/php-memcached/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1956b9e..a3836ae 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/php/php-memcached/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,16 +9,15 @@ platforms darwin freebsd openbsd
</span> maintainers {ryandesign @ryandesign} openmaintainer
license PHP-3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+php.branches 5.3 5.4 5.5 5.6 7.0 7.1 7.2 7.3 7.4
</span> php.pecl yes
if {[vercmp ${php.branch} 7] >= 0} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- version 3.0.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 3.1.5
</span> revision 0
<span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 c5c7ffcf482094690cf805319d842911a075c7ad \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 561db4c8abdb7c344703a6b7b0ff4f29c2fe0fbacf7b2a2a704d0ed9b1a17d11 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 78776
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles php73-memcached.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 5d71f0b19f6ff2e727cadbec00731c7d1b5f2b2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b288e45f839593e16c4d8508b241de51a86df4f7322153e6becb9e1c819021fd \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 83015
</span> } else {
version 2.2.0
revision 0
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/php/php-memcached/files/php73-memcached.patch b/php/php-memcached/files/php73-memcached.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 5932f6c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/php/php-memcached/files/php73-memcached.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,50 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fix build with php 7.3+.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php-memcached-dev/php-memcached/issues/385
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://github.com/php-memcached-dev/php-memcached/pull/390
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- php_memcached.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ php_memcached.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1298,7 +1298,7 @@ static PHP_METHOD(Memcached, __construct)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- le.type = php_memc_list_entry();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- le.ptr = intern->memc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GC_REFCOUNT(&le) = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GC_SET_REFCOUNT(&le, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* plist_key is not a persistent allocated key, thus we use str_update here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (zend_hash_str_update_mem(&EG(persistent_list), ZSTR_VAL(plist_key), ZSTR_LEN(plist_key), &le, sizeof(le)) == NULL) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3831,7 +3831,7 @@ PHP_METHOD(MemcachedServer, on)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Z_TRY_ADDREF(fci.function_name);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (fci.object) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GC_REFCOUNT(fci.object)++;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GC_ADDREF(fci.object);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RETURN_BOOL(rc);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- php_memcached_private.h.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ php_memcached_private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -72,6 +72,13 @@ typedef unsigned long int uint32_t;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+/* Backwards compatibility for GC API change in PHP 7.3 */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if PHP_VERSION_ID < 70300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define GC_ADDREF(p) ++GC_REFCOUNT(p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define GC_DELREF(p) --GC_REFCOUNT(p)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# define GC_SET_REFCOUNT(p, rc) GC_REFCOUNT(p) = rc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /****************************************
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Structures and definitions
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ****************************************/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- php_memcached_session.c.orig
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ php_memcached_session.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -376,7 +376,7 @@ PS_OPEN_FUNC(memcached)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- le.type = s_memc_sess_list_entry();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- le.ptr = memc;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GC_REFCOUNT(&le) = 1;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GC_SET_REFCOUNT(&le, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* plist_key is not a persistent allocated key, thus we use str_update here */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (zend_hash_str_update_mem(&EG(persistent_list), plist_key, plist_key_len, &le, sizeof(le)) == NULL) {
</span></pre><pre style='margin:0'>
</pre>