Skip to content
Browse files

Update to 1.2.0

  • Loading branch information...
1 parent 4b9d6b2 commit 0673600faedd746d98a34615dc4514a4531da099 @mamash mamash committed Aug 11, 2012
View
21 riakeds/Makefile
@@ -1,7 +1,7 @@
# $NetBSD$
#
-DISTNAME= riak_ee-1.1.4
+DISTNAME= riak_ee-1.2.0
PKGNAME= ${DISTNAME:S/_ee/eds/}
CATEGORIES= none
MASTER_SITES= #
@@ -30,18 +30,22 @@ EXTRACT_ONLY+= ${INNOSTORE}
.include "../../mk/bsd.prefs.mk"
.include "options.mk"
+
.include "../../lang/erlang/Makefile.versions"
.include "Makefile.versions"
+BUILD_DEFS+= VARBASE RIAK_USER RIAK_GROUP
+BUILD_DEFS+= RIAK_DATA RIAK_LOG
+
RIAK_USER?= riak
RIAK_GROUP?= ${RIAK_USER}
RIAK_DATA?= ${VARBASE}/db/riak
RIAK_LOG?= ${VARBASE}/log/riak
-RIAK_HOME?= ${RIAK_DATA}
PKG_GROUPS+= ${RIAK_GROUP}
PKG_USERS+= ${RIAK_USER}:${RIAK_GROUP}
PKG_HOME.${RIAK_USER}= ${RIAK_DATA}
+PKG_GECOS.${RIAK_USER}= Riak daemon user
OWN_DIRS+= ${RIAK_DATA} ${RIAK_LOG} ${RIAK_DATA}/snmp
OWN_DIRS+= ${RIAK_DATA}/snmp/agent ${RIAK_DATA}/snmp/agent/db
@@ -85,14 +89,15 @@ REPLACE_FILES.escript= rel/files/nodetool
REPLACE_FILES.escript+= ${WRKDIR}/innostore-${INNOVER}/priv/innodump
REPLACE_FILES.escript+= ${WRKDIR}/innostore-${INNOVER}/priv/innoload
-CHECK_PORTABILITY_SKIP+= tests/riak_search/run_all.sh
+CHECK_PORTABILITY_SKIP+= tests/riak_search/run_all.sh \
+ deps/riak_search/tests/riak_search/run_all.sh
MAKE_ENV+= PATCH=${PATCH:Q}
INSTALL_ENV+= REPO=riak_ee
INSTALL_ENV+= PKG_VERSION=${PKGVERSION_NOREV}
-INSTALL_ENV+= OPSYS=${OPSYS}
-INSTALL_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+INSTALL_ENV+= OSNAME=${OPSYS}
+INSTALL_ENV+= ARCH=${MACHINE_ARCH}
FETCH_MESSAGE = " The file ${DISTNAME}${EXTRACT_SUFX} must be fetched"
FETCH_MESSAGE+= " from the Basho site, and saved to"
@@ -101,6 +106,12 @@ PKGREPOSITORYSUBDIR= restricted
post-extract:
${CHMOD} -R u=rwX,g=rX,o=rX ${WRKDIR}/innostore-${INNOVER}
+ ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} \
+ ${WRKDIR}/innostore-${INNOVER} ${WRKSRC}
+ cp ${FILESDIR}/disable_visibility_on_sun.patch \
+ ${WRKDIR}/innostore-${INNOVER}/c_src/patches
+ cp ${FILESDIR}/js-src-jslock.c.patch \
+ ${WRKSRC}/deps/erlang_js/c_src/patches
do-install:
${MKDIR} ${WRKSRC}/package/pkgsrc
View
39 riakeds/Makefile.versions
@@ -3,35 +3,42 @@
_RIAK_VERSIONS+= \
basho_metrics 1.0.0 \
basho_stats 1.0.2 \
+ bear 0.1-0-g7ef9a7b \
bitcask 1.5.1 \
- cluster_info 1.2.1 \
+ cluster_info 1.2.2 \
dtrace 0.8 \
ebloom 1.1.1 \
- eleveldb 1.1.0 \
+ eleveldb 1.2.2 \
eper 0.61 \
- erlang_js 1.0.2 \
+ erlang_js 1.2.0 \
+ erlydtl 0.7.0 \
+ folsom 0.7-0-g64b24d3 \
+ getopt 0.4.3 \
innostore ${INNOVER} \
- lager 1.0.0 \
+ lager 1.2.0 \
lucene_parser 1 \
luke 0.2.5 \
- merge_index 1.1.0 \
+ merge_index 1.2.0 \
mochiweb 1.5.1 \
poolboy 0.6.1 \
- protobuffs 0.6.0 \
- riak_control 0.1.0 \
- riak_core 1.1.2 \
- riak_kv 1.1.4 \
- riak_pipe 1.1.2 \
- riak_search 1.1.2 \
+ protobuffs 0.7.0 \
+ riak_api 1.2.0 \
+ riak_control 1.2.0 \
+ riak_core 1.2.0 \
+ riak_kv 1.2.0 \
+ riak_pb 1.2.0 \
+ riak_pipe 1.2.0 \
+ riak_search 1.2.0 \
riak_sysmon 1.1.2 \
riakc 1.2.1 \
- sext 0.4.1 \
- webmachine 1.9.1
+ sext 0.4.1-0-g362bdd1 \
+ webmachine 1.9.2
_RIAK_VERSIONS+= \
- riak_jmx 1.1.1 \
- riak_repl 1.1.3 \
- riak_snmp 1.0.0
+ ranch 0.2.1 \
+ riak_jmx 1.2.0 \
+ riak_repl 1.2.0 \
+ riak_snmp 1.2.0
.for name version in ${_RIAK_VERSIONS}
VERSION.${name}=${version}
View
270 riakeds/PLIST
@@ -39,27 +39,37 @@ riak/erts-${VERSION.erts}/include/internal/ethread.h
riak/erts-${VERSION.erts}/include/internal/ethread.mk
riak/erts-${VERSION.erts}/include/internal/ethread_header_config.h
riak/erts-${VERSION.erts}/include/internal/gcc/ethr_atomic.h
+riak/erts-${VERSION.erts}/include/internal/gcc/ethr_dw_atomic.h
+riak/erts-${VERSION.erts}/include/internal/gcc/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/gcc/ethread.h
riak/erts-${VERSION.erts}/include/internal/i386/atomic.h
+riak/erts-${VERSION.erts}/include/internal/i386/ethr_dw_atomic.h
+riak/erts-${VERSION.erts}/include/internal/i386/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/i386/ethread.h
riak/erts-${VERSION.erts}/include/internal/i386/rwlock.h
riak/erts-${VERSION.erts}/include/internal/i386/spinlock.h
riak/erts-${VERSION.erts}/include/internal/libatomic_ops/ethr_atomic.h
+riak/erts-${VERSION.erts}/include/internal/libatomic_ops/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/libatomic_ops/ethread.h
riak/erts-${VERSION.erts}/include/internal/ppc32/atomic.h
+riak/erts-${VERSION.erts}/include/internal/ppc32/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/ppc32/ethread.h
riak/erts-${VERSION.erts}/include/internal/ppc32/rwlock.h
riak/erts-${VERSION.erts}/include/internal/ppc32/spinlock.h
riak/erts-${VERSION.erts}/include/internal/pthread/ethr_event.h
riak/erts-${VERSION.erts}/include/internal/sparc32/atomic.h
+riak/erts-${VERSION.erts}/include/internal/sparc32/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/sparc32/ethread.h
riak/erts-${VERSION.erts}/include/internal/sparc32/rwlock.h
riak/erts-${VERSION.erts}/include/internal/sparc32/spinlock.h
riak/erts-${VERSION.erts}/include/internal/sparc64/ethread.h
riak/erts-${VERSION.erts}/include/internal/tile/atomic.h
+riak/erts-${VERSION.erts}/include/internal/tile/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/tile/ethread.h
riak/erts-${VERSION.erts}/include/internal/win/ethr_atomic.h
+riak/erts-${VERSION.erts}/include/internal/win/ethr_dw_atomic.h
riak/erts-${VERSION.erts}/include/internal/win/ethr_event.h
+riak/erts-${VERSION.erts}/include/internal/win/ethr_membar.h
riak/erts-${VERSION.erts}/include/internal/win/ethread.h
riak/erts-${VERSION.erts}/include/internal/x86_64/ethread.h
riak/erts-${VERSION.erts}/lib/internal/README
@@ -69,18 +79,63 @@ riak/erts-${VERSION.erts}/lib/internal/libethread.a
riak/erts-${VERSION.erts}/lib/liberts.a
riak/erts-${VERSION.erts}/lib/liberts_r.a
riak/erts-${VERSION.erts}/src/setuid_socket_wrap.c
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon.app
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon.appup
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_a.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_dg.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_info.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_lb.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_place.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_txt.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/appmon_web.beam
+riak/lib/appmon-${VERSION.appmon}/ebin/process_info.beam
+riak/lib/appmon-${VERSION.appmon}/priv/appmon.gif
+riak/lib/appmon-${VERSION.appmon}/priv/appmon.tool
+riak/lib/appmon-${VERSION.appmon}/priv/appmon_help.txt
+riak/lib/appmon-${VERSION.appmon}/priv/blank.html
+riak/lib/appmon-${VERSION.appmon}/priv/info_frames.html
+riak/lib/appmon-${VERSION.appmon}/priv/main_frame.html
+riak/lib/appmon-${VERSION.appmon}/priv/start_info.html
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1.app
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1.appup
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1_db.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_check.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_constructed_ber.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_constructed_ber_bin_v2.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_constructed_per.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_ber.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_ber_bin_v2.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_per.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_gen_per_rt2ct.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_name.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_parser2.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_pretty_format.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_table.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_tok.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1ct_value.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_ber_bin.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_ber_bin_v2.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_check.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_nif.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_per_bin.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_per_bin_rt2ct.beam
+riak/lib/asn1-${VERSION.asn1}/ebin/asn1rt_uper_bin.beam
+riak/lib/asn1-${VERSION.asn1}/priv/lib/asn1_erl_nif.so
riak/lib/basho-patches/etop_txt.beam
-riak/lib/basho_metrics-${VERSION.basho_metrics}/ebin/basho_metrics.app
-riak/lib/basho_metrics-${VERSION.basho_metrics}/ebin/basho_metrics_nifs.beam
-riak/lib/basho_metrics-${VERSION.basho_metrics}/priv/basho_metrics_nifs.so
-riak/lib/basho_metrics-${VERSION.basho_metrics}/priv/vsn.git
riak/lib/basho_stats-${VERSION.basho_stats}/ebin/basho_stats.app
riak/lib/basho_stats-${VERSION.basho_stats}/ebin/basho_stats_histogram.beam
riak/lib/basho_stats-${VERSION.basho_stats}/ebin/basho_stats_rv.beam
riak/lib/basho_stats-${VERSION.basho_stats}/ebin/basho_stats_sample.beam
riak/lib/basho_stats-${VERSION.basho_stats}/ebin/basho_stats_utils.beam
riak/lib/basho_stats-${VERSION.basho_stats}/include/stats.hrl
riak/lib/basho_stats-${VERSION.basho_stats}/priv/vsn.git
+riak/lib/bear-${VERSION.bear}/ebin/bear.app
+riak/lib/bear-${VERSION.bear}/ebin/bear.beam
+riak/lib/bear-${VERSION.bear}/priv/vsn.git
riak/lib/bitcask-${VERSION.bitcask}/ebin/bitcask.app
riak/lib/bitcask-${VERSION.bitcask}/ebin/bitcask.beam
riak/lib/bitcask-${VERSION.bitcask}/ebin/bitcask_app.beam
@@ -108,12 +163,14 @@ riak/lib/compiler-${VERSION.compiler}/ebin/beam_clean.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_dead.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_dict.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_disasm.beam
+riak/lib/compiler-${VERSION.compiler}/ebin/beam_except.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_flatten.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_jump.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_listing.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_opcodes.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_peep.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_receive.beam
+riak/lib/compiler-${VERSION.compiler}/ebin/beam_split.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_trim.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_type.beam
riak/lib/compiler-${VERSION.compiler}/ebin/beam_utils.beam
@@ -168,7 +225,6 @@ riak/lib/eper-${VERSION.eper}/ebin/dtop_replay.beam
riak/lib/eper-${VERSION.eper}/ebin/eper.app
riak/lib/eper-${VERSION.eper}/ebin/eper.beam
riak/lib/eper-${VERSION.eper}/ebin/gen_serv.beam
-riak/lib/eper-${VERSION.eper}/ebin/getopt.beam
riak/lib/eper-${VERSION.eper}/ebin/gperf.beam
riak/lib/eper-${VERSION.eper}/ebin/gperfConsumer.beam
riak/lib/eper-${VERSION.eper}/ebin/gperfGtk.beam
@@ -223,6 +279,27 @@ riak/lib/erlang_js-${VERSION.erlang_js}/ebin/js_mochinum.beam
riak/lib/erlang_js-${VERSION.erlang_js}/priv/erlang_js_drv.so
riak/lib/erlang_js-${VERSION.erlang_js}/priv/json2.js
riak/lib/erlang_js-${VERSION.erlang_js}/priv/vsn.git
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/blocktrans_extractor.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/blocktrans_parser.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/blocktrans_scanner.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl.app
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_compiler.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_dateformat.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_deps.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_filters.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_i18n.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_parser.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_runtime.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_scanner.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_slice.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/erlydtl_unparser.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/i18n_manager.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/po_generator.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/po_scanner.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/ebin/sources_parser.beam
+riak/lib/erlydtl-${VERSION.erlydtl}/priv/custom_tags/flashvideo
+riak/lib/erlydtl-${VERSION.erlydtl}/priv/vsn.git
riak/lib/erts-${VERSION.erts}/ebin/erl_prim_loader.beam
riak/lib/erts-${VERSION.erts}/ebin/erlang.beam
riak/lib/erts-${VERSION.erts}/ebin/init.beam
@@ -258,6 +335,37 @@ riak/lib/eunit-${VERSION.eunit}/ebin/eunit_test.beam
riak/lib/eunit-${VERSION.eunit}/ebin/eunit_tests.beam
riak/lib/eunit-${VERSION.eunit}/ebin/eunit_tty.beam
riak/lib/eunit-${VERSION.eunit}/include/eunit.hrl
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom.app
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_ets.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_ewma.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_meter_timer_server.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_counter.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_duration.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_gauge.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_histogram.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_histogram_ets.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_history.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_meter.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_meter_reader.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_metrics_spiral.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_exdec.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_none.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_slide.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_slide_server.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_slide_sup.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_slide_uniform.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sample_uniform.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_sup.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_utils.beam
+riak/lib/folsom-${VERSION.folsom}/ebin/folsom_vm_metrics.beam
+riak/lib/folsom-${VERSION.folsom}/include/folsom.hrl
+riak/lib/folsom-${VERSION.folsom}/priv/vsn.git
+riak/lib/getopt-${VERSION.getopt}/ebin/getopt.app
+riak/lib/getopt-${VERSION.getopt}/ebin/getopt.beam
+riak/lib/getopt-${VERSION.getopt}/priv/vsn.git
riak/lib/gs-${VERSION.gs}/ebin/gs.app
riak/lib/gs-${VERSION.gs}/ebin/gs.appup
riak/lib/gs-${VERSION.gs}/ebin/gs.beam
@@ -352,7 +460,6 @@ riak/lib/inets-${VERSION.inets}/ebin/ftp.beam
riak/lib/inets-${VERSION.inets}/ebin/ftp_progress.beam
riak/lib/inets-${VERSION.inets}/ebin/ftp_response.beam
riak/lib/inets-${VERSION.inets}/ebin/ftp_sup.beam
-riak/lib/inets-${VERSION.inets}/ebin/http.beam
riak/lib/inets-${VERSION.inets}/ebin/http_chunk.beam
riak/lib/inets-${VERSION.inets}/ebin/http_request.beam
riak/lib/inets-${VERSION.inets}/ebin/http_response.beam
@@ -394,6 +501,7 @@ riak/lib/inets-${VERSION.inets}/ebin/inets_app.beam
riak/lib/inets-${VERSION.inets}/ebin/inets_regexp.beam
riak/lib/inets-${VERSION.inets}/ebin/inets_service.beam
riak/lib/inets-${VERSION.inets}/ebin/inets_sup.beam
+riak/lib/inets-${VERSION.inets}/ebin/inets_trace.beam
riak/lib/inets-${VERSION.inets}/ebin/mod_actions.beam
riak/lib/inets-${VERSION.inets}/ebin/mod_alias.beam
riak/lib/inets-${VERSION.inets}/ebin/mod_auth.beam
@@ -504,9 +612,12 @@ riak/lib/kernel-${VERSION.kernel}/ebin/user.beam
riak/lib/kernel-${VERSION.kernel}/ebin/user_drv.beam
riak/lib/kernel-${VERSION.kernel}/ebin/user_sup.beam
riak/lib/kernel-${VERSION.kernel}/ebin/wrap_log_reader.beam
+riak/lib/kernel-${VERSION.kernel}/include/dist.hrl
+riak/lib/kernel-${VERSION.kernel}/include/dist_util.hrl
riak/lib/kernel-${VERSION.kernel}/include/file.hrl
riak/lib/kernel-${VERSION.kernel}/include/inet.hrl
riak/lib/kernel-${VERSION.kernel}/include/inet_sctp.hrl
+riak/lib/kernel-${VERSION.kernel}/include/net_address.hrl
riak/lib/lager-${VERSION.lager}/ebin/error_logger_lager_h.beam
riak/lib/lager-${VERSION.lager}/ebin/lager.app
riak/lib/lager-${VERSION.lager}/ebin/lager.beam
@@ -635,6 +746,18 @@ riak/lib/observer-${VERSION.observer}/ebin/etop_tr.beam
riak/lib/observer-${VERSION.observer}/ebin/etop_txt.beam
riak/lib/observer-${VERSION.observer}/ebin/observer.app
riak/lib/observer-${VERSION.observer}/ebin/observer.appup
+riak/lib/observer-${VERSION.observer}/ebin/observer.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_app_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_lib.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_perf_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_pro_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_procinfo.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_sys_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_trace_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_traceoptions_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_tv_table.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_tv_wx.beam
+riak/lib/observer-${VERSION.observer}/ebin/observer_wx.beam
riak/lib/observer-${VERSION.observer}/ebin/ttb.beam
riak/lib/observer-${VERSION.observer}/ebin/ttb_et.beam
riak/lib/observer-${VERSION.observer}/include/etop.hrl
@@ -644,6 +767,7 @@ riak/lib/observer-${VERSION.observer}/priv/bin/getop
riak/lib/observer-${VERSION.observer}/priv/crashdump_viewer.tool
riak/lib/observer-${VERSION.observer}/priv/crashdump_viewer/collapsd.gif
riak/lib/observer-${VERSION.observer}/priv/crashdump_viewer/exploded.gif
+riak/lib/observer-${VERSION.observer}/priv/erlang_observer.png
riak/lib/os_mon-${VERSION.os_mon}/ebin/cpu_sup.beam
riak/lib/os_mon-${VERSION.os_mon}/ebin/disksup.beam
riak/lib/os_mon-${VERSION.os_mon}/ebin/memsup.beam
@@ -677,32 +801,67 @@ riak/lib/protobuffs-${VERSION.protobuffs}/ebin/pokemon_pb.beam
riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs.app
riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs.beam
riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs_compile.beam
+riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs_file.beam
riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs_parser.beam
riak/lib/protobuffs-${VERSION.protobuffs}/ebin/protobuffs_scanner.beam
riak/lib/protobuffs-${VERSION.protobuffs}/priv/vsn.git
riak/lib/public_key-${VERSION.public_key}/ebin/OTP-PUB-KEY.beam
+riak/lib/public_key-${VERSION.public_key}/ebin/PKCS-FRAME.beam
riak/lib/public_key-${VERSION.public_key}/ebin/pubkey_cert.beam
riak/lib/public_key-${VERSION.public_key}/ebin/pubkey_cert_records.beam
+riak/lib/public_key-${VERSION.public_key}/ebin/pubkey_pbe.beam
riak/lib/public_key-${VERSION.public_key}/ebin/pubkey_pem.beam
riak/lib/public_key-${VERSION.public_key}/ebin/pubkey_ssh.beam
riak/lib/public_key-${VERSION.public_key}/ebin/public_key.app
riak/lib/public_key-${VERSION.public_key}/ebin/public_key.appup
riak/lib/public_key-${VERSION.public_key}/ebin/public_key.beam
riak/lib/public_key-${VERSION.public_key}/include/OTP-PUB-KEY.hrl
+riak/lib/public_key-${VERSION.public_key}/include/PKCS-FRAME.hrl
riak/lib/public_key-${VERSION.public_key}/include/public_key.hrl
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch.app
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_acceptor.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_acceptors_sup.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_app.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_conns_sup.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_listener.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_listener_sup.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_ssl.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_sup.beam
+riak/lib/ranch-${VERSION.ranch}/ebin/ranch_tcp.beam
+riak/lib/ranch-${VERSION.ranch}/priv/vsn.git
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api.app
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_app.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_basic_pb_service.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_pb_listener.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_pb_server.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_pb_service.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_pb_sup.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_stat.beam
+riak/lib/riak_api-${VERSION.riak_api}/ebin/riak_api_sup.beam
+riak/lib/riak_api-${VERSION.riak_api}/priv/vsn.git
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_cluster.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_cluster_down.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_cluster_join.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_fallbacks.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_gui.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_node.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_node_leave.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_node_stop.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_overview.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_ring.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_routes.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_services_resource.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/admin_ui_resource.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/base64url.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/index_dtl.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/rekon_resource.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control.app
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_app.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_formatting.beam
+riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_rpc.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_security.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_session.beam
riak/lib/riak_control-${VERSION.riak_control}/ebin/riak_control_sup.beam
@@ -756,7 +915,6 @@ riak/lib/riak_control-${VERSION.riak_control}/priv/admin/images/slider-groove.pn
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/images/slider-handle.png
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/images/spinner.gif
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/images/unhealthy-cluster.png
-riak/lib/riak_control-${VERSION.riak_control}/priv/admin/index.html
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/js/cluster.js
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/js/gui.js
riak/lib/riak_control-${VERSION.riak_control}/priv/admin/js/jquery-1.7.min.js
@@ -788,14 +946,20 @@ riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_apl.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_app.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_bucket.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_capability.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_cinfo_core.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_claim.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_claim_sim.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_claim_util.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_claimant.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_config.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_console.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_coverage_fsm.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_coverage_plan.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_dtrace.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_eventhandler_guard.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_eventhandler_sup.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_format.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_gossip.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_gossip_legacy.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_handoff_listener.beam
@@ -811,12 +975,16 @@ riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_node_watcher.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_node_watcher_events.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_nodeid.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_pb.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_repair.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_ring.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_ring_events.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_ring_handler.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_ring_manager.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_ring_util.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_stat.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_stat_cache.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_stat_sup.beam
+riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_stats_sup.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_status.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_sup.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_sysmon_handler.beam
@@ -834,23 +1002,14 @@ riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_vnode_worker.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_vnode_worker_pool.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_web.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/riak_core_wm_urlmap.beam
-riak/lib/riak_core-${VERSION.riak_core}/ebin/slide.beam
-riak/lib/riak_core-${VERSION.riak_core}/ebin/spiraltime.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/supervisor_pre_r14b04.beam
riak/lib/riak_core-${VERSION.riak_core}/ebin/vclock.beam
+riak/lib/riak_core-${VERSION.riak_core}/include/riak_core_dtrace.hrl
riak/lib/riak_core-${VERSION.riak_core}/include/riak_core_handoff.hrl
riak/lib/riak_core-${VERSION.riak_core}/include/riak_core_pb.hrl
riak/lib/riak_core-${VERSION.riak_core}/include/riak_core_ring.hrl
riak/lib/riak_core-${VERSION.riak_core}/include/riak_core_vnode.hrl
riak/lib/riak_core-${VERSION.riak_core}/priv/vsn.git
-riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx.app
-riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx.beam
-riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_app.beam
-riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_monitor.beam
-riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_sup.beam
-riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/.hg_dummy
-riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/riak_jmx.sh
-riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/vsn.git
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/lk.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/raw_link_walker.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak.beam
@@ -904,9 +1063,10 @@ riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_memory_backend.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_mrc_map.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_mrc_pipe.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_multi_backend.beam
-riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_listener.beam
-riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_socket.beam
-riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_socket_sup.beam
+riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_bucket.beam
+riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_index.beam
+riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_mapred.beam
+riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pb_object.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_phase_proto.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pipe_get.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_pipe_index.beam
@@ -936,12 +1096,25 @@ riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_wm_utils.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_kv_worker.beam
riak/lib/riak_kv-${VERSION.riak_kv}/ebin/riak_object.beam
riak/lib/riak_kv-${VERSION.riak_kv}/include/.empty_for_hg
+riak/lib/riak_kv-${VERSION.riak_kv}/include/riak_kv_dtrace.hrl
riak/lib/riak_kv-${VERSION.riak_kv}/include/riak_kv_js_pools.hrl
riak/lib/riak_kv-${VERSION.riak_kv}/include/riak_kv_map_phase.hrl
riak/lib/riak_kv-${VERSION.riak_kv}/include/riak_kv_vnode.hrl
riak/lib/riak_kv-${VERSION.riak_kv}/priv/.empty_for_hg
riak/lib/riak_kv-${VERSION.riak_kv}/priv/mapred_builtins.js
riak/lib/riak_kv-${VERSION.riak_kv}/priv/vsn.git
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_kv_pb.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_pb.app
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_pb.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_pb_codec.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_pb_kv_codec.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_pb_search_codec.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/ebin/riak_search_pb.beam
+riak/lib/riak_pb-${VERSION.riak_pb}/include/riak_kv_pb.hrl
+riak/lib/riak_pb-${VERSION.riak_pb}/include/riak_pb.hrl
+riak/lib/riak_pb-${VERSION.riak_pb}/include/riak_pb_kv_codec.hrl
+riak/lib/riak_pb-${VERSION.riak_pb}/include/riak_search_pb.hrl
+riak/lib/riak_pb-${VERSION.riak_pb}/priv/vsn.git
riak/lib/riak_pipe-${VERSION.riak_pipe}/ebin/riak_pipe.app
riak/lib/riak_pipe-${VERSION.riak_pipe}/ebin/riak_pipe.beam
riak/lib/riak_pipe-${VERSION.riak_pipe}/ebin/riak_pipe_app.beam
@@ -972,6 +1145,14 @@ riak/lib/riak_pipe-${VERSION.riak_pipe}/include/riak_pipe_debug.hrl
riak/lib/riak_pipe-${VERSION.riak_pipe}/include/riak_pipe_log.hrl
riak/lib/riak_pipe-${VERSION.riak_pipe}/priv/app.slave0.config
riak/lib/riak_pipe-${VERSION.riak_pipe}/priv/vsn.git
+riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx.app
+riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx.beam
+riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_app.beam
+riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_monitor.beam
+riak/lib/riak_jmx-${VERSION.riak_jmx}/ebin/riak_jmx_sup.beam
+riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/.hg_dummy
+riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/riak_jmx.sh
+riak/lib/riak_jmx-${VERSION.riak_jmx}/priv/vsn.git
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/bounded_queue.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/couch_btree.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/couch_file.beam
@@ -990,7 +1171,6 @@ riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_keylist_client.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_keylist_server.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_leader.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_leader_helper.beam
-riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_listener.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_listener_sup.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_ring.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_ring_handler.beam
@@ -1002,12 +1182,14 @@ riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_syncv1_server.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_tcp_client.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_tcp_server.beam
riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_util.beam
+riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_web.beam
+riak/lib/riak_repl-${VERSION.riak_repl}/ebin/riak_repl_wm_stats.beam
riak/lib/riak_repl-${VERSION.riak_repl}/include/couch_db.hrl
riak/lib/riak_repl-${VERSION.riak_repl}/include/riak_repl.hrl
riak/lib/riak_repl-${VERSION.riak_repl}/priv/.empty_for_hg
riak/lib/riak_repl-${VERSION.riak_repl}/priv/vsn.git
riak/lib/riak_search-${VERSION.riak_search}/ebin/basho_bench_driver_riaksearch.beam
-riak/lib/riak_search-${VERSION.riak_search}/ebin/merge_index_backend.beam
+riak/lib/riak_search-${VERSION.merge_index}/ebin/merge_index_backend.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_indexed_doc.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search.app
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search.beam
@@ -1044,28 +1226,29 @@ riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_op_term.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_op_union.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_op_utils.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_operators_qc.beam
+riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_pb_query.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_repl_helper.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_ring_utils.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_schema.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_schema_parser.beam
+riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_stat.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_sup.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_test.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_utils.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_vnode.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_vnode_sup.beam
+riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_search_worker.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_indexer_wm.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_output.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_qc.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_search_client.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_searcher_wm.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_sort.beam
-riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_sup.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_xml.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/riak_solr_xml_xform.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/search.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/solr_search.beam
riak/lib/riak_search-${VERSION.riak_search}/ebin/text_analyzers.beam
-riak/lib/riak_search-${VERSION.riak_search}/include/qilr.hrl
riak/lib/riak_search-${VERSION.riak_search}/include/riak_search.hrl
riak/lib/riak_search-${VERSION.riak_search}/include/riak_solr.hrl
riak/lib/riak_search-${VERSION.riak_search}/priv/default.def
@@ -1087,16 +1270,8 @@ riak/lib/riak_sysmon-${VERSION.riak_sysmon}/ebin/riak_sysmon_filter.beam
riak/lib/riak_sysmon-${VERSION.riak_sysmon}/ebin/riak_sysmon_sup.beam
riak/lib/riak_sysmon-${VERSION.riak_sysmon}/ebin/riak_sysmon_testhandler.beam
riak/lib/riak_sysmon-${VERSION.riak_sysmon}/priv/vsn.git
-riak/lib/riakc-${VERSION.riakc}/ebin/riakc.app
-riak/lib/riakc-${VERSION.riakc}/ebin/riakc_obj.beam
-riak/lib/riakc-${VERSION.riakc}/ebin/riakc_pb.beam
-riak/lib/riakc-${VERSION.riakc}/ebin/riakc_pb_socket.beam
-riak/lib/riakc-${VERSION.riakc}/ebin/riakclient_pb.beam
-riak/lib/riakc-${VERSION.riakc}/include/riakc_obj.hrl
-riak/lib/riakc-${VERSION.riakc}/include/riakc_pb.hrl
-riak/lib/riakc-${VERSION.riakc}/include/riakclient_pb.hrl
-riak/lib/riakc-${VERSION.riakc}/priv/vsn.git
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/dbg.beam
+riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/dyntrace.beam
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/erts_alloc_config.beam
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/inviso_as_lib.beam
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/inviso_autostart.beam
@@ -1110,9 +1285,13 @@ riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.app
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.appup
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools.beam
riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/runtime_tools_sup.beam
+riak/lib/runtime_tools-${VERSION.runtime_tools}/ebin/ttb_autostart.beam
riak/lib/runtime_tools-${VERSION.runtime_tools}/include/observer_backend.hrl
+riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/dyntrace.so
riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_file_drv.so
riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/lib/trace_ip_drv.so
+riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dtrace_user.o
+riak/lib/runtime_tools-${VERSION.runtime_tools}/priv/obj/dyntrace.o
riak/lib/sasl-${VERSION.sasl}/ebin/alarm_handler.beam
riak/lib/sasl-${VERSION.sasl}/ebin/erlsrv.beam
riak/lib/sasl-${VERSION.sasl}/ebin/format_lib_supp.beam
@@ -1185,6 +1364,7 @@ riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_misc_sup.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_mpd.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_net_if.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_net_if_filter.beam
+riak/lib/snmp-${VERSION.snmp}/ebin/snmpm_net_if_mt.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_network_interface.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_network_interface_filter.beam
riak/lib/snmp-${VERSION.snmp}/ebin/snmpa_notification_delivery_info_receiver.beam
@@ -1266,41 +1446,30 @@ riak/lib/snmp-${VERSION.snmp}/priv/mibs/SNMPv2-MIB.bin
riak/lib/snmp-${VERSION.snmp}/priv/mibs/SNMPv2-TM.bin
riak/lib/snmp-${VERSION.snmp}/priv/mibs/STANDARD-MIB.bin
riak/lib/snmp-${VERSION.snmp}/priv/mibs/TRANSPORT-ADDRESS-MIB.bin
-riak/lib/ssl-${VERSION.ssl}/ebin/inet_ssl_dist.beam
+riak/lib/ssl-${VERSION.ssl}/ebin/inet_tls_dist.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl.app
riak/lib/ssl-${VERSION.ssl}/ebin/ssl.appup
riak/lib/ssl-${VERSION.ssl}/ebin/ssl.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_alert.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_app.beam
-riak/lib/ssl-${VERSION.ssl}/ebin/ssl_broker.beam
-riak/lib/ssl-${VERSION.ssl}/ebin/ssl_broker_sup.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_certificate_db.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_cipher.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_connection.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_connection_sup.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_debug.beam
+riak/lib/ssl-${VERSION.ssl}/ebin/ssl_dist_sup.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_handshake.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_manager.beam
-riak/lib/ssl-${VERSION.ssl}/ebin/ssl_prim.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_record.beam
-riak/lib/ssl-${VERSION.ssl}/ebin/ssl_server.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_session.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_session_cache_api.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl2.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_ssl3.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_sup.beam
+riak/lib/ssl-${VERSION.ssl}/ebin/ssl_tls_dist_proxy.beam
riak/lib/ssl-${VERSION.ssl}/ebin/ssl_tls1.beam
-riak/lib/ssl-${VERSION.ssl}/priv/bin/ssl_esock
-riak/lib/ssl-${VERSION.ssl}/priv/obj/Makefile
-riak/lib/ssl-${VERSION.ssl}/priv/obj/debuglog.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock_openssl.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock_osio.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock_poll.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock_posix_str.o
-riak/lib/ssl-${VERSION.ssl}/priv/obj/esock_utils.o
riak/lib/stdlib-${VERSION.stdlib}/ebin/array.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/base64.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/beam_lib.beam
@@ -1366,7 +1535,6 @@ riak/lib/stdlib-${VERSION.stdlib}/ebin/qlc_pt.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/queue.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/random.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/re.beam
-riak/lib/stdlib-${VERSION.stdlib}/ebin/regexp.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/sets.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/shell.beam
riak/lib/stdlib-${VERSION.stdlib}/ebin/shell_default.beam
@@ -1437,6 +1605,7 @@ riak/lib/webmachine-${VERSION.webmachine}/ebin/webmachine_util.beam
riak/lib/webmachine-${VERSION.webmachine}/ebin/wmtrace_resource.beam
riak/lib/webmachine-${VERSION.webmachine}/ebin/wrq.beam
riak/lib/webmachine-${VERSION.webmachine}/include/webmachine.hrl
+riak/lib/webmachine-${VERSION.webmachine}/include/webmachine_logger.hrl
riak/lib/webmachine-${VERSION.webmachine}/include/wm_reqdata.hrl
riak/lib/webmachine-${VERSION.webmachine}/include/wm_reqstate.hrl
riak/lib/webmachine-${VERSION.webmachine}/priv/templates/Makefile
@@ -1662,7 +1831,10 @@ riak/lib/wx-${VERSION.wx}/ebin/wxStdDialogButtonSizer.beam
riak/lib/wx-${VERSION.wx}/ebin/wxStyledTextCtrl.beam
riak/lib/wx-${VERSION.wx}/ebin/wxStyledTextEvent.beam
riak/lib/wx-${VERSION.wx}/ebin/wxSysColourChangedEvent.beam
+riak/lib/wx-${VERSION.wx}/ebin/wxSystemOptions.beam
riak/lib/wx-${VERSION.wx}/ebin/wxSystemSettings.beam
+riak/lib/wx-${VERSION.wx}/ebin/wxTaskBarIcon.beam
+riak/lib/wx-${VERSION.wx}/ebin/wxTaskBarIconEvent.beam
riak/lib/wx-${VERSION.wx}/ebin/wxTextAttr.beam
riak/lib/wx-${VERSION.wx}/ebin/wxTextCtrl.beam
riak/lib/wx-${VERSION.wx}/ebin/wxTextDataObject.beam
@@ -1725,7 +1897,6 @@ riak/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xs.beam
riak/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xsd.beam
riak/lib/xmerl-${VERSION.xmerl}/ebin/xmerl_xsd_type.beam
riak/lib/xmerl-${VERSION.xmerl}/include/xmerl.hrl
-riak/lib/xmerl-${VERSION.xmerl}/include/xmerl_xlink.hrl
riak/lib/xmerl-${VERSION.xmerl}/include/xmerl_xpath.hrl
riak/lib/xmerl-${VERSION.xmerl}/include/xmerl_xsd.hrl
riak/releases/${PKGVERSION}/riak.boot
@@ -1738,7 +1909,6 @@ riak/releases/RELEASES
riak/releases/start_erl.data
sbin/riak
sbin/riak-admin
-sbin/search-cmd
sbin/riak-repl
sbin/search-cmd
share/examples/riak/app.config
View
20 riakeds/distinfo
@@ -3,17 +3,17 @@ $NetBSD$
SHA1 (innostore-1.0.4.tar.gz) = dfbc3b90bac8b3dc930dc05ebd7418fc8a244e5d
RMD160 (innostore-1.0.4.tar.gz) = b4ab7ae7538f95366a9115b74689975bd08b3c9e
Size (innostore-1.0.4.tar.gz) = 1647782 bytes
-SHA1 (riak_ee-1.1.4.tar.gz) = b0887fd845cce06ada3fa2a99797851e08e14986
-RMD160 (riak_ee-1.1.4.tar.gz) = 573f93a36f954351657b39182f56e4cc84c9160b
-Size (riak_ee-1.1.4.tar.gz) = 12243529 bytes
+SHA1 (riak_ee-1.2.0.tar.gz) = baf26691cf7030317153f60270a1838a71c2ae15
+RMD160 (riak_ee-1.2.0.tar.gz) = c16a3ed0a37799528c1715c12d14920445da8525
+Size (riak_ee-1.2.0.tar.gz) = 11697709 bytes
SHA1 (patch-__innostore-1.0.4__rebar.config) = 1768205357d460fa853123b6354f5430fe001e11
SHA1 (patch-deps__ebloom__rebar.config) = f54dd62351e041a2be8d37fd62a169ebd1ecc18f
SHA1 (patch-deps__erlang_js__c_src__Makefile) = 8f31bdfae317f62dc620a8dd34ba5dcd4fb2cafd
-SHA1 (patch-package__Makefile) = 2c692fe029f55e618ddb9b176cc8dcd3ba8f3743
-SHA1 (patch-rel__files__app.config) = 33c87fdff4bd23305183bdd647fcd47448e53c24
-SHA1 (patch-rel__files__riak) = 973049a8c8039735db8f85039bd916c2c5073ad0
-SHA1 (patch-rel__files__riak-admin) = ae90938e0e67f9241eb5285ef14393c28a1bf50b
-SHA1 (patch-rel__files__riak-repl) = 6d1af2126ee1e82ce3862316c53f30cff68f49a7
-SHA1 (patch-rel__files__search-cmd) = 1160959014d48236a20bfe24f4646e176426ca05
+SHA1 (patch-package__Makefile) = 35da1a4092b74cdc009a3af78691c58e0a6c5050
+SHA1 (patch-rel__files__app.config) = 1304283ffe86f01d820db73a9b843695e54cf4d9
+SHA1 (patch-rel__files__riak) = e9a6e376a71bf009b8c3a3c7c149e209040a949e
+SHA1 (patch-rel__files__riak-admin) = bb0b234695cb6c9254a3dd5331a9328b0b832753
+SHA1 (patch-rel__files__riak-repl) = f5ce680b61af8ceaa2c65d669e4a5c8fb9676c79
+SHA1 (patch-rel__files__search-cmd) = 3da9e115bba8aaea094595a6188d306ef85a818e
SHA1 (patch-rel__files__vm.args) = c8397feee259e07c14d6025593e3071773306f82
-SHA1 (patch-rel__vars.config) = 4774b20861fa01d5d551278d12e4b90e74b65d81
+SHA1 (patch-rel__vars.config) = 3020fedd33d262f3aa69e8dc4e42b75fabe8886c
View
20 riakeds/files/js-src-jslock.c.patch
@@ -0,0 +1,20 @@
+--- c_src/js/src/jslock.c.orig 2008-03-29 13:38:28.000000000 +0000
++++ c_src/js/src/jslock.c 2012-06-23 09:01:27.971682329 +0000
+@@ -979,7 +979,7 @@
+ js_ResumeThread(tl);
+ }
+
+-JS_INLINE void
++void
+ js_Lock(JSThinLock *tl, jsword me)
+ {
+ JS_ASSERT(CURRENT_THREAD_IS_ME(me));
+@@ -993,7 +993,7 @@
+ #endif
+ }
+
+-JS_INLINE void
++void
+ js_Unlock(JSThinLock *tl, jsword me)
+ {
+ JS_ASSERT(CURRENT_THREAD_IS_ME(me));
View
52 riakeds/patches/patch-package__Makefile
@@ -1,49 +1,61 @@
$NetBSD$
Provide our own installation target.
---- package/Makefile.orig 2012-03-01 14:25:20.000000000 +0000
+--- package/Makefile.orig 2012-08-06 21:57:12.000000000 +0000
+++ package/Makefile
-@@ -1,37 +1,11 @@
- OS = $(shell uname -s)
+@@ -2,49 +2,8 @@ OS = $(shell uname -s)
KERNEL = $(shell uname -r)
ERLANG_BIN = $(shell dirname $(shell which erl))
--ifeq ($(OS),Linux)
+
+-ifeq ($(OS),Linux) # Linux
-ARCH = $(shell uname -m)
-PKGER = $(shell cat /etc/redhat-release 2> /dev/null)
--ifeq ($(PKGER),)
+-ifeq ($(PKGER),) # Debian / Ubuntu
-OSNAME = Debian
--PKGER = debuild
-PKGERDIR = deb
--else
+-BUILDDIR = debuild
+-else # Redhat / Centos
-OSNAME = RedHat
--PKGER = rpmbuild
-PKGERDIR = rpm
+-BUILDDIR = rpmbuild
-endif
--endif
--ifeq ($(OS),SunOS)
+-endif # linux
+-
+-
+-ifeq ($(OS),SunOS) # Solaris flavors
+-KERNELVER = $(shell uname -v | grep -c joyent 2> /dev/null)
-ARCH = $(shell uname -p)
- PKGER = make
+-
+-ifneq ($(KERNELVER),0) # SmartOS
+-OSNAME = SmartOS
+-PKGERDIR = smartos
+-BUILDDIR = smartosbuild
+-else # Solaris / OmniOS
-PKGERDIR = solaris
-DISTRO = $(shell head -1 /etc/release|awk \
-- '{if ($$1 == "OpenSolaris") {print $$1} else {print "Solaris"}}')
+- '{if ($$1 == "OmniOS") {print $$1} else {print "Solaris"}}')
-OSNAME = ${DISTRO}
-endif
--ifeq ($(OS),Darwin)
+-endif # solaris
+-
+-ifeq ($(OS),Darwin) # OSX
-OSNAME = OSX
-ARCH = $(shell uname -m)
--PKGER = make
-PKGERDIR = osx
-BUILDDIR = osxbuild
-endif
+-ifeq ($(OS),FreeBSD) # FreeBSD
+-OSNAME = $(OS)
+-ARCH = $(shell uname -p)
+-PKGERDIR = freebsd
+-BUILDDIR = bsdbuild
+-endif
++PKGER = make
+PKGERDIR = pkgsrc
DATE = $(shell date +%Y-%m-%d)
--VERSIONSTRING = $(APP) ($(PKG_VERSION) $(DATE)) $(OSNAME) $(ARCH)
-+VERSIONSTRING = $(APP) ($(PKG_VERSION) $(DATE)) $(OPSYS) $(MACHINE_ARCH)
-
- APP = $(shell echo "$(REPO)" | sed -e 's/_/-/g')
- # Assumes CURDIR is .../$(APP)/package/$(APP)/
-@@ -50,6 +24,6 @@ pkgcheck:
+ VERSIONSTRING = $(APP) ($(PKG_VERSION) $(DATE)) $(OSNAME) $(ARCH)
+@@ -66,6 +25,6 @@ pkgcheck:
@echo "Packaging \"$(DISTNAME)\""
# The heavy lifting is done by the individual packager Makefiles
View
22 riakeds/patches/patch-rel__files__app.config
@@ -1,19 +1,9 @@
$NetBSD$
Add innostore, leveldb and other minor bits.
---- rel/files/app.config.orig 2012-03-07 22:08:10.000000000 +0000
+--- rel/files/app.config.orig 2012-08-06 22:02:45.000000000 +0000
+++ rel/files/app.config
-@@ -6,6 +6,9 @@
- %% Default location of ringstate
- {ring_state_dir, "{{ring_state_dir}}"},
-
-+ %% Raise the initial ring size
-+ {ring_creation_size, {{ring_creation_size}} },
-+
- %% http is a list of IP addresses and TCP ports that the Riak
- %% HTTP interface will bind.
- {http, [ {"{{web_ip}}", {{web_port}} } ]},
-@@ -25,6 +28,9 @@
+@@ -47,6 +47,9 @@
%% intra-cluster data handoff.
{handoff_port, {{handoff_port}} },
@@ -23,7 +13,7 @@ Add innostore, leveldb and other minor bits.
%% To encrypt riak_core intra-cluster data handoff traffic,
%% uncomment the following line and edit its path to an
%% appropriate certfile and keyfile. (This example uses a
-@@ -43,7 +49,10 @@
+@@ -73,7 +76,10 @@
{riak_kv, [
%% Storage_backend specifies the Erlang module defining the storage
%% mechanism that will be used on this node.
@@ -33,9 +23,9 @@ Add innostore, leveldb and other minor bits.
+ {storage_backend, riak_kv_eleveldb_backend},
+ %% {storage_backend, riak_kv_innostore_backend},
- %% pb_ip is the IP address that the Riak Protocol Buffers interface
- %% will bind to. If this is undefined, the interface will not run.
-@@ -188,9 +197,57 @@
+ %% raw_name is the first part of all URLS used by the Riak raw HTTP
+ %% interface. See riak_web.erl and raw_http_resource.erl for
+@@ -193,9 +199,57 @@
%% eLevelDB Config
{eleveldb, [
View
134 riakeds/patches/patch-rel__files__riak
@@ -1,92 +1,66 @@
$NetBSD$
---- rel/files/riak.orig 2012-03-07 22:08:10.000000000 +0000
+Substitute whoami for id across SunOS platforms.
+Silence sudo (unneeded screen waste).
+Make sure we have enough file descriptors (on SunOS).
+Warn against using riak to start/stop rather than SMF.
+--- rel/files/riak.orig 2012-08-06 22:02:45.000000000 +0000
+++ rel/files/riak
-@@ -23,8 +23,7 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x
+@@ -13,6 +13,12 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SH
+ fi
+ unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
+
++if [ `uname -s` = 'SunOS' ]; then
++ WHOAMI_PROG="/usr/xpg4/bin/id -un"
++else
++ WHOAMI_PROG="whoami"
++fi
++
+ RUNNER_SCRIPT_DIR={{runner_script_dir}}
+ RUNNER_SCRIPT=${0##*/}
+
+@@ -27,7 +33,7 @@ PLATFORM_DATA_DIR={{platform_data_dir}}
+ SSL_DIST_CONFIG=$PLATFORM_DATA_DIR/ssl_distribution.args_file
+ RIAK_VERSION="git"
+
+-WHOAMI=$(whoami)
++WHOAMI=$(${WHOAMI_PROG})
+
+ # Make sure this script is running as the appropriate user
+ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
+@@ -36,8 +42,18 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" !
echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
exit 1
fi
-- echo "Attempting to restart script through sudo -u $RUNNER_USER"
-- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-+ exec sudo -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+- echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
++ exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
++fi
++
++# Make sure we preload extendedFILE.so.1 so that 32bit eleveldb works on SunOS
++export LD_PRELOAD_32=${LD_PRELOAD_32}:/usr/lib/extendedFILE.so.1
++
++# Make sure we have access to enough file descriptors
++ULIMIT_S=$(prctl -n process.max-file-descriptor -t basic -P $$ | awk '/max-file-descriptor/ { print $3 }')
++ULIMIT_H=$(prctl -n process.max-file-descriptor -t priv -P $$ | awk '/max-file-descriptor/ { print $3 }')
++if [ ${ULIMIT_S} -lt ${ULIMIT_H} ]; then
++ echo "Trying to raise the file descriptor limit to maximum allowed."
++ prctl -n process.max-file-descriptor -t basic -v ${ULIMIT_H} $$ || true
fi
# Warn the user if ulimit -n is less than 1024
-@@ -92,12 +91,35 @@ sed -n '/Begin SSL distribution items/,/
+@@ -102,6 +118,14 @@ rm -f $SSL_DIST_CONFIG
+ sed -n '/Begin SSL distribution items/,/End SSL distribution items/p' \
+ $RUNNER_ETC_DIR/vm.args > $SSL_DIST_CONFIG
+
++case "$1" in
++ start|stop|restart|reboot)
++ echo "***"
++ echo "Warning: please use 'svcadm disable riak' instead"
++ echo "***"
++ ;;
++esac
++
# Check the first argument for instructions
case "$1" in
start)
-+ if [ "${SMF_METHOD}" != "start" ]; then
-+ echo "***"
-+ echo "Warning: please use 'svcadm enable riak' instead"
-+ echo "***"
-+ fi
-+
-+ # Make sure we have access to enough file descriptors
-+ ULIMIT_S=$(prctl -n process.max-file-descriptor -t basic -P $$ | awk '/max-file-descriptor/ { print $3 }')
-+ ULIMIT_H=$(prctl -n process.max-file-descriptor -t priv -P $$ | awk '/max-file-descriptor/ { print $3 }')
-+ if [ ${ULIMIT_S} -lt ${ULIMIT_H} ]; then
-+ echo "Trying to raise the file descriptor limit to maximum allowed."
-+ prctl -n process.max-file-descriptor -t basic -v ${ULIMIT_H} $$ || true
-+ fi
-+
-+ # Make sure we preload extendedFILE.so.1 so that 32bit eleveldb works on SunOS
-+ export LD_PRELOAD_32=${LD_PRELOAD_32}:/usr/lib/extendedFILE.so.1
-+
- # Make sure there is not already a node running
- RES=`ping_node`
- if [ "$RES" = "pong" ]; then
- echo "Node is already running!"
- exit 1
- fi
-+
-+ # Cookie file should exist now, set proper permissions
-+ if [ -f $PLATFORM_DATA_DIR/.erlang.cookie ]; then
-+ chmod 400 $PLATFORM_DATA_DIR/.erlang.cookie
-+ fi
-+
- # Sanity check the app.config file
- RES=`$NODETOOL_LITE chkconfig $RUNNER_ETC_DIR/app.config`
- if [ "$RES" != "ok" ]; then
-@@ -138,6 +160,12 @@ case "$1" in
- ;;
-
- stop)
-+ if [ "${SMF_METHOD}" != "stop" ]; then
-+ echo "***"
-+ echo "Warning: please use 'svcadm disable riak' instead"
-+ echo "***"
-+ fi
-+
- UNAME_S=`uname -s`
- case $UNAME_S in
- Darwin)
-@@ -210,11 +238,28 @@ case "$1" in
- ;;
-
- console)
-+ # Make sure we preload extendedFILE.so.1 so that 32bit eleveldb works on SunOS
-+ export LD_PRELOAD_32=${LD_PRELOAD_32}:/usr/lib/extendedFILE.so.1
-+
-+ # Make sure we have access to enough file descriptors
-+ ULIMIT_S=$(prctl -n process.max-file-descriptor -t basic -P $$ | awk '/max-file-descriptor/ { print $3 }')
-+ ULIMIT_H=$(prctl -n process.max-file-descriptor -t priv -P $$ | awk '/max-file-descriptor/ { print $3 }')
-+ if [ ${ULIMIT_S} -lt ${ULIMIT_H} ]; then
-+ echo "Trying to raise the file descriptor limit to maximum allowed."
-+ prctl -n process.max-file-descriptor -t basic -v ${ULIMIT_H} $$ || true
-+ fi
-+
- RES=`ping_node`
- if [ "$RES" = "pong" ]; then
- echo "Node is already running - use '$SCRIPT attach' instead"
- exit 1
- fi
-+
-+ # Cookie file should exist now, set proper permissions
-+ if [ -f $PLATFORM_DATA_DIR/.erlang.cookie ]; then
-+ chmod 400 $PLATFORM_DATA_DIR/.erlang.cookie
-+ fi
-+
- # Sanity check the app.config file
- RES=`$NODETOOL_LITE chkconfig $RUNNER_ETC_DIR/app.config`
- if [ "$RES" != "ok" ]; then
View
35 riakeds/patches/patch-rel__files__riak-admin
@@ -1,15 +1,38 @@
$NetBSD$
-Avoiding sudo -i makes the scripts much more usable.
---- rel/files/riak-admin.orig 2011-06-01 18:23:36.000000000 +0000
+Substitute whoami for id across SunOS platforms.
+Silence sudo (unneeded screen waste).
+--- rel/files/riak-admin.orig 2012-08-06 22:02:45.000000000 +0000
+++ rel/files/riak-admin
-@@ -15,8 +15,7 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x
+@@ -11,6 +11,12 @@ if [ `uname -s` = 'SunOS' -a "${POSIX_SH
+ fi
+ unset POSIX_SHELL # clear it so if we invoke other scripts, they run as ksh as well
+
++if [ `uname -s` = 'SunOS' ]; then
++ WHOAMI_PROG="/usr/xpg4/bin/id -un"
++else
++ WHOAMI_PROG="whoami"
++fi
++
+ RUNNER_SCRIPT_DIR={{runner_script_dir}}
+ RUNNER_SCRIPT=${0##*/}
+
+@@ -20,7 +26,7 @@ RUNNER_LIB_DIR={{platform_lib_dir}}
+ RUNNER_LOG_DIR={{runner_log_dir}}
+ RUNNER_USER={{runner_user}}
+
+-WHOAMI=$(whoami)
++WHOAMI=$(${WHOAMI_PROG})
+
+ # Make sure this script is running as the appropriate user
+ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
+@@ -29,8 +35,7 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" !
echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
exit 1
fi
-- echo "Attempting to restart script through sudo -u $RUNNER_USER"
-- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-+ exec sudo -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+- echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
++ exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Make sure CWD is set to runner base dir
View
29 riakeds/patches/patch-rel__files__riak-repl
@@ -1,15 +1,30 @@
$NetBSD$
-Avoiding sudo -i makes the scripts much more usable.
---- rel/files/riak-repl.orig 2011-11-17 22:34:53.000000000 +0000
+Substitute whoami for id across SunOS platforms.
+Silence sudo (unneeded screen waste).
+--- rel/files/riak-repl.orig 2012-08-06 21:57:12.000000000 +0000
+++ rel/files/riak-repl
-@@ -16,8 +16,7 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x
- echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
+@@ -19,7 +19,13 @@ RUNNER_ETC_DIR={{runner_etc_dir}}
+ RUNNER_LOG_DIR={{runner_log_dir}}
+ RUNNER_USER={{runner_user}}
+
+-WHOAMI=$(whoami)
++if [ `uname -s` = 'SunOS' ]; then
++ WHOAMI_PROG="/usr/xpg4/bin/id -un"
++else
++ WHOAMI_PROG="whoami"
++fi
++
++WHOAMI=$(${WHOAMI_PROG})
+
+ # Make sure this script is running as the appropriate user
+ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" != "x$RUNNER_USER" ]); then
+@@ -29,7 +35,7 @@ if ([ "$RUNNER_USER" ] && [ "x$WHOAMI" !
exit 1
fi
-- echo "Attempting to restart script through sudo -u $RUNNER_USER"
-- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-+ exec sudo -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+ echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
++ exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Make sure CWD is set to runner base dir
View
13 riakeds/patches/patch-rel__files__search-cmd
@@ -1,15 +1,14 @@
$NetBSD$
-Avoiding sudo -i makes the scripts much more usable.
---- rel/files/search-cmd.orig 2012-03-07 21:21:46.000000000 +0000
+Silence sudo (unneeded screen waste).
+--- rel/files/search-cmd.orig 2012-08-06 21:57:12.000000000 +0000
+++ rel/files/search-cmd
-@@ -16,8 +16,7 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x
- echo "sudo doesn't appear to be installed and your EUID isn't $RUNNER_USER" 1>&2
+@@ -25,7 +25,7 @@ if [ "$RUNNER_USER" -a "x$LOGNAME" != "x
exit 1
fi
-- echo "Attempting to restart script through sudo -u $RUNNER_USER"
-- exec sudo -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
-+ exec sudo -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
+ echo "Attempting to restart script through sudo -H -u $RUNNER_USER"
+- exec sudo -H -u $RUNNER_USER -i $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
++ exec sudo -H -u $RUNNER_USER $RUNNER_SCRIPT_DIR/$RUNNER_SCRIPT $@
fi
# Make sure CWD is set to runner base dir
View
21 riakeds/patches/patch-rel__vars.config
@@ -1,9 +1,8 @@
$NetBSD$
-Provide pkgsrc-compatible default locations.
---- rel/vars.config.orig 2012-03-07 21:21:46.000000000 +0000
+--- rel/vars.config.orig 2012-08-06 21:57:12.000000000 +0000
+++ rel/vars.config
-@@ -2,23 +2,29 @@
+@@ -2,17 +2,18 @@
%% ex: ft=erlang ts=4 sw=4 et
%% Platform-specific installation paths
@@ -26,18 +25,18 @@ Provide pkgsrc-compatible default locations.
{handoff_port, 8099}.
{pb_ip, "127.0.0.1"}.
{pb_port, 8087}.
-+{ring_creation_size, 256}.
- {ring_state_dir, "{{platform_data_dir}}/ring"}.
- {bitcask_data_root, "{{platform_data_dir}}/bitcask"}.
- {leveldb_data_root, "{{platform_data_dir}}/leveldb"}.
+@@ -22,6 +23,10 @@
+ {sasl_error_log, "{{platform_log_dir}}/sasl-error.log"}.
+ {sasl_log_dir, "{{platform_log_dir}}/sasl"}.
+ {mapred_queue_dir, "{{platform_data_dir}}/mr_queue"}.
+{inno_data_dir, "@RIAK_DATA@/innodb"}.
+{inno_log_dir, "@RIAK_DATA@/innodb"}.
+{inno_error_log_dir,"@RIAK_LOG@/innodb.log"}.
+{inno_buffer_size, 33554432 }.
- {sasl_error_log, "{{platform_log_dir}}/sasl-error.log"}.
- {sasl_log_dir, "{{platform_log_dir}}/sasl"}.
- {mapred_queue_dir, "{{platform_data_dir}}/mr_queue"}.
-@@ -46,12 +52,12 @@
+ {repl_data_root, "{{platform_data_dir}}/riak_repl/"}.
+ {snmp_agent_conf, "{{platform_etc_dir}}/snmp/agent/conf"}.
+ {snmp_db_dir, "{{platform_data_dir}}/snmp/agent/db"}.
+@@ -43,12 +48,12 @@
%%
%% bin/riak
%%

0 comments on commit 0673600

Please sign in to comment.
Something went wrong with that request. Please try again.