diff --git a/.gitignore b/.gitignore index 79f50b6..fbf8665 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /basho-bitcask-1.6.3-0-gf20db99.tar.gz /bitcask-1.6.3.tar.gz /bitcask-1.7.4.tar.gz +/bitcask-2.0.3.tar.gz diff --git a/erlang-bitcask-0003-Fix-deprecation-warning-about-crypto-rand_bytes-1-fu.patch b/erlang-bitcask-0003-Fix-deprecation-warning-about-crypto-rand_bytes-1-fu.patch new file mode 100644 index 0000000..5e5115b --- /dev/null +++ b/erlang-bitcask-0003-Fix-deprecation-warning-about-crypto-rand_bytes-1-fu.patch @@ -0,0 +1,32 @@ +From: Peter Lemenkov +Date: Tue, 16 Aug 2016 16:37:30 +0300 +Subject: [PATCH] Fix deprecation warning about crypto:rand_bytes/1 fun + +Signed-off-by: Peter Lemenkov + +diff --git a/src/bitcask.erl b/src/bitcask.erl +index 0d9440c..e5667b1 100644 +--- a/src/bitcask.erl ++++ b/src/bitcask.erl +@@ -2236,7 +2236,7 @@ fold_corrupt_file_test2() -> + % and a pending hash is created. There *has* to be an iterator open when you + % call this or it will loop for ever and ever. Don't try this at home. + put_till_frozen(B) -> +- Key = crypto:rand_bytes(32), ++ Key = crypto:strong_rand_bytes(32), + bitcask:put(B, Key, <<>>), + bitcask:delete(B, Key), + +diff --git a/src/bitcask_nifs.erl b/src/bitcask_nifs.erl +index 2f99912..e84b9af 100644 +--- a/src/bitcask_nifs.erl ++++ b/src/bitcask_nifs.erl +@@ -733,7 +733,7 @@ keydir_itr_out_of_date_test2() -> + end). + + put_till_frozen(R, Name) -> +- bitcask_nifs:keydir_put(R, crypto:rand_bytes(32), 0, 1234, 0, 1, bitcask_time:tstamp()), ++ bitcask_nifs:keydir_put(R, crypto:strong_rand_bytes(32), 0, 1234, 0, 1, bitcask_time:tstamp()), + {ready, Ref2} = bitcask_nifs:keydir_new(Name), + %%?debugFmt("Putting", []), + case bitcask_nifs:keydir_itr_int(Ref2, 2000001, diff --git a/erlang-bitcask.spec b/erlang-bitcask.spec index 649e29b..b1bcde1 100644 --- a/erlang-bitcask.spec +++ b/erlang-bitcask.spec @@ -3,8 +3,8 @@ Name: erlang-%{realname} -Version: 1.7.4 -Release: 3%{?dist} +Version: 2.0.3 +Release: 1%{?dist} Summary: Eric Brewer-inspired key/value store Group: Development/Languages License: ASL 2.0 @@ -16,6 +16,7 @@ Source0: https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realnam Source1: bitcask.licensing Patch1: erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch Patch2: erlang-bitcask-0002-Drop-unneeded-eunit-include.patch +Patch3: erlang-bitcask-0003-Fix-deprecation-warning-about-crypto-rand_bytes-1-fu.patch BuildRequires: erlang-cuttlefish BuildRequires: erlang-meck BuildRequires: erlang-rebar @@ -30,6 +31,7 @@ Eric Brewer-inspired key/value store. %setup -q -n %{realname}-%{version} %patch1 -p1 -b .deprecated %patch2 -p1 -b .no_eunit +%patch3 -p1 -b .deprecated_erl_19 %build @@ -53,6 +55,10 @@ cp -arv priv/bitcask_multi.schema %{buildroot}%{erlang_appdir}/priv %changelog +* Tue Aug 16 2016 Peter Lemenkov - 2.0.3-1 +- Ver. 2.0.3 +- Fixed FTBFS with Erlang 19 + * Sun Aug 07 2016 Igor Gnatenko - 1.7.4-3 - Rebuild for Erlang 19 diff --git a/sources b/sources index 03d2bff..944c07d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2f8a83196d0bc5c6c8eb54e5f32f840f bitcask-1.7.4.tar.gz +5545718710174bda520dd6f3697b995e bitcask-2.0.3.tar.gz