From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 6508A138359 for ; Mon, 27 Jul 2020 20:06:29 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9495DE1697; Mon, 27 Jul 2020 20:06:28 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65185E15B9 for ; Mon, 27 Jul 2020 20:06:28 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 31C5334F1B1 for ; Mon, 27 Jul 2020 20:06:27 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A43A32AE for ; Mon, 27 Jul 2020 20:06:25 +0000 (UTC) From: "Aaron Bauman" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Aaron Bauman" Message-ID: <1595880373.7f1b47ae0fc2ba7c96c90ec60f43d734f1f6f830.bman@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-db/redis/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-db/redis/files/redis-4.0.1-shared.patch dev-db/redis/files/redis-4.0.1-sharedlua.patch dev-db/redis/files/redis-sentinel-4.0.6-config.patch X-VCS-Directories: dev-db/redis/files/ X-VCS-Committer: bman X-VCS-Committer-Name: Aaron Bauman X-VCS-Revision: 7f1b47ae0fc2ba7c96c90ec60f43d734f1f6f830 X-VCS-Branch: master Date: Mon, 27 Jul 2020 20:06:25 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3c2dd9b8-1888-43be-9fc0-8b007be41464 X-Archives-Hash: fa0c996764cae0f726c8f84b3a321d1a commit: 7f1b47ae0fc2ba7c96c90ec60f43d734f1f6f830 Author: Michael Mair-Keimberger gmail com> AuthorDate: Mon Jul 27 12:05:47 2020 +0000 Commit: Aaron Bauman gentoo org> CommitDate: Mon Jul 27 20:06:13 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f1b47ae dev-db/redis: remove unused patches Package-Manager: Portage-3.0.0, Repoman-2.3.23 Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/16853 Signed-off-by: Aaron Bauman gentoo.org> dev-db/redis/files/redis-4.0.1-shared.patch | 32 ------------ dev-db/redis/files/redis-4.0.1-sharedlua.patch | 60 ---------------------- .../redis/files/redis-sentinel-4.0.6-config.patch | 9 ---- 3 files changed, 101 deletions(-) diff --git a/dev-db/redis/files/redis-4.0.1-shared.patch b/dev-db/redis/files/redis-4.0.1-shared.patch deleted file mode 100644 index 945d114ae2f..00000000000 --- a/dev-db/redis/files/redis-4.0.1-shared.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/src/Makefile b/src/Makefile -index 86e0b3fe..c7db0ee9 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -29,14 +29,7 @@ INSTALL_BIN=$(PREFIX)/bin - INSTALL=install - - # Default allocator defaults to Jemalloc if it's not an ARM --MALLOC=libc --ifneq ($(uname_M),armv6l) --ifneq ($(uname_M),armv7l) --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --endif --endif --endif -+MALLOC?=jemalloc - - # To get ARM stack traces if Redis crashes we need a special C flag. - ifneq (,$(findstring armv,$(uname_M))) -@@ -120,9 +113,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) - endif - - ifeq ($(MALLOC),jemalloc) -- DEPENDENCY_TARGETS+= jemalloc -- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include -- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) diff --git a/dev-db/redis/files/redis-4.0.1-sharedlua.patch b/dev-db/redis/files/redis-4.0.1-sharedlua.patch deleted file mode 100644 index d2b572250e8..00000000000 --- a/dev-db/redis/files/redis-4.0.1-sharedlua.patch +++ /dev/null @@ -1,60 +0,0 @@ -diff --git a/deps/lua/src/lua_cjson.c b/deps/lua/src/lua_cjson.c -index c26c0d7b..fa50c410 100644 ---- a/deps/lua/src/lua_cjson.c -+++ b/deps/lua/src/lua_cjson.c -@@ -46,7 +46,7 @@ - #include "strbuf.h" - #include "fpconv.h" - --#include "../../../src/solarisfixes.h" -+#include "solarisfixes.h" - - #ifndef CJSON_MODNAME - #define CJSON_MODNAME "cjson" -diff --git a/src/Makefile b/src/Makefile -index 86e0b3fe..09630321 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -16,7 +16,7 @@ release_hdr := $(shell sh -c './mkreleasehdr.sh') - uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not') - uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo not') - OPTIMIZATION?=-O2 --DEPENDENCY_TARGETS=hiredis linenoise lua -+DEPENDENCY_TARGETS=hiredis linenoise - NODEPS:=clean distclean - - # Default settings -@@ -66,6 +66,7 @@ endif - FINAL_CFLAGS=$(STD) $(WARN) $(OPT) $(DEBUG) $(CFLAGS) $(REDIS_CFLAGS) - FINAL_LDFLAGS=$(LDFLAGS) $(REDIS_LDFLAGS) $(DEBUG) - FINAL_LIBS=-lm -+FINAL_LIBS+=@LUA_LIBS@ - DEBUG=-g -ggdb - - ifeq ($(uname_S),SunOS) -@@ -107,7 +108,7 @@ endif - 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 @LUA_CFLAGS@ - - ifeq ($(MALLOC),tcmalloc) - FINAL_CFLAGS+= -DUSE_TCMALLOC -@@ -145,6 +146,7 @@ endif - 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 -+REDIS_SERVER_OBJ+=fpconv.o strbuf.o lua_bit.o lua_cjson.o lua_cmsgpack.o lua_struct.o - REDIS_CLI_NAME=redis-cli - REDIS_CLI_OBJ=anet.o adlist.o redis-cli.o zmalloc.o release.o anet.o ae.o crc64.o - REDIS_BENCHMARK_NAME=redis-benchmark -@@ -196,7 +198,7 @@ endif - - # redis-server - $(REDIS_SERVER_NAME): $(REDIS_SERVER_OBJ) -- $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a ../deps/lua/src/liblua.a $(FINAL_LIBS) -+ $(REDIS_LD) -o $@ $^ ../deps/hiredis/libhiredis.a $(FINAL_LIBS) - - # redis-sentinel - $(REDIS_SENTINEL_NAME): $(REDIS_SERVER_NAME) diff --git a/dev-db/redis/files/redis-sentinel-4.0.6-config.patch b/dev-db/redis/files/redis-sentinel-4.0.6-config.patch deleted file mode 100644 index f2a75814951..00000000000 --- a/dev-db/redis/files/redis-sentinel-4.0.6-config.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/sentinel.conf b/sentinel.conf -index 0e1b266..869a4b9 100644 ---- a/sentinel.conf -+++ b/sentinel.conf -@@ -194,3 +194,4 @@ sentinel failover-timeout mymaster 180000 - # - # sentinel client-reconfig-script mymaster /var/redis/reconfig.sh - -+logfile "/var/log/redis/sentinel.log"