From owner-svn-ports-all@freebsd.org Wed Nov 27 18:20:55 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 3F3651B3E16; Wed, 27 Nov 2019 18:20:55 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47NTbq0rZrz4NGC; Wed, 27 Nov 2019 18:20:55 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DA33E195CE; Wed, 27 Nov 2019 18:20:54 +0000 (UTC) (envelope-from osa@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xARIKs4a033852; Wed, 27 Nov 2019 18:20:54 GMT (envelope-from osa@FreeBSD.org) Received: (from osa@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xARIKrUv033845; Wed, 27 Nov 2019 18:20:53 GMT (envelope-from osa@FreeBSD.org) Message-Id: <201911271820.xARIKrUv033845@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: osa set sender to osa@FreeBSD.org using -f From: "Sergey A. Osokin" Date: Wed, 27 Nov 2019 18:20:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r518516 - in head/databases/redis-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: osa X-SVN-Commit-Paths: in head/databases/redis-devel: . files X-SVN-Commit-Revision: 518516 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 27 Nov 2019 18:20:55 -0000 Author: osa Date: Wed Nov 27 18:20:53 2019 New Revision: 518516 URL: https://svnweb.freebsd.org/changeset/ports/518516 Log: Update to the recent development version from the unstable branch. Modified: head/databases/redis-devel/Makefile head/databases/redis-devel/distinfo head/databases/redis-devel/files/extra-patch-src-Makefile.lua head/databases/redis-devel/files/extra-patch-src-Makefile.luajit head/databases/redis-devel/files/patch-deps-hiredis-Makefile head/databases/redis-devel/files/patch-redis.conf head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/Makefile Wed Nov 27 18:20:53 2019 (r518516) @@ -2,16 +2,19 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 5.0.7 -PORTREVISION= 1 +PORTVERSION= 6.0.0.20191125 CATEGORIES= databases -MASTER_SITES= http://download.redis.io/releases/ PKGNAMESUFFIX= -devel MAINTAINER= osa@FreeBSD.org COMMENT= Persistent key-value database with built-in net interface LICENSE= BSD3CLAUSE + +USE_GITHUB= yes +GH_ACCOUNT= antirez +GH_PROJECT= ${PORTNAME} +GH_TAGNAME= a1b6548 OPTIONS_DEFINE= JEMALLOC TESTS TRIB OPTIONS_RADIO= EXTLUA Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/distinfo Wed Nov 27 18:20:53 2019 (r518516) @@ -1,3 +1,3 @@ -TIMESTAMP = 1574364884 -SHA256 (redis-5.0.7.tar.gz) = 61db74eabf6801f057fd24b590232f2f337d422280fd19486eca03be87d3a82b -SIZE (redis-5.0.7.tar.gz) = 1984203 +TIMESTAMP = 1574869655 +SHA256 (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 33f9e9af6339d7d6aaa583ba8fefc42986a3577cacc63db3750175f88a484f58 +SIZE (antirez-redis-6.0.0.20191125-a1b6548_GH0.tar.gz) = 2164648 Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.lua Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua Wed Nov 27 18:20:53 2019 (r518516) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2018-10-18 18:09:43.930566000 -0400 -+++ src/Makefile 2018-10-18 18:10:32.562125000 -0400 +--- src/Makefile.orig 2019-11-24 18:35:15.366487000 -0500 ++++ src/Makefile 2019-11-24 18:36:15.006447000 -0500 @@ -16,7 +16,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') @@ -9,7 +9,7 @@ NODEPS:=clean distclean # Default settings -@@ -63,8 +63,8 @@ +@@ -72,8 +72,8 @@ # Override default settings if possible -include .make-settings @@ -20,7 +20,7 @@ FINAL_LIBS=-lm ifeq ($(uname_S),SunOS) -@@ -112,7 +112,7 @@ +@@ -134,7 +134,7 @@ endif endif # Include paths to dependencies @@ -29,8 +29,8 @@ ifeq ($(MALLOC),tcmalloc) FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -130,6 +130,9 @@ - FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) +@@ -158,6 +158,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif +FINAL_CFLAGS+=-I${PREFIX}/include/lua51 @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -150,6 +153,7 @@ +@@ -178,6 +181,7 @@ REDIS_SERVER_NAME=redis-server REDIS_SENTINEL_NAME=redis-sentinel - REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o REDIS_CLI_NAME=redis-cli REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -201,7 +205,7 @@ +@@ -229,7 +233,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit Wed Nov 27 18:20:53 2019 (r518516) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2018-10-18 18:11:24.649811000 -0400 -+++ src/Makefile 2018-10-18 18:11:35.160523000 -0400 +--- src/Makefile.orig 2019-11-24 18:37:44.530528000 -0500 ++++ src/Makefile 2019-11-24 18:38:18.143896000 -0500 @@ -16,7 +16,7 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') @@ -9,7 +9,7 @@ NODEPS:=clean distclean # Default settings -@@ -63,8 +63,8 @@ +@@ -72,8 +72,8 @@ # Override default settings if possible -include .make-settings @@ -20,7 +20,7 @@ FINAL_LIBS=-lm ifeq ($(uname_S),SunOS) -@@ -112,7 +112,7 @@ +@@ -134,7 +134,7 @@ endif endif # Include paths to dependencies @@ -29,8 +29,8 @@ ifeq ($(MALLOC),tcmalloc) FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -130,6 +130,9 @@ - FINAL_LIBS := ../deps/jemalloc/lib/libjemalloc.a $(FINAL_LIBS) +@@ -158,6 +158,9 @@ + FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif +FINAL_CFLAGS+=-I${PREFIX}/include/luajit-2.0 @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -150,6 +153,7 @@ +@@ -178,6 +181,7 @@ REDIS_SERVER_NAME=redis-server REDIS_SENTINEL_NAME=redis-sentinel - REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o + REDIS_SERVER_OBJ=adlist.o quicklist.o ae.o anet.o dict.o server.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o pubsub.o multi.o debug.o sort.o intset.o syncio.o cluster.o crc16.o endianconv.o slowlog.o scripting.o bio.o rio.o rand.o memtest.o crc64.o bitops.o sentinel.o notify.o setproctitle.o blocked.o hyperloglog.o latency.o sparkline.o redis-check-rdb.o redis-check-aof.o geo.o lazyfree.o module.o evict.o expire.o geohash.o geohash_helper.o childinfo.o defrag.o siphash.o rax.o t_stream.o listpack.o localtime.o lolwut.o lolwut5.o lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.o +REDIS_SERVER_OBJ+=fpconv.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o strbuf.o REDIS_CLI_NAME=redis-cli REDIS_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -201,7 +205,7 @@ +@@ -229,7 +233,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/patch-deps-hiredis-Makefile ============================================================================== --- head/databases/redis-devel/files/patch-deps-hiredis-Makefile Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/files/patch-deps-hiredis-Makefile Wed Nov 27 18:20:53 2019 (r518516) @@ -1,6 +1,6 @@ ---- deps/hiredis/Makefile.orig 2019-09-25 10:40:18 UTC -+++ deps/hiredis/Makefile -@@ -15,7 +15,7 @@ HIREDIS_PATCH=$(shell grep HIREDIS_PATCH hiredis.h | a +--- deps/hiredis/Makefile.orig 2019-11-24 18:44:27.552196000 -0500 ++++ deps/hiredis/Makefile 2019-11-24 19:16:28.147610000 -0500 +@@ -21,7 +21,7 @@ HIREDIS_SONAME=$(shell grep HIREDIS_SONAME hiredis.h | awk '{print $$3}') # Installation related variables and target @@ -9,33 +9,32 @@ INCLUDE_PATH?=include/hiredis LIBRARY_PATH?=lib PKGCONF_PATH?=pkgconfig -@@ -38,10 +38,10 @@ export REDIS_TEST_CONFIG +@@ -44,10 +44,8 @@ # 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++') + 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 -+#OPTIMIZATION?=-O3 - WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings + WARNINGS=-Wall -W -Wstrict-prototypes -Wwrite-strings -Wno-missing-field-initializers -DEBUG_FLAGS?= -g -ggdb --REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) $(ARCH) -+#DEBUG_FLAGS?= -g -ggdb +-REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CPPFLAGS) $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) +REAL_CFLAGS=$(OPTIMIZATION) -fPIC $(CFLAGS) $(WARNINGS) $(DEBUG_FLAGS) - REAL_LDFLAGS=$(LDFLAGS) $(ARCH) + REAL_LDFLAGS=$(LDFLAGS) DYLIBSUFFIX=so -@@ -59,6 +59,15 @@ ifeq ($(uname_S),SunOS) +@@ -82,6 +80,16 @@ + ifeq ($(uname_S),SunOS) REAL_LDFLAGS+= -ldl -lnsl -lsocket DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS) - INSTALL= cp -r +endif +ifeq ($(uname_S),FreeBSD) + CFLAGS?=$(CFLAGS) -+ CCLINK?=-pthread ++ CCLINK?=pthread + LDFLAGS?=-L. -Wl,-rpath,. + DYLIBNAME?=libhiredis.so + DYLIB_MAKE_CMD?=$(CC) -o ${DYLIBNAME} ${OBJ} + STLIBNAME?=libhiredis.a + STLIB_MAKE_CMD?=ar rcs ${STLIBNAME} ${OBJ} ++ SSL_LDFLAGS+= ${OPENSSL_LDFLAGS} endif ifeq ($(uname_S),Darwin) DYLIBSUFFIX=dylib Modified: head/databases/redis-devel/files/patch-redis.conf ============================================================================== --- head/databases/redis-devel/files/patch-redis.conf Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/files/patch-redis.conf Wed Nov 27 18:20:53 2019 (r518516) @@ -1,6 +1,6 @@ ---- redis.conf.orig 2019-09-25 10:40:18 UTC +--- redis.conf.orig 2019-11-22 16:54:22 UTC +++ redis.conf -@@ -133,7 +133,7 @@ tcp-keepalive 300 +@@ -203,7 +203,7 @@ tcp-keepalive 300 # By default Redis does not run as a daemon. Use 'yes' if you need it. # Note that Redis will write a pid file in /var/run/redis.pid when daemonized. @@ -9,7 +9,7 @@ # If you run Redis from upstart or systemd, Redis can interact with your # supervision tree. Options: -@@ -155,7 +155,7 @@ supervised no +@@ -225,7 +225,7 @@ supervised no # # Creating a pid file is best effort: if Redis is not able to create it # nothing bad happens, the server will start and run normally. @@ -18,7 +18,7 @@ # Specify the server verbosity level. # This can be one of: -@@ -168,7 +168,7 @@ loglevel notice +@@ -238,7 +238,7 @@ loglevel notice # Specify the log file name. Also the empty string can be used to force # Redis to log on the standard output. Note that if you use standard # output for logging but daemonize, logs will be sent to /dev/null @@ -27,7 +27,7 @@ # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -260,7 +260,7 @@ dbfilename dump.rdb +@@ -330,7 +330,7 @@ dbfilename dump.rdb # The Append Only File will also be created inside this directory. # # Note that you must specify a directory here, not a file name. Modified: head/databases/redis-devel/files/patch-src-mkreleasehdr.sh ============================================================================== --- head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Wed Nov 27 18:18:16 2019 (r518515) +++ head/databases/redis-devel/files/patch-src-mkreleasehdr.sh Wed Nov 27 18:20:53 2019 (r518516) @@ -1,4 +1,4 @@ ---- src/mkreleasehdr.sh.orig 2019-09-25 10:40:18 UTC +--- src/mkreleasehdr.sh.orig 2019-11-22 16:54:22 UTC +++ src/mkreleasehdr.sh @@ -1,6 +1,6 @@ #!/bin/sh @@ -8,4 +8,4 @@ +GIT_DIRTY="0" BUILD_ID=`uname -n`"-"`date +%s` if [ -n "$SOURCE_DATE_EPOCH" ]; then - BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u %s) + BUILD_ID=$(date -u -d "@$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u -r "$SOURCE_DATE_EPOCH" +%s 2>/dev/null || date -u +%s)