summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2019-11-26 12:43:42 +0000
committerwiz <wiz@pkgsrc.org>2019-11-26 12:43:42 +0000
commit05a1744aa3e37019876a8453c41e4138738b14a8 (patch)
tree04f0f055f02f623aa837972808da5613e0fa384a
parent33893eedcb8bdeda2e8673fbb60a9d8ef5b34398 (diff)
downloadpkgsrc-05a1744aa3e37019876a8453c41e4138738b14a8.tar.gz
hiredis: update to 0.14.0.
### 0.14.0 **Fixes**: * Catch a buffer overflow when formatting the error message * Import latest upstream sds. This breaks applications that are linked against the old hiredis v0.13 * Fix warnings, when compiled with -Wshadow * Make hiredis compile in Cygwin on Windows, now CI-tested * Bulk and multi-bulk lengths less than -1 or greater than `LLONG_MAX` are now protocol errors. This is consistent with the RESP specification. On 32-bit platforms, the upper bound is lowered to `SIZE_MAX`. **BREAKING CHANGES**: * Change `redisReply.len` to `size_t`, as it denotes the the size of a string User code should compare this to `size_t` values as well. If it was used to compare to other values, casting might be necessary or can be removed, if casting was applied before. * Remove backwards compatibility macro's This removes the following old function aliases, use the new name now: | Old | New | | --------------------------- | ---------------------- | | redisReplyReaderCreate | redisReaderCreate | | redisReplyReaderCreate | redisReaderCreate | | redisReplyReaderFree | redisReaderFree | | redisReplyReaderFeed | redisReaderFeed | | redisReplyReaderGetReply | redisReaderGetReply | | redisReplyReaderSetPrivdata | redisReaderSetPrivdata | | redisReplyReaderGetObject | redisReaderGetObject | | redisReplyReaderGetError | redisReaderGetError | * The `DEBUG` variable in the Makefile was renamed to `DEBUG_FLAGS` Previously it broke some builds for people that had `DEBUG` set to some arbitrary value, due to debugging other software. By renaming we avoid unintentional name clashes. Simply rename `DEBUG` to `DEBUG_FLAGS` in your environment to make it working again.
-rw-r--r--databases/hiredis/Makefile4
-rw-r--r--databases/hiredis/distinfo12
-rw-r--r--databases/hiredis/patches/patch-Makefile22
3 files changed, 19 insertions, 19 deletions
diff --git a/databases/hiredis/Makefile b/databases/hiredis/Makefile
index 646d773e746..5390878d8fa 100644
--- a/databases/hiredis/Makefile
+++ b/databases/hiredis/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2015/11/29 18:35:37 wiedi Exp $
+# $NetBSD: Makefile,v 1.5 2019/11/26 12:43:42 wiz Exp $
-DISTNAME= hiredis-0.13.3
+DISTNAME= hiredis-0.14.0
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GITHUB:=redis/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/databases/hiredis/distinfo b/databases/hiredis/distinfo
index a6683a090e9..d50be91b63c 100644
--- a/databases/hiredis/distinfo
+++ b/databases/hiredis/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2018/01/26 09:33:31 jperkin Exp $
+$NetBSD: distinfo,v 1.8 2019/11/26 12:43:42 wiz Exp $
-SHA1 (hiredis-0.13.3.tar.gz) = be6f1c50fc4d649dd2924f0afecc0a1705dbe0d3
-RMD160 (hiredis-0.13.3.tar.gz) = 0183a5bfffa09fa51bc89667081d89c619b85037
-SHA512 (hiredis-0.13.3.tar.gz) = 0d8b71d5ee4105e8aaeeee308795afc2c1f60a04b0bfe8ae873d800a0c157882ec307efa04a8d0e63b538fd3fc3f88eedf4d46cb87c8937e2403927aeb7e434c
-Size (hiredis-0.13.3.tar.gz) = 58291 bytes
-SHA1 (patch-Makefile) = ab9270f4dd2fe46aa39db5ca11ce51209f7cb239
+SHA1 (hiredis-0.14.0.tar.gz) = d668b86756d2c68f0527e845dc10ace5a053bbd9
+RMD160 (hiredis-0.14.0.tar.gz) = 59427d0df9a7738ebf7aa3ed31ee24d13ae5c907
+SHA512 (hiredis-0.14.0.tar.gz) = 57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0
+Size (hiredis-0.14.0.tar.gz) = 63061 bytes
+SHA1 (patch-Makefile) = b501dfef63c608c4514a68bfb1a1942efef54009
diff --git a/databases/hiredis/patches/patch-Makefile b/databases/hiredis/patches/patch-Makefile
index ccbdbe9a757..330604cdb81 100644
--- a/databases/hiredis/patches/patch-Makefile
+++ b/databases/hiredis/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.5 2018/01/26 09:33:31 jperkin Exp $
+$NetBSD: patch-Makefile,v 1.6 2019/11/26 12:43:42 wiz Exp $
use libtool
---- Makefile.orig 2015-09-16 10:25:02.000000000 +0000
+--- Makefile.orig 2018-09-25 22:59:34.000000000 +0000
+++ Makefile
@@ -51,13 +51,14 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
@@ -17,11 +17,11 @@ use libtool
REAL_LDFLAGS+= -ldl -lnsl -lsocket
- DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
+ DYLIB_MAKE_CMD=$(CC) -shared -o $(DYLIBNAME) -Wl,-h,$(DYLIB_MINOR_NAME) $(LDFLAGS)
- INSTALL= cp -r
endif
ifeq ($(uname_S),Darwin)
-@@ -66,7 +67,7 @@ ifeq ($(uname_S),Darwin)
- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+ DYLIBSUFFIX=dylib
+@@ -65,7 +66,7 @@ ifeq ($(uname_S),Darwin)
+ DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
endif
-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
@@ -29,7 +29,7 @@ use libtool
# Deps (use make dep to generate this)
async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
-@@ -83,6 +84,11 @@ $(DYLIBNAME): $(OBJ)
+@@ -82,6 +83,11 @@ $(DYLIBNAME): $(OBJ)
$(STLIBNAME): $(OBJ)
$(STLIB_MAKE_CMD) $(OBJ)
@@ -41,7 +41,7 @@ use libtool
dynamic: $(DYLIBNAME)
static: $(STLIBNAME)
-@@ -153,7 +159,7 @@ check: hiredis-test
+@@ -152,7 +158,7 @@ check: hiredis-test
kill `cat /tmp/hiredis-test-redis.pid`
.c.o:
@@ -50,10 +50,10 @@ use libtool
clean:
rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -183,9 +189,7 @@ $(PKGCONFNAME): hiredis.h
- install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
- mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
- $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
+@@ -179,9 +185,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKG
+ mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters $(INSTALL_LIBRARY_PATH)
+ $(INSTALL) hiredis.h async.h read.h sds.h $(INSTALL_INCLUDE_PATH)
+ $(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
- $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME)
- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)