diff --git a/databases/redis/Makefile b/databases/redis/Makefile index bbe8788a703..c1f78f7f9ca 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,7 +1,7 @@ -# $OpenBSD: Makefile,v 1.23 2012/02/28 11:57:11 dcoppa Exp $ +# $OpenBSD: Makefile,v 1.24 2012/03/19 09:27:36 dcoppa Exp $ COMMENT = persistent key-value database -DISTNAME = redis-2.4.8 +DISTNAME = redis-2.4.9 CATEGORIES = databases HOMEPAGE = http://redis.io/ diff --git a/databases/redis/distinfo b/databases/redis/distinfo index da9ac660caf..0ea4a589516 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,5 +1,5 @@ -MD5 (redis-2.4.8.tar.gz) = rHdtJfI4sULT1SbPzcYhqw== -RMD160 (redis-2.4.8.tar.gz) = I11gcyblfLKWF4ESyAc9uLRzo+Y= -SHA1 (redis-2.4.8.tar.gz) = 0FCDhTDit33Bck79KeU2ekxcHhg= -SHA256 (redis-2.4.8.tar.gz) = gWbKbd6kvbMRUQWQoe+U4+Mu7S+uRIdaW0T+cr2lVvM= -SIZE (redis-2.4.8.tar.gz) = 618164 +MD5 (redis-2.4.9.tar.gz) = s3UklkJ7Cn5c7qQB8nmqJA== +RMD160 (redis-2.4.9.tar.gz) = JIFo4v2l1ks/L/YjFW4PB26fF3E= +SHA1 (redis-2.4.9.tar.gz) = fI4FpZV72D/bIuJu3FiVFCLs8BM= +SHA256 (redis-2.4.9.tar.gz) = rEIMnwH14dTpd0AZNvjagdJAHmXAPeLgyhHrocxxyHQ= +SIZE (redis-2.4.9.tar.gz) = 621457 diff --git a/databases/redis/patches/patch-src_Makefile b/databases/redis/patches/patch-src_Makefile index 2bb24306a0c..d0e16ab3298 100644 --- a/databases/redis/patches/patch-src_Makefile +++ b/databases/redis/patches/patch-src_Makefile @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_Makefile,v 1.6 2012/02/28 11:57:11 dcoppa Exp $ +$OpenBSD: patch-src_Makefile,v 1.7 2012/03/19 09:27:36 dcoppa Exp $ --- src/Makefile.orig Wed Feb 22 14:23:43 2012 +++ src/Makefile Tue Feb 28 12:37:49 2012 @@ -4,7 +4,7 @@ @@ -28,12 +28,12 @@ $OpenBSD: patch-src_Makefile,v 1.6 2012/02/28 11:57:11 dcoppa Exp $ INSTALL_BIN= $(PREFIX)/bin INSTALL= cp -pf --OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o +-OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o slowlog.o bio.o memtest.o +ifndef INSTALL_DIR + INSTALL_DIR= mkdir -p +endif + -+OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o endian.o slowlog.o bio.o ++OBJ = adlist.o ae.o anet.o dict.o redis.o sds.o zmalloc.o lzf_c.o lzf_d.o pqsort.o zipmap.o sha1.o ziplist.o release.o networking.o util.o object.o db.o replication.o rdb.o t_string.o t_list.o t_set.o t_zset.o t_hash.o config.o aof.o vm.o pubsub.o multi.o debug.o sort.o intset.o syncio.o endian.o slowlog.o bio.o memtest.o BENCHOBJ = ae.o anet.o redis-benchmark.o sds.o adlist.o zmalloc.o CLIOBJ = anet.o sds.o adlist.o redis-cli.o zmalloc.o release.o CHECKDUMPOBJ = redis-check-dump.o lzf_c.o lzf_d.o diff --git a/databases/redis/patches/patch-src_redis_c b/databases/redis/patches/patch-src_redis_c index 4d28d7ba4a9..0d4d4fde102 100644 --- a/databases/redis/patches/patch-src_redis_c +++ b/databases/redis/patches/patch-src_redis_c @@ -1,6 +1,6 @@ -$OpenBSD: patch-src_redis_c,v 1.7 2012/02/28 11:57:11 dcoppa Exp $ ---- src/redis.c.orig Wed Feb 22 14:23:43 2012 -+++ src/redis.c Tue Feb 28 12:29:39 2012 +$OpenBSD: patch-src_redis_c,v 1.8 2012/03/19 09:27:36 dcoppa Exp $ +--- src/redis.c.orig Sun Mar 18 22:14:28 2012 ++++ src/redis.c Mon Mar 19 10:19:36 2012 @@ -33,7 +33,9 @@ #ifdef HAVE_BACKTRACE @@ -19,7 +19,7 @@ $OpenBSD: patch-src_redis_c,v 1.7 2012/02/28 11:57:11 dcoppa Exp $ #include #include #include -@@ -1793,7 +1796,9 @@ int main(int argc, char **argv) { +@@ -1806,7 +1809,9 @@ int main(int argc, char **argv) { #ifdef HAVE_BACKTRACE static void *getMcontextEip(ucontext_t *uc) { @@ -30,7 +30,7 @@ $OpenBSD: patch-src_redis_c,v 1.7 2012/02/28 11:57:11 dcoppa Exp $ return (void*) uc->uc_mcontext.mc_eip; #elif defined(__dietlibc__) return (void*) uc->uc_mcontext.eip; -@@ -1822,14 +1827,6 @@ static void *getMcontextEip(ucontext_t *uc) { +@@ -1835,14 +1840,6 @@ static void *getMcontextEip(ucontext_t *uc) { #endif } @@ -45,7 +45,16 @@ $OpenBSD: patch-src_redis_c,v 1.7 2012/02/28 11:57:11 dcoppa Exp $ static void sigsegvHandler(int sig, siginfo_t *info, void *secret) { void *trace[100]; char **messages = NULL; -@@ -1920,6 +1917,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v +@@ -1918,7 +1915,7 @@ static void sigsegvHandler(int sig, siginfo_t *info, v + "=== REDIS BUG REPORT END. Make sure to include from START to END. ===\n\n" + " Please report the crash opening an issue on github:\n\n" + " http://github.com/antirez/redis/issues\n\n" +-" Suspect RAM error? Use redis-server --test-memory to veryfy it.\n\n" ++" Suspect RAM error? Use redis-server --test-memory to verify it.\n\n" + ); + /* free(messages); Don't call free() with possibly corrupted memory. */ + if (server.daemonize) unlink(server.pidfile); +@@ -1934,6 +1931,14 @@ static void sigsegvHandler(int sig, siginfo_t *info, v kill(getpid(),sig); } #endif /* HAVE_BACKTRACE */