diff options
author | Michael Mair-Keimberger (asterix) <m.mairkeimberger@gmail.com> | 2016-07-19 19:29:57 +0200 |
---|---|---|
committer | Patrice Clement <monsieurp@gentoo.org> | 2016-07-30 08:46:41 +0200 |
commit | 3e85c8c4859384b2e7860512dee265c8d18ec370 (patch) | |
tree | 7651bef4ad238b7146bfcac02f06ae99e39c6046 /dev-db/redis/files | |
parent | x11-terms/xfce4-terminal: Bump to 0.6.90, early GTK+3 release (diff) | |
download | gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.gz gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.tar.bz2 gentoo-3e85c8c4859384b2e7860512dee265c8d18ec370.zip |
dev-db/*: remove unused patches.
Squash all commit messages into a single one.
Closes: https://github.com/gentoo/gentoo/pull/1936
Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Diffstat (limited to 'dev-db/redis/files')
-rw-r--r-- | dev-db/redis/files/redis-2.4.17-shared.patch | 22 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.4.3-shared.patch | 22 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.4.4-tcmalloc.patch | 21 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.6.7-config.patch | 69 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.6.7-shared.patch | 36 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.6.9-tclsh86.patch | 57 | ||||
-rw-r--r-- | dev-db/redis/files/redis-2.8.3-config.patch | 59 | ||||
-rw-r--r-- | dev-db/redis/files/redis.initd-2 | 23 | ||||
-rw-r--r-- | dev-db/redis/files/redis.initd-3 | 32 |
9 files changed, 0 insertions, 341 deletions
diff --git a/dev-db/redis/files/redis-2.4.17-shared.patch b/dev-db/redis/files/redis-2.4.17-shared.patch deleted file mode 100644 index 9c607145d38f..000000000000 --- a/dev-db/redis/files/redis-2.4.17-shared.patch +++ /dev/null @@ -1,22 +0,0 @@ -See https://github.com/antirez/redis/pull/137 - ---- src/Makefile 2011-10-17 10:46:00.000000000 +0200 -+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200 -@@ -49,7 +49,16 @@ - ifeq ($(USE_JEMALLOC),yes) - ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a - ALLOC_LINK=$(ALLOC_DEP) -ldl -- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include -+ ALLOC_FLAGS=-DUSE_JEMALLOC -+ ifdef JEMALLOC_SHARED -+ ALLOC_DEP= -+ ALLOC_LINK=-ljemalloc -+ ALLOC_FLAGS=-DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -I/usr/include -+ else -+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a -+ ALLOC_LINK=$(ALLOC_DEP) -ldl -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include -+ endif - endif - - CCOPT= $(CFLAGS) $(ARCH) $(PROF)
\ No newline at end of file diff --git a/dev-db/redis/files/redis-2.4.3-shared.patch b/dev-db/redis/files/redis-2.4.3-shared.patch deleted file mode 100644 index 20cdebe41b47..000000000000 --- a/dev-db/redis/files/redis-2.4.3-shared.patch +++ /dev/null @@ -1,22 +0,0 @@ -See https://github.com/antirez/redis/pull/137 - ---- src/Makefile 2011-10-17 10:46:00.000000000 +0200 -+++ src/Makefile.2 2011-10-17 13:47:53.000000000 +0200 -@@ -49,7 +49,16 @@ - ifeq ($(USE_JEMALLOC),yes) - ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a - ALLOC_LINK=$(ALLOC_DEP) -ldl -- ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include -+ ALLOC_FLAGS=-DUSE_JEMALLOC -+ ifdef JEMALLOC_SHARED -+ ALLOC_DEP= -+ ALLOC_LINK=-ljemalloc -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I/usr/include -+ else -+ ALLOC_DEP=../deps/jemalloc/lib/libjemalloc.a -+ ALLOC_LINK=$(ALLOC_DEP) -ldl -+ ALLOC_FLAGS=-DUSE_JEMALLOC -I../deps/jemalloc/include -+ endif - endif - - CCOPT= $(CFLAGS) $(ARCH) $(PROF) diff --git a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch b/dev-db/redis/files/redis-2.4.4-tcmalloc.patch deleted file mode 100644 index 964ce71d5f78..000000000000 --- a/dev-db/redis/files/redis-2.4.4-tcmalloc.patch +++ /dev/null @@ -1,21 +0,0 @@ -https://github.com/antirez/redis/pull/218 - -diff --git a/src/Makefile b/src/Makefile -index 72edcad..3e43990 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -35,12 +35,14 @@ else - endif - - ifeq ($(USE_TCMALLOC),yes) -+ USE_JEMALLOC=no - ALLOC_DEP= - ALLOC_LINK=-ltcmalloc - ALLOC_FLAGS=-DUSE_TCMALLOC - endif - - ifeq ($(USE_TCMALLOC_MINIMAL),yes) -+ USE_JEMALLOC=no - ALLOC_DEP= - ALLOC_LINK=-ltcmalloc_minimal - ALLOC_FLAGS=-DUSE_TCMALLOC
\ No newline at end of file diff --git a/dev-db/redis/files/redis-2.6.7-config.patch b/dev-db/redis/files/redis-2.6.7-config.patch deleted file mode 100644 index 0aea1c760ef2..000000000000 --- a/dev-db/redis/files/redis-2.6.7-config.patch +++ /dev/null @@ -1,69 +0,0 @@ -commit 7f05e59a052941fd070be1825d0623a054c66e2d -Author: jbergstroem <bugs@bergstroem.nu> -Date: Tue Oct 30 13:11:23 2012 +1100 - - Adapt config based on Gentoo defaults - -diff --git a/redis.conf b/redis.conf -index 751a3eb..1a36b12 100644 ---- a/redis.conf -+++ b/redis.conf -@@ -14,11 +14,11 @@ - - # 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. --daemonize no -+daemonize yes - - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by - # default. You can specify a custom pid file location here. --pidfile /var/run/redis.pid -+pidfile /var/run/redis/redis.pid - - # Accept connections on the specified port, default is 6379. - # If port 0 is specified Redis will not listen on a TCP socket. -@@ -27,7 +27,7 @@ port 6379 - # If you want you can bind a single interface, if the bind option is not - # specified all the interfaces will listen for incoming connections. - # --# bind 127.0.0.1 -+bind 127.0.0.1 - - # Specify the path for the unix socket that will be used to listen for - # incoming connections. There is no default, so Redis will not listen -@@ -50,7 +50,7 @@ loglevel notice - # Specify the log file name. Also 'stdout' 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 --logfile stdout -+logfile /var/log/redis/redis.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -124,7 +124,7 @@ rdbcompression yes - rdbchecksum yes - - # The filename where to dump the DB --dbfilename dump.rdb -+dbfilename /var/lib/redis/dump.rdb - - # The working directory. - # -@@ -134,7 +134,7 @@ dbfilename dump.rdb - # Also the Append Only File will be created inside this directory. - # - # Note that you must specify a directory here, not a file name. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - -@@ -278,7 +278,7 @@ slave-priority 100 - # limit for maxmemory so that there is some free RAM on the system for slave - # output buffers (but this is not needed if the policy is 'noeviction'). - # --# maxmemory <bytes> -+maxmemory 67108864 - - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory - # is reached? You can select among five behavior:
\ No newline at end of file diff --git a/dev-db/redis/files/redis-2.6.7-shared.patch b/dev-db/redis/files/redis-2.6.7-shared.patch deleted file mode 100644 index 992af6c490b6..000000000000 --- a/dev-db/redis/files/redis-2.6.7-shared.patch +++ /dev/null @@ -1,36 +0,0 @@ -commit 6931bf1d81de597b3abc2a36adf081a24c114567 -Author: jbergstroem <bugs@bergstroem.nu> -Date: Tue Oct 23 12:26:04 2012 +1100 - - Build against shared jemalloc - -diff --git a/src/Makefile b/src/Makefile -index 358b4cb..41390f4 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -22,12 +22,7 @@ STD= -std=c99 -pedantic - WARN= -Wall - OPT= $(OPTIMIZATION) - --# Default allocator --ifeq ($(uname_S),Linux) -- MALLOC=jemalloc --else -- MALLOC=libc --endif -+MALLOC?=jemalloc - - # Backwards compatibility for selecting an allocator - ifeq ($(USE_TCMALLOC),yes) -@@ -71,9 +66,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 -ldl -+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE -+ FINAL_LIBS+= -ljemalloc -ldl - endif - - REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
\ No newline at end of file diff --git a/dev-db/redis/files/redis-2.6.9-tclsh86.patch b/dev-db/redis/files/redis-2.6.9-tclsh86.patch deleted file mode 100644 index 00d81dfafcc7..000000000000 --- a/dev-db/redis/files/redis-2.6.9-tclsh86.patch +++ /dev/null @@ -1,57 +0,0 @@ -diff --git a/runtest b/runtest -index 0eb384c..fadc283 100755 ---- a/runtest -+++ b/runtest -@@ -1,5 +1,5 @@ - #!/bin/sh --TCL=tclsh8.5 -+TCL=tclsh - which $TCL - if [ "$?" != "0" ] - then -diff --git a/tests/integration/replication-4.tcl b/tests/integration/replication-4.tcl -index 69fcab3..58a70fa 100644 ---- a/tests/integration/replication-4.tcl -+++ b/tests/integration/replication-4.tcl -@@ -1,5 +1,5 @@ - proc start_bg_complex_data {host port db ops} { -- exec tclsh8.5 tests/helpers/bg_complex_data.tcl $host $port $db $ops & -+ exec tclsh tests/helpers/bg_complex_data.tcl $host $port $db $ops & - } - - proc stop_bg_complex_data {handle} { -diff --git a/tests/integration/replication.tcl b/tests/integration/replication.tcl -index da94b08..30baf6a 100644 ---- a/tests/integration/replication.tcl -+++ b/tests/integration/replication.tcl -@@ -78,7 +78,7 @@ start_server {tags {"repl"}} { - } - - proc start_write_load {host port seconds} { -- exec tclsh8.5 tests/helpers/gen_write_load.tcl $host $port $seconds & -+ exec tclsh tests/helpers/gen_write_load.tcl $host $port $seconds & - } - - proc stop_write_load {handle} { -diff --git a/tests/test_helper.tcl b/tests/test_helper.tcl -index b2e58b4..253e955 100644 ---- a/tests/test_helper.tcl -+++ b/tests/test_helper.tcl -@@ -2,6 +2,8 @@ - # This softare is released under the BSD License. See the COPYING file for - # more information. - -+package require Tcl 8.5 -+ - set tcl_precision 17 - source tests/support/redis.tcl - source tests/support/server.tcl -@@ -189,7 +191,7 @@ proc test_server_main {} { - set start_port [expr {$::port+100}] - for {set j 0} {$j < $::numclients} {incr j} { - set start_port [find_available_port $start_port] -- set p [exec tclsh8.5 [info script] {*}$::argv \ -+ set p [exec tclsh [info script] {*}$::argv \ - --client $port --port $start_port &] - lappend ::clients_pids $p - incr start_port 10
\ No newline at end of file diff --git a/dev-db/redis/files/redis-2.8.3-config.patch b/dev-db/redis/files/redis-2.8.3-config.patch deleted file mode 100644 index 3f5d95b847ad..000000000000 --- a/dev-db/redis/files/redis-2.8.3-config.patch +++ /dev/null @@ -1,59 +0,0 @@ -commit 66f26c12faaeb8ed85a715d2dfd6a41c978a4bd1 -Author: Johan Bergström <bugs@bergstroem.nu> -Date: Mon Nov 25 09:23:10 2013 +1100 - - Modify config to gentoo defaults - -diff --git redis.conf redis.conf -index 2e3239c..6c7ef4a 100644 ---- redis.conf -+++ redis.conf -@@ -14,11 +14,11 @@ - - # 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. --daemonize no -+daemonize yes - - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by - # default. You can specify a custom pid file location here. --pidfile /var/run/redis.pid -+pidfile /run/redis/redis.pid - - # Accept connections on the specified port, default is 6379. - # If port 0 is specified Redis will not listen on a TCP socket. -@@ -32,7 +32,7 @@ port 6379 - # Examples: - # - # bind 192.168.1.100 10.0.0.1 --# bind 127.0.0.1 -+bind 127.0.0.1 - - # Specify the path for the unix socket that will be used to listen for - # incoming connections. There is no default, so Redis will not listen -@@ -71,7 +71,7 @@ loglevel notice - # Specify the log file name. Also the emptry 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 --logfile "" -+logfile /var/log/redis/redis.log - - # To enable logging to the system logger, just set 'syslog-enabled' to yes, - # and optionally update the other syslog parameters to suit your needs. -@@ -155,7 +155,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. --dir ./ -+dir /var/lib/redis/ - - ################################# REPLICATION ################################# - -@@ -365,6 +365,7 @@ slave-priority 100 - # output buffers (but this is not needed if the policy is 'noeviction'). - # - # maxmemory <bytes> -+maxmemory 67108864 - - # MAXMEMORY POLICY: how Redis will select what to remove when maxmemory - # is reached. You can select among five behaviors: diff --git a/dev-db/redis/files/redis.initd-2 b/dev-db/redis/files/redis.initd-2 deleted file mode 100644 index 48ebe565ca5a..000000000000 --- a/dev-db/redis/files/redis.initd-2 +++ /dev/null @@ -1,23 +0,0 @@ -#!/sbin/openrc-run -# $Id$ - -REDIS_DIR=${REDIS_DIR:-/var/lib/redis} -REDIS_CONF=${REDIS_CONF:-/etc/redis.conf} -REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"} -REDIS_USER=${REDIS_USER:-redis} -REDIS_GROUP=${REDIS_GROUP:-redis} - -command=/usr/sbin/redis-server -start_stop_daemon_args="--chdir \"${REDIS_DIR}\" - --user ${REDIS_USER} --group ${REDIS_GROUP}" -command_args="${REDIS_OPTS}" -pidfile=${REDIS_PID:-/var/run/redis/redis.pid} - -depend() { - use net localmount logger - after keepalived -} - -start_pre() { - checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID}) -} diff --git a/dev-db/redis/files/redis.initd-3 b/dev-db/redis/files/redis.initd-3 deleted file mode 100644 index a8564e4c9031..000000000000 --- a/dev-db/redis/files/redis.initd-3 +++ /dev/null @@ -1,32 +0,0 @@ -#!/sbin/openrc-run -# $Id$ - -REDIS_DIR=${REDIS_DIR:-/var/lib/redis} -REDIS_CONF=${REDIS_CONF:-/etc/redis.conf} -REDIS_OPTS=${REDIS_OPTS:-"${REDIS_CONF}"} -REDIS_USER=${REDIS_USER:-redis} -REDIS_GROUP=${REDIS_GROUP:-redis} - -command=/usr/sbin/redis-server -start_stop_daemon_args="--chdir \"${REDIS_DIR}\" - --user ${REDIS_USER} --group ${REDIS_GROUP}" -command_args="${REDIS_OPTS}" -pidfile=${REDIS_PID:-/run/redis/redis.pid} - -depend() { - use net localmount logger - after keepalived -} - -start_pre() { - checkpath -d -m 0775 -o ${REDIS_USER}:${REDIS_GROUP} $(dirname ${REDIS_PID}) -} - -stop() { - ebegin "Stopping ${SVCNAME}" - start-stop-daemon --stop \ - --exec ${retries} \ - --retry 30 \ - --pidfile ${pidfile} - eend -} |