summaryrefslogtreecommitdiff
path: root/databases/hiredis
diff options
context:
space:
mode:
authorwiedi <wiedi@pkgsrc.org>2015-09-02 15:12:37 +0000
committerwiedi <wiedi@pkgsrc.org>2015-09-02 15:12:37 +0000
commit65d5d9d90b6cae9c0ffadcb1feb51d0dba6e238d (patch)
treeef18f9fc53bd51bcdd2487313b73ff8d64d8a25c /databases/hiredis
parenta10f912f338a69923b15ede2748294be42585d57 (diff)
downloadpkgsrc-65d5d9d90b6cae9c0ffadcb1feb51d0dba6e238d.tar.gz
Update hiredis to 0.13.2
* Prevent crash on pending replies in async code (Thanks, @switch-st) * Clear `REDIS_CONNECTED` flag when connection is closed (Thanks, Jerry Jacobs) * Add MacOS X addapter (Thanks, @dizzus) * Add Qt adapter (Thanks, Pietro Cerutti) * Add Ivykis adapter (Thanks, Gergely Nagy) All adapters are provided as is and are only tested where possible.
Diffstat (limited to 'databases/hiredis')
-rw-r--r--databases/hiredis/Makefile4
-rw-r--r--databases/hiredis/PLIST5
-rw-r--r--databases/hiredis/distinfo10
-rw-r--r--databases/hiredis/patches/patch-Makefile17
4 files changed, 19 insertions, 17 deletions
diff --git a/databases/hiredis/Makefile b/databases/hiredis/Makefile
index 263a7ca74b4..57b9e97416c 100644
--- a/databases/hiredis/Makefile
+++ b/databases/hiredis/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+# $NetBSD: Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $
-DISTNAME= hiredis-0.13.1
+DISTNAME= hiredis-0.13.2
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_GITHUB:=redis/}
GITHUB_TAG= v${PKGVERSION_NOREV}
diff --git a/databases/hiredis/PLIST b/databases/hiredis/PLIST
index 3a997227075..98c212aa3c2 100644
--- a/databases/hiredis/PLIST
+++ b/databases/hiredis/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/09/02 15:12:37 wiedi Exp $
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/libuv.h
+include/hiredis/adapters/macosx.h
+include/hiredis/adapters/qt.h
include/hiredis/async.h
include/hiredis/hiredis.h
include/hiredis/read.h
diff --git a/databases/hiredis/distinfo b/databases/hiredis/distinfo
index 2a33f3c1aba..d9ece1848a9 100644
--- a/databases/hiredis/distinfo
+++ b/databases/hiredis/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+$NetBSD: distinfo,v 1.3 2015/09/02 15:12:37 wiedi Exp $
-SHA1 (hiredis-0.13.1.tar.gz) = 737c4ed101096c5ec47fcaeba847664352d16204
-RMD160 (hiredis-0.13.1.tar.gz) = c2324cc857ada5b8864a4f73330e409fb80a3972
-Size (hiredis-0.13.1.tar.gz) = 54912 bytes
-SHA1 (patch-Makefile) = 1249d256bf9ac81c4d985cc4a5e81dea47b21a58
+SHA1 (hiredis-0.13.2.tar.gz) = 49481f5807e46713dcec6bde8a9b2a40f4ba7b59
+RMD160 (hiredis-0.13.2.tar.gz) = bb5e389aefdcba2e64cca285b24e824645437a23
+Size (hiredis-0.13.2.tar.gz) = 58206 bytes
+SHA1 (patch-Makefile) = f0c189ce10ed32d9a31a30b2067a03460e852fd1
diff --git a/databases/hiredis/patches/patch-Makefile b/databases/hiredis/patches/patch-Makefile
index 7c34a97ba5b..e0926b6c41d 100644
--- a/databases/hiredis/patches/patch-Makefile
+++ b/databases/hiredis/patches/patch-Makefile
@@ -1,9 +1,9 @@
-$NetBSD: patch-Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.3 2015/09/02 15:12:37 wiedi Exp $
use libtool
---- Makefile.orig 2015-05-03 20:58:11.000000000 +0000
+--- Makefile.orig 2015-08-25 12:16:20.000000000 +0000
+++ Makefile
-@@ -49,6 +49,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
+@@ -51,6 +51,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
@@ -11,7 +11,7 @@ use libtool
STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
# Platform-specific overrides
-@@ -65,7 +66,7 @@ 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)
endif
@@ -20,7 +20,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
-@@ -82,6 +83,11 @@ $(DYLIBNAME): $(OBJ)
+@@ -83,6 +84,11 @@ $(DYLIBNAME): $(OBJ)
$(STLIBNAME): $(OBJ)
$(STLIB_MAKE_CMD) $(OBJ)
@@ -32,7 +32,7 @@ use libtool
dynamic: $(DYLIBNAME)
static: $(STLIBNAME)
-@@ -133,7 +139,7 @@ check: hiredis-test
+@@ -153,7 +159,7 @@ check: hiredis-test
kill `cat /tmp/hiredis-test-redis.pid`
.c.o:
@@ -41,13 +41,12 @@ use libtool
clean:
rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -163,10 +169,7 @@ $(PKGCONFNAME): hiredis.h
+@@ -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)
- $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
-- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
-- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
+- 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)