[Bug 1023017] New: Restore ECC support in Erlang's crypto library
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023017
Bug ID: 1023017
Summary: Restore ECC support in Erlang's crypto library
Product: Fedora
Version: rawhide
Component: erlang
Severity: high
Assignee: lemenkov(a)gmail.com
Reporter: lemenkov(a)gmail.com
QA Contact: extras-qa(a)fedoraproject.org
CC: erlang(a)lists.fedoraproject.org, lemenkov(a)gmail.com,
rhbugs(a)n-dimensional.de
Right now ECC is disabled explicitly since it looks like Erlang's crypto
library assumes that it's either available fully or not. We've just enabled few
ECC curves so this confuses erlang-crypto and leads to a startup issue like
this:
=ERROR REPORT==== 24-Oct-2013::16:30:48 ===
Unable to load crypto library. Failed with error:
"load_failed, Failed to load NIF library:
'/usr/lib64/erlang/lib/crypto-3.1/priv/lib/crypto.so: undefined symbol:
EC_GROUP_new_curve_GF2m'"
OpenSSL might not be installed on this system.
We should patch crypto module to provide available ECC bits instead of
disabling it completely.
--
You are receiving this mail because:
You are on the CC list for the bug.
Unsubscribe from this bug https://bugzilla.redhat.com/token.cgi?t=COwcnn7Cu3&a=cc_unsubscribe
9 years, 8 months
[Bug 1023960] New: erlang-R16B-02.2.fc20 fails to build on secondary arches
by Red Hat Bugzilla
https://bugzilla.redhat.com/show_bug.cgi?id=1023960
Bug ID: 1023960
Summary: erlang-R16B-02.2.fc20 fails to build on secondary
arches
Product: Fedora
Version: 20
Component: erlang
Assignee: lemenkov(a)gmail.com
Reporter: dan(a)danny.cz
QA Contact: extras-qa(a)fedoraproject.org
CC: erlang(a)lists.fedoraproject.org, lemenkov(a)gmail.com,
rhbugs(a)n-dimensional.de
Blocks: 467765 (ZedoraTracker)
erlang-R16B-02 fails to build on secondary arches, seen on ppc and s390, but I
guess aarch64 would also fail.
from s390 build.log
(http://s390.koji.fedoraproject.org/koji/taskinfo?taskID=1243484):
...
gcc -Werror=return-type -O3 -fomit-frame-pointer -g -pipe -Wall
-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector
--param=ssp-buffer-size=4 -grecord-gcc-switches -m31 -march=z9-109 -mtune=z10
-fno-strict-aliasing
-I/builddir/build/BUILD/otp_src_R16B02/erts/s390-ibm-linux-gnu
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -D_GNU_SOURCE
-DERTS_SMP -DHAVE_CONFIG_H -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wdeclaration-after-statement -DUSE_THREADS -D_THREAD_SAFE -D_REENTRANT
-DPOSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS -Is390-ibm-linux-gnu/opt/smp
-Ibeam -Isys/unix -Isys/common -Is390-ibm-linux-gnu -Ipcre -Ihipe -I../include
-I../include/s390-ibm-linux-gnu -I../include/internal
-I../include/internal/s390-ibm-linux-gnu -c beam/erl_bif_info.c -o
obj/s390-ibm-linux-gnu/opt/smp/erl_bif_info.o
In file included from beam/erl_bif_info.c:30:0:
beam/erl_bif_info.c: In function 'system_info_1':
beam/erl_bif_info.c:2073:10: error: 'hipe_arch_name' undeclared (first use in
this function)
BIF_RET(hipe_arch_name);
^
beam/bif.h:118:28: note: in definition of macro 'BIF_RET'
#define BIF_RET(x) return (x)
^
beam/erl_bif_info.c:2073:10: note: each undeclared identifier is reported only
once for each function it appears in
BIF_RET(hipe_arch_name);
^
beam/bif.h:118:28: note: in definition of macro 'BIF_RET'
#define BIF_RET(x) return (x)
^
make[3]: Leaving directory `/builddir/build/BUILD/otp_src_R16B02/erts/emulator'
make[3]: *** [obj/s390-ibm-linux-gnu/opt/smp/erl_bif_info.o] Error 1
from ppc build.log
(http://ppc.koji.fedoraproject.org/koji/taskinfo?taskID=1483569):
...
gcc -Werror=return-type -O3 -fomit-frame-pointer -g -pipe -Wall
-Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong
--param=ssp-buffer-size=4 -grecord-gcc-switches -m32 -fno-strict-aliasing
-I/builddir/build/BUILD/otp_src_R16B02/erts/powerpc-redhat-linux-gnu
-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -fno-tree-copyrename -D_GNU_SOURCE
-DERTS_SMP -DHAVE_CONFIG_H -Wall -Wstrict-prototypes -Wmissing-prototypes
-Wdeclaration-after-statement -DUSE_THREADS -D_THREAD_SAFE -D_REENTRANT
-DPOSIX_THREADS -D_POSIX_THREAD_SAFE_FUNCTIONS
-Ipowerpc-redhat-linux-gnu/opt/smp -Ibeam -Isys/unix -Isys/common
-Ipowerpc-redhat-linux-gnu -Ipcre -Ihipe -I../include
-I../include/powerpc-redhat-linux-gnu -I../include/internal
-I../include/internal/powerpc-redhat-linux-gnu -c beam/erl_bif_info.c -o
obj/powerpc-redhat-linux-gnu/opt/smp/erl_bif_info.o
In file included from beam/erl_bif_info.c:30:0:
beam/erl_bif_info.c: In function 'system_info_1':
hipe/hipe_ppc.h:63:24: error: 'am_powerpc' undeclared (first use in this
function)
#define hipe_arch_name am_powerpc
^
beam/bif.h:118:28: note: in definition of macro 'BIF_RET'
#define BIF_RET(x) return (x)
^
beam/erl_bif_info.c:2073:10: note: in expansion of macro 'hipe_arch_name'
BIF_RET(hipe_arch_name);
^
hipe/hipe_ppc.h:63:24: note: each undeclared identifier is reported only once
for each function it appears in
#define hipe_arch_name am_powerpc
^
beam/bif.h:118:28: note: in definition of macro 'BIF_RET'
#define BIF_RET(x) return (x)
^
beam/erl_bif_info.c:2073:10: note: in expansion of macro 'hipe_arch_name'
BIF_RET(hipe_arch_name);
^
make[3]: *** [obj/powerpc-redhat-linux-gnu/opt/smp/erl_bif_info.o] Error 1
make[3]: Leaving directory `/builddir/build/BUILD/otp_src_R16B02/erts/emulator'
Version-Release number of selected component (if applicable):
erlang-R16B-02.2.fc20
proposed solution:
diff --git a/erlang.spec b/erlang.spec
index 1d4cbfd..50bbe68 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -966,9 +966,15 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old
%build
%ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure
--enable-shared-zlib --enable-sctp --enable-hipe
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" \
%else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib
--enable-sctp --enable-hipe
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
+%endif
+%configure --enable-shared-zlib --enable-sctp \
+%ifnarch s390 s390x ppc
+ --enable-hipe
+%else
+ %{nil}
%endif
or maybe using %ifarch with a positive list like %{ix86} x86_64 %{arm} would be
even better
Referenced Bugs:
https://bugzilla.redhat.com/show_bug.cgi?id=467765
[Bug 467765] Fedora for System z (s390): Bug Tracker
--
You are receiving this mail because:
You are on the CC list for the bug.
10 years, 4 months
[erlang] Really disable HiPE on s390(x)
by Peter Lemenkov
commit f56df7bde54c3f51f95c67a1cf5f49c423e0af5e
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Tue Oct 29 17:00:20 2013 +0400
Really disable HiPE on s390(x)
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
erlang.spec | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 6c3b085..602748c 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -22,15 +22,13 @@
%ifarch %{arm} %{ix86} x86_64 ppc %{power64}
%global __with_hipe 1
-%else
-%global __with_hipe 0
%endif
%global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm}
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel_for_rpm}.6%{?dist}
+Release: %{upstream_rel_for_rpm}.7%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -2284,6 +2282,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 29 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.7
+- Really disable HiPE on s390(x)
+
* Tue Oct 29 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.6
- Actually re-enable HiPE
10 years, 6 months
[erlang] Actually re-enable HiPE
by Peter Lemenkov
commit d2f651795b8284381b0ae921fb940ace69dc74b4
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Tue Oct 29 13:21:34 2013 +0400
Actually re-enable HiPE
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
erlang.spec | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 4ae1249..6c3b085 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -30,7 +30,7 @@
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel_for_rpm}.5%{?dist}
+Release: %{upstream_rel_for_rpm}.6%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -976,9 +976,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old
%build
%ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe}
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe}
%else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe}
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{?__with_hipe:--enable-hipe}
%endif
# Remove pre-built BEAM files
@@ -2284,6 +2284,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Oct 29 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.6
+- Actually re-enable HiPE
+
* Mon Oct 28 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.5
- Re-enable HiPE on ppc64, ppc64v7
10 years, 6 months
[erlang] Re-enable HiPE on ppc64, ppc64v7
by Peter Lemenkov
commit 13312e6dfe59910880417a3a8551b6a0ce4f7c4c
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Mon Oct 28 22:50:38 2013 +0400
Re-enable HiPE on ppc64, ppc64v7
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
erlang.spec | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index e673291..4ae1249 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -20,7 +20,7 @@
%global use_prebuilt_docs 0
%endif
-%ifarch %{arm} %{ix86} x86_64 ppc
+%ifarch %{arm} %{ix86} x86_64 ppc %{power64}
%global __with_hipe 1
%else
%global __with_hipe 0
@@ -30,7 +30,7 @@
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel_for_rpm}.4%{?dist}
+Release: %{upstream_rel_for_rpm}.5%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -2284,6 +2284,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 28 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.5
+- Re-enable HiPE on ppc64, ppc64v7
+
* Mon Oct 28 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.4
- Disable HiPE on s390(x) (rhbz #1023960)
- Fix HiPE on ppc (rhbz #1023960)
10 years, 6 months
[erlang] Disable HiPE on unsupported arches
by Peter Lemenkov
commit a737a5a32cdaaa7aa606f503331d5c4b4d8eae48
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Mon Oct 28 17:40:26 2013 +0400
Disable HiPE on unsupported arches
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
erlang.spec | 20 +++++++++++++++--
otp-0010-Fix-for-powerpc-architecture.patch | 29 +++++++++++++++++++++++++++
2 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/erlang.spec b/erlang.spec
index 1d4cbfd..e673291 100644
--- a/erlang.spec
+++ b/erlang.spec
@@ -20,11 +20,17 @@
%global use_prebuilt_docs 0
%endif
+%ifarch %{arm} %{ix86} x86_64 ppc
+%global __with_hipe 1
+%else
+%global __with_hipe 0
+%endif
+
%global n_uvr %{name}-%{upstream_ver}-%{upstream_rel_for_rpm}
Name: erlang
Version: %{upstream_ver}
-Release: %{upstream_rel_for_rpm}.3%{?dist}
+Release: %{upstream_rel_for_rpm}.4%{?dist}
Summary: General-purpose programming language and runtime environment
Group: Development/Languages
@@ -82,6 +88,9 @@ Patch8: otp-0008-Fix-for-armv7hl-architecture.patch
# Fedora specific patch
# TEMPORARILY disable ECC until dust settles
Patch9: otp-0009-TEMPORARILY-disable-ECC-until-dust-settles.patch
+# Fedora specific patch
+# Fix for powerpc architecture
+Patch10: otp-0010-Fix-for-powerpc-architecture.patch
# end of autogenerated patch tag list
# BuildRoot not strictly needed since F10, but keep it for spec file robustness
@@ -944,6 +953,7 @@ Erlang mode for XEmacs (source lisp files).
%endif
%patch8 -p1 -b .Fix_for_armv7hl_architecture
%patch9 -p1 -b .TEMPORARILY_disable_ECC_until_dust_settles
+%patch10 -p1 -b .Fix_for_powerpc_architecture
# end of autogenerated prep patch list
# FIXME we should come up with a better solution
@@ -966,9 +976,9 @@ rm -f lib/ssl/examples/certs/etc/erlangCA/index.txt.old
%build
%ifarch sparcv9 sparc64
-CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe
+CFLAGS="$RPM_OPT_FLAGS -mcpu=ultrasparc -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe}
%else
-CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp --enable-hipe
+CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %configure --enable-shared-zlib --enable-sctp %{__with_hipe:--enable-hipe}
%endif
# Remove pre-built BEAM files
@@ -2274,6 +2284,10 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Oct 28 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.4
+- Disable HiPE on s390(x) (rhbz #1023960)
+- Fix HiPE on ppc (rhbz #1023960)
+
* Thu Oct 24 2013 Peter Lemenkov <lemenkov(a)gmail.com> - R16B-02.3
- TEMPORARILY disable ECC until dust settles
diff --git a/otp-0010-Fix-for-powerpc-architecture.patch b/otp-0010-Fix-for-powerpc-architecture.patch
new file mode 100644
index 0000000..1d56394
--- /dev/null
+++ b/otp-0010-Fix-for-powerpc-architecture.patch
@@ -0,0 +1,29 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Mon, 28 Oct 2013 17:11:11 +0400
+Subject: [PATCH] Fix for powerpc architecture
+
+Taken from openSUSE:
+
+* https://build.opensuse.org/package/view_file/devel:languages:erlang:Facto...
+
+See also:
+
+* https://bugzilla.redhat.com/1023960
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+---
+ erts/configure.in | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/erts/configure.in b/erts/configure.in
+index 5b72215..9f396f0 100644
+--- a/erts/configure.in
++++ b/erts/configure.in
+@@ -625,6 +625,7 @@ case $chk_arch_ in
+ x86_64) ARCH=amd64;;
+ amd64) ARCH=amd64;;
+ macppc) ARCH=ppc;;
++ powerpc) ARCH=ppc;;
+ ppc) ARCH=ppc;;
+ ppc64) ARCH=ppc64;;
+ "Power Macintosh") ARCH=ppc;;
10 years, 6 months
[riak] Rebuild with new Erlang and hopefully fix #986623
by Peter Lemenkov
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
10 years, 6 months