git: f46bd2c58425 - main - databases/redis-devel: Update to latest snapshot

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yasuhiro Kimura <yasu_at_FreeBSD.org>
Date: Fri, 30 Jun 2023 23:59:45 UTC
The branch main has been updated by yasu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=f46bd2c58425c0a59b26c7144f08e7e3209a2f12

commit f46bd2c58425c0a59b26c7144f08e7e3209a2f12
Author:     Yasuhiro Kimura <yasu@FreeBSD.org>
AuthorDate: 2023-06-30 23:40:18 +0000
Commit:     Yasuhiro Kimura <yasu@FreeBSD.org>
CommitDate: 2023-06-30 23:59:21 +0000

    databases/redis-devel: Update to latest snapshot
    
    Changes:        https://github.com/redis/redis/compare/c2f1815bc...6bf9b144e
---
 databases/redis-devel/Makefile                          |  4 ++--
 databases/redis-devel/distinfo                          |  6 +++---
 databases/redis-devel/files/patch-deps-Makefile         |  6 +++---
 databases/redis-devel/files/patch-deps-hiredis-Makefile | 16 ++++++++--------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile
index 367b1af3856a..9d4b4e410785 100644
--- a/databases/redis-devel/Makefile
+++ b/databases/redis-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	redis
-DISTVERSION=	7.0.11.20230530
+DISTVERSION=	7.0.11.20230629
 CATEGORIES=	databases
 PKGNAMESUFFIX=	-devel
 
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 USES+=		compiler:c11 cpe gmake
 CPE_VENDOR=	redislabs
 USE_GITHUB=	yes
-GH_TAGNAME=	c2f1815bc
+GH_TAGNAME=	6bf9b144e
 
 MAKE_ENV=	OPTIMIZATION= \
 		V=yo
diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo
index 9ad332acbbbe..f34182b9c917 100644
--- a/databases/redis-devel/distinfo
+++ b/databases/redis-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1685765994
-SHA256 (redis-redis-7.0.11.20230530-c2f1815bc_GH0.tar.gz) = d92719d16d338e232b44cdd6ba69b352925e4a197d803bad0dc9f1e73a88b1f0
-SIZE (redis-redis-7.0.11.20230530-c2f1815bc_GH0.tar.gz) = 3380158
+TIMESTAMP = 1688167047
+SHA256 (redis-redis-7.0.11.20230629-6bf9b144e_GH0.tar.gz) = 83f50bb2431d511e525df40e9e42f0daaf9c2843023fcb3c77b5ef7b46d33224
+SIZE (redis-redis-7.0.11.20230629-6bf9b144e_GH0.tar.gz) = 3409919
diff --git a/databases/redis-devel/files/patch-deps-Makefile b/databases/redis-devel/files/patch-deps-Makefile
index f49ee7e60b30..9da224428a99 100644
--- a/databases/redis-devel/files/patch-deps-Makefile
+++ b/databases/redis-devel/files/patch-deps-Makefile
@@ -1,4 +1,4 @@
---- deps/Makefile.orig	2023-05-11 05:14:59 UTC
+--- deps/Makefile.orig	2023-06-29 16:32:01 UTC
 +++ deps/Makefile
 @@ -83,7 +83,7 @@ LUA_LDFLAGS+= $(LDFLAGS)
  ifeq ($(LUA_DEBUG),yes)
@@ -13,9 +13,9 @@
  
  jemalloc: .make-prerequisites
  	@printf '%b %b\n' $(MAKECOLOR)MAKE$(ENDCOLOR) $(BINCOLOR)$@$(ENDCOLOR)
--	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
+-	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 -	cd jemalloc && $(MAKE) lib/libjemalloc.a
-+	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
++	cd jemalloc && ./configure --disable-cxx --with-version=5.3.0-0-g0 --with-lg-quantum=3 --disable-cache-oblivious --with-jemalloc-prefix=je_ CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" $(JEMALLOC_CONFIGURE_OPTS)
 +	cd jemalloc && $(MAKE) CFLAGS="$(JEMALLOC_CFLAGS)" CXXFLAGS="$(JEMALLOC_CFLAGS)" LDFLAGS="$(JEMALLOC_LDFLAGS)" lib/libjemalloc.a
  
  .PHONY: jemalloc
diff --git a/databases/redis-devel/files/patch-deps-hiredis-Makefile b/databases/redis-devel/files/patch-deps-hiredis-Makefile
index aec6b29a7b2e..ef26b1c71b74 100644
--- a/databases/redis-devel/files/patch-deps-hiredis-Makefile
+++ b/databases/redis-devel/files/patch-deps-hiredis-Makefile
@@ -1,6 +1,6 @@
---- deps/hiredis/Makefile.orig	2021-01-12 14:21:03 UTC
+--- deps/hiredis/Makefile.orig	2023-06-29 16:32:01 UTC
 +++ deps/hiredis/Makefile
-@@ -21,7 +21,7 @@
+@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a
  HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}')
  
  # Installation related variables and target
@@ -9,21 +9,21 @@
  INCLUDE_PATH?=include/hiredis
  LIBRARY_PATH?=lib
  PKGCONF_PATH?=pkgconfig
-@@ -44,10 +44,8 @@
+@@ -38,10 +38,8 @@ export REDIS_TEST_CONFIG
  # Fallback to gcc when $CC is not in $PATH.
  CC:=$(shell sh -c 'type $${CC%% *} >/dev/null 2>/dev/null && echo $(CC) || echo gcc')
  CXX:=$(shell sh -c 'type $${CXX%% *} >/dev/null 2>/dev/null && echo $(CXX) || echo g++')
 -OPTIMIZATION?=-O3
  WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers
 -DEBUG_FLAGS?= -g -ggdb
--REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
-+REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS)
+-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
++REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(PLATFORM_FLAGS)
  REAL_LDFLAGS=$(LDFLAGS)
  
  DYLIBSUFFIX=so
-@@ -83,7 +81,16 @@
-   CFLAGS+=-I$(OPENSSL_PREFIX)/include
-   SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
+@@ -122,7 +120,16 @@ ifeq ($(uname_S),FreeBSD)
+ else
+   REAL_CFLAGS+=-pedantic
  endif
 -
 +ifeq ($(uname_S),FreeBSD)