summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-deps-hiredis-net.c
diff options
context:
space:
mode:
authorSergey A. Osokin <osa@FreeBSD.org>2019-11-05 21:38:26 +0000
committerSergey A. Osokin <osa@FreeBSD.org>2019-11-05 21:38:26 +0000
commit41e56db75f1139b60b505a970726239ea732be5a (patch)
tree15a63789ec33f44f173727b7638f2c132f72efd4 /databases/redis-devel/files/patch-deps-hiredis-net.c
parentmisc/esniper: Mark BROKEN (diff)
Update from 5.0.5 to 5.0.6.
Regenerate the patches to make portlint(1) happier. <ChangeLog> Upgrade urgency CRITICAL: Only in case of exposed instances to untrusted users. This Redis release, 5.0.6, is a bugfix and enhancement release. The most important bugfix is a corruption related to the HyperLogLog. A malformed HyperLogLog string could cause an invalid access to the memory. At a first glance the vulnerability appears to be not exploitable but just a DoS. The way to trigger the issue is complex, we'll not provide any information about how to do that for the users safety. Other significant changes in this release: * New modules APIs merged from Redis unstable to Redis 5. * Some memory optimization related to objects creation. * Fixes to flushSlaveOutputBuffer() that make sure that SHUTDOWN will transfer pending buffers to replicas. </ChangeLog>
Notes
Notes: svn path=/head/; revision=516843
Diffstat (limited to 'databases/redis-devel/files/patch-deps-hiredis-net.c')
-rw-r--r--databases/redis-devel/files/patch-deps-hiredis-net.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/databases/redis-devel/files/patch-deps-hiredis-net.c b/databases/redis-devel/files/patch-deps-hiredis-net.c
index b230b0b91e4c..dc390fab3057 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-net.c
+++ b/databases/redis-devel/files/patch-deps-hiredis-net.c
@@ -1,6 +1,6 @@
---- deps/hiredis/net.c.orig 2017-04-22 07:23:27.000000000 -0400
-+++ deps/hiredis/net.c 2017-05-05 20:02:09.292479000 -0400
-@@ -135,13 +135,12 @@
+--- deps/hiredis/net.c.orig 2019-09-25 10:40:18 UTC
++++ deps/hiredis/net.c
+@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
val = interval;
@@ -16,7 +16,7 @@
val = interval;
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-@@ -160,6 +159,27 @@
+@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
return REDIS_ERR;
}
@@ -44,7 +44,7 @@
#endif
#endif
-@@ -431,7 +451,7 @@
+@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
struct sockaddr_un sa;
long timeout_msec = -1;
@@ -53,7 +53,7 @@
return REDIS_ERR;
if (redisSetBlocking(c,0) != REDIS_OK)
return REDIS_ERR;
-@@ -456,7 +476,7 @@
+@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
return REDIS_ERR;