hiredis: updated to 1.1.0

1.1.0

🐛 Bug Fixes

Add support for nan in RESP3 double

🧰 Maintenance

Add an example that calls redisCommandArgv
fix flag reference
Make freeing a NULL redisAsyncContext a no-op.
CI updates

4 files changed, 25 insertions, 68 deletions

diff --git a/databases/hiredis/Makefile b/databases/hiredis/Makefile
index de23a31b324..ca1632906e7 100644
--- a/databases/hiredis/Makefile
+++ b/databases/hiredis/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2021/10/08 06:46:02 adam Exp $
+# $NetBSD: Makefile,v 1.10 2022/11/25 10:40:35 adam Exp $
 
-DISTNAME=	hiredis-1.0.2
+DISTNAME=	hiredis-1.1.0
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_GITHUB:=redis/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -10,9 +10,13 @@ HOMEPAGE=	https://github.com/redis/hiredis
 COMMENT=	Minimalistic C client library for the Redis database
 LICENSE=	modified-bsd
 
-USE_LIBTOOL=	yes
-USE_TOOLS+=	gmake
-MAKE_ENV+=	DESTDIR=${DESTDIR}
-TEST_TARGET=	check
+USE_CMAKE=	yes
+TEST_ENV+=	LD_LIBRARY_PATH=${WRKSRC}
+# For Darwin
+TEST_ENV+=	DYLD_LIBRARY_PATH=${WRKSRC}
+
+# needs running redis-server
+do-test:
+	cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ./hiredis-test
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/hiredis/PLIST b/databases/hiredis/PLIST
index 665f7d7fa1e..7aefe2b3614 100644
--- a/databases/hiredis/PLIST
+++ b/databases/hiredis/PLIST
@@ -1,16 +1,25 @@
-@comment $NetBSD: PLIST,v 1.4 2020/03/22 18:20:11 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2022/11/25 10:40:35 adam Exp $
+build/native/hiredis.targets
 include/hiredis/adapters/ae.h
 include/hiredis/adapters/glib.h
 include/hiredis/adapters/ivykis.h
 include/hiredis/adapters/libev.h
 include/hiredis/adapters/libevent.h
+include/hiredis/adapters/libhv.h
 include/hiredis/adapters/libuv.h
 include/hiredis/adapters/macosx.h
+include/hiredis/adapters/poll.h
 include/hiredis/adapters/qt.h
 include/hiredis/alloc.h
 include/hiredis/async.h
 include/hiredis/hiredis.h
 include/hiredis/read.h
 include/hiredis/sds.h
-lib/libhiredis.la
+include/hiredis/sockcompat.h
+lib/cmake/hiredis/hiredis-config.cmake
+lib/cmake/hiredis/hiredis-targets-noconfig.cmake
+lib/cmake/hiredis/hiredis-targets.cmake
+lib/libhiredis.a
+lib/libhiredis.so
+lib/libhiredis.so.${PKGVERSION}
 lib/pkgconfig/hiredis.pc
diff --git a/databases/hiredis/distinfo b/databases/hiredis/distinfo
index cd73dd0724f..31342f9b890 100644
--- a/databases/hiredis/distinfo
+++ b/databases/hiredis/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.14 2021/10/26 10:09:19 nia Exp $
+$NetBSD: distinfo,v 1.15 2022/11/25 10:40:35 adam Exp $
 
-BLAKE2s (hiredis-1.0.2.tar.gz) = 5d1a6769a838772f87821d5342c8d1271b6461679432b2181cc6ef3a7b07dbe8
-SHA512 (hiredis-1.0.2.tar.gz) = 86497a1c21869bbe535378885eee6dbd594ef96325966511a3513f81e501af0f5ac7fed864f3230372f3ac7a23c05bad477fa5aa90b9747c9fb1408028174f9b
-Size (hiredis-1.0.2.tar.gz) = 98139 bytes
-SHA1 (patch-Makefile) = 2071de674bd5322365702986421accbfd1aadbcc
+BLAKE2s (hiredis-1.1.0.tar.gz) = c30b431e2e91fe5992ec019c1a1ff08a67f01c44a28b24cea2a37948ff2b4b8b
+SHA512 (hiredis-1.1.0.tar.gz) = 9dad012c144ed24de6aa413a3a10d19a9d0d9ece18dbc388406cd86c5b98cb66c76c586cb559c601ed13a75051d8921dc2882534cc3605513fde47d57276c3bb
+Size (hiredis-1.1.0.tar.gz) = 122002 bytes
diff --git a/databases/hiredis/patches/patch-Makefile b/databases/hiredis/patches/patch-Makefile
deleted file mode 100644
index a1324b29946..00000000000
--- a/databases/hiredis/patches/patch-Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-$NetBSD: patch-Makefile,v 1.8 2021/06/23 19:35:44 adam Exp $
-
-Use libtool
-
---- Makefile.orig	2020-08-03 18:18:07.000000000 +0000
-+++ Makefile
-@@ -58,6 +58,7 @@ DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
- 
- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME)
- STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
-+LANAME=$(LIBNAME).la
- STLIB_MAKE_CMD=$(AR) rcs
- 
- SSL_DYLIB_MINOR_NAME=$(SSL_LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME)
-@@ -103,7 +104,7 @@ ifeq ($(uname_S),Darwin)
-   DYLIB_PLUGIN=-Wl,-undefined -Wl,dynamic_lookup
- endif
- 
--all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
-+all: $(LANAME) $(PKGCONFNAME)
- ifeq ($(USE_SSL),1)
- all: $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(SSL_PKGCONFNAME)
- endif
-@@ -132,6 +133,11 @@ $(SSL_DYLIBNAME): $(SSL_OBJ)
- $(SSL_STLIBNAME): $(SSL_OBJ)
- 	$(STLIB_MAKE_CMD) $(SSL_STLIBNAME) $(SSL_OBJ)
- 
-+$(LANAME): $(OBJ)
-+	$(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $(LANAME) $(OBJ:.o=.lo) \
-+		-rpath $(PREFIX)/lib \
-+		-version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
-+
- dynamic: $(DYLIBNAME)
- static: $(STLIBNAME)
- ifeq ($(USE_SSL),1)
-@@ -220,7 +226,7 @@ check: hiredis-test
- 	TEST_SSL=$(USE_SSL) ./test.sh
- 
- .c.o:
--	$(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
-+	$(LIBTOOL) --mode=compile $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
- 
- clean:
- 	rm -rf $(DYLIBNAME) $(STLIBNAME) $(SSL_DYLIBNAME) $(SSL_STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -261,9 +267,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 alloc.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)
-+	$(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(INSTALL_LIBRARY_PATH)
- 	mkdir -p $(INSTALL_PKGCONF_PATH)
- 	$(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
-