Update databases/redis to 3.2.1.

Upgrade urgency HIGH: Critical fix to Redis Sentinel, due to 3.2.0
regression compared to 3.0.

Hey, this is Redis 3.2.1, and this release should bring some grain of
maturity to Redis 3.2. The list of commits following this note will tell
you the details, but the main things addressed in this release are the
following:

1. A critical bug in Sentinel was hopefully fixed. During the big 3.2
   refactoring of Redis Sentinel, in order to implement connection sharing
   to make Sentinel able to scale better (few Sentinels to monitor many
   masters), a bug was introduced that mis-counted the number of pending
   commands in the Redis link. This in turn resulted into an inability to
   talk with certain Redis instances. A common result of this bug was the
   inability of Redis Sentinel to reconfigure back the old master, after
   a failover, when it is reachable again, as the slave of the new master.
   This was due to the inability to talk with the old master at all.

2. BITFIELD bugs fixed.

3. GEO commands fixes on syntax errors and edge cases.

4. RESTORE now accepts dumps generated by older Redis versions.

5. Jemalloc now is really configured to save you memory, for a problem a
   change in the jemalloc configuration did not really survived when the
   3.2.0 release was finalized.

6. TTL and TYPE command no longer alter the last access time of a key, for
   LRU evictions purposes. A new TOUCH command was introduced *just* to
   update the access time of a key.

7. A bug was fixed in redis-cli, that connected to the instance running on
   the port 6379 if there was one, regardless of what was specified.

8. TCP keep alive is now enabled by default. This should fix most ghost
   connections problems without resulting in any practical change in
   otherwise sane deployments.

9. A Sentinel crash that could happen during failovers was fixed.

3 files changed, 15 insertions, 15 deletions

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index ac30d5960ba..6941a670fa5 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2016/05/06 14:00:45 fhajny Exp $
+# $NetBSD: Makefile,v 1.21 2016/06/19 21:28:58 fhajny Exp $
 
-DISTNAME=	redis-3.2.0
+DISTNAME=	redis-3.2.1
 CATEGORIES=	databases
 MASTER_SITES=	http://download.redis.io/releases/
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 1dde484223e..a4716eee15e 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2016/05/06 14:00:45 fhajny Exp $
+$NetBSD: distinfo,v 1.23 2016/06/19 21:28:58 fhajny Exp $
 
-SHA1 (redis-3.2.0.tar.gz) = 0c1820931094369c8cc19fc1be62f598bc5961ca
-RMD160 (redis-3.2.0.tar.gz) = cb346293dae3abc2e2ed67d8ded5bacf24739c9b
-SHA512 (redis-3.2.0.tar.gz) = 02a046080d070a81d38f4e8868ae85ace2db26718fc292388a94fd8f0ac45fe071f1536b3197e22451f99848dcd110469005f84456b8455836b2779eeb554d49
-Size (redis-3.2.0.tar.gz) = 1525900 bytes
+SHA1 (redis-3.2.1.tar.gz) = 26c0fc282369121b4e278523fce122910b65fbbf
+RMD160 (redis-3.2.1.tar.gz) = fa2b678b3d8b7f32f289bf18a738ca5c9ee647ca
+SHA512 (redis-3.2.1.tar.gz) = 600416558d96d584e67b7fee57292553d801499bc425e39a75e4f047a0b0e59210c6558c9d8206affe4c0fd66a7eaaca67d9e3139380c66098c6c37a22132cb7
+Size (redis-3.2.1.tar.gz) = 1534696 bytes
 SHA1 (patch-ab) = 21754f59e9f1013095fe47ccf7411b438385d558
-SHA1 (patch-ac) = b389aafc4caada95f57e00786c5fba84a9c6c88d
+SHA1 (patch-ac) = 1d848860a39af7a93a06eb8f3001fe89cb1bb3ad
 SHA1 (patch-deps_hiredis_fmacros.h) = b9d7d0a82e6794078d997769db6e5572f981b445
 SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299
diff --git a/databases/redis/patches/patch-ac b/databases/redis/patches/patch-ac
index d84a9d36c50..aec880d443b 100644
--- a/databases/redis/patches/patch-ac
+++ b/databases/redis/patches/patch-ac
@@ -1,9 +1,9 @@
-$NetBSD: patch-ac,v 1.5 2016/05/06 14:00:45 fhajny Exp $
+$NetBSD: patch-ac,v 1.6 2016/06/19 21:28:58 fhajny Exp $
 
 Sane defaults for the config file.
---- redis.conf.orig	2016-05-06 07:11:36.000000000 +0000
+--- redis.conf.orig	2016-06-17 13:15:21.000000000 +0000
 +++ redis.conf
-@@ -124,7 +124,7 @@ tcp-keepalive 0
+@@ -125,7 +125,7 @@ tcp-keepalive 300
  
  # 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.
@@ -12,16 +12,16 @@ Sane defaults for the config file.
  
  # If you run Redis from upstart or systemd, Redis can interact with your
  # supervision tree. Options:
-@@ -146,7 +146,7 @@ supervised no
+@@ -147,7 +147,7 @@ supervised no
  #
  # Creating a pid file is best effort: if Redis is not able to create it
  # nothing bad happens, the server will start and run normally.
--pidfile /var/run/redis.pid
+-pidfile /var/run/redis_6379.pid
 +pidfile @REDIS_PIDDIR@/redis.pid
  
  # Specify the server verbosity level.
  # This can be one of:
-@@ -159,7 +159,7 @@ loglevel notice
+@@ -160,7 +160,7 @@ loglevel notice
  # Specify the log file name. Also the empty 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
@@ -30,7 +30,7 @@ Sane defaults for the config file.
  
  # To enable logging to the system logger, just set 'syslog-enabled' to yes,
  # and optionally update the other syslog parameters to suit your needs.
-@@ -243,7 +243,7 @@ dbfilename dump.rdb
+@@ -244,7 +244,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.