diff options
-rw-r--r-- | databases/pecl-redis/Makefile | 1 | ||||
-rw-r--r-- | databases/pecl-redis/files/patch-redis.c | 15 | ||||
-rw-r--r-- | databases/pecl-redis/files/patch-redis__session.c | 16 |
3 files changed, 32 insertions, 0 deletions
diff --git a/databases/pecl-redis/Makefile b/databases/pecl-redis/Makefile index fa656afeb589..003a839b6fae 100644 --- a/databases/pecl-redis/Makefile +++ b/databases/pecl-redis/Makefile @@ -2,6 +2,7 @@ PORTNAME= redis PORTVERSION= 5.3.0 +PORTREVISION= 1 CATEGORIES= databases MAINTAINER= daniel@blodan.se diff --git a/databases/pecl-redis/files/patch-redis.c b/databases/pecl-redis/files/patch-redis.c new file mode 100644 index 000000000000..5765cabf50d7 --- /dev/null +++ b/databases/pecl-redis/files/patch-redis.c @@ -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> diff --git a/databases/pecl-redis/files/patch-redis__session.c b/databases/pecl-redis/files/patch-redis__session.c new file mode 100644 index 000000000000..a52eae3b19d8 --- /dev/null +++ b/databases/pecl-redis/files/patch-redis__session.c @@ -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; |