From 6c366f8fa691a524ed43f71a5eb031861948242c Mon Sep 17 00:00:00 2001
From: dcoppa <dcoppa@openbsd.org>
Date: Wed, 17 Nov 2010 08:44:54 +0000
Subject: [PATCH] Bugfix update to redis-2.0.4

---
 databases/redis/Makefile              |  4 ++--
 databases/redis/distinfo              | 10 +++++-----
 databases/redis/patches/patch-ae_c    | 14 ++++++++++++++
 databases/redis/patches/patch-redis_c |  8 ++++----
 4 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 databases/redis/patches/patch-ae_c

diff --git a/databases/redis/Makefile b/databases/redis/Makefile
index 8974fd853b4..e8015bea3fc 100644
--- a/databases/redis/Makefile
+++ b/databases/redis/Makefile
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile,v 1.3 2010/10/17 12:48:46 dcoppa Exp $
+# $OpenBSD: Makefile,v 1.4 2010/11/17 08:44:54 dcoppa Exp $
 
 COMMENT =		persistent key-value database
-DISTNAME =		redis-2.0.3
+DISTNAME =		redis-2.0.4
 CATEGORIES =		databases
 HOMEPAGE =		http://redis.googlecode.com/
 
diff --git a/databases/redis/distinfo b/databases/redis/distinfo
index 1c549342037..82982319fdd 100644
--- a/databases/redis/distinfo
+++ b/databases/redis/distinfo
@@ -1,5 +1,5 @@
-MD5 (redis-2.0.3.tar.gz) = d5neefNuvbc7y48JgW0aww==
-RMD160 (redis-2.0.3.tar.gz) = bCUeK/Z0vSDCBdVlFg/xdRYNlq0=
-SHA1 (redis-2.0.3.tar.gz) = MGaHFZ7nzSMn2iJZPxBl05WDqZc=
-SHA256 (redis-2.0.3.tar.gz) = XLN/IkY/lEM5IEnZd4vuBv4qCTb/lEBMhBySmZ1W7Oc=
-SIZE (redis-2.0.3.tar.gz) = 348407
+MD5 (redis-2.0.4.tar.gz) = YGVhE++2dZq2RNdJVinZCw==
+RMD160 (redis-2.0.4.tar.gz) = 6K5g6cXPebL4EjO/plFmWf6jmD8=
+SHA1 (redis-2.0.4.tar.gz) = /uLxlg7aIjhVA1F6mm3K5hDfhNU=
+SHA256 (redis-2.0.4.tar.gz) = 9jXTHHK95UHOFgv7Q9uOCB3iMyJyPP/fMV0bdrAQvz0=
+SIZE (redis-2.0.4.tar.gz) = 346383
diff --git a/databases/redis/patches/patch-ae_c b/databases/redis/patches/patch-ae_c
new file mode 100644
index 00000000000..c865a2f02bc
--- /dev/null
+++ b/databases/redis/patches/patch-ae_c
@@ -0,0 +1,14 @@
+$OpenBSD: patch-ae_c,v 1.1 2010/11/17 08:44:54 dcoppa Exp $
+
+missing #include for memset(3)
+
+--- ae.c.orig	Wed Nov 17 08:38:00 2010
++++ ae.c	Wed Nov 17 08:38:15 2010
+@@ -35,6 +35,7 @@
+ #include <sys/types.h>
+ #include <unistd.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ #include "ae.h"
+ #include "zmalloc.h"
diff --git a/databases/redis/patches/patch-redis_c b/databases/redis/patches/patch-redis_c
index 0b153687921..b24d4060219 100644
--- a/databases/redis/patches/patch-redis_c
+++ b/databases/redis/patches/patch-redis_c
@@ -1,11 +1,11 @@
-$OpenBSD: patch-redis_c,v 1.2 2010/10/17 12:48:46 dcoppa Exp $
+$OpenBSD: patch-redis_c,v 1.3 2010/11/17 08:44:54 dcoppa Exp $
 
 Fix an alignment problem that was causing a SIGBUS on strict alignment 
 archs like SPARC
 
---- redis.c.orig	Fri Oct 15 13:07:25 2010
-+++ redis.c	Sun Oct 17 13:41:22 2010
-@@ -7444,7 +7444,7 @@ static int deleteIfVolatile(redisDb *db, robj *key) {
+--- redis.c.orig	Sat Nov  6 10:09:28 2010
++++ redis.c	Wed Nov 17 08:35:50 2010
+@@ -7447,7 +7447,7 @@ static int deleteIfVolatile(redisDb *db, robj *key) {
  
  static void expireGenericCommand(redisClient *c, robj *key, robj *param, long offset) {
      dictEntry *de;