From b9fc28c52bf5ef22f9686c27c6f9976d582996cb Mon Sep 17 00:00:00 2001 From: "Sergey A. Osokin" Date: Mon, 11 Feb 2013 18:38:18 +0000 Subject: [PATCH] Update from 2.6.9 to 2.6.10. UPGRADE URGENCY: MODERATE, this release contains many non-critical fixes and many small improvements. * [BUGFIX] redis-cli --rdb, fixed when the server sends newlines to ping. * [BUGFIX] redis-cli, minor fixes on connection handling, prompt. * [BUGFIX] Slow log: don't log EXEC, just executed commands. * [BUGFIX] On failed shutdown don't try again and again compulsively. * [BUGFIX] Fix build on sunos without backtrace(). * [BUGFIX] UNSUBSCRIBE and PUNSUBSCRIBE: always provide a reply (see 742e580) * [BUGFIX] Lua struct library was broken, upgraded. * [BUGFIX] Fix a bug in srandmemberWithCountCommand() with count argument. * [BUGFIX] Test: disable clients timeout to prevent issues on slow systems. * [BUGFIX] Sentinel: don't advertise the promoted slave as master too early. * [IMPROVED] Whitelist SIGUSR1, see http://redis.io/topics/signals. * [IMPROVED] Simpler to understand redis-cli --bigkeys output. * [IMPROVED] Test now works with tclsh > 8.5. * [IMPROVED] Added option to turn of the Nagle algorithm in slave socket. * [IMPROVED] Optionally use SO_KEEPALIVE to detect dead peers. --- databases/redis-devel/Makefile | 2 +- databases/redis-devel/distinfo | 4 ++-- databases/redis-devel/files/patch-src-config.h | 10 +++++----- databases/redis/Makefile | 2 +- databases/redis/distinfo | 4 ++-- databases/redis/files/patch-src-config.h | 10 +++++----- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/databases/redis-devel/Makefile b/databases/redis-devel/Makefile index d0b27889bf01..94057dd75bad 100644 --- a/databases/redis-devel/Makefile +++ b/databases/redis-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.6.9 +DISTVERSION= 2.6.10 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE PKGNAMESUFFIX= -devel diff --git a/databases/redis-devel/distinfo b/databases/redis-devel/distinfo index 34d984aeade8..c561a824c1d3 100644 --- a/databases/redis-devel/distinfo +++ b/databases/redis-devel/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis-2.6.9.tar.gz) = 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 -SIZE (redis-2.6.9.tar.gz) = 989119 +SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22 +SIZE (redis-2.6.10.tar.gz) = 991437 diff --git a/databases/redis-devel/files/patch-src-config.h b/databases/redis-devel/files/patch-src-config.h index ae6f5cb4fde2..2225d63d9d36 100644 --- a/databases/redis-devel/files/patch-src-config.h +++ b/databases/redis-devel/files/patch-src-config.h @@ -1,11 +1,11 @@ ---- src/config.h.orig 2012-02-24 16:56:36.000000000 +0400 -+++ src/config.h 2012-02-24 16:57:01.000000000 +0400 -@@ -25,7 +25,7 @@ +--- src/config.h.orig 2013-02-11 21:47:44.000000000 +0400 ++++ src/config.h 2013-02-11 21:50:10.000000000 +0400 +@@ -54,7 +54,7 @@ #endif /* Test for backtrace() */ --#if defined(__APPLE__) || defined(__linux__) || defined(__sun) -+#if defined(__APPLE__) || defined(__linux__) || defined(__sun) || defined(__FreeBSD__) +-#if defined(__APPLE__) || defined(__linux__) ++#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) #define HAVE_BACKTRACE 1 #endif diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 1cca46e32893..bbf6f84e82e6 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= redis -DISTVERSION= 2.6.9 +DISTVERSION= 2.6.10 CATEGORIES= databases MASTER_SITES= GOOGLE_CODE diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 34d984aeade8..c561a824c1d3 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,2 +1,2 @@ -SHA256 (redis-2.6.9.tar.gz) = 4d967eff2038aebea33875d17e85ed67179df6505df68529a622f7836d1c7489 -SIZE (redis-2.6.9.tar.gz) = 989119 +SHA256 (redis-2.6.10.tar.gz) = 0b930976830afaad40274107a36f9aae0d8a8fbbdea4e566d20765ee502c2a22 +SIZE (redis-2.6.10.tar.gz) = 991437 diff --git a/databases/redis/files/patch-src-config.h b/databases/redis/files/patch-src-config.h index ae6f5cb4fde2..2225d63d9d36 100644 --- a/databases/redis/files/patch-src-config.h +++ b/databases/redis/files/patch-src-config.h @@ -1,11 +1,11 @@ ---- src/config.h.orig 2012-02-24 16:56:36.000000000 +0400 -+++ src/config.h 2012-02-24 16:57:01.000000000 +0400 -@@ -25,7 +25,7 @@ +--- src/config.h.orig 2013-02-11 21:47:44.000000000 +0400 ++++ src/config.h 2013-02-11 21:50:10.000000000 +0400 +@@ -54,7 +54,7 @@ #endif /* Test for backtrace() */ --#if defined(__APPLE__) || defined(__linux__) || defined(__sun) -+#if defined(__APPLE__) || defined(__linux__) || defined(__sun) || defined(__FreeBSD__) +-#if defined(__APPLE__) || defined(__linux__) ++#if defined(__APPLE__) || defined(__linux__) || defined(__FreeBSD__) #define HAVE_BACKTRACE 1 #endif