summaryrefslogtreecommitdiff
path: root/databases/redis-devel/files/patch-deps-hiredis-Makefile
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-Makefile
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-Makefile')
-rw-r--r--databases/redis-devel/files/patch-deps-hiredis-Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index 705bc2fb97e0..a74d7b4cc81c 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig 2017-05-01 19:46:31.733229000 -0400
-+++ deps/hiredis/Makefile 2017-05-01 19:48:37.150358000 -0400
-@@ -15,7 +15,7 @@
+--- deps/hiredis/Makefile.orig 2019-09-25 10:40:18 UTC
++++ deps/hiredis/Makefile
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
# Installation related variables and target
@@ -9,7 +9,7 @@
INCLUDE_PATH?=include/hiredis
LIBRARY_PATH?=lib
PKGCONF_PATH?=pkgconfig
-@@ -38,10 +38,10 @@
+@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG
# Fallback to gcc when $CC is not in $PATH.
CC:=$(shell sh -c 'type $(CC) >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
CXX:=$(shell sh -c 'type $(CXX) >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
@@ -23,10 +23,11 @@
REAL_LDFLAGS=$(LDFLAGS) $(ARCH)
DYLIBSUFFIX=so
-@@ -60,6 +60,15 @@
+@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS)
+ REAL_LDFLAGS+= -ldl -lnsl -lsocket
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
INSTALL= cp -r
- endif
++endif
+ifeq ($(uname_S),FreeBSD)
+ CFLAGS?=$(CFLAGS)
+ CCLINK?=-pthread
@@ -35,7 +36,6 @@
+ DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ}
+ STLIBNAME?=libhiredis.a
+ STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ}
-+endif
+ endif
ifeq ($(uname_S),Darwin)
DYLIBSUFFIX=dylib
- DYLIB_MINOR_NAME=$(LIBNAME).$(HIREDIS_SONAME).$(DYLIBSUFFIX)