The package rpms/erlang-bitcask.git has added or updated architecture specific content in
its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/erlang-bitcask.git/commit/?id=0e3....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 0e30581638d0ae70ea370ace1d1af41577534af3
Author: Peter Lemenkov <lemenkov(a)gmail.com>
Date: Wed Dec 2 11:49:32 2020 +0100
bitcask ver. 2.1.0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
diff --git a/.gitignore b/.gitignore
index 0e57e16..65de5b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
/bitcask-2.0.6.tar.gz
/bitcask-2.0.7.tar.gz
/bitcask-2.0.8.tar.gz
+/bitcask-2.1.0.tar.gz
diff --git a/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch
b/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch
index d9a1173..3b3b0b5 100644
--- a/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch
+++ b/erlang-bitcask-0001-Don-t-use-deprecated-erlang-now-0.patch
@@ -4,33 +4,11 @@ Subject: [PATCH] Don't use deprecated erlang:now/0
Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-diff --git a/test/bitcask_pr156.erl b/test/bitcask_pr156.erl
-index 5cdfc46..7916524 100644
---- a/test/bitcask_pr156.erl
-+++ b/test/bitcask_pr156.erl
-@@ -34,7 +34,7 @@ pr156_regression2_test_() ->
- end}.
-
- pr156_regression1(X) ->
-- io:format("pr156_regression1 ~p at ~p\n", [X, now()]),
-+ io:format("pr156_regression1 ~p at ~p\n", [X, os:timestamp()]),
- token:next_name(),
- Dir = ?BITCASK ++ ".1." ++ token:get_name(),
- os:cmd("rm -rf " ++ Dir),
-@@ -74,7 +74,7 @@ pr156_regression1(X) ->
- %% r1s11.bos1 executes each of N iterations in about 1500 msec.
-
- pr156_regression2(X) ->
-- io:format("pr156_regression2 ~p at ~p\n", [X, now()]),
-+ io:format("pr156_regression2 ~p at ~p\n", [X, os:timestamp()]),
- token:next_name(),
- Dir = ?BITCASK ++ ".2." ++ token:get_name(),
- os:cmd("rm -rf " ++ Dir),
-diff --git a/test/bitcask_pulse.erl b/test/bitcask_pulse.erl
-index abdd970..9acf632 100644
---- a/test/bitcask_pulse.erl
-+++ b/test/bitcask_pulse.erl
-@@ -276,7 +276,7 @@ host() ->
+diff --git a/eqc/pulse/bitcask_pulse.erl b/eqc/pulse/bitcask_pulse.erl
+index cc6533b..ff61936 100644
+--- a/eqc/pulse/bitcask_pulse.erl
++++ b/eqc/pulse/bitcask_pulse.erl
+@@ -281,7 +281,7 @@ host() ->
%% Generate a most likely unique node name
unique_name() ->
@@ -39,7 +17,7 @@ index abdd970..9acf632 100644
list_to_atom(lists:concat([integer_to_list(A), "-",
integer_to_list(B), "-",
integer_to_list(C)])).
-@@ -1021,7 +1021,7 @@ custom_shrink(CE=[_,Seed|_], [C|Cs], Repeat) ->
+@@ -1020,7 +1020,7 @@ custom_shrink(CE=[_,Seed|_], [C|Cs], Repeat) ->
end.
check_many(C, N) ->
@@ -48,7 +26,7 @@ index abdd970..9acf632 100644
check_many(_, _, 0) -> true;
check_many(Seed, C0, N) ->
-@@ -1037,7 +1037,7 @@ mk_counterexample(CE = [Cmds, _Seed]) when is_list(Cmds) ->
+@@ -1036,7 +1036,7 @@ mk_counterexample(CE = [Cmds, _Seed]) when is_list(Cmds) ->
CE;
mk_counterexample(Cmds) ->
S = state_after(?MODULE, Cmds),
@@ -57,7 +35,7 @@ index abdd970..9acf632 100644
[ {0, []} | [ {I, []}
|| I <- lists:seq(1, length(S#state.readers)) ] ]
++ [ {errors, []}, {events, []} ] ].
-@@ -1047,7 +1047,7 @@ mk_counterexample(Cmds, Seed) ->
+@@ -1046,7 +1046,7 @@ mk_counterexample(Cmds, Seed) ->
[Cmds, Seed, Conj].
foo() ->
@@ -66,62 +44,3 @@ index abdd970..9acf632 100644
%% Helper functions
fold(F, X) ->
-diff --git a/test/bitcask_qc.erl b/test/bitcask_qc.erl
-index f30f6cc..624d989 100644
---- a/test/bitcask_qc.erl
-+++ b/test/bitcask_qc.erl
-@@ -158,7 +158,7 @@ prop_merge() ->
- ?FORALL({Ops, M1, M2}, {eqc_gen:non_empty(list(ops(Keys, Values))),
- choose(1,128), choose(1,128)},
- begin
-- Tm = tuple_to_list(now()),
-+ Tm = tuple_to_list(os:timestamp()),
- Dir = lists:flatten(
- io_lib:format(
- "/tmp/bc.prop.merge.~w.~w.~w", Tm)),
-diff --git a/test/event_logger.erl b/test/event_logger.erl
-index 52b1080..78a9c97 100644
---- a/test/event_logger.erl
-+++ b/test/event_logger.erl
-@@ -128,6 +128,6 @@ add_event(#event{timestamp = Now, data = Data}, State) ->
- State#state{ events = [Event|State#state.events] }.
-
- timestamp() ->
-- {A, B, C} = erlang:now(),
-+ {A, B, C} = os:timestamp(),
- 1000000 * (1000000 * A + B) + C.
-
-diff --git a/test/generic_qc_fsm.erl b/test/generic_qc_fsm.erl
-index 541feb9..9c9d46b 100644
---- a/test/generic_qc_fsm.erl
-+++ b/test/generic_qc_fsm.erl
-@@ -163,7 +163,7 @@ prop(FI_enabledP, VerboseP) ->
- faulterl_nif:poke("bc_fi_enabled", 0,
<<0:8/native>>, false),
- [catch erlang:garbage_collect(Pid) || Pid <- erlang:processes()],
-
-- {Ta, Tb, Tc} = now(),
-+ {Ta, Tb, Tc} = os:timestamp(),
- TestDir = ?TEST_DIR ++
lists:flatten(io_lib:format(".~w.~w.~w", [Ta, Tb, Tc])),
- ok = file:make_dir(TestDir),
- Env = [{parameter_test_dir, TestDir}],
-@@ -443,7 +443,7 @@ fold_all(H) ->
- [{K,V}|Acc]
- end,
- io:format(user, "<f", []),
-- ID = now(),
-+ ID = os:timestamp(),
- event_logger:event({fold, start, ID}),
- case bitcask:fold(H, F, []) of
- {error, _} ->
-diff --git a/test/token.erl b/test/token.erl
-index e9a0a54..9dfa6ec 100644
---- a/test/token.erl
-+++ b/test/token.erl
-@@ -50,6 +50,6 @@ loop(Name) ->
- end.
-
- mk_name() ->
-- {A, B, C} = erlang:now(),
-+ {A, B, C} = os:timestamp(),
- lists:concat([A, "-", B, "-", C]).
-
diff --git a/erlang-bitcask-0002-Drop-unneeded-eunit-include.patch
b/erlang-bitcask-0002-Drop-unneeded-eunit-include.patch
deleted file mode 100644
index 7918b01..0000000
--- a/erlang-bitcask-0002-Drop-unneeded-eunit-include.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Sun, 8 May 2016 14:33:02 +0300
-Subject: [PATCH] Drop unneeded eunit include
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/src/bitcask_file.erl b/src/bitcask_file.erl
-index a44c09d..ad56eb0 100644
---- a/src/bitcask_file.erl
-+++ b/src/bitcask_file.erl
-@@ -23,8 +23,6 @@
- -compile(export_all).
- -behaviour(gen_server).
-
---include_lib("eunit/include/eunit.hrl").
--
- -ifdef(PULSE).
- -compile({parse_transform, pulse_instrument}).
- -endif.
diff --git a/erlang-bitcask-0002-Fix-for-rebar2.patch
b/erlang-bitcask-0002-Fix-for-rebar2.patch
new file mode 100644
index 0000000..6db0549
--- /dev/null
+++ b/erlang-bitcask-0002-Fix-for-rebar2.patch
@@ -0,0 +1,46 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Wed, 2 Dec 2020 11:46:11 +0100
+Subject: [PATCH] Fix for rebar2
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/test/bitcask_schema_tests.erl b/test/bitcask_schema_tests.erl
+index 9f43d20..c5cb902 100644
+--- a/test/bitcask_schema_tests.erl
++++ b/test/bitcask_schema_tests.erl
+@@ -11,7 +11,7 @@ basic_schema_test_() ->
+ basic_schema_test2() ->
+ lager:start(),
+ %% The defaults are defined in ../priv/bitcask.schema. it is the file under test.
+- Config = cuttlefish_unit:generate_templated_config("priv/bitcask.schema",
[], context(), predefined_schema()),
++ Config =
cuttlefish_unit:generate_templated_config("../priv/bitcask.schema", [],
context(), predefined_schema()),
+
+ cuttlefish_unit:assert_config(Config, "bitcask.data_root",
"./data/bitcask"),
+ cuttlefish_unit:assert_config(Config, "bitcask.open_timeout", 4),
+@@ -46,7 +46,7 @@ merge_window_test2() ->
+ ],
+
+ %% The defaults are defined in ../priv/bitcask.schema. it is the file under test.
+- Config = cuttlefish_unit:generate_templated_config("priv/bitcask.schema",
Conf, context(), predefined_schema()),
++ Config =
cuttlefish_unit:generate_templated_config("../priv/bitcask.schema", Conf,
context(), predefined_schema()),
+
+ cuttlefish_unit:assert_config(Config, "bitcask.data_root",
"./data/bitcask"),
+ cuttlefish_unit:assert_config(Config, "bitcask.open_timeout", 4),
+@@ -99,7 +99,7 @@ override_schema_test2() ->
+ ],
+
+ %% The defaults are defined in ../priv/bitcask.schema. it is the file under test.
+- Config = cuttlefish_unit:generate_templated_config("priv/bitcask.schema",
Conf, context(), predefined_schema()),
++ Config =
cuttlefish_unit:generate_templated_config("../priv/bitcask.schema", Conf,
context(), predefined_schema()),
+
+ cuttlefish_unit:assert_config(Config, "bitcask.data_root",
"/absolute/data/bitcask"),
+ cuttlefish_unit:assert_config(Config, "bitcask.open_timeout", 2),
+@@ -132,7 +132,7 @@ multi_backend_test2() ->
+ ],
+ %% The defaults are defined in ../priv/bitcask.schema. it is the file under test.
+ Config = cuttlefish_unit:generate_templated_config(
+- ["priv/bitcask.schema", "priv/bitcask_multi.schema",
"test/multi_backend.schema"],
++ ["../priv/bitcask.schema",
"../priv/bitcask_multi.schema", "../test/multi_backend.schema"],
+ Conf, context(), predefined_schema()),
+ %%io:format("Config: ~p~n", []),
+
diff --git
a/erlang-bitcask-0003-Fix-deprecation-warning-while-building-with-Erlang-1.patch
b/erlang-bitcask-0003-Fix-deprecation-warning-while-building-with-Erlang-1.patch
deleted file mode 100644
index 8eb1412..0000000
--- a/erlang-bitcask-0003-Fix-deprecation-warning-while-building-with-Erlang-1.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Tue, 16 Aug 2016 16:37:30 +0300
-Subject: [PATCH] Fix deprecation warning while building with Erlang 19
-
-The following functions are considered deprecated:
-
-- crypto:rand_bytes/1
-- random:seed/1
-- random:uniform/1
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/src/bitcask.erl b/src/bitcask.erl
-index 7f28560..afe2f34 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),
-
-@@ -3679,12 +3679,12 @@ update_tombstones_test() ->
- ?assertEqual(1, TombCount).
-
- make_merge_file(Dir, Seed, Probability) ->
-- random:seed(Seed),
-+ rand:seed(exsplus, Seed),
- case filelib:is_dir(Dir) of
- true ->
- DataFiles = filelib:wildcard("*.data", Dir),
- {ok, FH} = file:open(Dir ++ "/merge.txt", [write,raw]),
-- [case random:uniform(100) < Probability of
-+ [case rand:uniform(100) < Probability of
- true ->
- file:write(FH, io_lib:format("~s\n", [DF]));
- false ->
-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/test/bitcask_pr156.erl b/test/bitcask_pr156.erl
-index 7916524..13631e9 100644
---- a/test/bitcask_pr156.erl
-+++ b/test/bitcask_pr156.erl
-@@ -136,12 +136,12 @@ check_no_tombstones(Ref, Good) ->
- end.
-
- make_merge_txt(Dir, Seed, Probability) ->
-- random:seed(Seed),
-+ rand:seed(exsplus, Seed),
- case filelib:is_dir(Dir) of
- true ->
- DataFiles = filelib:wildcard("*.data", Dir),
- {ok, FH} = file:open(Dir ++ "/merge.txt", [write]),
-- [case random:uniform(100) < Probability of
-+ [case rand:uniform(100) < Probability of
- true ->
- io:format(FH, "~s\n", [DF]);
- false ->
diff --git a/erlang-bitcask-0003-Remove-eqc-we-still-don-t-use-them.patch
b/erlang-bitcask-0003-Remove-eqc-we-still-don-t-use-them.patch
new file mode 100644
index 0000000..b928f20
--- /dev/null
+++ b/erlang-bitcask-0003-Remove-eqc-we-still-don-t-use-them.patch
@@ -0,0 +1,19 @@
+From: Peter Lemenkov <lemenkov(a)gmail.com>
+Date: Wed, 2 Dec 2020 11:54:05 +0100
+Subject: [PATCH] Remove eqc - we still don't use them
+
+Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
+
+diff --git a/rebar.config b/rebar.config
+index 8212b62..d0a1c39 100644
+--- a/rebar.config
++++ b/rebar.config
+@@ -54,8 +54,6 @@
+ ]}
+ ]}.
+
+-{plugins, [pc, {eqc_rebar, {git, "https://github.com/Quviq/eqc-rebar",
{branch, "master"}}}]}.
+-
+ {provider_hooks,
+ [
+ {pre,
diff --git a/erlang-bitcask-0004-Dont-treat-warnings-as-errors.patch
b/erlang-bitcask-0004-Dont-treat-warnings-as-errors.patch
deleted file mode 100644
index 7c5b746..0000000
--- a/erlang-bitcask-0004-Dont-treat-warnings-as-errors.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-From: Peter Lemenkov <lemenkov(a)gmail.com>
-Date: Fri, 23 Feb 2018 17:15:10 +0300
-Subject: [PATCH] Dont' treat warnings as errors
-
-Signed-off-by: Peter Lemenkov <lemenkov(a)gmail.com>
-
-diff --git a/rebar.config b/rebar.config
-index efcaf36..0d73d69 100644
---- a/rebar.config
-+++ b/rebar.config
-@@ -1,4 +1,4 @@
--{erl_opts, [debug_info, warn_untyped_record, warnings_as_errors,
-+{erl_opts, [debug_info, warn_untyped_record,
- {platform_define, "^[0-9]+", namespaced_types}]}.
- {port_specs, [{"priv/bitcask.so", ["c_src/*.c"]}]}.
-
diff --git a/erlang-bitcask-0005-Support-for-OTP-21.patch
b/erlang-bitcask-0005-Support-for-OTP-21.patch
deleted file mode 100644
index e99a4db..0000000
--- a/erlang-bitcask-0005-Support-for-OTP-21.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From: Andrew Thompson <andrew(a)hijacked.us>
-Date: Tue, 26 Jun 2018 09:46:24 -0700
-Subject: [PATCH] Support for OTP 21
-
-
-diff --git a/src/bitcask.erl b/src/bitcask.erl
-index afe2f34..e975cee 100644
---- a/src/bitcask.erl
-+++ b/src/bitcask.erl
-@@ -3074,6 +3074,7 @@ corrupt_file(Path, Offset, Data) ->
- ok = file:write(FH, Data),
- file:close(FH).
-
-+-ifndef(OTP_RELEASE). %% only applies to OTP20 and earlier
- % Verify that if the cached efile port goes away, we can recover
- % and not get stuck opening casks
- efile_error_test() ->
-@@ -3092,6 +3093,7 @@ efile_error_test() ->
- B2 when is_reference(B2) ->
- ok = bitcask:close(B2)
- end.
-+-endif.
-
- %% About leak_t0():
- %%
-diff --git a/src/bitcask_fileops.erl b/src/bitcask_fileops.erl
-index aa48fb3..a7eeb35 100644
---- a/src/bitcask_fileops.erl
-+++ b/src/bitcask_fileops.erl
-@@ -783,15 +783,25 @@ hintfile_entry(Key, Tstamp, TombInt, Offset, TotalSz) ->
- TombInt:?TOMBSTONEFIELD_V2, Offset:?OFFSETFIELD_V2>>, Key].
-
- %% ===================================================================
--%% file/filelib avoidance code.
-+%% file/filelib avoidance code. Only needed for pre OTP-21 releases.
- %% ===================================================================
-
-+-ifdef(OTP_RELEASE).
-+read_file_info(Filename) ->
-+ file:read_file_info(Filename).
-+
-+write_file_info(FileName, Info) ->
-+ file:write_file_info(FileName, Info).
-+-else.
- read_file_info(FileName) ->
- prim_file:read_file_info(FileName).
-
- write_file_info(FileName, Info) ->
- prim_file:write_file_info(FileName, Info).
-
-+-endif.
-+
-+
- is_file(File) ->
- case read_file_info(File) of
- {ok, #file_info{type=regular}} ->
-@@ -840,6 +850,11 @@ ensure_dir(F) ->
- list_dir(Dir) ->
- list_dir(Dir, 1).
-
-+
-+-ifdef(OTP_RELEASE).
-+list_dir(Directory, Retries) when is_integer(Retries), Retries > 0 ->
-+ file:list_dir(Directory).
-+-else.
- list_dir(_, 0) ->
- {error, efile_driver_unavailable};
- list_dir(Directory, Retries) when is_integer(Retries), Retries > 0 ->
-@@ -880,4 +895,4 @@ prim_file_drv_open(Driver, Portopts) ->
- error:Reason ->
- {error, Reason}
- end.
--
-+-endif.
diff --git a/erlang-bitcask.spec b/erlang-bitcask.spec
index 4a4d38e..b0584ff 100644
--- a/erlang-bitcask.spec
+++ b/erlang-bitcask.spec
@@ -3,8 +3,8 @@
Name: erlang-%{realname}
-Version: 2.0.8
-Release: 13%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
Summary: Eric Brewer-inspired key/value store
License: ASL 2.0
URL:
https://github.com/%{upstream}/%{realname}
@@ -12,16 +12,12 @@ VCS:
scm:git:https://github.com/%{upstream}/%{realname}.git
Source0:
https://github.com/%{upstream}/%{realname}/archive/%{version}/%{realname}...
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-while-building-with-Erlang-1.patch
-Patch4: erlang-bitcask-0004-Dont-treat-warnings-as-errors.patch
-Patch5: erlang-bitcask-0005-Support-for-OTP-21.patch
+Patch2: erlang-bitcask-0002-Fix-for-rebar2.patch
+Patch3: erlang-bitcask-0003-Remove-eqc-we-still-don-t-use-them.patch
BuildRequires: erlang-cuttlefish
BuildRequires: erlang-meck
BuildRequires: erlang-rebar
BuildRequires: gcc
-# Remove when
https://bugzilla.redhat.com/show_bug.cgi?id=1770256 is resolved
-ExcludeArch: s390x
%description
@@ -53,6 +49,9 @@ cp -arv priv/bitcask_multi.schema %{buildroot}%{erlang_appdir}/priv
%changelog
+* Wed Dec 2 2020 Peter Lemenkov <lemenkov(a)gmail.com> - 2.1.0-1
+- Ver. 2.1.0
+
* Sat Aug 01 2020 Fedora Release Engineering <releng(a)fedoraproject.org> - 2.0.8-13
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
diff --git a/sources b/sources
index ba38254..dcd2808 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (bitcask-2.0.8.tar.gz) =
b9e6f2bfb37dd27b6029c3f3c87d47ef1c7989494f03785c122eee2452e45ca9b4300558dac520dc46cfa8e0151800d779050e7d9d98990b0ec889e190815600
+SHA512 (bitcask-2.1.0.tar.gz) =
c361f63b11e6f9eaf09835dde4f82572b751a4d45da9503b6f7663cd6d0f5afeb993d10278973d744d35e7dc4316130831e151a04c2f30564df1da54798ca939