commit 54fe176b0c06142df163fa815e8d8e4923d8d393
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Mon Oct 28 16:58:02 2013 +0400
Rebuild with new Erlang and hopefully fix #986623
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
riak-0001-Rename-basho-patches-directory.patch | 2 +-
...Don-t-require-specific-Erlang-OTP-version.patch | 2 +-
riak-0003-Relax-version-deps.patch | 2 +-
...-Temporarily-disable-lager_syslog-backend.patch | 2 +-
riak-0005-Remove-additional-search-paths.patch | 2 +-
...0006-Don-t-use-versioned-path-for-escript.patch | 2 +-
...stall-nodetool-into-bindir-and-add-prefix.patch | 2 +-
...0008-Don-t-use-versioned-path-for-run_erl.patch | 26 ++++++++
riak-0009-Don-t-use-versioned-path-for-erl.patch | 62 ++++++++++++++++++++
...-0010-Don-t-use-versioned-path-for-to_erl.patch | 26 ++++++++
riak-0011-Don-t-hardcode-path-to-erlexec.patch | 26 ++++++++
...-0012-Remove-unused-environment-variables.patch | 48 +++++++++++++++
riak.spec | 16 +++++-
13 files changed, 210 insertions(+), 8 deletions(-)
---
diff --git a/riak-0001-Rename-basho-patches-directory.patch b/riak-0001-Rename-basho-patches-directory.patch
index bb7abd8..8042d51 100644
--- a/riak-0001-Rename-basho-patches-directory.patch
+++ b/riak-0001-Rename-basho-patches-directory.patch
@@ -1,7 +1,7 @@
From c048f5b74f3ec192a6133976bb37e1f6e0a6417d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun, 24 Mar 2013 19:14:56 +0400
-Subject: [PATCH 1/7] Rename basho-patches directory
+Subject: [PATCH 01/12] Rename basho-patches directory
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
index a5dd15c..322b271 100644
--- a/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
+++ b/riak-0002-Don-t-require-specific-Erlang-OTP-version.patch
@@ -1,7 +1,7 @@
From 6cbaf21ab0e542e4d0b6b4348b8f376b949d6d19 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sun, 24 Mar 2013 19:55:40 +0400
-Subject: [PATCH 2/7] Don't require specific Erlang/OTP version
+Subject: [PATCH 02/12] Don't require specific Erlang/OTP version
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0003-Relax-version-deps.patch b/riak-0003-Relax-version-deps.patch
index a02d4ff..e589ba2 100644
--- a/riak-0003-Relax-version-deps.patch
+++ b/riak-0003-Relax-version-deps.patch
@@ -1,7 +1,7 @@
From 827f1f9698ec9bc1fdb1691c0982e5084df7e25b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat, 6 Apr 2013 10:50:04 +0400
-Subject: [PATCH 3/7] Relax version deps
+Subject: [PATCH 03/12] Relax version deps
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0004-Temporarily-disable-lager_syslog-backend.patch b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
index fb7f904..c8b0d90 100644
--- a/riak-0004-Temporarily-disable-lager_syslog-backend.patch
+++ b/riak-0004-Temporarily-disable-lager_syslog-backend.patch
@@ -1,7 +1,7 @@
From d38a1441fb47c3f5156435de5a85e80d2fecf9ba Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat, 6 Apr 2013 10:52:17 +0400
-Subject: [PATCH 4/7] Temporarily disable lager_syslog backend
+Subject: [PATCH 04/12] Temporarily disable lager_syslog backend
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0005-Remove-additional-search-paths.patch b/riak-0005-Remove-additional-search-paths.patch
index adb981f..005b6be 100644
--- a/riak-0005-Remove-additional-search-paths.patch
+++ b/riak-0005-Remove-additional-search-paths.patch
@@ -1,7 +1,7 @@
From 431927babc9b457d5c2b155f4bc6cae4c9ee9e5b Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Sat, 6 Apr 2013 20:43:38 +0400
-Subject: [PATCH 5/7] Remove additional search paths
+Subject: [PATCH 05/12] Remove additional search paths
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0006-Don-t-use-versioned-path-for-escript.patch b/riak-0006-Don-t-use-versioned-path-for-escript.patch
index 3362970..ece9ea5 100644
--- a/riak-0006-Don-t-use-versioned-path-for-escript.patch
+++ b/riak-0006-Don-t-use-versioned-path-for-escript.patch
@@ -1,7 +1,7 @@
From 016cb820577a012c63209133b9790fa642378071 Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu, 1 Aug 2013 17:38:57 +0400
-Subject: [PATCH 6/7] Don't use versioned path for escript
+Subject: [PATCH 06/12] Don't use versioned path for escript
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch b/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch
index ffb8fa6..48fb469 100644
--- a/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch
+++ b/riak-0007-Install-nodetool-into-bindir-and-add-prefix.patch
@@ -1,7 +1,7 @@
From 68f4730e3b760dca9de8a8864ade8cf6d990417d Mon Sep 17 00:00:00 2001
From: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Thu, 1 Aug 2013 17:45:43 +0400
-Subject: [PATCH 7/7] Install nodetool into bindir and add prefix
+Subject: [PATCH 07/12] Install nodetool into bindir and add prefix
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
---
diff --git a/riak-0008-Don-t-use-versioned-path-for-run_erl.patch b/riak-0008-Don-t-use-versioned-path-for-run_erl.patch
new file mode 100644
index 0000000..a1fd152
--- /dev/null
+++ b/riak-0008-Don-t-use-versioned-path-for-run_erl.patch
@@ -0,0 +1,26 @@
+From 1c43961861bbec121c96d769549648a61e0bd7bf Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 10:35:02 +0400
+Subject: [PATCH 08/12] Don't use versioned path for run_erl
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ rel/files/riak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index f8caf97..a938609 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -148,7 +148,7 @@ case "$1" in
+ exit 1
+ fi
+
+- $ERTS_PATH/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR \
++ /usr/bin/run_erl -daemon $PIPE_DIR $RUNNER_LOG_DIR \
+ "exec $RUNNER_SCRIPT_DIR/$SCRIPT console" 2>&1
+
+ # Wait for the node to come up. We can't just ping it because
+--
+1.8.3.1
+
diff --git a/riak-0009-Don-t-use-versioned-path-for-erl.patch b/riak-0009-Don-t-use-versioned-path-for-erl.patch
new file mode 100644
index 0000000..b27fe01
--- /dev/null
+++ b/riak-0009-Don-t-use-versioned-path-for-erl.patch
@@ -0,0 +1,62 @@
+From a9d29aaa72605261cd1ce080fe82b7e6149a3d8c Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 13:51:13 +0400
+Subject: [PATCH 09/12] Don't use versioned path for erl
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ rel/files/riak-admin | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/rel/files/riak-admin b/rel/files/riak-admin
+index 2d609e0..4e49ad5 100755
+--- a/rel/files/riak-admin
++++ b/rel/files/riak-admin
+@@ -478,7 +478,7 @@ case "$1" in
+ fi
+ OLDNODE=$1
+ NEWNODE=$2
+- $ERTS_PATH/erl -noshell \
++ /usr/bin/erl -noshell \
+ -pa $RUNNER_LIB_DIR/basho-patches \
+ -config $RUNNER_ETC_DIR/app.config \
+ -eval "riak_kv_console:$ACTION(['$OLDNODE', '$NEWNODE'])" \
+@@ -498,7 +498,7 @@ case "$1" in
+ COOKIE=$2
+ FILENAME=$3
+
+- $ERTS_PATH/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
++ /usr/bin/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
+ -pa $RUNNER_LIB_DIR/basho-patches \
+ -eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\")" -s init stop
+ ;;
+@@ -517,7 +517,7 @@ case "$1" in
+ FILENAME=$3
+ TYPE=$4
+
+- $ERTS_PATH/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
++ /usr/bin/erl -noshell $NAME_PARAM riak_kv_backup$NAME_HOST -setcookie $COOKIE \
+ -pa $RUNNER_LIB_DIR/basho-patches \
+ -eval "riak_kv_backup:$ACTION('$NODE', \"$FILENAME\", \"$TYPE\")" -s init stop
+ ;;
+@@ -535,7 +535,7 @@ case "$1" in
+ # Parse out the node name to pass to the client
+ NODE_NAME=${NAME_ARG#* }
+
+- $ERTS_PATH/erl -noshell $NAME_PARAM riak_test$NAME_HOST $COOKIE_ARG \
++ /usr/bin/erl -noshell $NAME_PARAM riak_test$NAME_HOST $COOKIE_ARG \
+ -pa $RUNNER_LIB_DIR/basho-patches \
+ -eval "case catch(riak:client_test(\"$NODE_NAME\")) of \
+ ok -> init:stop(); \
+@@ -582,7 +582,7 @@ case "$1" in
+
+ MYPID=$$
+ NODE_NAME=${NAME_ARG#* }
+- $ERTS_PATH/erl -noshell -noinput \
++ /usr/bin/erl -noshell -noinput \
+ -pa $RUNNER_LIB_DIR/basho-patches \
+ -hidden $NAME_PARAM riak_etop$MYPID$NAME_HOST $COOKIE_ARG \
+ -s etop -s erlang halt -output text \
+--
+1.8.3.1
+
diff --git a/riak-0010-Don-t-use-versioned-path-for-to_erl.patch b/riak-0010-Don-t-use-versioned-path-for-to_erl.patch
new file mode 100644
index 0000000..79e16c8
--- /dev/null
+++ b/riak-0010-Don-t-use-versioned-path-for-to_erl.patch
@@ -0,0 +1,26 @@
+From f9ae0eea2dc3737f6af22b96f08c51d33c58cb24 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 13:51:45 +0400
+Subject: [PATCH 10/12] Don't use versioned path for to_erl
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ rel/files/riak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index a938609..02f98bf 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -248,7 +248,7 @@ case "$1" in
+ fi
+
+ shift
+- exec $ERTS_PATH/to_erl $PIPE_DIR
++ exec /usr/bin/to_erl $PIPE_DIR
+ ;;
+
+ console)
+--
+1.8.3.1
+
diff --git a/riak-0011-Don-t-hardcode-path-to-erlexec.patch b/riak-0011-Don-t-hardcode-path-to-erlexec.patch
new file mode 100644
index 0000000..903f8d6
--- /dev/null
+++ b/riak-0011-Don-t-hardcode-path-to-erlexec.patch
@@ -0,0 +1,26 @@
+From 5ecbd461a694af7a948e77f90af00183e5502881 Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 13:52:57 +0400
+Subject: [PATCH 11/12] Don't hardcode path to erlexec
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ rel/files/riak | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index 02f98bf..d5d879b 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -266,7 +266,7 @@ case "$1" in
+ fi
+ # Setup beam-required vars
+ ROOTDIR=$RUNNER_BASE_DIR
+- BINDIR=$ROOTDIR/erts-$ERTS_VSN/bin
++ BINDIR=`erl -noshell -noinput -eval "io:format(\"~s/erts-~s/bin\", [code:root_dir(), erlang:system_info(version)])." -s erlang halt`
+ EMU=beam
+ PROGNAME=`echo $0 | sed 's/.*\///'`
+ CMD="$BINDIR/erlexec -boot $RUNNER_BASE_DIR/releases/$APP_VSN/$SCRIPT \
+--
+1.8.3.1
+
diff --git a/riak-0012-Remove-unused-environment-variables.patch b/riak-0012-Remove-unused-environment-variables.patch
new file mode 100644
index 0000000..a36f127
--- /dev/null
+++ b/riak-0012-Remove-unused-environment-variables.patch
@@ -0,0 +1,48 @@
+From 969ed1076ec3d0fa8d6fef6d8d73f7c3650fde7a Mon Sep 17 00:00:00 2001
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 13:54:16 +0400
+Subject: [PATCH 12/12] Remove unused environment variables
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ rel/files/riak | 4 ----
+ rel/files/riak-admin | 4 ----
+ 2 files changed, 8 deletions(-)
+
+diff --git a/rel/files/riak b/rel/files/riak
+index d5d879b..bfd83dc 100755
+--- a/rel/files/riak
++++ b/rel/files/riak
+@@ -83,12 +83,8 @@ SCRIPT=`basename $0`
+
+ # Parse out release and erts info
+ START_ERL=`cat $RUNNER_BASE_DIR/releases/start_erl.data`
+-ERTS_VSN=${START_ERL% *}
+ APP_VSN=${START_ERL#* }
+
+-# Add ERTS bin dir to our path
+-ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+-
+ # Setup command to control the node
+ NODETOOL="/usr/bin/escript /usr/bin/riak-nodetool $NAME_ARG $COOKIE_ARG"
+ NODETOOL_LITE="/usr/bin/escript /usr/bin/riak-nodetool"
+diff --git a/rel/files/riak-admin b/rel/files/riak-admin
+index 4e49ad5..15f0e80 100755
+--- a/rel/files/riak-admin
++++ b/rel/files/riak-admin
+@@ -70,12 +70,8 @@ SCRIPT=`basename $0`
+
+ # Parse out release and erts info
+ START_ERL=`cat $RUNNER_BASE_DIR/releases/start_erl.data`
+-ERTS_VSN=${START_ERL% *}
+ APP_VSN=${START_ERL#* }
+
+-# Add ERTS bin dir to our path
+-ERTS_PATH=$RUNNER_BASE_DIR/erts-$ERTS_VSN/bin
+-
+ # Setup command to control the node
+ NODETOOL="/usr/bin/escript /usr/bin/riak-nodetool $NAME_ARG $COOKIE_ARG"
+
+--
+1.8.3.1
+
diff --git a/riak.spec b/riak.spec
index 5c7c4fd..9b8f118 100644
--- a/riak.spec
+++ b/riak.spec
@@ -16,7 +16,7 @@
Name: riak
Version: 1.3.2
-Release: 1%{?dist}
+Release: 2%{?dist}
Summary: Dynamo-inspired key/value store
Group: Applications/Databases
License: ASL 2.0
@@ -34,6 +34,11 @@ Patch4: %{name}-0004-Temporarily-disable-lager_syslog-backend.patch
Patch5: %{name}-0005-Remove-additional-search-paths.patch
Patch6: %{name}-0006-Don-t-use-versioned-path-for-escript.patch
Patch7: %{name}-0007-Install-nodetool-into-bindir-and-add-prefix.patch
+Patch8: %{name}-0008-Don-t-use-versioned-path-for-run_erl.patch
+Patch9: %{name}-0009-Don-t-use-versioned-path-for-erl.patch
+Patch10: %{name}-0010-Don-t-use-versioned-path-for-to_erl.patch
+Patch11: %{name}-0011-Don-t-hardcode-path-to-erlexec.patch
+Patch12: %{name}-0012-Remove-unused-environment-variables.patch
BuildRequires: erlang-rebar
BuildRequires: erlang-cluster_info
BuildRequires: erlang-ebloom
@@ -111,6 +116,11 @@ decide exactly how fault-tolerant they want and need their applications to be.
%patch5 -p1 -b .remove_search_paths
%patch6 -p1 -b .fix_escript
%patch7 -p1 -b .fix_nodetool
+%patch8 -p1 -b .run_erl
+%patch9 -p1 -b .erl
+%patch10 -p1 -b .to_erl
+%patch11 -p1 -b .erlexec
+%patch12 -p1 -b .cleanup
gzip -d doc/man/man1/*.1.gz
sed -i -e "s,\\\n,,g" doc/man/man1/riak-admin.1
@@ -301,6 +311,10 @@ fi
%changelog
+* Mon Oct 28 2013 Peter Lemenkov <lemenkov(a)gmail.com> - 1.3.2-2
+- Rebuild with new Erlang
+- Hopefully fix #986623
+
* Tue Aug 06 2013 Peter Lemenkov <lemenkov(a)gmail.com> - 1.3.2-1
- Ver. 1.3.2
- Raised a number of opened files/sockets to 16384
