From 460cd52ee604e3f5b0f98c5f593a6c9804a43631 Mon Sep 17 00:00:00 2001 From: fhajny Date: Fri, 6 May 2016 14:00:45 +0000 Subject: Update databases/redis to 3.2.0. Redis 3.2 contains significant changes to the API and implementation of Redis. - A new set of commands for Geo indexing was added (GEOADD, GEORADIUS and related commands). - The new BITFIELD command handles contiguous arrays of integers or counters of arbitrary bits width and offset inside strings. - Memory optimizations to hold the same data in less memory. - Lua scripts can now contain side effects using the new effect replication. - A complete remote Lua debugger is available in order to make writing scripts a simpler task. Read the release notes for the full set of changes: https://raw.githubusercontent.com/antirez/redis/3.2/00-RELEASENOTES --- databases/redis/Makefile | 7 +++---- databases/redis/PLIST | 20 +++++++++++++++----- databases/redis/distinfo | 13 ++++++------- databases/redis/patches/patch-ac | 22 +++++++++++++--------- databases/redis/patches/patch-src_cluster.c | 26 -------------------------- 5 files changed, 37 insertions(+), 51 deletions(-) delete mode 100644 databases/redis/patches/patch-src_cluster.c (limited to 'databases/redis') diff --git a/databases/redis/Makefile b/databases/redis/Makefile index 6ad436822e7..ac30d5960ba 100644 --- a/databases/redis/Makefile +++ b/databases/redis/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2016/03/04 08:58:58 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2016/05/06 14:00:45 fhajny Exp $ -DISTNAME= redis-3.0.7 +DISTNAME= redis-3.2.0 CATEGORIES= databases MASTER_SITES= http://download.redis.io/releases/ @@ -11,7 +11,6 @@ LICENSE= modified-bsd USE_LANGUAGES= c99 USE_TOOLS+= gmake pax -DIST_SUBDIR= redis-3.0.7v2 .include "../../mk/bsd.prefs.mk" @@ -19,7 +18,7 @@ RCD_SCRIPTS+= redis RCD_SCRIPT_SRC.redis= ${FILESDIR}/redis.sh DOCDIR= share/doc/redis -DOCFILES+= 00-RELEASENOTES BUGS COPYING README +DOCFILES+= 00-RELEASENOTES BUGS COPYING README.md EGDIR= ${PREFIX}/share/examples/${PKGBASE} INSTALLATION_DIRS+= bin ${DOCDIR} ${EGDIR} ${EGDIR}/utils ${EGDIR}/tests CONF_FILES= ${EGDIR}/redis.conf.example ${PKG_SYSCONFDIR}/redis.conf diff --git a/databases/redis/PLIST b/databases/redis/PLIST index 23b7285df52..a378dd6e943 100644 --- a/databases/redis/PLIST +++ b/databases/redis/PLIST @@ -1,14 +1,14 @@ -@comment $NetBSD: PLIST,v 1.8 2015/06/09 12:17:56 fhajny Exp $ +@comment $NetBSD: PLIST,v 1.9 2016/05/06 14:00:45 fhajny Exp $ bin/redis-benchmark bin/redis-check-aof -bin/redis-check-dump +bin/redis-check-rdb bin/redis-cli bin/redis-sentinel bin/redis-server share/doc/redis/00-RELEASENOTES share/doc/redis/BUGS share/doc/redis/COPYING -share/doc/redis/README +share/doc/redis/README.md share/examples/redis/redis.conf.example share/examples/redis/tests/assets/default.conf share/examples/redis/tests/assets/encodings.rdb @@ -27,6 +27,7 @@ share/examples/redis/tests/cluster/tests/08-update-msg.tcl share/examples/redis/tests/cluster/tests/09-pubsub.tcl share/examples/redis/tests/cluster/tests/10-manual-failover.tcl share/examples/redis/tests/cluster/tests/11-manual-takeover.tcl +share/examples/redis/tests/cluster/tests/12-replica-migration-2.tcl share/examples/redis/tests/cluster/tests/helpers/onlydots.tcl share/examples/redis/tests/cluster/tests/includes/init-tests.tcl share/examples/redis/tests/cluster/tmp/.gitignore @@ -64,12 +65,14 @@ share/examples/redis/tests/test_helper.tcl share/examples/redis/tests/tmp/.gitignore share/examples/redis/tests/unit/aofrw.tcl share/examples/redis/tests/unit/auth.tcl -share/examples/redis/tests/unit/basic.tcl +share/examples/redis/tests/unit/bitfield.tcl share/examples/redis/tests/unit/bitops.tcl share/examples/redis/tests/unit/dump.tcl share/examples/redis/tests/unit/expire.tcl +share/examples/redis/tests/unit/geo.tcl share/examples/redis/tests/unit/hyperloglog.tcl share/examples/redis/tests/unit/introspection.tcl +share/examples/redis/tests/unit/keyspace.tcl share/examples/redis/tests/unit/latency-monitor.tcl share/examples/redis/tests/unit/limits.tcl share/examples/redis/tests/unit/maxmemory.tcl @@ -86,11 +89,13 @@ share/examples/redis/tests/unit/scripting.tcl share/examples/redis/tests/unit/slowlog.tcl share/examples/redis/tests/unit/sort.tcl share/examples/redis/tests/unit/type/hash.tcl +share/examples/redis/tests/unit/type/incr.tcl share/examples/redis/tests/unit/type/list-2.tcl share/examples/redis/tests/unit/type/list-3.tcl share/examples/redis/tests/unit/type/list-common.tcl share/examples/redis/tests/unit/type/list.tcl share/examples/redis/tests/unit/type/set.tcl +share/examples/redis/tests/unit/type/string.tcl share/examples/redis/tests/unit/type/zset.tcl share/examples/redis/utils/build-static-symbols.tcl share/examples/redis/utils/cluster_fail_time.tcl @@ -98,16 +103,21 @@ share/examples/redis/utils/create-cluster/.gitignore share/examples/redis/utils/create-cluster/README share/examples/redis/utils/create-cluster/create-cluster share/examples/redis/utils/generate-command-help.rb +share/examples/redis/utils/hashtable/README +share/examples/redis/utils/hashtable/rehashing.c share/examples/redis/utils/hyperloglog/.gitignore share/examples/redis/utils/hyperloglog/hll-err.rb share/examples/redis/utils/hyperloglog/hll-gnuplot-graph.rb share/examples/redis/utils/install_server.sh share/examples/redis/utils/lru/README share/examples/redis/utils/lru/test-lru.rb -share/examples/redis/utils/mkrelease.sh share/examples/redis/utils/redis-copy.rb share/examples/redis/utils/redis-sha1.rb share/examples/redis/utils/redis_init_script share/examples/redis/utils/redis_init_script.tpl +share/examples/redis/utils/releasetools/01_create_tarball.sh +share/examples/redis/utils/releasetools/02_upload_tarball.sh +share/examples/redis/utils/releasetools/03_test_release.sh +share/examples/redis/utils/releasetools/04_release_hash.sh share/examples/redis/utils/speed-regression.tcl share/examples/redis/utils/whatisdoing.sh diff --git a/databases/redis/distinfo b/databases/redis/distinfo index 25d9140cefa..1dde484223e 100644 --- a/databases/redis/distinfo +++ b/databases/redis/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.21 2016/03/04 08:58:58 wiz Exp $ +$NetBSD: distinfo,v 1.22 2016/05/06 14:00:45 fhajny Exp $ -SHA1 (redis-3.0.7v2/redis-3.0.7.tar.gz) = e56b4b7e033ae8dbf311f9191cf6fdf3ae974d1c -RMD160 (redis-3.0.7v2/redis-3.0.7.tar.gz) = 595762ed65acf7d4593ae28707d2fcfc438cc35a -SHA512 (redis-3.0.7v2/redis-3.0.7.tar.gz) = 6c8f4c88d911e1433fd28efff2f6d62763e08be89814ebf4aa4e68e2c8bd605eba24ca3410548b2f480ae094437ce96c0bafa7a5762b3b405d5d850886297ba3 -Size (redis-3.0.7v2/redis-3.0.7.tar.gz) = 1375200 bytes +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 (patch-ab) = 21754f59e9f1013095fe47ccf7411b438385d558 -SHA1 (patch-ac) = 5cd23cef32a010a07ae59fce283891b9f9722c05 +SHA1 (patch-ac) = b389aafc4caada95f57e00786c5fba84a9c6c88d SHA1 (patch-deps_hiredis_fmacros.h) = b9d7d0a82e6794078d997769db6e5572f981b445 -SHA1 (patch-src_cluster.c) = 8efb650773412764449a49c4bc1d8f4924352e47 SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299 diff --git a/databases/redis/patches/patch-ac b/databases/redis/patches/patch-ac index 91bcdee5e8a..d84a9d36c50 100644 --- a/databases/redis/patches/patch-ac +++ b/databases/redis/patches/patch-ac @@ -1,23 +1,27 @@ -$NetBSD: patch-ac,v 1.4 2015/04/13 11:33:35 fhajny Exp $ +$NetBSD: patch-ac,v 1.5 2016/05/06 14:00:45 fhajny Exp $ Sane defaults for the config file. ---- redis.conf.orig 2015-04-01 14:01:44.000000000 +0000 +--- redis.conf.orig 2016-05-06 07:11:36.000000000 +0000 +++ redis.conf -@@ -34,11 +34,11 @@ +@@ -124,7 +124,7 @@ tcp-keepalive 0 # 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. -daemonize no +daemonize yes - # When running daemonized, Redis writes a pid file in /var/run/redis.pid by - # default. You can specify a custom pid file location here. + # If you run Redis from upstart or systemd, Redis can interact with your + # supervision tree. Options: +@@ -146,7 +146,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 @REDIS_PIDDIR@/redis.pid - # Accept connections on the specified port, default is 6379. - # If port 0 is specified Redis will not listen on a TCP socket. -@@ -100,7 +100,7 @@ loglevel notice + # Specify the server verbosity level. + # This can be one of: +@@ -159,7 +159,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 @@ -26,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. -@@ -184,7 +184,7 @@ dbfilename dump.rdb +@@ -243,7 +243,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-src_cluster.c b/databases/redis/patches/patch-src_cluster.c deleted file mode 100644 index 39c69ae34ea..00000000000 --- a/databases/redis/patches/patch-src_cluster.c +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-src_cluster.c,v 1.1 2015/04/13 11:33:35 fhajny Exp $ - -Add fcntl support on SunOS. - ---- src/cluster.c.orig 2015-04-01 14:01:44.000000000 +0000 -+++ src/cluster.c -@@ -369,8 +369,19 @@ int clusterLockConfig(char *filename) { - return REDIS_ERR; - } - -+#ifdef __sun -+ struct flock lock; -+ lock.l_start = 0; -+ lock.l_len = 0; -+ lock.l_type = F_WRLCK; -+ lock.l_whence = SEEK_SET; -+ -+ if (fcntl(fd,F_SETLK,&lock) == -1) { -+ if (errno == EAGAIN) { -+#else - if (flock(fd,LOCK_EX|LOCK_NB) == -1) { - if (errno == EWOULDBLOCK) { -+#endif - redisLog(REDIS_WARNING, - "Sorry, the cluster configuration file %s is already used " - "by a different Redis Cluster node. Please make sure that " -- cgit v1.2.3