Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2015Q2

Browse Source
This commit is contained in:
Lionel Sambuc
2015-08-30 02:56:09 -07:00
committed by Lionel Sambuc
parent 4af1cdf7a9
commit f641581404
15409 changed files with 267784 additions and 121624 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
databases/redis/Makefile
View File

@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.12 2015/03/12 14:10:28 tnn Exp $
# $NetBSD: Makefile,v 1.14 2015/06/09 12:17:56 fhajny Exp $
DISTNAME= redis-2.8.18
DISTNAME= redis-3.0.2
CATEGORIES= databases
MASTER_SITES= http://download.redis.io/releases/
@@ -46,7 +46,7 @@ FILES_SUBST+= REDIS_GROUP=${REDIS_GROUP}
FILES_SUBST+= REDIS_DATADIR=${REDIS_DATADIR}
SUBST_CLASSES+= fix-paths
SUBST_STAGE.fix-paths= post-patch
SUBST_STAGE.fix-paths= pre-configure
SUBST_MESSAGE.fix-paths= Fixing paths.
SUBST_FILES.fix-paths= redis.conf
SUBST_VARS.fix-paths= REDIS_DATADIR REDIS_LOGDIR REDIS_PIDDIR

29
databases/redis/PLIST
View File

@@ -1,8 +1,9 @@
@comment $NetBSD: PLIST,v 1.6 2014/07/18 09:33:58 fhajny Exp $
@comment $NetBSD: PLIST,v 1.8 2015/06/09 12:17:56 fhajny Exp $
bin/redis-benchmark
bin/redis-check-aof
bin/redis-check-dump
bin/redis-cli
bin/redis-sentinel
bin/redis-server
share/doc/redis/00-RELEASENOTES
share/doc/redis/BUGS
@@ -12,12 +13,30 @@ share/examples/redis/redis.conf.example
share/examples/redis/tests/assets/default.conf
share/examples/redis/tests/assets/encodings.rdb
share/examples/redis/tests/assets/hash-zipmap.rdb
share/examples/redis/tests/cluster/cluster.tcl
share/examples/redis/tests/cluster/run.tcl
share/examples/redis/tests/cluster/tests/00-base.tcl
share/examples/redis/tests/cluster/tests/01-faildet.tcl
share/examples/redis/tests/cluster/tests/02-failover.tcl
share/examples/redis/tests/cluster/tests/03-failover-loop.tcl
share/examples/redis/tests/cluster/tests/04-resharding.tcl
share/examples/redis/tests/cluster/tests/05-slave-selection.tcl
share/examples/redis/tests/cluster/tests/06-slave-stop-cond.tcl
share/examples/redis/tests/cluster/tests/07-replica-migration.tcl
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/helpers/onlydots.tcl
share/examples/redis/tests/cluster/tests/includes/init-tests.tcl
share/examples/redis/tests/cluster/tmp/.gitignore
share/examples/redis/tests/helpers/bg_complex_data.tcl
share/examples/redis/tests/helpers/gen_write_load.tcl
share/examples/redis/tests/instances.tcl
share/examples/redis/tests/integration/aof-race.tcl
share/examples/redis/tests/integration/aof.tcl
share/examples/redis/tests/integration/convert-zipmap-hash-on-load.tcl
share/examples/redis/tests/integration/logging.tcl
share/examples/redis/tests/integration/rdb.tcl
share/examples/redis/tests/integration/redis-cli.tcl
share/examples/redis/tests/integration/replication-2.tcl
@@ -32,8 +51,10 @@ share/examples/redis/tests/sentinel/tests/02-slaves-reconf.tcl
share/examples/redis/tests/sentinel/tests/03-runtime-reconf.tcl
share/examples/redis/tests/sentinel/tests/04-slave-selection.tcl
share/examples/redis/tests/sentinel/tests/05-manual.tcl
share/examples/redis/tests/sentinel/tests/06-ckquorum.tcl
share/examples/redis/tests/sentinel/tests/includes/init-tests.tcl
share/examples/redis/tests/sentinel/tmp/.gitignore
share/examples/redis/tests/support/cluster.tcl
share/examples/redis/tests/support/redis.tcl
share/examples/redis/tests/support/server.tcl
share/examples/redis/tests/support/test.tcl
@@ -72,11 +93,17 @@ share/examples/redis/tests/unit/type/list.tcl
share/examples/redis/tests/unit/type/set.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
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/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

17
databases/redis/distinfo
View File

@@ -1,9 +1,10 @@
$NetBSD: distinfo,v 1.11 2014/12/10 13:36:54 fhajny Exp $
$NetBSD: distinfo,v 1.13 2015/06/09 12:17:56 fhajny Exp $
SHA1 (redis-2.8.18.tar.gz) = 129629262fea2bc60daa542f52457e65e6aa7fd5
RMD160 (redis-2.8.18.tar.gz) = f46713539b0cb0fffff1e897fa7c37361da9e6da
Size (redis-2.8.18.tar.gz) = 1254077 bytes
SHA1 (patch-ab) = e8c66139433112ca88ba90acd39ed7e4d9c45b2c
SHA1 (patch-ac) = a8a8affc07eac53f7056425070041089ab974b89
SHA1 (patch-deps_hiredis_fmacros.h) = 1bf148708b605ec51bb0f675d779394e32767dbd
SHA1 (patch-src_object.c) = 3ada430fcdcd8524c2e53553691b1c5bffd2f3ff
SHA1 (redis-3.0.2.tar.gz) = a38755fe9a669896f7c5d8cd3ebbf76d59712002
RMD160 (redis-3.0.2.tar.gz) = e89b14ff93f35ed3f64e16a3e8c46d832a315275
Size (redis-3.0.2.tar.gz) = 1360182 bytes
SHA1 (patch-ab) = 21754f59e9f1013095fe47ccf7411b438385d558
SHA1 (patch-ac) = 5cd23cef32a010a07ae59fce283891b9f9722c05
SHA1 (patch-deps_hiredis_fmacros.h) = b9d7d0a82e6794078d997769db6e5572f981b445
SHA1 (patch-src_cluster.c) = 8efb650773412764449a49c4bc1d8f4924352e47
SHA1 (patch-src_object.c) = 30ffaec9c7e6135e3a5576cd1a35d7bcec668299

6
databases/redis/patches/patch-ab
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-ab,v 1.2 2014/01/02 17:26:19 fhajny Exp $
$NetBSD: patch-ab,v 1.3 2015/04/13 11:33:35 fhajny Exp $
Add DESTDIR support.
--- src/Makefile.orig 2013-12-11 14:31:57.000000000 +0000
--- src/Makefile.orig 2015-04-01 14:01:44.000000000 +0000
+++ src/Makefile
@@ -23,8 +23,8 @@ WARN=-Wall
@@ -23,8 +23,8 @@ WARN=-Wall -W
OPT=$(OPTIMIZATION)
PREFIX?=/usr/local

4
databases/redis/patches/patch-ac
View File

@@ -1,7 +1,7 @@
$NetBSD: patch-ac,v 1.3 2014/12/10 13:36:54 fhajny Exp $
$NetBSD: patch-ac,v 1.4 2015/04/13 11:33:35 fhajny Exp $
Sane defaults for the config file.
--- redis.conf.orig 2014-12-04 10:36:52.000000000 +0000
--- redis.conf.orig 2015-04-01 14:01:44.000000000 +0000
+++ redis.conf
@@ -34,11 +34,11 @@

6
databases/redis/patches/patch-deps_hiredis_fmacros.h
View File

@@ -1,9 +1,9 @@
$NetBSD: patch-deps_hiredis_fmacros.h,v 1.2 2014/01/02 17:26:19 fhajny Exp $
$NetBSD: patch-deps_hiredis_fmacros.h,v 1.3 2015/04/13 11:33:35 fhajny Exp $
Add MirBSD support.
--- deps/hiredis/fmacros.h.orig Wed Aug 28 09:36:00 2013
--- deps/hiredis/fmacros.h.orig 2015-04-01 14:01:44.000000000 +0000
+++ deps/hiredis/fmacros.h
@@ -7,6 +7,7 @@
@@ -11,6 +11,7 @@
#if defined(__sun__)
#define _POSIX_C_SOURCE 200112L

26
databases/redis/patches/patch-src_cluster.c Normal file
View File

@@ -0,0 +1,26 @@
$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 "

26
databases/redis/patches/patch-src_object.c
View File

@@ -1,17 +1,15 @@
$NetBSD: patch-src_object.c,v 1.2 2014/01/02 17:26:19 fhajny Exp $
$NetBSD: patch-src_object.c,v 1.3 2015/04/13 11:33:35 fhajny Exp $
Add MirBSD support.
--- src/object.c.orig Wed Aug 28 09:36:00 2013
--- src/object.c.orig 2015-04-01 14:01:44.000000000 +0000
+++ src/object.c
@@ -450,7 +450,11 @@ int getLongDoubleFromObject(robj *o, lon
redisAssertWithInfo(NULL,o,o->type == REDIS_STRING);
if (o->encoding == REDIS_ENCODING_RAW) {
errno = 0;
+#ifdef __MirBSD__
+ value = (long double)strtod(o->ptr, &eptr);
+#else
value = strtold(o->ptr, &eptr);
+#endif
if (isspace(((char*)o->ptr)[0]) || eptr[0] != '\0' ||
errno == ERANGE || isnan(value))
return REDIS_ERR;
@@ -32,7 +32,7 @@
#include <math.h>
#include <ctype.h>
-#ifdef __CYGWIN__
+#if defined(__CYGWIN__) || defined(__MirBSD__)
#define strtold(a,b) ((long double)strtod((a),(b)))
#endif