Change to script name in riak-admin to reflect changes in formatting

Makefile

@@ -26,6 +26,10 @@ $(if $(ERLANG_BIN),,$(warning "Warning: No Erlang found in your path, this will
 all: compile
 
 compile:
+	$(REBAR) get-deps
+	if ls patches/*.patch 2>/dev/null; then \
+	  ls patches/*.patch | xargs cat | GIT_WORK_TREE=. git apply -v --unsafe-paths; \
+	fi
 	$(REBAR) compile
 
 clean: testclean

bom.xml

@@ -0,0 +1 @@
+<?xml version="1.0"?><bom serialNumber="2cd0cf40-029e-4173-9b32-9a6ad9832229" xmlns="http://cyclonedx.org/schema/bom/1.1"><components><component type="library"><name>getopt</name><version>1.0.2</version><description>Command-line options parser for Erlang</description><licenses><license><name>BSD</name></license></licenses><purl>pkg:github/martinsumner/getopt@5d2b27dab5d31669764dc759e44c2d96cac01a4e</purl></component><component type="library"><name>bear</name><version>1.0.0</version><description>A set of statistics functions for erlang</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:hex/[email protected]</purl><hashes><hash alg="SHA-256">157b67901adf84ff0da6eae035ca1292a0ac18aa55148154d8c582b2c68959db</hash></hashes></component><component type="library"><name>setup</name><version>2.1.0</version><description>Generic setup application for Erlang-based systems</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:hex/[email protected]</purl><hashes><hash alg="SHA-256">efd072578f0cf85bea96caaffc7adb0992398272522660a136e10567377071c5</hash></hashes></component><component type="library"><name>parse_trans</name><version>3.4.1</version><description>Parse transform library</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:hex/[email protected]</purl><hashes><hash alg="SHA-256">620a406ce75dada827b82e453c19cf06776be266f5a67cff34e1ef2cbb60e49a</hash></hashes></component><component type="library"><name>lz4</name><version>0.2.2</version><description>LZ4 Compression Library</description><purl>pkg:github/martinsumner/erlang-lz4@d407af5de71303b8e381df718d2e5d05eb775c59</purl></component><component type="library"><name>hut</name><version>1.3.0</version><description>helper library for making Erlang libraries logging framework agnostic</description><licenses><license><id>MIT</id></license></licenses><purl>pkg:hex/[email protected]</purl><hashes><hash alg="SHA-256">7e15d28555d8a1f2b5a3a931ec120af0753e4853a4c66053db354f35bf9ab563</hash></hashes></component><component type="library"><name>folsom</name><version>1.0.0</version><description>Erlang based metrics system</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:hex/[email protected]</purl><hashes><hash alg="SHA-256">dd6ab97278e94f9e4cfc43e188224a7b8c7eaec0dd2e935007005177f3eebb0e</hash></hashes></component><component type="library"><name>cuttlefish</name><version>3.0.1</version><description>cuttlefish configuration abstraction</description><licenses><license><name>Apache</name></license></licenses><purl>pkg:github/basho/cuttlefish@cb3df6a917ee93374de2b881e138e3dc6e9bf5cf</purl></component><component type="library"><name>webmachine</name><version>1.11.1+build.668.ref33f83f5</version><description>webmachine</description><licenses><license><name>Apache</name></license></licenses><purl>pkg:github/webmachine/webmachine@33f83f5db0d3a578ef607d4d5aecabeb9ba2cdf0</purl></component><component type="library"><name>riakc</name><version>3.0.8+p1+build.915.refa48bc72</version><description>Riak Client</description><purl>pkg:github/basho/riak-erlang-client@a48bc7252918b87ee1b52355c319fc51dfbc0c4b</purl></component><component type="library"><name>riak_sysmon</name><version>2.2.0+build.119.refc9640be</version><description>Rate-limiting system_monitor event handler</description><purl>pkg:github/basho/riak_sysmon@c9640bedc7bc011a10e177922b431b63be661512</purl></component><component type="library"><name>riak_pb</name><version>3.0.8+build.595.ref7a5e535</version><description>Riak Protocol Buffers Messages</description><purl>pkg:github/basho/riak_pb@7a5e535217c13a32f3041888b0d46e9b4476065c</purl></component><component type="library"><name>riak_ensemble</name><version>riak_kv-3.0.0+build.237.refd57c457</version><description>Multi-Paxos framework in Erlang</description><purl>pkg:github/basho/riak_ensemble@d57c457ee738a60153d9307a12f4bc86d10c85bd</purl></component><component type="library"><name>poolboy</name><version>riak_kv-3.0.0+build.137.refd775915</version><description>A hunky Erlang worker pool factory</description><purl>pkg:github/basho/poolboy@d775915c446c9dd251af5bf70e6cfc4beb83d557</purl></component><component type="library"><name>pbkdf2</name><version>2.1.0+build.2688.ref7e9bd5fc</version><description>Erlang PBKDF2 Key Derivation Function</description><purl>pkg:github/basho/erlang-pbkdf2@7e9bd5fcd3cc3062159e4c9214bb628aa6feb5ca</purl></component><component type="library"><name>mochiweb</name><version>3.0.0</version><description>MochiMedia Web Server</description><licenses><license><id>MIT</id></license></licenses><purl>pkg:github/basho/mochiweb@adb632e96d0256fdb9e4c22c3523dbd7d98c4ec1</purl></component><component type="library"><name>leveled</name><version>1.0.4+build.1602.refe06d2a5</version><description>Key Value store based on LSM-Tree and designed for larger values</description><licenses><license><name>Apache</name></license></licenses><purl>pkg:github/martinsumner/leveled@e06d2a538fac9669145f1d226ff049d1ab1f9294</purl></component><component type="library"><name>ibrowse</name><version>4.4.2</version><description>Erlang HTTP client application</description><licenses><license><name>GPLv2</name></license><license><name>BSD</name></license></licenses><purl>pkg:github/basho/ibrowse@076be16d0dcff768aa885d98a23bb3e980e79060</purl></component><component type="library"><name>exometer_core</name><version>1.6.1</version><description>Code instrumentation and metrics collection package.</description><licenses><license><id>MPL-2.0</id></license></licenses><purl>pkg:github/feuerlabs/exometer_core@66c287e24ceff337f622e3f58e0b4a3ab9ced0f0</purl></component><component type="library"><name>eleveldb</name><version>riak_kv-3.0.0+build.697.ref6c0d5bf</version><description>Erlang wrapper to Basho-modified leveldb store</description><purl>pkg:github/basho/eleveldb@6c0d5bf16b84d06609e272dd6803d4537c24cf42</purl></component><component type="library"><name>clique</name><version>0.3.11+build.199.ref3929fa5</version><description>A CLI library for Erlang</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:github/basho/clique@3929fa5aeed341b407e16479626ff6b9dddf2ea3</purl></component><component type="library"><name>basho_stats</name><version>1.1.0+build.53.ref3b33ac1</version><description>Basic Erlang statistics library</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:github/basho/basho_stats@3b33ac15e11cc88e2fc676a1e2d31b80bd02bea6</purl></component><component type="library"><name>sidejob</name><version>2.1.0+build.61.ref10abce4</version><description>Parallel worker and capacity limiting library</description><purl>pkg:github/basho/sidejob@10abce4fc76054c8aad230943b5c1a31b67efc6f</purl></component><component type="library"><name>sext</name><version>1.8.0</version><description>Sortable serialization library</description><licenses><license><id>Apache-2.0</id></license></licenses><purl>pkg:github/uwiger/sext@c1d93beae5a2d9448a520c31adcb0053c76ef4df</purl></component><component type="library"><name>riak_pipe</name><version>riak_kv-3.0.9+build.394.ref63b8660</version><description>Riak Pipeline</description><purl>pkg:github/basho/riak_pipe@63b866011859bc3f774c9a0d477b5faa34de41d9</purl></component><component type="library"><name>riak_dt</name><version>riak_kv-3.0.0+build.342.ref1085511</version><description>Riak datatype library</description><purl>pkg:github/basho/riak_dt@10855112980da92632c4604430dc707b79af3e42</purl></component><component type="library"><name>riak_core</name><version>riak_kv-3.0.9+build.2075.refdfcc27a</version><description>Riak Core</description><purl>pkg:github/basho/riak_core@dfcc27ad86e3f28a01e6653d1e7fd2e02cd35591</purl></component><component type="library"><name>riak_api</name><version>riak_kv-3.0.9+build.370.refd69bcdb</version><description>Riak Client APIs</description><purl>pkg:github/basho/riak_api@d69bcdbc37801a1e9d3a6a1c59ec08e19b9b1485</purl></component><component type="library"><name>rhc</name><version>3.0.8+build.258.ref8897851</version><description>Riak HTTP Client</description><purl>pkg:github/basho/riak-erlang-http-client@889785140621a02e2cd206b701f59341ad48eb46</purl></component><component type="library"><name>redbug</name><version>2.0.7</version><description>Erlang Tracing Debugger</description><licenses><license><id>MIT</id></license></licenses><purl>pkg:github/massemanet/redbug@09ee7142f0fcab99151efb1fc405a067f1b15b56</purl></component><component type="library"><name>recon</name><version>2.5.2</version><description>Diagnostic tools for production use</description><licenses><license><name>BSD</name></license></licenses><purl>pkg:github/ferd/recon@34194da6d9f8ed25f274e0ebb098dc9e95bcf547</purl></component><component type="library"><name>ranch</name><version>1.8.0</version><description>Socket acceptor pool for TCP protocols.</description><purl>pkg:github/ninenines/ranch@a692f44567034dacf5efcaa24a24183788594eb7</purl></component><component type="library"><name>kv_index_tictactree</name><version>0.9.19+build.282.ref493f94b</version><description>AAE helper service for KV vnode</description><licenses><license><name>Apache</name></license></licenses><purl>pkg:github/martinsumner/kv_index_tictactree@493f94ba24028d823772665c244d33728eca2a6e</purl></component><component type="library"><name>hyper</name><version>1.0</version><description>HyperLogLog</description><purl>pkg:github/basho/hyper@d0bf3d67fd17b8ed2610b266aebd54b1027ea916</purl></component><component type="library"><name>ebloom</name><version>2.0.0</version><description>A NIF wrapper around a basic bloom filter</description><purl>pkg:github/basho/ebloom@3c25f9ef61a73d5f1d2c2601da464dd03975721d</purl></component><component type="library"><name>canola</name><version>2.1.0+build.15.ref2507f69</version><description>PAM port for Erlang</description><purl>pkg:github/basho/canola@2507f698b4dc1156b07dbf568fc651730942fe73</purl></component><component type="library"><name>bitcask</name><version>2.0.3</version><description>Yet another key/value storage engine</description><purl>pkg:github/basho/bitcask@d84c8d913713da8f02403431217405f84ee1ba22</purl></component><component type="library"><name>riak_repl</name><version>riak_kv-3.0.9+build.1953.reff27f74e</version><description>Enterprise replication for Riak</description><purl>pkg:github/basho/riak_repl@f27f74ed88465ba440c7118b2e8f8d10e460a4f9</purl></component><component type="library"><name>riak_kv</name><version>riak_kv-3.0.9+build.3962.ref1d4ee470</version><description>Riak Key/Value Store</description><purl>pkg:github/basho/riak_kv@1d4ee4700f9070a39260010e369f46754df7c850</purl></component><component type="library"><name>riak_auth_mods</name><version>riak_kv-3.0.0+build.23.refc9b88ea</version><description>Third party authentication modules for Riak</description><purl>pkg:github/basho/riak_auth_mods@c9b88ea685e3fe7f327aaeeda207ea3fed7883cd</purl></component><component type="library"><name>cluster_info</name><version>2.1.0+build.110.ref55b12eb</version><description>Cluster info/postmortem app</description><purl>pkg:github/basho/cluster_info@55b12ebb60883766fd0077dac43b266fb5eb6c69</purl></component></components></bom>

rebar.config

@@ -16,7 +16,8 @@
       ]}.
 
 {project_plugins, [
-    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.3.0"}}}
+    {rebar3_cuttlefish, {git, "https://github.com/basho/rebar3_cuttlefish", {tag, "0.3.0"}}},
+    rebar3_sbom
 ]}.
 
 {cuttlefish, [

rel/files/riak-admin

@@ -3,7 +3,7 @@
 # ex: ts=4 sw=4 et
 
 # Identify the script name
-SCRIPT="riak-admin"
+SCRIPT="riak admin"
 
 PLATFORM_BASE_DIR={{platform_base_dir}}
 PLATFORM_BASE_DIR=${PLATFORM_BASE_DIR:-$(cd $(dirname "$0")/.. && pwd -P)}
@@ -789,7 +789,7 @@ case "$1" in
             echo "Lists the services available on the node. See also: wait-for-service"
             exit 1
         fi
-        rpc riak_core_node_watcher services
+        rpc_raw riak_core_node_watcher services
         ;;
 
     wait[_-]for[_-]service)

rel/pkg/Makefile

@@ -5,7 +5,6 @@ export
 
 OS            = $(shell uname -s)
 ERLANG_BIN   ?= $(shell dirname $(shell which erl))
-DEPS_DIR     ?= deps
 
 ##
 ## Support RPM and Debian based linux systems

rel/pkg/alpine/README.md

@@ -6,9 +6,6 @@ Packaging instructions for Alpine cannot be placed in
 rel/pkg/alpine/Makefile without bending too many rules and
 conventions.
 
-Instead, the aim is to have the APKBUILDs for
-[riak](https://gitlab.alpinelinux.org/hmmr/aports/-/commit/9a4f91c2f5336a492520c0ae774b95f088a09f96)
-(as well as for
-[erlang-22](https://gitlab.alpinelinux.org/hmmr/aports/-/commit/0f1eaabe0112f82e8e5acec6dc0fb826b2114858))
-merged into the official "community" repo. This file will be updated
-once it is done.
+Instead, TI Tokyo [builds](https://github.com/TI-Tokyo/alpine-builds)
+apks for x86_64 and aarch64 and maintains an external Alpine
+repository at https://files.tiot.jp/alpine/.

rel/pkg/deb/debian/control

@@ -8,6 +8,6 @@ Homepage: riak.com
 
 Package: riak
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, logrotate, sudo
+Depends: ${misc:Depends}, ${shlibs:Depends}, adduser, sudo
 Homepage: riak.com
 Description: Riak KV Database