diff --git a/dev-db/redis/patches/redis-2.9.0-git.patch b/dev-db/redis/patches/redis-2.9.0-git.patch index d286f6acf..3d0bb4f81 100644 --- a/dev-db/redis/patches/redis-2.9.0-git.patch +++ b/dev-db/redis/patches/redis-2.9.0-git.patch @@ -1,7 +1,7 @@ -diff --git a/deps/hiredis/Makefile redis/deps/hiredis/Makefile +diff --git redis-2.9.0-git/deps/hiredis/Makefile redis-2.9.0-git/deps/hiredis/Makefile index 2a84b9b..1225539 100644 ---- a/deps/hiredis/Makefile -+++ redis/deps/hiredis/Makefile +--- redis-2.9.0-git/deps/hiredis/Makefile ++++ redis-2.9.0-git/deps/hiredis/Makefile @@ -26,6 +26,15 @@ ifeq ($(uname_S),Darwin) STLIBNAME?=libhiredis.a STLIB_MAKE_CMD?=libtool -static -o ${STLIBNAME} - ${OBJ} @@ -26,10 +26,10 @@ index 2a84b9b..1225539 100644 CCOPT= $(CFLAGS) $(CCLINK) DEBUG?= -g -ggdb -diff --git a/src/Makefile redis/src/Makefile +diff --git redis-2.9.0-git/src/Makefile redis-2.9.0-git/src/Makefile index 292255c..e6a6d87 100644 ---- a/src/Makefile -+++ redis/src/Makefile +--- redis-2.9.0-git/src/Makefile ++++ redis-2.9.0-git/src/Makefile @@ -15,12 +15,18 @@ endif ifeq ($(uname_S),SunOS) CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W -D__EXTENSIONS__ -D_XPG6 @@ -50,10 +50,10 @@ index 292255c..e6a6d87 100644 ifeq ($(USE_TCMALLOC),yes) ALLOD_DEPS= -diff --git a/src/aof.c redis/src/aof.c +diff --git redis-2.9.0-git/src/aof.c redis-2.9.0-git/src/aof.c index dbd0468..7a5d21f 100644 ---- a/src/aof.c -+++ redis/src/aof.c +--- redis-2.9.0-git/src/aof.c ++++ redis-2.9.0-git/src/aof.c @@ -25,7 +25,7 @@ void stopAppendOnly(void) { int statloc; @@ -63,10 +63,10 @@ index dbd0468..7a5d21f 100644 /* reset the buffer accumulating changes while the child saves */ sdsfree(server.bgrewritebuf); server.bgrewritebuf = sdsempty(); -diff --git a/src/redis.c redis/src/redis.c +diff --git redis-2.9.0-git/src/redis.c redis-2.9.0-git/src/redis.c index 1a1f84f..4ecc873 100644 ---- a/src/redis.c -+++ redis/src/redis.c +--- redis-2.9.0-git/src/redis.c ++++ redis-2.9.0-git/src/redis.c @@ -646,7 +646,7 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { int statloc; pid_t pid; @@ -76,10 +76,10 @@ index 1a1f84f..4ecc873 100644 int exitcode = WEXITSTATUS(statloc); int bysignal = 0; -diff --git a/src/sha1.c redis/src/sha1.c +diff --git redis-2.9.0-git/src/sha1.c redis-2.9.0-git/src/sha1.c index 26a5565..e90812e 100644 ---- a/src/sha1.c -+++ redis/src/sha1.c +--- redis-2.9.0-git/src/sha1.c ++++ redis-2.9.0-git/src/sha1.c @@ -27,6 +27,9 @@ A million repetitions of "a" #if defined(__sun) #include "solarisfixes.h" @@ -90,10 +90,10 @@ index 26a5565..e90812e 100644 #include "sha1.h" #include "config.h" -diff --git a/src/util.c redis/src/util.c +diff --git redis-2.9.0-git/src/util.c redis-2.9.0-git/src/util.c index f5a23af..2a6d18d 100644 ---- a/src/util.c -+++ redis/src/util.c +--- redis-2.9.0-git/src/util.c ++++ redis-2.9.0-git/src/util.c @@ -317,7 +317,7 @@ int d2string(char *buf, size_t len, double value) { * integer printing function that is much faster. */ double min = -4503599627370495; /* (2^52)-1 */