CVS commit: pkgsrc/databases/hiredis

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Mar 22 18:20:12 UTC 2020

Modified Files:
        pkgsrc/databases/hiredis: Makefile PLIST distinfo
        pkgsrc/databases/hiredis/patches: patch-Makefile

Log Message:
hiredis: update to 0.14.1.

### 0.14.1 (2020-03-13)

* Adds safe allocation wrappers (CVE-2020-7105, #747, #752) (Michael Grunder)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/hiredis/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/databases/hiredis/PLIST
cvs rdiff -u -r1.8 -r1.9 pkgsrc/databases/hiredis/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/hiredis/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/hiredis/Makefile
diff -u pkgsrc/databases/hiredis/Makefile:1.5 pkgsrc/databases/hiredis/Makefile:1.6
--- pkgsrc/databases/hiredis/Makefile:1.5       Tue Nov 26 12:43:42 2019
+++ pkgsrc/databases/hiredis/Makefile   Sun Mar 22 18:20:11 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2019/11/26 12:43:42 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2020/03/22 18:20:11 wiz Exp $
 
-DISTNAME=      hiredis-0.14.0
+DISTNAME=      hiredis-0.14.1
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=redis/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}

Index: pkgsrc/databases/hiredis/PLIST
diff -u pkgsrc/databases/hiredis/PLIST:1.3 pkgsrc/databases/hiredis/PLIST:1.4
--- pkgsrc/databases/hiredis/PLIST:1.3  Wed Sep  2 15:12:37 2015
+++ pkgsrc/databases/hiredis/PLIST      Sun Mar 22 18:20:11 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2015/09/02 15:12:37 wiedi Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/03/22 18:20:11 wiz Exp $
 include/hiredis/adapters/ae.h
 include/hiredis/adapters/glib.h
 include/hiredis/adapters/ivykis.h
@@ -7,6 +7,7 @@ include/hiredis/adapters/libevent.h
 include/hiredis/adapters/libuv.h
 include/hiredis/adapters/macosx.h
 include/hiredis/adapters/qt.h
+include/hiredis/alloc.h
 include/hiredis/async.h
 include/hiredis/hiredis.h
 include/hiredis/read.h

Index: pkgsrc/databases/hiredis/distinfo
diff -u pkgsrc/databases/hiredis/distinfo:1.8 pkgsrc/databases/hiredis/distinfo:1.9
--- pkgsrc/databases/hiredis/distinfo:1.8       Tue Nov 26 12:43:42 2019
+++ pkgsrc/databases/hiredis/distinfo   Sun Mar 22 18:20:11 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2019/11/26 12:43:42 wiz Exp $
+$NetBSD: distinfo,v 1.9 2020/03/22 18:20:11 wiz Exp $
 
-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
+SHA1 (hiredis-0.14.1.tar.gz) = a422493d601aa36cd14504a6791e7609093af8ed
+RMD160 (hiredis-0.14.1.tar.gz) = d87b275f8d3c16ad91fff664044faa5e731d53ae
+SHA512 (hiredis-0.14.1.tar.gz) = a7310f2d65075df0c17636a0220e16487759471a3442b1de2595ab747565f6b6262e37131613b13e396b31050bcbe5529c35d420cd43fd7d500d9d563d469c4f
+Size (hiredis-0.14.1.tar.gz) = 64372 bytes
+SHA1 (patch-Makefile) = 7291b7a6014160a871e8ec1a50fa11ed18df2ee7

Index: pkgsrc/databases/hiredis/patches/patch-Makefile
diff -u pkgsrc/databases/hiredis/patches/patch-Makefile:1.6 pkgsrc/databases/hiredis/patches/patch-Makefile:1.7
--- pkgsrc/databases/hiredis/patches/patch-Makefile:1.6 Tue Nov 26 12:43:42 2019
+++ pkgsrc/databases/hiredis/patches/patch-Makefile     Sun Mar 22 18:20:11 2020
@@ -1,8 +1,8 @@
-$NetBSD: patch-Makefile,v 1.6 2019/11/26 12:43:42 wiz Exp $
+$NetBSD: patch-Makefile,v 1.7 2020/03/22 18:20:11 wiz Exp $
 
 use libtool
 
---- Makefile.orig      2018-09-25 22:59:34.000000000 +0000
+--- Makefile.orig      2020-03-14 18:46:35.000000000 +0000
 +++ Makefile
 @@ -51,13 +51,14 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
  DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
@@ -28,8 +28,8 @@ use libtool
 +all: $(LANAME) $(PKGCONFNAME)
  
  # 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)
+ alloc.o: alloc.c fmacros.h alloc.h
+@@ -83,6 +84,11 @@ $(DYLIBNAME): $(OBJ)
  $(STLIBNAME): $(OBJ)
        $(STLIB_MAKE_CMD) $(OBJ)
  
@@ -41,7 +41,7 @@ use libtool
  dynamic: $(DYLIBNAME)
  static: $(STLIBNAME)
  
-@@ -152,7 +158,7 @@ check: hiredis-test
+@@ -153,7 +159,7 @@ check: hiredis-test
        kill `cat /tmp/hiredis-test-redis.pid`
  
  .c.o:
@@ -50,9 +50,9 @@ use libtool
  
  clean:
        rm -rf $(DYLIBNAME) $(STLIBNAME) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -179,9 +185,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKG
+@@ -180,9 +186,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) 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)