Date: Sat, 4 Apr 2020 00:31:49 +0000 (UTC) From: "Sergey A. Osokin" <osa@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r530532 - in head/databases/redis-devel: . files Message-ID: <202004040031.0340Vngt089164@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: osa Date: Sat Apr 4 00:31:48 2020 New Revision: 530532 URL: https://svnweb.freebsd.org/changeset/ports/530532 Log: Update to the Apr 3, 2020. Re-generate lua/luajit specific patches. 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/extra-patch-src-Makefile.luajit-or Modified: head/databases/redis-devel/Makefile ============================================================================== --- head/databases/redis-devel/Makefile Fri Apr 3 23:16:57 2020 (r530531) +++ head/databases/redis-devel/Makefile Sat Apr 4 00:31:48 2020 (r530532) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -PORTVERSION= 6.0.0.20200316 +PORTVERSION= 6.0.0.20200403 CATEGORIES= databases PKGNAMESUFFIX= -devel @@ -13,7 +13,7 @@ LICENSE= BSD3CLAUSE USES+= compiler:c11 gmake USE_GITHUB= yes -GH_TUPLE= antirez:${PORTNAME}:b3a9700 +GH_TUPLE= antirez:${PORTNAME}:b0bbfed OPTIONS_DEFINE= JEMALLOC TESTS TLS TRIB OPTIONS_RADIO= EXTLUA Modified: head/databases/redis-devel/distinfo ============================================================================== --- head/databases/redis-devel/distinfo Fri Apr 3 23:16:57 2020 (r530531) +++ head/databases/redis-devel/distinfo Sat Apr 4 00:31:48 2020 (r530532) @@ -1,3 +1,3 @@ -TIMESTAMP = 1584465786 -SHA256 (antirez-redis-6.0.0.20200316-b3a9700_GH0.tar.gz) = 63c6d923c6ee81aba8dffc7de03a5b38fdf848000932df2f9ad8ee67100df776 -SIZE (antirez-redis-6.0.0.20200316-b3a9700_GH0.tar.gz) = 2190128 +TIMESTAMP = 1585931945 +SHA256 (antirez-redis-6.0.0.20200403-b0bbfed_GH0.tar.gz) = a5a5966159da417972fdd922dc3e8ae5d5a3a0934739cbce4cbdc28beeb39f69 +SIZE (antirez-redis-6.0.0.20200403-b0bbfed_GH0.tar.gz) = 2196890 Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.lua ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.lua Fri Apr 3 23:16:57 2020 (r530531) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.lua Sat Apr 4 00:31:48 2020 (r530532) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2019-11-24 18:35:15.366487000 -0500 -+++ src/Makefile 2019-11-24 18:36:15.006447000 -0500 +--- src/Makefile.orig 2020-04-03 08:12:31.000000000 -0400 ++++ src/Makefile 2020-04-03 12:51:41.764129000 -0400 @@ -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 -@@ -72,8 +72,8 @@ +@@ -73,8 +73,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) -@@ -134,7 +134,7 @@ +@@ -139,7 +139,7 @@ endif endif # Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -158,6 +158,9 @@ + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -187,6 +187,9 @@ FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -178,6 +181,7 @@ +@@ -207,6 +210,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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.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 timeout.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_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -229,7 +233,7 @@ +@@ -258,7 +262,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 Fri Apr 3 23:16:57 2020 (r530531) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit Sat Apr 4 00:31:48 2020 (r530532) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2019-11-24 18:37:44.530528000 -0500 -+++ src/Makefile 2019-11-24 18:38:18.143896000 -0500 +--- src/Makefile.orig 2020-04-03 08:12:31.000000000 -0400 ++++ src/Makefile 2020-04-03 12:57:17.873850000 -0400 @@ -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 -@@ -72,8 +72,8 @@ +@@ -73,8 +73,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) -@@ -134,7 +134,7 @@ +@@ -139,7 +139,7 @@ endif endif # Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -158,6 +158,9 @@ + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -187,6 +187,9 @@ FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -178,6 +181,7 @@ +@@ -207,6 +210,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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.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 timeout.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_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -229,7 +233,7 @@ +@@ -258,7 +262,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) Modified: head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or ============================================================================== --- head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or Fri Apr 3 23:16:57 2020 (r530531) +++ head/databases/redis-devel/files/extra-patch-src-Makefile.luajit-or Sat Apr 4 00:31:48 2020 (r530532) @@ -1,5 +1,5 @@ ---- src/Makefile.orig 2019-11-24 18:37:44.530528000 -0500 -+++ src/Makefile 2019-11-24 18:38:18.143896000 -0500 +--- src/Makefile.orig 2020-04-03 08:12:31.000000000 -0400 ++++ src/Makefile 2020-04-03 12:54:04.887107000 -0400 @@ -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 -@@ -72,8 +72,8 @@ +@@ -73,8 +73,8 @@ # Override default settings if possible -include .make-settings @@ -18,18 +18,18 @@ +FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) +FINAL_LDFLAGS=$(LDFLAGS) $(DEBUG) FINAL_LIBS=-lm + DEBUG=-g -ggdb - ifeq ($(uname_S),SunOS) -@@ -134,7 +134,7 @@ +@@ -139,7 +139,7 @@ endif endif # Include paths to dependencies -FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src +FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -158,6 +158,9 @@ + # Determine systemd support and/or build preference (defaulting to auto-detection) + BUILD_WITH_SYSTEMD=no +@@ -187,6 +187,9 @@ FINAL_LIBS += ../deps/hiredis/libhiredis_ssl.a -lssl -lcrypto endif @@ -39,15 +39,15 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -@@ -178,6 +181,7 @@ +@@ -207,6 +210,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 lolwut6.o acl.o gopher.o tracking.o connection.o tls.o sha256.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 timeout.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_CLI_OBJ=anet.o adlist.o dict.o redis-cli.o zmalloc.o release.o ae.o crc64.o siphash.o crc16.o REDIS_BENCHMARK_NAME=redis-benchmark -@@ -229,7 +233,7 @@ +@@ -258,7 +262,7 @@ # redis-server $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202004040031.0340Vngt089164>