| 1 |
djc 12/12/26 11:15:46 |
| 2 |
|
| 3 |
Added: redis-2.6.7-shared.patch redis-2.6.7-config.patch |
| 4 |
Log: |
| 5 |
Version bump redis to 2.6.7 (bug 439354), fix up 2.4.18 patch name. |
| 6 |
|
| 7 |
(Portage version: 2.1.11.27/cvs/Linux x86_64, signed Manifest commit with key 6B065BFB) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.1 dev-db/redis/files/redis-2.6.7-shared.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.6.7-shared.patch?rev=1.1&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.6.7-shared.patch?rev=1.1&content-type=text/plain |
| 14 |
|
| 15 |
Index: redis-2.6.7-shared.patch |
| 16 |
=================================================================== |
| 17 |
commit 6931bf1d81de597b3abc2a36adf081a24c114567 |
| 18 |
Author: jbergstroem <bugs@××××××××××.nu> |
| 19 |
Date: Tue Oct 23 12:26:04 2012 +1100 |
| 20 |
|
| 21 |
Build against shared jemalloc |
| 22 |
|
| 23 |
diff --git a/src/Makefile b/src/Makefile |
| 24 |
index 358b4cb..41390f4 100644 |
| 25 |
--- a/src/Makefile |
| 26 |
+++ b/src/Makefile |
| 27 |
@@ -22,12 +22,7 @@ STD= -std=c99 -pedantic |
| 28 |
WARN= -Wall |
| 29 |
OPT= $(OPTIMIZATION) |
| 30 |
|
| 31 |
-# Default allocator |
| 32 |
-ifeq ($(uname_S),Linux) |
| 33 |
- MALLOC=jemalloc |
| 34 |
-else |
| 35 |
- MALLOC=libc |
| 36 |
-endif |
| 37 |
+MALLOC?=jemalloc |
| 38 |
|
| 39 |
# Backwards compatibility for selecting an allocator |
| 40 |
ifeq ($(USE_TCMALLOC),yes) |
| 41 |
@@ -71,9 +66,8 @@ ifeq ($(MALLOC),tcmalloc_minimal) |
| 42 |
endif |
| 43 |
|
| 44 |
ifeq ($(MALLOC),jemalloc) |
| 45 |
- DEPENDENCY_TARGETS+= jemalloc |
| 46 |
- FINAL_CFLAGS+= -DUSE_JEMALLOC -I../deps/jemalloc/include |
| 47 |
- FINAL_LIBS+= ../deps/jemalloc/lib/libjemalloc.a -ldl |
| 48 |
+ FINAL_CFLAGS+= -DUSE_JEMALLOC -DJEMALLOC_NO_DEMANGLE |
| 49 |
+ FINAL_LIBS+= -ljemalloc -ldl |
| 50 |
endif |
| 51 |
|
| 52 |
REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) |
| 53 |
|
| 54 |
|
| 55 |
1.1 dev-db/redis/files/redis-2.6.7-config.patch |
| 56 |
|
| 57 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.6.7-config.patch?rev=1.1&view=markup |
| 58 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-db/redis/files/redis-2.6.7-config.patch?rev=1.1&content-type=text/plain |
| 59 |
|
| 60 |
Index: redis-2.6.7-config.patch |
| 61 |
=================================================================== |
| 62 |
commit 7f05e59a052941fd070be1825d0623a054c66e2d |
| 63 |
Author: jbergstroem <bugs@××××××××××.nu> |
| 64 |
Date: Tue Oct 30 13:11:23 2012 +1100 |
| 65 |
|
| 66 |
Adapt config based on Gentoo defaults |
| 67 |
|
| 68 |
diff --git a/redis.conf b/redis.conf |
| 69 |
index 751a3eb..1a36b12 100644 |
| 70 |
--- a/redis.conf |
| 71 |
+++ b/redis.conf |
| 72 |
@@ -14,11 +14,11 @@ |
| 73 |
|
| 74 |
# By default Redis does not run as a daemon. Use 'yes' if you need it. |
| 75 |
# Note that Redis will write a pid file in /var/run/redis.pid when daemonized. |
| 76 |
-daemonize no |
| 77 |
+daemonize yes |
| 78 |
|
| 79 |
# When running daemonized, Redis writes a pid file in /var/run/redis.pid by |
| 80 |
# default. You can specify a custom pid file location here. |
| 81 |
-pidfile /var/run/redis.pid |
| 82 |
+pidfile /var/run/redis/redis.pid |
| 83 |
|
| 84 |
# Accept connections on the specified port, default is 6379. |
| 85 |
# If port 0 is specified Redis will not listen on a TCP socket. |
| 86 |
@@ -27,7 +27,7 @@ port 6379 |
| 87 |
# If you want you can bind a single interface, if the bind option is not |
| 88 |
# specified all the interfaces will listen for incoming connections. |
| 89 |
# |
| 90 |
-# bind 127.0.0.1 |
| 91 |
+bind 127.0.0.1 |
| 92 |
|
| 93 |
# Specify the path for the unix socket that will be used to listen for |
| 94 |
# incoming connections. There is no default, so Redis will not listen |
| 95 |
@@ -50,7 +50,7 @@ loglevel notice |
| 96 |
# Specify the log file name. Also 'stdout' can be used to force |
| 97 |
# Redis to log on the standard output. Note that if you use standard |
| 98 |
# output for logging but daemonize, logs will be sent to /dev/null |
| 99 |
-logfile stdout |
| 100 |
+logfile /var/log/redis/redis.log |
| 101 |
|
| 102 |
# To enable logging to the system logger, just set 'syslog-enabled' to yes, |
| 103 |
# and optionally update the other syslog parameters to suit your needs. |
| 104 |
@@ -124,7 +124,7 @@ rdbcompression yes |
| 105 |
rdbchecksum yes |
| 106 |
|
| 107 |
# The filename where to dump the DB |
| 108 |
-dbfilename dump.rdb |
| 109 |
+dbfilename /var/lib/redis/dump.rdb |
| 110 |
|
| 111 |
# The working directory. |
| 112 |
# |
| 113 |
@@ -134,7 +134,7 @@ dbfilename dump.rdb |
| 114 |
# Also the Append Only File will be created inside this directory. |
| 115 |
# |
| 116 |
# Note that you must specify a directory here, not a file name. |
| 117 |
-dir ./ |
| 118 |
+dir /var/lib/redis/ |
| 119 |
|
| 120 |
################################# REPLICATION ################################# |
| 121 |
|
| 122 |
@@ -278,7 +278,7 @@ slave-priority 100 |
| 123 |
# limit for maxmemory so that there is some free RAM on the system for slave |
| 124 |
# output buffers (but this is not needed if the policy is 'noeviction'). |
| 125 |
# |
| 126 |
-# maxmemory <bytes> |
| 127 |
+maxmemory 67108864 |
| 128 |
|
| 129 |
# MAXMEMORY POLICY: how Redis will select what to remove when maxmemory |
| 130 |
# is reached? You can select among five behavior: |
Archives