CVS commit: pkgsrc/databases/hiredis

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/databases/hiredis
From: "Adam Ciarcinski" <adam%netbsd.org@localhost>
Date: Wed, 23 Jun 2021 19:35:44 +0000

Module Name:    pkgsrc
Committed By:   adam
Date:           Wed Jun 23 19:35:44 UTC 2021

Modified Files:
        pkgsrc/databases/hiredis: Makefile buildlink3.mk distinfo
        pkgsrc/databases/hiredis/patches: patch-Makefile

Log Message:
hiredis: updated to 1.0.0

Release of v1.0.0

Hiredis v1.0.0 marks the first stable release of Hiredis and introduces
RESP3 support, SSL connections, allocator injection, better Windows support,
and more.

IMPORTANT:  There are breaking changes in this release meaning your code
will need to be recompiled and may need small changes.  The exact
details of the breaking changes can be found in README.md.

CHANGELOG.md has a detailed list of changes between v0.14.1 and v1.0.0.


To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 pkgsrc/databases/hiredis/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/hiredis/buildlink3.mk
cvs rdiff -u -r1.9 -r1.10 pkgsrc/databases/hiredis/distinfo
cvs rdiff -u -r1.7 -r1.8 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.6 pkgsrc/databases/hiredis/Makefile:1.7
--- pkgsrc/databases/hiredis/Makefile:1.6       Sun Mar 22 18:20:11 2020
+++ pkgsrc/databases/hiredis/Makefile   Wed Jun 23 19:35:44 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2020/03/22 18:20:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2021/06/23 19:35:44 adam Exp $
 
-DISTNAME=      hiredis-0.14.1
+DISTNAME=      hiredis-1.0.0
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=redis/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -10,8 +10,9 @@ HOMEPAGE=     https://github.com/redis/hired
 COMMENT=       Minimalistic C client library for the Redis database
 LICENSE=       modified-bsd
 
-USE_TOOLS+=    gmake
 USE_LIBTOOL=   yes
+USE_TOOLS+=    gmake
 MAKE_ENV+=     DESTDIR=${DESTDIR}
+TEST_TARGET=   check
 
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/hiredis/buildlink3.mk
diff -u pkgsrc/databases/hiredis/buildlink3.mk:1.1 pkgsrc/databases/hiredis/buildlink3.mk:1.2
--- pkgsrc/databases/hiredis/buildlink3.mk:1.1  Wed Apr  2 17:25:44 2014
+++ pkgsrc/databases/hiredis/buildlink3.mk      Wed Jun 23 19:35:44 2021
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/02 17:25:44 wiedi Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/06/23 19:35:44 adam Exp $
 
 BUILDLINK_TREE+=       hiredis
 
 .if !defined(HIREDIS_BUILDLINK3_MK)
 HIREDIS_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.hiredis+=        hiredis>=0.11.0
+BUILDLINK_API_DEPENDS.hiredis+=        hiredis>=1.0.0
 BUILDLINK_PKGSRCDIR.hiredis?=  ../../databases/hiredis
 .endif # HIREDIS_BUILDLINK3_MK
 

Index: pkgsrc/databases/hiredis/distinfo
diff -u pkgsrc/databases/hiredis/distinfo:1.9 pkgsrc/databases/hiredis/distinfo:1.10
--- pkgsrc/databases/hiredis/distinfo:1.9       Sun Mar 22 18:20:11 2020
+++ pkgsrc/databases/hiredis/distinfo   Wed Jun 23 19:35:44 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2020/03/22 18:20:11 wiz Exp $
+$NetBSD: distinfo,v 1.10 2021/06/23 19:35:44 adam Exp $
 
-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
+SHA1 (hiredis-1.0.0.tar.gz) = 26242153e8ce5bfd0f953b3c036f0c63e8c939fe
+RMD160 (hiredis-1.0.0.tar.gz) = 397b66137f7211936e6044b40cda26d9526b1564
+SHA512 (hiredis-1.0.0.tar.gz) = eb56201121eecdbfc8d42e8c2c141ae77bea248eeb36687ac6835c9b2404f5475beb351c4d8539d552db4d88e933bb2bd5b73f165e62b130bb11aeff39928e69
+Size (hiredis-1.0.0.tar.gz) = 97507 bytes
+SHA1 (patch-Makefile) = 2071de674bd5322365702986421accbfd1aadbcc

Index: pkgsrc/databases/hiredis/patches/patch-Makefile
diff -u pkgsrc/databases/hiredis/patches/patch-Makefile:1.7 pkgsrc/databases/hiredis/patches/patch-Makefile:1.8
--- pkgsrc/databases/hiredis/patches/patch-Makefile:1.7 Sun Mar 22 18:20:11 2020
+++ pkgsrc/databases/hiredis/patches/patch-Makefile     Wed Jun 23 19:35:44 2021
@@ -1,37 +1,29 @@
-$NetBSD: patch-Makefile,v 1.7 2020/03/22 18:20:11 wiz Exp $
+$NetBSD: patch-Makefile,v 1.8 2021/06/23 19:35:44 adam Exp $
 
-use libtool
+Use libtool
 
---- Makefile.orig      2020-03-14 18:46:35.000000000 +0000
+--- Makefile.orig      2020-08-03 18:18:07.000000000 +0000
 +++ Makefile
-@@ -51,13 +51,14 @@ DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFI
- DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX)
- DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+@@ -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 $(STLIBNAME)
+ STLIB_MAKE_CMD=$(AR) rcs
  
- # Platform-specific overrides
- uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
- ifeq ($(uname_S),SunOS)
-   REAL_LDFLAGS+= -ldl -lnsl -lsocket
--  DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
-+  DYLIB_MAKE_CMD=$(CC) -shared -o $(DYLIBNAME) -Wl,-h,$(DYLIB_MINOR_NAME) $(LDFLAGS)
- endif
- ifeq ($(uname_S),Darwin)
-   DYLIBSUFFIX=dylib
-@@ -65,7 +66,7 @@ ifeq ($(uname_S),Darwin)
-   DYLIB_MAKE_CMD=$(CC) -dynamiclib -Wl,-install_name,$(PREFIX)/$(LIBRARY_PATH)/$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS)
+ 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)
- 
- # Deps (use make dep to generate this)
- alloc.o: alloc.c fmacros.h alloc.h
-@@ -83,6 +84,11 @@ $(DYLIBNAME): $(OBJ)
- $(STLIBNAME): $(OBJ)
-       $(STLIB_MAKE_CMD) $(OBJ)
+ 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) \
@@ -40,17 +32,17 @@ use libtool
 +
  dynamic: $(DYLIBNAME)
  static: $(STLIBNAME)
- 
-@@ -153,7 +159,7 @@ check: hiredis-test
-       kill `cat /tmp/hiredis-test-redis.pid`
+ 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) $(TESTS) $(PKGCONFNAME) examples/hiredis-example* *.o *.gcda *.gcno *.gcov
-@@ -180,9 +186,7 @@ install: $(DYLIBNAME) $(STLIBNAME) $(PKG
+       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

Prev by Date: CVS commit: pkgsrc/net/ntopng
Next by Date: CVS commit: pkgsrc/sysutils/ansible-base
Previous by Thread: CVS commit: pkgsrc/net/ntopng
Next by Thread: CVS commit: pkgsrc/sysutils/ansible-base
Indexes:

Home | Main Index | Thread Index | Old Index