From owner-svn-ports-all@freebsd.org Mon Jul 6 06:37:24 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3029135D327; Mon, 6 Jul 2020 06:37:24 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B0bTc0Xg1z4q1v; Mon, 6 Jul 2020 06:37:24 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D14FA1A0B7; Mon, 6 Jul 2020 06:37:23 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0666bN7u011276; Mon, 6 Jul 2020 06:37:23 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0666bNZt011270; Mon, 6 Jul 2020 06:37:23 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <202007060637.0666bNZt011270@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Mon, 6 Jul 2020 06:37:23 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r541314 - in head/databases/pecl-redis: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/databases/pecl-redis: . files X-SVN-Commit-Revision: 541314 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Jul 2020 06:37:24 -0000 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@lutter.sk, daniel@blodan.se (maintainer) Reviewed by: daniel@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@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 + #include + #include +- ++#include + + #ifdef PHP_SESSION + #include 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;