[pkgsrc/trunk]: pkgsrc/databases/hiredis Update hiredis to 0.13.1

[wiedi <wiedi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cf2a4c880eea
branches:  trunk
changeset: 652624:cf2a4c880eea
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Fri Jun 05 14:07:27 2015 +0000

description:
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

diffstat:

 databases/hiredis/Makefile                |  10 +--
 databases/hiredis/PLIST                   |   7 ++-
 databases/hiredis/distinfo                |  11 ++--
 databases/hiredis/patches/patch-Makefile  |  70 ++++++++++++------------------
 databases/hiredis/patches/patch-fmacros.h |  14 ------
 5 files changed, 43 insertions(+), 69 deletions(-)

diffs (178 lines):

diff -r 6995b4a1097f -r cf2a4c880eea databases/hiredis/Makefile
--- a/databases/hiredis/Makefile        Fri Jun 05 13:43:41 2015 +0000
+++ b/databases/hiredis/Makefile        Fri Jun 05 14:07:27 2015 +0000
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.1 2014/04/02 17:25:44 wiedi Exp $
+# $NetBSD: Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
 
-VERSION=       0.11.0
-DISTNAME=      v${VERSION}
-PKGNAME=       hiredis-${VERSION}
+DISTNAME=      hiredis-0.13.1
 CATEGORIES=    databases
-MASTER_SITES=  https://github.com/redis/hiredis/archive/
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=redis/}
+GITHUB_TAG=    v${PKGVERSION_NOREV}
 
 MAINTAINER=    wiedi%frubar.net@localhost
 HOMEPAGE=      https://github.com/redis/hiredis/
@@ -13,7 +12,6 @@
 
 USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
-WRKSRC=                ${WRKDIR}/hiredis-${VERSION}
 MAKE_ENV+=     DESTDIR=${DESTDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff -r 6995b4a1097f -r cf2a4c880eea databases/hiredis/PLIST
--- a/databases/hiredis/PLIST   Fri Jun 05 13:43:41 2015 +0000
+++ b/databases/hiredis/PLIST   Fri Jun 05 14:07:27 2015 +0000
@@ -1,7 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1 2014/04/02 17:25:44 wiedi Exp $
+@comment $NetBSD: PLIST,v 1.2 2015/06/05 14:07:27 wiedi Exp $
 include/hiredis/adapters/ae.h
+include/hiredis/adapters/glib.h
 include/hiredis/adapters/libev.h
 include/hiredis/adapters/libevent.h
+include/hiredis/adapters/libuv.h
 include/hiredis/async.h
 include/hiredis/hiredis.h
+include/hiredis/read.h
+include/hiredis/sds.h
 lib/libhiredis.la
+lib/pkgconfig/hiredis.pc
diff -r 6995b4a1097f -r cf2a4c880eea databases/hiredis/distinfo
--- a/databases/hiredis/distinfo        Fri Jun 05 13:43:41 2015 +0000
+++ b/databases/hiredis/distinfo        Fri Jun 05 14:07:27 2015 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/04/02 17:25:44 wiedi Exp $
+$NetBSD: distinfo,v 1.2 2015/06/05 14:07:27 wiedi Exp $
 
-SHA1 (v0.11.0.tar.gz) = 694b6d7a6e4ea7fb20902619e9a2423c014b37c1
-RMD160 (v0.11.0.tar.gz) = a22c38518d32b8badd77c486ab041e3e54f3ff71
-Size (v0.11.0.tar.gz) = 42137 bytes
-SHA1 (patch-Makefile) = fac6faa11c2dd80acaf7a378cc4146d7a03a937c
-SHA1 (patch-fmacros.h) = 77e49207baeccae657a8d2c85429d6e76c2438b3
+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
diff -r 6995b4a1097f -r cf2a4c880eea databases/hiredis/patches/patch-Makefile
--- a/databases/hiredis/patches/patch-Makefile  Fri Jun 05 13:43:41 2015 +0000
+++ b/databases/hiredis/patches/patch-Makefile  Fri Jun 05 14:07:27 2015 +0000
@@ -1,41 +1,38 @@
-$NetBSD: patch-Makefile,v 1.1 2014/04/02 17:25:44 wiedi Exp $
-add DESTDIR and use libtool
+$NetBSD: patch-Makefile,v 1.2 2015/06/05 14:07:27 wiedi Exp $
+use libtool
 
---- Makefile.orig      2012-08-28 06:55:52.000000000 +0000
+--- Makefile.orig      2015-05-03 20:58:11.000000000 +0000
 +++ Makefile
-@@ -27,6 +27,8 @@ DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname
+@@ -49,6 +49,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)
++LANAME=$(LIBNAME).la
  STLIB_MAKE_CMD=ar rcs $(STLIBNAME)
  
-+LANAME=$(LIBNAME).la
-+
  # Platform-specific overrides
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- ifeq ($(uname_S),SunOS)
-@@ -41,7 +43,7 @@ ifeq ($(uname_S),Darwin)
+@@ -65,7 +66,7 @@ ifeq ($(uname_S),Darwin)
    DYLIB_MAKE_CMD=$(CC) -shared -Wl,-install_name,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
  endif
  
--all: $(DYLIBNAME) $(BINS)
-+all: $(LANAME)
+-all: $(DYLIBNAME) $(STLIBNAME) hiredis-test $(PKGCONFNAME)
++all: $(LANAME) $(PKGCONFNAME)
  
  # Deps (use make dep to generate this)
- net.o: net.c fmacros.h net.h hiredis.h
-@@ -60,6 +62,13 @@ $(STLIBNAME): $(OBJ)
+ 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)
+ $(STLIBNAME): $(OBJ)
+       $(STLIB_MAKE_CMD) $(OBJ)
+ 
++$(LANAME): $(OBJ)
++      $(LIBTOOL) --mode=link $(CC) -o $(LANAME) $(OBJ:.o=.lo) \
++              -rpath $(PREFIX)/lib \
++              -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
++
  dynamic: $(DYLIBNAME)
  static: $(STLIBNAME)
  
-+$(LANAME): $(OBJ)
-+      $(LIBTOOL) --mode=link \
-+              $(CC) -o $(LANAME) \
-+              $(OBJ:.o=.lo) \
-+              -rpath $(PREFIX)/lib \
-+              -version-number $(HIREDIS_MAJOR):$(HIREDIS_MINOR)
-+
- # Binaries:
- hiredis-example-libevent: example-libevent.c adapters/libevent.h $(STLIBNAME)
-       $(CC) -o $@ $(REAL_CFLAGS) $(REAL_LDFLAGS) -levent example-libevent.c $(STLIBNAME)
-@@ -95,7 +104,7 @@ check: hiredis-test
+@@ -133,7 +139,7 @@ check: hiredis-test
        kill `cat /tmp/hiredis-test-redis.pid`
  
  .c.o:
@@ -43,27 +40,16 @@
 +      $(LIBTOOL) --mode=compile $(CC) -std=c99 -pedantic -c $(REAL_CFLAGS) $<
  
  clean:
-       rm -rf $(DYLIBNAME) $(STLIBNAME) $(BINS) hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -107,8 +116,8 @@ dep:
- PREFIX?=/usr/local
- INCLUDE_PATH?=include/hiredis
- LIBRARY_PATH?=lib
--INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
--INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
-+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
-+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
- 
- ifeq ($(uname_S),SunOS)
-   INSTALL?= cp -r
-@@ -119,10 +128,7 @@ INSTALL?= cp -a
- install: $(DYLIBNAME) $(STLIBNAME)
+       rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
+@@ -163,10 +169,7 @@ $(PKGCONFNAME): hiredis.h
+ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
        mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
-       $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_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)
 -      $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH)
-+      $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(DESTDIR)$(PREFIX)/lib
++      $(LIBTOOL) --mode=install $(BSD_INSTALL_LIB) $(LANAME) $(INSTALL_LIBRARY_PATH)
+       mkdir -p $(INSTALL_PKGCONF_PATH)
+       $(INSTALL) $(PKGCONFNAME) $(INSTALL_PKGCONF_PATH)
  
- 32bit:
-       @echo ""
diff -r 6995b4a1097f -r cf2a4c880eea databases/hiredis/patches/patch-fmacros.h
--- a/databases/hiredis/patches/patch-fmacros.h Fri Jun 05 13:43:41 2015 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
-$NetBSD: patch-fmacros.h,v 1.1 2014/04/02 17:25:45 wiedi Exp $
-getaddrinfo visibility on NetBSD
-
---- fmacros.h.orig     2012-08-28 06:55:52.000000000 +0000
-+++ fmacros.h
-@@ -7,7 +7,7 @@
- 
- #if defined(__sun__)
- #define _POSIX_C_SOURCE 200112L
--#elif defined(__linux__)
-+#elif defined(__linux__) || defined(__NetBSD__)
- #define _XOPEN_SOURCE 600
- #else
- #define _XOPEN_SOURCE