diff options
Diffstat (limited to 'databases/redis')
| -rw-r--r-- | databases/redis/Makefile | 4 | ||||
| -rw-r--r-- | databases/redis/PLIST | 5 | ||||
| -rw-r--r-- | databases/redis/distinfo | 16 | ||||
| -rw-r--r-- | databases/redis/patches/patch-ab | 23 | ||||
| -rw-r--r-- | databases/redis/patches/patch-ac | 13 | ||||
| -rw-r--r-- | databases/redis/patches/patch-deps_hiredis_fmacros.h | 3 | ||||
| -rw-r--r-- | databases/redis/patches/patch-src_object.c | 3 |
7 files changed, 35 insertions, 32 deletions
diff --git a/databases/redis/Makefile b/databases/redis/Makefile index c372b89ed69..2bf59712665 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2013/09/09 14:05:03 fhajny Exp $ +# $NetBSD: Makefile,v 1.5 2014/01/02 17:26:19 fhajny Exp $ -DISTNAME= redis-2.6.16 +DISTNAME= redis-2.8.3 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ diff --git a/databases/redis/PLIST b/databases/redis/PLIST index 22d24505f1d..e4ebd66e012 100644 --- a/databases/redis/PLIST +++ b/databases/redis/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2013/06/13 17:41:34 mspo Exp $ +@comment $NetBSD: PLIST,v 1.2 2014/01/02 17:26:19 fhajny Exp $ bin/redis-benchmark bin/redis-check-aof bin/redis-check-dump @@ -23,6 +23,7 @@ share/examples/redis/tests/integration/redis-cli.tcl share/examples/redis/tests/integration/replication-2.tcl share/examples/redis/tests/integration/replication-3.tcl share/examples/redis/tests/integration/replication-4.tcl +share/examples/redis/tests/integration/replication-psync.tcl share/examples/redis/tests/integration/replication.tcl share/examples/redis/tests/support/redis.tcl share/examples/redis/tests/support/server.tcl @@ -40,6 +41,7 @@ share/examples/redis/tests/unit/expire.tcl share/examples/redis/tests/unit/introspection.tcl share/examples/redis/tests/unit/limits.tcl share/examples/redis/tests/unit/maxmemory.tcl +share/examples/redis/tests/unit/memefficiency.tcl share/examples/redis/tests/unit/multi.tcl share/examples/redis/tests/unit/obuf-limits.tcl share/examples/redis/tests/unit/other.tcl @@ -47,6 +49,7 @@ share/examples/redis/tests/unit/printver.tcl share/examples/redis/tests/unit/protocol.tcl share/examples/redis/tests/unit/pubsub.tcl share/examples/redis/tests/unit/quit.tcl +share/examples/redis/tests/unit/scan.tcl share/examples/redis/tests/unit/scripting.tcl share/examples/redis/tests/unit/slowlog.tcl share/examples/redis/tests/unit/sort.tcl diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 382721452b5..8b8cf5c6950 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.5 2014/01/01 16:08:24 bsiegert Exp $ +$NetBSD: distinfo,v 1.6 2014/01/02 17:26:19 fhajny Exp $ -SHA1 (redis-2.6.16.tar.gz) = f94c0f623aaa8c310f9be2a88e81716de01ce0ce -RMD160 (redis-2.6.16.tar.gz) = af80991ab3bbfda9990d811ea521a367bec78eff -Size (redis-2.6.16.tar.gz) = 999579 bytes -SHA1 (patch-ab) = 1faa0907ec5a47fb1f4f325a3002725006477466 -SHA1 (patch-ac) = 51f06c5a0724cadd19acca5f8319d652d70bb251 -SHA1 (patch-deps_hiredis_fmacros.h) = 816aba614a7b985fa74efca50ec5b18531b84c13 -SHA1 (patch-src_object.c) = 293ea7285eafadf6bb600ae38d5100b91ccba375 +SHA1 (redis-2.8.3.tar.gz) = a751371eeed5f5f02965eb34d989c1963dd8d8c7 +RMD160 (redis-2.8.3.tar.gz) = d63d517602b88aeca210a377162e714b24bf6546 +Size (redis-2.8.3.tar.gz) = 1046106 bytes +SHA1 (patch-ab) = e8c66139433112ca88ba90acd39ed7e4d9c45b2c +SHA1 (patch-ac) = e15bbc17138a0527c910deac7962b91db90d7358 +SHA1 (patch-deps_hiredis_fmacros.h) = 1bf148708b605ec51bb0f675d779394e32767dbd +SHA1 (patch-src_object.c) = 3ada430fcdcd8524c2e53553691b1c5bffd2f3ff diff --git a/databases/redis/patches/patch-ab b/databases/redis/patches/patch-ab index e59b7f0a6f3..6ed5add3c99 100644 --- a/databases/redis/patches/patch-ab +++ b/databases/redis/patches/patch-ab @@ -1,17 +1,16 @@ -$NetBSD: patch-ab,v 1.1 2013/06/13 17:41:34 mspo Exp $ +$NetBSD: patch-ab,v 1.2 2014/01/02 17:26:19 fhajny Exp $ -* Add DESTDIR support. - ---- src/Makefile.orig 2012-12-03 11:53:09.000000000 +0000 +Add DESTDIR support. +--- src/Makefile.orig 2013-12-11 14:31:57.000000000 +0000 +++ src/Makefile -@@ -81,8 +81,8 @@ REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFL - REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) +@@ -23,8 +23,8 @@ WARN=-Wall + OPT=$(OPTIMIZATION) PREFIX?=/usr/local --INSTALL_BIN= $(PREFIX)/bin --INSTALL= cp -pf -+INSTALL_BIN= $(DESTDIR)$(PREFIX)/bin -+INSTALL= $(BSD_INSTALL_PROGRAM) +-INSTALL_BIN=$(PREFIX)/bin +-INSTALL=install ++INSTALL_BIN=$(DESTDIR)$(PREFIX)/bin ++INSTALL=$(BSD_INSTALL_PROGRAM) - CCCOLOR="\033[34m" - LINKCOLOR="\033[34;1m" + # Default allocator + ifeq ($(uname_S),Linux) diff --git a/databases/redis/patches/patch-ac b/databases/redis/patches/patch-ac index db30386b933..b7f766af01a 100644 --- a/databases/redis/patches/patch-ac +++ b/databases/redis/patches/patch-ac @@ -1,8 +1,7 @@ -$NetBSD: patch-ac,v 1.1 2013/06/13 17:41:34 mspo Exp $ +$NetBSD: patch-ac,v 1.2 2014/01/02 17:26:19 fhajny Exp $ Sane defaults for the config file. - ---- redis.conf.orig 2013-04-30 13:15:56.000000000 +0000 +--- redis.conf.orig 2013-12-11 14:31:57.000000000 +0000 +++ redis.conf @@ -14,11 +14,11 @@ @@ -18,16 +17,16 @@ Sane defaults for the config file. # Accept connections on the specified port, default is 6379. # If port 0 is specified Redis will not listen on a TCP socket. -@@ -66,7 +66,7 @@ loglevel notice - # Specify the log file name. Also 'stdout' can be used to force +@@ -71,7 +71,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 --logfile stdout +-logfile "" +logfile @REDIS_LOGDIR@/redis.log # To enable logging to the system logger, just set 'syslog-enabled' to yes, # and optionally update the other syslog parameters to suit your needs. -@@ -150,7 +150,7 @@ dbfilename dump.rdb +@@ -155,7 +155,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. diff --git a/databases/redis/patches/patch-deps_hiredis_fmacros.h b/databases/redis/patches/patch-deps_hiredis_fmacros.h index 1c0c0b57130..9c054dade63 100644 --- a/databases/redis/patches/patch-deps_hiredis_fmacros.h +++ b/databases/redis/patches/patch-deps_hiredis_fmacros.h @@ -1,5 +1,6 @@ -$NetBSD: patch-deps_hiredis_fmacros.h,v 1.1 2014/01/01 16:08:24 bsiegert Exp $ +$NetBSD: patch-deps_hiredis_fmacros.h,v 1.2 2014/01/02 17:26:19 fhajny Exp $ +Add MirBSD support. --- deps/hiredis/fmacros.h.orig Wed Aug 28 09:36:00 2013 +++ deps/hiredis/fmacros.h @@ -7,6 +7,7 @@ diff --git a/databases/redis/patches/patch-src_object.c b/databases/redis/patches/patch-src_object.c index 0b7cc552461..871a2c61124 100644 --- a/databases/redis/patches/patch-src_object.c +++ b/databases/redis/patches/patch-src_object.c @@ -1,5 +1,6 @@ -$NetBSD: patch-src_object.c,v 1.1 2014/01/01 16:08:24 bsiegert Exp $ +$NetBSD: patch-src_object.c,v 1.2 2014/01/02 17:26:19 fhajny Exp $ +Add MirBSD support. --- src/object.c.orig Wed Aug 28 09:36:00 2013 +++ src/object.c @@ -450,7 +450,11 @@ int getLongDoubleFromObject(robj *o, lon |