pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
Update riak to 2.1.4.
Module Name: pkgsrc-wip
Committed By: Filip Hajny <filip%joyent.com@localhost>
Pushed By: fhajny
Date: Fri May 6 10:25:04 2016 +0000
Changeset: 00dd752c129cae8f767371b0605895272c4cd1fd
Modified Files:
riak/Makefile
riak/Makefile.versions
riak/PLIST
riak/distinfo
riak/patches/patch-deps_eleveldb_c__src_build__deps.sh
riak/patches/patch-deps_node__package_priv_base_env.sh
Log Message:
Update riak to 2.1.4.
- eleveldb has been upgraded to version 2.0.17, which contains
fixes for these issues:
- Riak KV restarts and active anti-entropy (AAE) tree rebuilds
could cause a segfault, terminating Riak KV's process.
- LevelDB's tiered storage is susceptible to data loss if Riak
KV is stopped and started with less than 60 Mb stored per
vnode.
- LevelDB's recovery option does not work with tier-storage due
to failed parameter passing with Riak KV.
- Riak KV's active anti-entropy (AAE) process has potential to
induce a segfault, though this issue has only been seen in new
development code and not in existing releases.
- File permissions/ownership in packaged releases generated by the
node_package library has been tightened.
- The wording of a failed communication attempt when using
command-line tools to interact with Riak KV has been changed, as
the failure of attempt is not always due to a down node.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=00dd752c129cae8f767371b0605895272c4cd1fd
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
riak/Makefile | 2 +-
riak/Makefile.versions | 2 +-
riak/PLIST | 4 ++++
riak/distinfo | 12 ++++++------
riak/patches/patch-deps_eleveldb_c__src_build__deps.sh | 8 ++++----
riak/patches/patch-deps_node__package_priv_base_env.sh | 15 +--------------
6 files changed, 17 insertions(+), 26 deletions(-)
diffs:
diff --git a/riak/Makefile b/riak/Makefile
index cd4fb6b..d244e93 100644
--- a/riak/Makefile
+++ b/riak/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.27 2015/07/14 19:44:09 fhajny Exp $
-DISTNAME= riak-2.1.3
+DISTNAME= riak-2.1.4
CATEGORIES= databases
MASTER_SITES= http://s3.amazonaws.com/downloads.basho.com/riak/2.1/${PKGVERSION}/ \
http://s3.amazonaws.com/files.basho.com/solr/ \
diff --git a/riak/Makefile.versions b/riak/Makefile.versions
index 1303686..e718b4f 100644
--- a/riak/Makefile.versions
+++ b/riak/Makefile.versions
@@ -9,7 +9,7 @@ RIAK_VERSIONS+=clique 0.3.2-0-ge332c8f
RIAK_VERSIONS+=cluster_info 2.0.3-0-g76c73fc
RIAK_VERSIONS+=cuttlefish 2.0.5-0-g9ff5830
RIAK_VERSIONS+=edown 0.5-0-gd62ec85
-RIAK_VERSIONS+=eleveldb 2.1.10-0-g0537ca9
+RIAK_VERSIONS+=eleveldb 2.0.17-0-g973fc92
RIAK_VERSIONS+=eper 0.78-0-g7222eca
RIAK_VERSIONS+=erlang_js 1.3.0-0-g07467d8
RIAK_VERSIONS+=erlydtl 0.7.0
diff --git a/riak/PLIST b/riak/PLIST
index fcd14fb..4794496 100644
--- a/riak/PLIST
+++ b/riak/PLIST
@@ -355,6 +355,10 @@ lib/riak/lib/eleveldb-${VERSION.eleveldb}/ebin/eleveldb_bump.beam
lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/eleveldb.schema
lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/eleveldb.so
lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/eleveldb_multi.schema
+lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/leveldb_repair
+lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/perf_dump
+lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/sst_rewrite
+lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/sst_scan
lib/riak/lib/eleveldb-${VERSION.eleveldb}/priv/vsn.git
lib/riak/lib/env.sh
lib/riak/lib/eper-${VERSION.eper}/ebin/bread.beam
diff --git a/riak/distinfo b/riak/distinfo
index ad17294..97ab2b8 100644
--- a/riak/distinfo
+++ b/riak/distinfo
@@ -1,9 +1,9 @@
$NetBSD: distinfo,v 1.24 2015/07/14 19:44:09 fhajny Exp $
-SHA1 (basho/riak-2.1.3.tar.gz) = 18743afc2463801acc5b8c4a1f41748e55d296db
-RMD160 (basho/riak-2.1.3.tar.gz) = 6163ce1f7efc80b725cdf7171aeb9619d868e9dd
-SHA512 (basho/riak-2.1.3.tar.gz) = d61c732d300dd28b05a5967c504f59fdc4536850acc6eb648ee8d5fc0712190d6294407a047361effebee57a6f38d85593585cd8de3d72d0f205d132df3fc873
-Size (basho/riak-2.1.3.tar.gz) = 18962967 bytes
+SHA1 (basho/riak-2.1.4.tar.gz) = e442759f96daa8ef42f618cba419bc80abd1fc1b
+RMD160 (basho/riak-2.1.4.tar.gz) = eb37aecf943cccf3a6ed32b1ecd38abef1682860
+SHA512 (basho/riak-2.1.4.tar.gz) = cc810d68e59166f99829c80b92f2cf1805a6ddb52e990e23d4421da0c33e73e7b506c71a5710d2afb4b1174453a1f030064250afbcf2e949c2667e6d2acf1c8c
+Size (basho/riak-2.1.4.tar.gz) = 18971981 bytes
SHA1 (basho/solr-4.7.0-yz-1.tgz) = e21b7734bc112711cd6ec4ae7188726069ae16e3
RMD160 (basho/solr-4.7.0-yz-1.tgz) = b06b0d4a11644da9d074e9d161c3bef5b35826cb
SHA512 (basho/solr-4.7.0-yz-1.tgz) = 4d30a6f3048657e5f30fb0a7817e88a1279db75d9f9743028c0713bdbb86e40d2e47de0b6c86b9e2e279f9fc754ceac907835baec86b773eb861f1e5a62ffab9
@@ -18,8 +18,8 @@ SHA512 (basho/yz_monitor-1.jar) = 0732bd5d7119d1eff325e99028a888b4f339485a214999
Size (basho/yz_monitor-1.jar) = 2661 bytes
SHA1 (patch-deps__erlang_js__c_src__Makefile) = a49481f9cb0ae9130a96102b3d540a828b8ec5f7
SHA1 (patch-deps_cuttlefish_rebar.config) = 23a0b960b88277a9370eefe5a284b7aa8bd71f42
-SHA1 (patch-deps_eleveldb_c__src_build__deps.sh) = 88348831637a6fcafea0099ae0bd35c36e197146
+SHA1 (patch-deps_eleveldb_c__src_build__deps.sh) = 8878a0e99d89f084b0cf8860743f4a39a996c47f
SHA1 (patch-deps_eleveldb_c__src_eleveldb.cc) = 2e21a560c3f990ff9ac7dd604de00404644e7a5a
-SHA1 (patch-deps_node__package_priv_base_env.sh) = c7a32ac69b916c47706b914c71042ea6fd62a1e2
+SHA1 (patch-deps_node__package_priv_base_env.sh) = ee305e631180a50a1192a10e5dd4bf185c2e96c8
SHA1 (patch-deps_yokozuna_tools_grab-solr.sh) = d90115d3522238cd6a6774ff221fad009d17ebbb
SHA1 (patch-rel__vars.config) = 1cde95447a50300bd10994d6eb6628914a8ac97b
diff --git a/riak/patches/patch-deps_eleveldb_c__src_build__deps.sh b/riak/patches/patch-deps_eleveldb_c__src_build__deps.sh
index c2ad4e8..46d3cbf 100644
--- a/riak/patches/patch-deps_eleveldb_c__src_build__deps.sh
+++ b/riak/patches/patch-deps_eleveldb_c__src_build__deps.sh
@@ -1,9 +1,9 @@
$NetBSD: patch-deps_eleveldb_c__src_build__deps.sh,v 1.1 2014/11/28 20:38:31 fhajny Exp $
Do not detect lzf includes, breaks on NetBSD.
---- deps/eleveldb/c_src/build_deps.sh.orig 2014-11-05 19:41:07.000000000 +0000
-+++ deps/eleveldb/c_src/build_deps.sh 2014-11-27 16:04:35.000000000 +0000
-@@ -62,7 +62,7 @@ case "$1" in
+--- deps/eleveldb/c_src/build_deps.sh.orig 2016-04-12 14:46:02.000000000 +0000
++++ deps/eleveldb/c_src/build_deps.sh
+@@ -67,7 +67,7 @@ case "$1" in
*)
if [ ! -d snappy-$SNAPPY_VSN ]; then
tar -xzf snappy-$SNAPPY_VSN.tar.gz
@@ -11,4 +11,4 @@ Do not detect lzf includes, breaks on NetBSD.
+ (cd snappy-$SNAPPY_VSN && ./configure --prefix=$BASEDIR/system --libdir=$BASEDIR/system/lib --with-pic ac_cv_lib_lzf_lzf_compress=no)
fi
- (cd snappy-$SNAPPY_VSN && $MAKE && $MAKE install)
+ if [ ! -f system/lib/libsnappy.a ]; then
diff --git a/riak/patches/patch-deps_node__package_priv_base_env.sh b/riak/patches/patch-deps_node__package_priv_base_env.sh
index 7f3ba09..2f2bf8f 100644
--- a/riak/patches/patch-deps_node__package_priv_base_env.sh
+++ b/riak/patches/patch-deps_node__package_priv_base_env.sh
@@ -3,7 +3,7 @@ $NetBSD: patch-deps_node__package_priv_base_env.sh,v 1.4 2015/02/23 17:32:17 fha
Substitute whoami for id across SunOS platforms.
Let us substitute run dir.
---- deps/node_package/priv/base/env.sh.orig 2015-02-11 20:15:28.000000000 +0000
+--- deps/node_package/priv/base/env.sh.orig 2016-03-21 18:53:19.000000000 +0000
+++ deps/node_package/priv/base/env.sh
@@ -30,7 +30,7 @@ APP_VERSION={{app_version}}
# Variables needed to support creation of .pid files
@@ -14,16 +14,3 @@ Let us substitute run dir.
PID_DIR=$RUN_DIR/$RUNNER_SCRIPT
PID_FILE=$PID_DIR/$RUNNER_SCRIPT.pid
-@@ -44,7 +44,11 @@ fi
- # Registered process to wait for to consider start a success
- WAIT_FOR_PROCESS={{runner_wait_process}}
-
--WHOAMI=`whoami`
-+if [ `uname -s` = 'SunOS' ]; then
-+ WHOAMI=$(/usr/xpg4/bin/id -un)
-+else
-+ WHOAMI=$(whoami)
-+fi
-
- # Echo to stderr on errors
- echoerr() { echo "$@" 1>&2; }
Home |
Main Index |
Thread Index |
Old Index