svn commit: r541314 - in head/databases/pecl-redis: . files

[Thomas Zander]

Author: riggs
Date: Mon Jul  6 06:37:22 2020
New Revision: 541314
URL: https://svnweb.freebsd.org/changeset/ports/541314

Log:
  Fix runtime link error: Undefined symbol "php_hash_bin2hex" and segfault
  
  PR:		247717
  Submitted by:	juraj at lutter.sk, daniel at blodan.se (maintainer)
  Reviewed by:	daniel at blodan.se (maintainer)
  MFH:		2020Q3

Added:
  head/databases/pecl-redis/files/
  head/databases/pecl-redis/files/patch-redis.c   (contents, props changed)
  head/databases/pecl-redis/files/patch-redis__session.c   (contents, props changed)
Modified:
  head/databases/pecl-redis/Makefile

Modified: head/databases/pecl-redis/Makefile
==============================================================================
--- head/databases/pecl-redis/Makefile	Mon Jul  6 06:34:41 2020	(r541313)
+++ head/databases/pecl-redis/Makefile	Mon Jul  6 06:37:22 2020	(r541314)
@@ -2,6 +2,7 @@
 
 PORTNAME=	redis
 PORTVERSION=	5.3.0
+PORTREVISION=	1
 CATEGORIES=	databases
 
 MAINTAINER=	daniel at blodan.se

Added: head/databases/pecl-redis/files/patch-redis.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/pecl-redis/files/patch-redis.c	Mon Jul  6 06:37:22 2020	(r541314)
@@ -0,0 +1,15 @@
+Patch can be removed in next release
+Upstream fix: 
+https://github.com/phpredis/phpredis/pull/1800
+
+--- redis.c.orig	2020-07-03 06:16:52 UTC
++++ redis.c
+@@ -30,7 +30,7 @@
+ #include <standard/php_random.h>
+ #include <zend_exceptions.h>
+ #include <ext/standard/info.h>
+-
++#include <ext/hash/php_hash.h>
+ 
+ #ifdef PHP_SESSION
+ #include <ext/session/php_session.h>

Added: head/databases/pecl-redis/files/patch-redis__session.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/databases/pecl-redis/files/patch-redis__session.c	Mon Jul  6 06:37:22 2020	(r541314)
@@ -0,0 +1,16 @@
+Patch can be removed in next release
+Upstream fix;
+https://github.com/phpredis/phpredis/pull/1804
+
+--- redis_session.c.orig	2020-07-03 06:17:19 UTC
++++ redis_session.c
+@@ -480,7 +480,8 @@ PS_OPEN_FUNC(redis)
+             }
+ 
+             redis_sock = redis_sock_create(addr, addrlen, port, timeout, read_timeout,
+-                                           persistent, ZSTR_VAL(persistent_id), retry_interval);
++                                           persistent, persistent_id ? ZSTR_VAL(persistent_id) : NULL,
++                                           retry_interval);
+ 
+             redis_pool_add(pool, redis_sock, weight, db);
+             redis_sock->prefix = prefix;