Fri Jun 5 14:07:27 2015 UTC ()
Update hiredis to 0.13.1

### 0.13.1 - May 03, 2015

This is a bug fix release.
The new `reconnect` method introduced new struct members, which clashed with pre-defined names in pre-C99 code.
Another commit forced C99 compilation just to make it work, but of course this is not desirable for outside projects.
Other non-C99 code can now use hiredis as usual again.
Sorry for the inconvenience.

* Fix memory leak in async reply handling (Salvatore Sanfilippo)
* Rename struct member to avoid name clash with pre-c99 code (Alex Balashov, ncopa)

### 0.13.0 - April 16, 2015

This release adds a minimal Windows compatibility layer.
The parser, standalone since v0.12.0, can now be compiled on Windows
(and thus used in other client libraries as well)

* Windows compatibility layer for parser code (tzickel)
* Properly escape data printed to PKGCONF file (Dan Skorupski)
* Fix tests when assert() undefined (Keith Bennett, Matt Stancliff)
* Implement a reconnect method for the client context, this changes the structure of `redisContext` (Aaron Bedra)

### 0.12.1 - January 26, 2015

* Fix `make install`: DESTDIR support, install all required files, install PKGCONF in proper location
* Fix `make test` as 32 bit build on 64 bit platform

### 0.12.0 - January 22, 2015

* Add optional KeepAlive support
* Try again on EINTR errors
* Add libuv adapter
* Add IPv6 support
* Remove possiblity of multiple close on same fd
* Add ability to bind source address on connect
* Add redisConnectFd() and redisFreeKeepFd()
* Fix getaddrinfo() memory leak
* Free string if it is unused (fixes memory leak)
* Improve redisAppendCommandArgv performance 2.5x
* Add support for SO_REUSEADDR
* Fix redisvFormatCommand format parsing
* Add GLib 2.0 adapter
* Refactor reading code into read.c
* Fix errno error buffers to not clobber errors
* Generate pkgconf during build
* Silence _BSD_SOURCE warnings
* Improve digit counting for multibulk creation


(wiedi)
diff -r1.1 -r1.2 pkgsrc/databases/hiredis/Makefile
diff -r1.1 -r1.2 pkgsrc/databases/hiredis/PLIST
diff -r1.1 -r1.2 pkgsrc/databases/hiredis/distinfo
diff -r1.1 -r1.2 pkgsrc/databases/hiredis/patches/patch-Makefile
diff -r1.1 -r0 pkgsrc/databases/hiredis/patches/patch-fmacros.h
cvs diff -r1.1 -r1.2 pkgsrc/databases/hiredis/Makefile (expand / switch to unified diff)

--- pkgsrc/databases/hiredis/Makefile 2014/04/02 17:25:44 1.1
+++ pkgsrc/databases/hiredis/Makefile 2015/06/05 14:07:27 1.2
@@ -1,19 +1,17 @@ @@ -1,19 +1,17 @@
1# $NetBSD: Makefile,v 1.1 2014/04/02 17:25:44 wiedi Exp $ 1# $NetBSD: Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
2 2
3VERSION= 0.11.0 3DISTNAME= hiredis-0.13.1
4DISTNAME= v${VERSION} 
5PKGNAME= hiredis-${VERSION} 
6CATEGORIES= databases 4CATEGORIES= databases
7MASTER_SITES= https://github.com/redis/hiredis/archive/ 5MASTER_SITES= ${MASTER_SITE_GITHUB:=redis/}
 6GITHUB_TAG= v${PKGVERSION_NOREV}
8 7
9MAINTAINER= wiedi@frubar.net 8MAINTAINER= wiedi@frubar.net
10HOMEPAGE= https://github.com/redis/hiredis/ 9HOMEPAGE= https://github.com/redis/hiredis/
11COMMENT= Minimalistic C client library for the Redis database 10COMMENT= Minimalistic C client library for the Redis database
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14USE_TOOLS+= gmake 13USE_TOOLS+= gmake
15USE_LIBTOOL= yes 14USE_LIBTOOL= yes
16WRKSRC= ${WRKDIR}/hiredis-${VERSION} 
17MAKE_ENV+= DESTDIR=${DESTDIR} 15MAKE_ENV+= DESTDIR=${DESTDIR}
18 16
19.include "../../mk/bsd.pkg.mk" 17.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/databases/hiredis/PLIST (expand / switch to unified diff)

--- pkgsrc/databases/hiredis/PLIST 2014/04/02 17:25:44 1.1
+++ pkgsrc/databases/hiredis/PLIST 2015/06/05 14:07:27 1.2
@@ -1,7 +1,12 @@ @@ -1,7 +1,12 @@
1@comment $NetBSD: PLIST,v 1.1 2014/04/02 17:25:44 wiedi Exp $ 1@comment $NetBSD: PLIST,v 1.2 2015/06/05 14:07:27 wiedi Exp $
2include/hiredis/adapters/ae.h 2include/hiredis/adapters/ae.h
 3include/hiredis/adapters/glib.h
3include/hiredis/adapters/libev.h 4include/hiredis/adapters/libev.h
4include/hiredis/adapters/libevent.h 5include/hiredis/adapters/libevent.h
 6include/hiredis/adapters/libuv.h
5include/hiredis/async.h 7include/hiredis/async.h
6include/hiredis/hiredis.h 8include/hiredis/hiredis.h
 9include/hiredis/read.h
 10include/hiredis/sds.h
7lib/libhiredis.la 11lib/libhiredis.la
 12lib/pkgconfig/hiredis.pc
cvs diff -r1.1 -r1.2 pkgsrc/databases/hiredis/distinfo (expand / switch to unified diff)

--- pkgsrc/databases/hiredis/distinfo 2014/04/02 17:25:44 1.1
+++ pkgsrc/databases/hiredis/distinfo 2015/06/05 14:07:27 1.2
@@ -1,7 +1,6 @@ @@ -1,7 +1,6 @@
1$NetBSD: distinfo,v 1.1 2014/04/02 17:25:44 wiedi Exp $ 1$NetBSD: distinfo,v 1.2 2015/06/05 14:07:27 wiedi Exp $
2 2
3SHA1 (v0.11.0.tar.gz) = 694b6d7a6e4ea7fb20902619e9a2423c014b37c1 3SHA1 (hiredis-0.13.1.tar.gz) = 737c4ed101096c5ec47fcaeba847664352d16204
4RMD160 (v0.11.0.tar.gz) = a22c38518d32b8badd77c486ab041e3e54f3ff71 4RMD160 (hiredis-0.13.1.tar.gz) = c2324cc857ada5b8864a4f73330e409fb80a3972
5Size (v0.11.0.tar.gz) = 42137 bytes 5Size (hiredis-0.13.1.tar.gz) = 54912 bytes
6SHA1 (patch-Makefile) = fac6faa11c2dd80acaf7a378cc4146d7a03a937c 6SHA1 (patch-Makefile) = 1249d256bf9ac81c4d985cc4a5e81dea47b21a58
7SHA1 (patch-fmacros.h) = 77e49207baeccae657a8d2c85429d6e76c2438b3 
cvs diff -r1.1 -r1.2 pkgsrc/databases/hiredis/patches/Attic/patch-Makefile (expand / switch to unified diff)

--- pkgsrc/databases/hiredis/patches/Attic/patch-Makefile 2014/04/02 17:25:44 1.1
+++ pkgsrc/databases/hiredis/patches/Attic/patch-Makefile 2015/06/05 14:07:27 1.2
@@ -1,69 +1,55 @@ @@ -1,69 +1,55 @@
1$NetBSD: patch-Makefile,v 1.1 2014/04/02 17:25:44 wiedi Exp $ 1$NetBSD: patch-Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
2add DESTDIR and use libtool 2use libtool
3 3
4--- Makefile.orig 2012-08-28 06:55:52.000000000 +0000 4--- Makefile.orig 2015-05-03 20:58:11.000000000 +0000
5+++ Makefile 5+++ Makefile
6@@ -27,6 +27,8 @@ DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname 6@@ -49,6 +49,7 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
 7 DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
 8 DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
7 STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) 9 STLIBNAME=$(LIBNAME).$(STLIBSUFFIX)
 10+LANAME=$(LIBNAME).la
8 STLIB_MAKE_CMD=ar rcs $(STLIBNAME) 11 STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
9  12
10+LANAME=$(LIBNAME).la 
11+ 
12 # Platform-specific overrides 13 # Platform-specific overrides
13 uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') 14@@ -65,7 +66,7 @@ ifeq ($(uname_S),Darwin)
14 ifeq ($(uname_S),SunOS) 
15@@ -41,7 +43,7 @@ ifeq ($(uname_S),Darwin) 
16 DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) 15 DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
17 endif 16 endif
18  17
19-all: $(DYLIBNAME) $(BINS) 18-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
20+all: $(LANAME) 19+all: $(LANAME) $(PKGCONFNAME)
21  20
22 # Deps (use make dep to generate this) 21 # Deps (use make dep to generate this)
23 net.o: net.c fmacros.h net.h hiredis.h 22 async.o: async.c fmacros.h async.h hiredis.h read.h sds.h net.h dict.c dict.h
24@@ -60,6 +62,13 @@ $(STLIBNAME): $(OBJ) 23@@ -82,6 +83,11 @@ $(DYLIBNAME): $(OBJ)
25 dynamic: $(DYLIBNAME) 24 $(STLIBNAME): $(OBJ)
26 static: $(STLIBNAME) 25 $(STLIB_MAKE_CMD) $(OBJ)
27  26
28+$(LANAME): $(OBJ) 27+$(LANAME): $(OBJ)
29+ $(LIBTOOL) --mode=link \ 28+ $(LIBTOOL) --mode=link $(CC) -o $(LANAME) $(OBJ:.o=.lo) \
30+ $(CC) -o $(LANAME) \ 
31+ $(OBJ:.o=.lo) \ 
32+ -rpath $(PREFIX)/lib \ 29+ -rpath $(PREFIX)/lib \
33+ -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR) 30+ -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
34+ 31+
35 # Binaries: 32 dynamic: $(DYLIBNAME)
36 hiredis-example-libevent: example-libevent.c adapters/libevent.h $(STLIBNAME) 33 static: $(STLIBNAME)
37 $(CC) -o $@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -levent example-libevent.c $(STLIBNAME) 34
38@@ -95,7 +104,7 @@ check: hiredis-test 35@@ -133,7 +139,7 @@ check: hiredis-test
39 kill `cat /tmp/hiredis-test-redis.pid` 36 kill `cat /tmp/hiredis-test-redis.pid`
40  37
41 .c.o: 38 .c.o:
42- $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $< 39- $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
43+ $(LIBTOOL) --mode=compile $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $< 40+ $(LIBTOOL) --mode=compile $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
44  41
45 clean: 42 clean:
46 rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov 43 rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
47@@ -107,8 +116,8 @@ dep: 44@@ -163,10 +169,7 @@ $(PKGCONFNAME): hiredis.h
48 PREFIX?=/usr/local 45 install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
49 INCLUDE_PATH?=include/hiredis 
50 LIBRARY_PATH?=lib 
51-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) 
52-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) 
53+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH) 
54+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH) 
55  
56 ifeq ($(uname_S),SunOS) 
57 INSTALL?= cp -r 
58@@ -119,10 +128,7 @@ INSTALL?= cp -a 
59 install: $(DYLIBNAME) $(STLIBNAME) 
60 mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) 46 mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
61 $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH) 47 $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
62- $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) 48- $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
63- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) 49- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
64- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME) 50- cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
65- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) 51- $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
66+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(DESTDIR)$(PREFIX)/lib 52+ $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(INSTALL_LIBRARY_PATH)
 53 mkdir -p $(INSTALL_PKGCONF_PATH)
 54 $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
67  55
68 32bit: 
69 @echo "" 
File Deleted: pkgsrc/databases/hiredis/patches/Attic/patch-fmacros.h