diff --git a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch index 08ee8f9..1b1b06f 100644 --- a/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch +++ b/couchdb-0001-Do-not-gzip-doc-files-and-do-not-install-installatio.patch @@ -1,3 +1,4 @@ +From 4d91d1b2dead4b17853d53fc3afb7165593d53b6 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 13 Feb 2011 13:52:38 +0300 Subject: [PATCH] Do not gzip doc-files and do not install installation diff --git a/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch b/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch index 60ff434..c4b9dc7 100644 --- a/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch +++ b/couchdb-0002-More-directories-to-search-for-place-for-init-script.patch @@ -1,3 +1,4 @@ +From 61c1da4677c0fc64e1cef8b1366ac38b6bde2916 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 13 Feb 2011 14:21:20 +0300 Subject: [PATCH] More directories to search for place for init-script diff --git a/couchdb-0003-Install-into-erllibdir-by-default.patch b/couchdb-0003-Install-into-erllibdir-by-default.patch index 3aacd7c..923a558 100644 --- a/couchdb-0003-Install-into-erllibdir-by-default.patch +++ b/couchdb-0003-Install-into-erllibdir-by-default.patch @@ -1,3 +1,4 @@ +From f21df328fb5286a755f18508b47ed5f2fe4098fe Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 13 Feb 2011 14:36:36 +0300 Subject: [PATCH] Install into erllibdir by default diff --git a/couchdb-0004-Don-t-use-bundled-libraries.patch b/couchdb-0004-Don-t-use-bundled-libraries.patch index 5bc0478..9c0391d 100644 --- a/couchdb-0004-Don-t-use-bundled-libraries.patch +++ b/couchdb-0004-Don-t-use-bundled-libraries.patch @@ -1,3 +1,4 @@ +From 450bd5e6146b605ac296f27d0ec1f018782205bb Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 15 May 2011 18:47:41 +0400 Subject: [PATCH] Don't use bundled libraries diff --git a/couchdb-0005-Fixes-for-system-wide-ibrowse.patch b/couchdb-0005-Fixes-for-system-wide-ibrowse.patch index a18f644..a3ffaa0 100644 --- a/couchdb-0005-Fixes-for-system-wide-ibrowse.patch +++ b/couchdb-0005-Fixes-for-system-wide-ibrowse.patch @@ -1,3 +1,4 @@ +From cae5dce9b2f217abb389eef0beeea85600eaad72 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Sun, 13 Feb 2011 14:52:57 +0300 Subject: [PATCH] Fixes for system-wide ibrowse diff --git a/couchdb-0006-Remove-pid-file-after-stop.patch b/couchdb-0006-Remove-pid-file-after-stop.patch index 9c06a50..523142e 100644 --- a/couchdb-0006-Remove-pid-file-after-stop.patch +++ b/couchdb-0006-Remove-pid-file-after-stop.patch @@ -1,3 +1,4 @@ +From 0ad5ebf92e375002d9f3c3b2b9e63b9ce1611d8f Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jun 2010 15:08:42 +0400 Subject: [PATCH] Remove pid-file after stop diff --git a/couchdb-0007-Change-respawn-timeout-to-0.patch b/couchdb-0007-Change-respawn-timeout-to-0.patch index 96ed5b5..0dd6899 100644 --- a/couchdb-0007-Change-respawn-timeout-to-0.patch +++ b/couchdb-0007-Change-respawn-timeout-to-0.patch @@ -1,3 +1,4 @@ +From 06ac38ef2d5503a4d70270c1da0f723261131a2b Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 26 Aug 2010 13:22:56 +0400 Subject: [PATCH] Change respawn timeout to 0. diff --git a/couchdb-0008-Fix-for-Erlang-R16B01.patch b/couchdb-0008-Fix-for-Erlang-R16B01.patch index 281627b..eb1d929 100644 --- a/couchdb-0008-Fix-for-Erlang-R16B01.patch +++ b/couchdb-0008-Fix-for-Erlang-R16B01.patch @@ -1,3 +1,4 @@ +From 10090c23732e7645bbde03d937a8b1986b97dd37 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 21 Jun 2013 11:56:54 +0400 Subject: [PATCH] Fix for Erlang R16B01 diff --git a/couchdb-0009-README-was-renamed.patch b/couchdb-0009-README-was-renamed.patch index b2113ab..880bc82 100644 --- a/couchdb-0009-README-was-renamed.patch +++ b/couchdb-0009-README-was-renamed.patch @@ -1,3 +1,4 @@ +From 115ff0fe9cb160db70b6b5bc1c1419398b9e42b5 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 15 Aug 2013 19:06:31 +0400 Subject: [PATCH] README was renamed diff --git a/couchdb-0010-Silence-redundant-logging-to-stdout-stderr.patch b/couchdb-0010-Silence-redundant-logging-to-stdout-stderr.patch index 4c6aa33..4312242 100644 --- a/couchdb-0010-Silence-redundant-logging-to-stdout-stderr.patch +++ b/couchdb-0010-Silence-redundant-logging-to-stdout-stderr.patch @@ -1,3 +1,4 @@ +From 9394eba9a24bc1e432e0bdf57935cbbc6052f39c Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Jul 2014 22:54:38 -1000 Subject: [PATCH] Silence redundant logging to stdout/stderr diff --git a/couchdb-0011-Expand-.d-directories-in-erlang.patch b/couchdb-0011-Expand-.d-directories-in-erlang.patch index 547db71..8875d57 100644 --- a/couchdb-0011-Expand-.d-directories-in-erlang.patch +++ b/couchdb-0011-Expand-.d-directories-in-erlang.patch @@ -1,3 +1,4 @@ +From 8339290f363527ed615eb10cdef99b3764b28f05 Mon Sep 17 00:00:00 2001 From: Robert Newson Date: Sun, 6 Jul 2014 23:47:23 +0100 Subject: [PATCH] Expand .d directories in erlang diff --git a/couchdb-0012-Add-systemd-notification-support.patch b/couchdb-0012-Add-systemd-notification-support.patch index 56822b6..ebf1adc 100644 --- a/couchdb-0012-Add-systemd-notification-support.patch +++ b/couchdb-0012-Add-systemd-notification-support.patch @@ -1,3 +1,4 @@ +From 793c7d661bece86385a945369fa079a56f788d3c Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 7 Jul 2014 21:32:43 +0400 Subject: [PATCH] Add systemd notification support diff --git a/couchdb-0013-Fix-for-recent-erlang-mochiweb.patch b/couchdb-0013-Fix-for-recent-erlang-mochiweb.patch index 16b53d6..4e51ec8 100644 --- a/couchdb-0013-Fix-for-recent-erlang-mochiweb.patch +++ b/couchdb-0013-Fix-for-recent-erlang-mochiweb.patch @@ -1,3 +1,4 @@ +From 1246445c14798852a159a4f79719935129aea021 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 7 Apr 2016 14:10:05 +0300 Subject: [PATCH] Fix for recent erlang-mochiweb diff --git a/couchdb-0014-Switch-JSON-encoding-decoding-to-Jiffy.patch b/couchdb-0014-Switch-JSON-encoding-decoding-to-Jiffy.patch index 27b5739..0a24e4d 100644 --- a/couchdb-0014-Switch-JSON-encoding-decoding-to-Jiffy.patch +++ b/couchdb-0014-Switch-JSON-encoding-decoding-to-Jiffy.patch @@ -1,3 +1,4 @@ +From 4e7e4ffac4ca8b41d57378daccd8f7f84068dffe Mon Sep 17 00:00:00 2001 From: "Paul J. Davis" Date: Tue, 4 Feb 2014 22:20:32 -0600 Subject: [PATCH] Switch JSON encoding/decoding to Jiffy diff --git a/couchdb-0015-Fix-tests-for-Jiffy.patch b/couchdb-0015-Fix-tests-for-Jiffy.patch index 2c7fc8f..0697c7b 100644 --- a/couchdb-0015-Fix-tests-for-Jiffy.patch +++ b/couchdb-0015-Fix-tests-for-Jiffy.patch @@ -1,3 +1,4 @@ +From d6ae5e8e3a6b3db6fe30f17bb8cfd3fee07cf703 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Mon, 18 Apr 2016 14:02:36 +0300 Subject: [PATCH] Fix tests for Jiffy diff --git a/couchdb-0016-disable-tests-failing-on-ARM.patch b/couchdb-0016-disable-tests-failing-on-ARM.patch index 5d92115..890d608 100644 --- a/couchdb-0016-disable-tests-failing-on-ARM.patch +++ b/couchdb-0016-disable-tests-failing-on-ARM.patch @@ -1,3 +1,4 @@ +From 371a2bc448682ad490b80a2784afe2ed5c29ba07 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Tue, 27 Jan 2015 18:40:21 +0100 Subject: [PATCH] disable tests failing on ARM diff --git a/couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch b/couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch index 9af50b6..ea31893 100644 --- a/couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch +++ b/couchdb-0017-Update-jiffy-to-use-dedupe_keys.patch @@ -1,3 +1,4 @@ +From 36b1de2e066075e54f06d795d961053ce1c77c02 Mon Sep 17 00:00:00 2001 From: "Paul J. Davis" Date: Mon, 30 Oct 2017 16:47:06 -0500 Subject: [PATCH] Update jiffy to use dedupe_keys diff --git a/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch b/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch index d1b32cc..f401c86 100644 --- a/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch +++ b/couchdb-0018-Revert-disable-tests-failing-on-ARM.patch @@ -1,3 +1,4 @@ +From 58b0ee0bf1f9d6f522835c05e32a734e7a7c01f4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 16 Nov 2017 17:04:47 +0300 Subject: [PATCH] Revert "disable tests failing on ARM" diff --git a/couchdb-0019-Increase-various-eunit-test-timeouts.patch b/couchdb-0019-Increase-various-eunit-test-timeouts.patch index 9369c2d..cdc899a 100644 --- a/couchdb-0019-Increase-various-eunit-test-timeouts.patch +++ b/couchdb-0019-Increase-various-eunit-test-timeouts.patch @@ -1,3 +1,4 @@ +From efb452e30b8a613c707fff874c10a2acabf099aa Mon Sep 17 00:00:00 2001 From: Jay Doane Date: Wed, 26 Jul 2017 11:15:12 -0700 Subject: [PATCH] Increase various eunit test timeouts diff --git a/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch b/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch index 3f1dab3..ad72671 100644 --- a/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch +++ b/couchdb-0020-Fix-CouchDB-stopping-in-tests.patch @@ -1,3 +1,4 @@ +From 6871420348ac62c0659a5b6280f5dc75324d8877 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Wed, 21 Nov 2018 12:24:42 +0300 Subject: [PATCH] Fix CouchDB stopping in tests diff --git a/couchdb-0021-Build-with-Erlang-21.patch b/couchdb-0021-Build-with-Erlang-21.patch index 5b31020..4b7021b 100644 --- a/couchdb-0021-Build-with-Erlang-21.patch +++ b/couchdb-0021-Build-with-Erlang-21.patch @@ -1,3 +1,4 @@ +From 9f05a63d031e680089d293bd74ce3b8382fde1d8 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Fri, 1 Mar 2019 18:17:41 +0300 Subject: [PATCH] Build with Erlang 21 diff --git a/couchdb-0022-Deprecation-erlang-now-0-erlang-timestamp-0.patch b/couchdb-0022-Deprecation-erlang-now-0-erlang-timestamp-0.patch new file mode 100644 index 0000000..2dc3150 --- /dev/null +++ b/couchdb-0022-Deprecation-erlang-now-0-erlang-timestamp-0.patch @@ -0,0 +1,322 @@ +From 01bd7cf79c44222567843adfbea74fee78180de4 Mon Sep 17 00:00:00 2001 +From: Peter Lemenkov +Date: Tue, 12 Mar 2019 16:50:18 +0300 +Subject: [PATCH] Deprecation: erlang:now/0 -> erlang:timestamp/0 + +Signed-off-by: Peter Lemenkov + +diff --git a/src/couch_replicator/src/couch_replicator_manager.erl b/src/couch_replicator/src/couch_replicator_manager.erl +index 4891c4c4c..5ab452e19 100644 +--- a/src/couch_replicator/src/couch_replicator_manager.erl ++++ b/src/couch_replicator/src/couch_replicator_manager.erl +@@ -561,7 +561,7 @@ update_rep_doc(RepDb, #doc{body = {RepDocBody}} = RepDoc, KVs) -> + % RFC3339 timestamps. + % Note: doesn't include the time seconds fraction (RFC3339 says it's optional). + timestamp() -> +- {{Year, Month, Day}, {Hour, Min, Sec}} = calendar:now_to_local_time(now()), ++ {{Year, Month, Day}, {Hour, Min, Sec}} = calendar:now_to_local_time(erlang:timestamp()), + UTime = erlang:universaltime(), + LocalTime = calendar:universal_time_to_local_time(UTime), + DiffSecs = calendar:datetime_to_gregorian_seconds(LocalTime) - +diff --git a/src/couch_replicator/src/couch_replicator_worker.erl b/src/couch_replicator/src/couch_replicator_worker.erl +index d66d47805..506565e2c 100644 +--- a/src/couch_replicator/src/couch_replicator_worker.erl ++++ b/src/couch_replicator/src/couch_replicator_worker.erl +@@ -72,7 +72,7 @@ + + start_link(Cp, #db{} = Source, Target, ChangesManager, _MaxConns) -> + Pid = spawn_link(fun() -> +- erlang:put(last_stats_report, now()), ++ erlang:put(last_stats_report, erlang:timestamp()), + queue_fetch_loop(Source, Target, Cp, Cp, ChangesManager) + end), + {ok, Pid}; +@@ -88,7 +88,7 @@ init({Cp, Source, Target, ChangesManager, MaxConns}) -> + LoopPid = spawn_link(fun() -> + queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) + end), +- erlang:put(last_stats_report, now()), ++ erlang:put(last_stats_report, erlang:timestamp()), + State = #state{ + cp = Cp, + max_parallel_conns = MaxConns, +@@ -235,7 +235,7 @@ queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) -> + end, + close_db(Target2), + ok = gen_server:call(Cp, {report_seq_done, ReportSeq, Stats}, infinity), +- erlang:put(last_stats_report, now()), ++ erlang:put(last_stats_report, erlang:timestamp()), + ?LOG_DEBUG("Worker reported completion of seq ~p", [ReportSeq]), + queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) + end. +@@ -375,7 +375,7 @@ spawn_writer(Target, #batch{docs = DocList, size = Size}) -> + + after_full_flush(#state{stats = Stats, flush_waiter = Waiter} = State) -> + gen_server:reply(Waiter, {ok, Stats}), +- erlang:put(last_stats_report, now()), ++ erlang:put(last_stats_report, erlang:timestamp()), + State#state{ + stats = #rep_stats{}, + flush_waiter = nil, +@@ -504,7 +504,7 @@ find_missing(DocInfos, Target) -> + + + maybe_report_stats(Cp, Stats) -> +- Now = now(), ++ Now = erlang:timestamp(), + case timer:now_diff(erlang:get(last_stats_report), Now) >= ?STATS_DELAY of + true -> + ok = gen_server:call(Cp, {add_stats, Stats}, infinity), +diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl +index 42ccd4436..be6b7c4f9 100644 +--- a/src/couchdb/couch_auth_cache.erl ++++ b/src/couchdb/couch_auth_cache.erl +@@ -182,7 +182,7 @@ handle_call({fetch, UserName}, _From, State) -> + [] -> + couch_stats_collector:increment({couchdb, auth_cache_misses}), + Creds = get_user_props_from_db(UserName), +- State1 = add_cache_entry(UserName, Creds, erlang:now(), State), ++ State1 = add_cache_entry(UserName, Creds, erlang:timestamp(), State), + {Creds, State1} + end, + {reply, Credentials, NewState}; +@@ -261,7 +261,7 @@ free_mru_cache_entry() -> + + + cache_hit(UserName, Credentials, ATime) -> +- NewATime = erlang:now(), ++ NewATime = erlang:timestamp(), + true = ets:delete(?BY_ATIME, ATime), + true = ets:insert(?BY_ATIME, {NewATime, UserName}), + true = ets:insert(?BY_USER, {UserName, {Credentials, NewATime}}). +diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl +index 6edde32db..ac5f27bc0 100644 +--- a/src/couchdb/couch_changes.erl ++++ b/src/couchdb/couch_changes.erl +@@ -61,7 +61,7 @@ handle_changes(Args1, Req, Db0) -> + undefined -> + erlang:erase(last_changes_heartbeat); + Val when is_integer(Val); Val =:= true -> +- put(last_changes_heartbeat, now()) ++ put(last_changes_heartbeat, erlang:timestamp()) + end, + + case lists:member(Feed, ["continuous", "longpoll", "eventsource"]) of +@@ -556,7 +556,7 @@ reset_heartbeat() -> + undefined -> + ok; + _ -> +- put(last_changes_heartbeat, now()) ++ put(last_changes_heartbeat, erlang:timestamp()) + end. + + maybe_heartbeat(Timeout, TimeoutFun, Acc) -> +@@ -565,7 +565,7 @@ maybe_heartbeat(Timeout, TimeoutFun, Acc) -> + undefined -> + {ok, Acc}; + _ -> +- Now = now(), ++ Now = erlang:timestamp(), + case timer:now_diff(Now, Before) div 1000 >= Timeout of + true -> + Acc2 = TimeoutFun(Acc), +diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl +index c92097f62..3db8e9549 100644 +--- a/src/couchdb/couch_db_updater.erl ++++ b/src/couchdb/couch_db_updater.erl +@@ -466,7 +466,7 @@ init_db(DbName, Filepath, Fd, ReaderFd, Header0, Options) -> + {ok, Security} = couch_file:pread_term(Fd, SecurityPtr) + end, + % convert start time tuple to microsecs and store as a binary string +- {MegaSecs, Secs, MicroSecs} = now(), ++ {MegaSecs, Secs, MicroSecs} = erlang:timestamp(), + StartTime = ?l2b(io_lib:format("~p", + [(MegaSecs*1000000*1000000) + (Secs*1000000) + MicroSecs])), + {ok, RefCntr} = couch_ref_counter:start([Fd, ReaderFd]), +diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl +index 9a6bf3ab4..896dde36a 100644 +--- a/src/couchdb/couch_httpd.erl ++++ b/src/couchdb/couch_httpd.erl +@@ -232,7 +232,7 @@ handle_request(MochiReq, DefaultFun, UrlHandlers, DbUrlHandlers, + + handle_request_int(MochiReq, DefaultFun, + UrlHandlers, DbUrlHandlers, DesignUrlHandlers) -> +- Begin = now(), ++ Begin = erlang:timestamp(), + % for the path, use the raw path with the query string and fragment + % removed, but URL quoting left intact + RawUri = MochiReq:get(raw_path), +@@ -379,7 +379,7 @@ handle_request_int(MochiReq, DefaultFun, + ?LOG_INFO("Stacktrace: ~p",[Stack]), + send_error(HttpReq, Error) + end, +- RequestTime = round(timer:now_diff(now(), Begin)/1000), ++ RequestTime = round(timer:now_diff(erlang:timestamp(), Begin)/1000), + couch_stats_collector:record({couchdb, request_time}, RequestTime), + couch_stats_collector:increment({httpd, requests}), + {ok, Resp}. +diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl +index f7bbb13fe..6001e1392 100644 +--- a/src/couchdb/couch_httpd_auth.erl ++++ b/src/couchdb/couch_httpd_auth.erl +@@ -396,7 +396,7 @@ auth_name(String) when is_list(String) -> + ?l2b(Name). + + make_cookie_time() -> +- {NowMS, NowS, _} = erlang:now(), ++ {NowMS, NowS, _} = erlang:timestamp(), + NowMS * 1000000 + NowS. + + cookie_scheme(#httpd{mochi_req=MochiReq}) -> +diff --git a/src/couchdb/couch_os_daemons.erl b/src/couchdb/couch_os_daemons.erl +index cac031a9b..ec3905586 100644 +--- a/src/couchdb/couch_os_daemons.erl ++++ b/src/couchdb/couch_os_daemons.erl +@@ -123,7 +123,7 @@ handle_info({Port, {exit_status, Status}}, Table) -> + [D] -> + % Port died for unknown reason. Check to see if it's + % died too many times or if we should boot it back up. +- case should_halt([now() | D#daemon.errors]) of ++ case should_halt([erlang:timestamp() | D#daemon.errors]) of + {true, _} -> + % Halting the process. We won't try and reboot + % until the configuration changes. +@@ -363,7 +363,7 @@ should_halt(Errors) -> + RetryTimeCfg = couch_config:get("os_daemon_settings", "retry_time", "5"), + RetryTime = list_to_integer(RetryTimeCfg), + +- Now = now(), ++ Now = erlang:timestamp(), + RecentErrors = lists:filter(fun(Time) -> + timer:now_diff(Now, Time) =< RetryTime * 1000000 + end, Errors), +diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl +index 3da4ecf33..a861e8165 100644 +--- a/src/couchdb/couch_server.erl ++++ b/src/couchdb/couch_server.erl +@@ -225,7 +225,7 @@ maybe_close_lru_db(#server{dbs_open=NumOpen, max_dbs_open=MaxOpen}=Server) + {ok, Server}; + maybe_close_lru_db(#server{dbs_open=NumOpen}=Server) -> + % must free up the lru db. +- case try_close_lru(now()) of ++ case try_close_lru(erlang:timestamp()) of + ok -> + {ok, Server#server{dbs_open=NumOpen - 1}}; + Error -> Error +@@ -246,7 +246,7 @@ try_close_lru(StartTime) -> + false -> + % this still has referrers. Go ahead and give it a current lru time + % and try the next one in the table. +- NewLruTime = now(), ++ NewLruTime = erlang:timestamp(), + true = ets:insert(couch_dbs_by_name, {DbName, {opened, MainPid, NewLruTime}}), + true = ets:insert(couch_dbs_by_pid, {MainPid, DbName}), + true = ets:delete(couch_dbs_by_lru, LruTime), +@@ -320,7 +320,7 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}, Options}, _From, Server) -> + gen_server:reply(From, + catch couch_db:open_ref_counted(OpenedDbPid, FromPid)) + end, Froms), +- LruTime = now(), ++ LruTime = erlang:timestamp(), + true = ets:insert(couch_dbs_by_name, + {DbName, {opened, OpenedDbPid, LruTime}}), + true = ets:delete(couch_dbs_by_pid, Opener), +@@ -351,7 +351,7 @@ handle_call({open_result, DbName, Error, Options}, _From, Server) -> + end, + {reply, ok, Server#server{dbs_open = DbsOpen}}; + handle_call({open, DbName, Options}, {FromPid,_}=From, Server) -> +- LruTime = now(), ++ LruTime = erlang:timestamp(), + case ets:lookup(couch_dbs_by_name, DbName) of + [] -> + open_db(DbName, Server, Options, From); +diff --git a/src/couchdb/couch_stats_aggregator.erl b/src/couchdb/couch_stats_aggregator.erl +index 6090355d5..e86d069de 100644 +--- a/src/couchdb/couch_stats_aggregator.erl ++++ b/src/couchdb/couch_stats_aggregator.erl +@@ -139,7 +139,7 @@ handle_call(collect_sample, _, {OldTRef, SampleInterval}) -> + end, couch_stats_collector:all(absolute)), + + Values = Incs ++ Abs, +- Now = erlang:now(), ++ Now = erlang:timestamp(), + lists:foreach(fun({{Key, Rate}, Agg}) -> + NewAgg = case proplists:lookup(Key, Values) of + none -> +diff --git a/src/couchdb/couch_task_status.erl b/src/couchdb/couch_task_status.erl +index e23b56089..eed4817b0 100644 +--- a/src/couchdb/couch_task_status.erl ++++ b/src/couchdb/couch_task_status.erl +@@ -82,7 +82,7 @@ get(Prop) -> + + maybe_persist(TaskProps0) -> + {LastUpdateTime, Frequency} = erlang:get(task_status_update), +- case timer:now_diff(Now = now(), LastUpdateTime) >= Frequency of ++ case timer:now_diff(Now = erlang:timestamp(), LastUpdateTime) >= Frequency of + true -> + put(task_status_update, {Now, Frequency}), + TaskProps = ?set(TaskProps0, updated_on, timestamp(Now)), +@@ -145,7 +145,7 @@ code_change(_OldVsn, State, _Extra) -> + + + timestamp() -> +- timestamp(now()). ++ timestamp(erlang:timestamp()). + + timestamp({Mega, Secs, _}) -> + Mega * 1000000 + Secs. +diff --git a/src/couchdb/couch_uuids.erl b/src/couchdb/couch_uuids.erl +index 581aba97a..082a96526 100644 +--- a/src/couchdb/couch_uuids.erl ++++ b/src/couchdb/couch_uuids.erl +@@ -36,7 +36,7 @@ utc_random() -> + utc_suffix(couch_util:to_hex(crypto:strong_rand_bytes(9))). + + utc_suffix(Suffix) -> +- Now = {_, _, Micro} = now(), ++ Now = {_, _, Micro} = erlang:timestamp(), + Nowish = calendar:now_to_universal_time(Now), + Nowsecs = calendar:datetime_to_gregorian_seconds(Nowish), + Then = calendar:datetime_to_gregorian_seconds({{1970, 1, 1}, {0, 0, 0}}), +diff --git a/test/couchdb/couchdb_http_proxy_tests.erl b/test/couchdb/couchdb_http_proxy_tests.erl +index 03ceca7c2..2f6e4159e 100644 +--- a/test/couchdb/couchdb_http_proxy_tests.erl ++++ b/test/couchdb/couchdb_http_proxy_tests.erl +@@ -467,7 +467,7 @@ recv_body(ReqId, Acc) -> + %% Copy from couch test_util @ master branch + + now_us() -> +- {MegaSecs, Secs, MicroSecs} = now(), ++ {MegaSecs, Secs, MicroSecs} = erlang:timestamp(), + (MegaSecs * 1000000 + Secs) * 1000000 + MicroSecs. + + stop_sync(Name) -> +diff --git a/test/couchdb/include/couch_eunit.hrl.in b/test/couchdb/include/couch_eunit.hrl.in +index 063b3dbb2..d30fa24bc 100644 +--- a/test/couchdb/include/couch_eunit.hrl.in ++++ b/test/couchdb/include/couch_eunit.hrl.in +@@ -25,21 +25,21 @@ + + -define(tempfile, + fun() -> +- {A, B, C} = erlang:now(), ++ {A, B, C} = erlang:timestamp(), + N = node(), + FileName = lists:flatten(io_lib:format("~p-~p.~p.~p", [N, A, B, C])), + filename:join([?TEMPDIR, FileName]) + end). + -define(tempdb, + fun() -> +- Nums = tuple_to_list(erlang:now()), ++ Nums = tuple_to_list(erlang:timestamp()), + Prefix = "eunit-test-db", + Suffix = lists:concat([integer_to_list(Num) || Num <- Nums]), + list_to_binary(Prefix ++ "-" ++ Suffix) + end). + -define(docid, + fun() -> +- {A, B, C} = erlang:now(), ++ {A, B, C} = erlang:timestamp(), + lists:flatten(io_lib:format("~p~p~p", [A, B, C])) + end). + diff --git a/couchdb-0022-Deprecation-erlang-now-0-os-timestamp-0.patch b/couchdb-0022-Deprecation-erlang-now-0-os-timestamp-0.patch deleted file mode 100644 index 9fe3aa6..0000000 --- a/couchdb-0022-Deprecation-erlang-now-0-os-timestamp-0.patch +++ /dev/null @@ -1,321 +0,0 @@ -From: Peter Lemenkov -Date: Tue, 12 Mar 2019 16:50:18 +0300 -Subject: [PATCH] Deprecation: erlang:now/0 -> os:timestamp/0 - -Signed-off-by: Peter Lemenkov - -diff --git a/src/couch_replicator/src/couch_replicator_manager.erl b/src/couch_replicator/src/couch_replicator_manager.erl -index 4891c4c4c..6c9e5924c 100644 ---- a/src/couch_replicator/src/couch_replicator_manager.erl -+++ b/src/couch_replicator/src/couch_replicator_manager.erl -@@ -561,7 +561,7 @@ update_rep_doc(RepDb, #doc{body = {RepDocBody}} = RepDoc, KVs) -> - % RFC3339 timestamps. - % Note: doesn't include the time seconds fraction (RFC3339 says it's optional). - timestamp() -> -- {{Year, Month, Day}, {Hour, Min, Sec}} = calendar:now_to_local_time(now()), -+ {{Year, Month, Day}, {Hour, Min, Sec}} = calendar:now_to_local_time(os:timestamp()), - UTime = erlang:universaltime(), - LocalTime = calendar:universal_time_to_local_time(UTime), - DiffSecs = calendar:datetime_to_gregorian_seconds(LocalTime) - -diff --git a/src/couch_replicator/src/couch_replicator_worker.erl b/src/couch_replicator/src/couch_replicator_worker.erl -index d66d47805..5e13e84ef 100644 ---- a/src/couch_replicator/src/couch_replicator_worker.erl -+++ b/src/couch_replicator/src/couch_replicator_worker.erl -@@ -72,7 +72,7 @@ - - start_link(Cp, #db{} = Source, Target, ChangesManager, _MaxConns) -> - Pid = spawn_link(fun() -> -- erlang:put(last_stats_report, now()), -+ erlang:put(last_stats_report, os:timestamp()), - queue_fetch_loop(Source, Target, Cp, Cp, ChangesManager) - end), - {ok, Pid}; -@@ -88,7 +88,7 @@ init({Cp, Source, Target, ChangesManager, MaxConns}) -> - LoopPid = spawn_link(fun() -> - queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) - end), -- erlang:put(last_stats_report, now()), -+ erlang:put(last_stats_report, os:timestamp()), - State = #state{ - cp = Cp, - max_parallel_conns = MaxConns, -@@ -235,7 +235,7 @@ queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) -> - end, - close_db(Target2), - ok = gen_server:call(Cp, {report_seq_done, ReportSeq, Stats}, infinity), -- erlang:put(last_stats_report, now()), -+ erlang:put(last_stats_report, os:timestamp()), - ?LOG_DEBUG("Worker reported completion of seq ~p", [ReportSeq]), - queue_fetch_loop(Source, Target, Parent, Cp, ChangesManager) - end. -@@ -375,7 +375,7 @@ spawn_writer(Target, #batch{docs = DocList, size = Size}) -> - - after_full_flush(#state{stats = Stats, flush_waiter = Waiter} = State) -> - gen_server:reply(Waiter, {ok, Stats}), -- erlang:put(last_stats_report, now()), -+ erlang:put(last_stats_report, os:timestamp()), - State#state{ - stats = #rep_stats{}, - flush_waiter = nil, -@@ -504,7 +504,7 @@ find_missing(DocInfos, Target) -> - - - maybe_report_stats(Cp, Stats) -> -- Now = now(), -+ Now = os:timestamp(), - case timer:now_diff(erlang:get(last_stats_report), Now) >= ?STATS_DELAY of - true -> - ok = gen_server:call(Cp, {add_stats, Stats}, infinity), -diff --git a/src/couchdb/couch_auth_cache.erl b/src/couchdb/couch_auth_cache.erl -index 42ccd4436..439637ce6 100644 ---- a/src/couchdb/couch_auth_cache.erl -+++ b/src/couchdb/couch_auth_cache.erl -@@ -182,7 +182,7 @@ handle_call({fetch, UserName}, _From, State) -> - [] -> - couch_stats_collector:increment({couchdb, auth_cache_misses}), - Creds = get_user_props_from_db(UserName), -- State1 = add_cache_entry(UserName, Creds, erlang:now(), State), -+ State1 = add_cache_entry(UserName, Creds, os:timestamp(), State), - {Creds, State1} - end, - {reply, Credentials, NewState}; -@@ -261,7 +261,7 @@ free_mru_cache_entry() -> - - - cache_hit(UserName, Credentials, ATime) -> -- NewATime = erlang:now(), -+ NewATime = os:timestamp(), - true = ets:delete(?BY_ATIME, ATime), - true = ets:insert(?BY_ATIME, {NewATime, UserName}), - true = ets:insert(?BY_USER, {UserName, {Credentials, NewATime}}). -diff --git a/src/couchdb/couch_changes.erl b/src/couchdb/couch_changes.erl -index 6edde32db..8b8fe7cd7 100644 ---- a/src/couchdb/couch_changes.erl -+++ b/src/couchdb/couch_changes.erl -@@ -61,7 +61,7 @@ handle_changes(Args1, Req, Db0) -> - undefined -> - erlang:erase(last_changes_heartbeat); - Val when is_integer(Val); Val =:= true -> -- put(last_changes_heartbeat, now()) -+ put(last_changes_heartbeat, os:timestamp()) - end, - - case lists:member(Feed, ["continuous", "longpoll", "eventsource"]) of -@@ -556,7 +556,7 @@ reset_heartbeat() -> - undefined -> - ok; - _ -> -- put(last_changes_heartbeat, now()) -+ put(last_changes_heartbeat, os:timestamp()) - end. - - maybe_heartbeat(Timeout, TimeoutFun, Acc) -> -@@ -565,7 +565,7 @@ maybe_heartbeat(Timeout, TimeoutFun, Acc) -> - undefined -> - {ok, Acc}; - _ -> -- Now = now(), -+ Now = os:timestamp(), - case timer:now_diff(Now, Before) div 1000 >= Timeout of - true -> - Acc2 = TimeoutFun(Acc), -diff --git a/src/couchdb/couch_db_updater.erl b/src/couchdb/couch_db_updater.erl -index c92097f62..fcd10206a 100644 ---- a/src/couchdb/couch_db_updater.erl -+++ b/src/couchdb/couch_db_updater.erl -@@ -466,7 +466,7 @@ init_db(DbName, Filepath, Fd, ReaderFd, Header0, Options) -> - {ok, Security} = couch_file:pread_term(Fd, SecurityPtr) - end, - % convert start time tuple to microsecs and store as a binary string -- {MegaSecs, Secs, MicroSecs} = now(), -+ {MegaSecs, Secs, MicroSecs} = os:timestamp(), - StartTime = ?l2b(io_lib:format("~p", - [(MegaSecs*1000000*1000000) + (Secs*1000000) + MicroSecs])), - {ok, RefCntr} = couch_ref_counter:start([Fd, ReaderFd]), -diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl -index 9a6bf3ab4..4e4528a4c 100644 ---- a/src/couchdb/couch_httpd.erl -+++ b/src/couchdb/couch_httpd.erl -@@ -232,7 +232,7 @@ handle_request(MochiReq, DefaultFun, UrlHandlers, DbUrlHandlers, - - handle_request_int(MochiReq, DefaultFun, - UrlHandlers, DbUrlHandlers, DesignUrlHandlers) -> -- Begin = now(), -+ Begin = os:timestamp(), - % for the path, use the raw path with the query string and fragment - % removed, but URL quoting left intact - RawUri = MochiReq:get(raw_path), -@@ -379,7 +379,7 @@ handle_request_int(MochiReq, DefaultFun, - ?LOG_INFO("Stacktrace: ~p",[Stack]), - send_error(HttpReq, Error) - end, -- RequestTime = round(timer:now_diff(now(), Begin)/1000), -+ RequestTime = round(timer:now_diff(os:timestamp(), Begin)/1000), - couch_stats_collector:record({couchdb, request_time}, RequestTime), - couch_stats_collector:increment({httpd, requests}), - {ok, Resp}. -diff --git a/src/couchdb/couch_httpd_auth.erl b/src/couchdb/couch_httpd_auth.erl -index f7bbb13fe..527cc7a6b 100644 ---- a/src/couchdb/couch_httpd_auth.erl -+++ b/src/couchdb/couch_httpd_auth.erl -@@ -396,7 +396,7 @@ auth_name(String) when is_list(String) -> - ?l2b(Name). - - make_cookie_time() -> -- {NowMS, NowS, _} = erlang:now(), -+ {NowMS, NowS, _} = os:timestamp(), - NowMS * 1000000 + NowS. - - cookie_scheme(#httpd{mochi_req=MochiReq}) -> -diff --git a/src/couchdb/couch_os_daemons.erl b/src/couchdb/couch_os_daemons.erl -index cac031a9b..d8a4513e5 100644 ---- a/src/couchdb/couch_os_daemons.erl -+++ b/src/couchdb/couch_os_daemons.erl -@@ -123,7 +123,7 @@ handle_info({Port, {exit_status, Status}}, Table) -> - [D] -> - % Port died for unknown reason. Check to see if it's - % died too many times or if we should boot it back up. -- case should_halt([now() | D#daemon.errors]) of -+ case should_halt([os:timestamp() | D#daemon.errors]) of - {true, _} -> - % Halting the process. We won't try and reboot - % until the configuration changes. -@@ -363,7 +363,7 @@ should_halt(Errors) -> - RetryTimeCfg = couch_config:get("os_daemon_settings", "retry_time", "5"), - RetryTime = list_to_integer(RetryTimeCfg), - -- Now = now(), -+ Now = os:timestamp(), - RecentErrors = lists:filter(fun(Time) -> - timer:now_diff(Now, Time) =< RetryTime * 1000000 - end, Errors), -diff --git a/src/couchdb/couch_server.erl b/src/couchdb/couch_server.erl -index 3da4ecf33..b6aee180b 100644 ---- a/src/couchdb/couch_server.erl -+++ b/src/couchdb/couch_server.erl -@@ -225,7 +225,7 @@ maybe_close_lru_db(#server{dbs_open=NumOpen, max_dbs_open=MaxOpen}=Server) - {ok, Server}; - maybe_close_lru_db(#server{dbs_open=NumOpen}=Server) -> - % must free up the lru db. -- case try_close_lru(now()) of -+ case try_close_lru(os:timestamp()) of - ok -> - {ok, Server#server{dbs_open=NumOpen - 1}}; - Error -> Error -@@ -246,7 +246,7 @@ try_close_lru(StartTime) -> - false -> - % this still has referrers. Go ahead and give it a current lru time - % and try the next one in the table. -- NewLruTime = now(), -+ NewLruTime = os:timestamp(), - true = ets:insert(couch_dbs_by_name, {DbName, {opened, MainPid, NewLruTime}}), - true = ets:insert(couch_dbs_by_pid, {MainPid, DbName}), - true = ets:delete(couch_dbs_by_lru, LruTime), -@@ -320,7 +320,7 @@ handle_call({open_result, DbName, {ok, OpenedDbPid}, Options}, _From, Server) -> - gen_server:reply(From, - catch couch_db:open_ref_counted(OpenedDbPid, FromPid)) - end, Froms), -- LruTime = now(), -+ LruTime = os:timestamp(), - true = ets:insert(couch_dbs_by_name, - {DbName, {opened, OpenedDbPid, LruTime}}), - true = ets:delete(couch_dbs_by_pid, Opener), -@@ -351,7 +351,7 @@ handle_call({open_result, DbName, Error, Options}, _From, Server) -> - end, - {reply, ok, Server#server{dbs_open = DbsOpen}}; - handle_call({open, DbName, Options}, {FromPid,_}=From, Server) -> -- LruTime = now(), -+ LruTime = os:timestamp(), - case ets:lookup(couch_dbs_by_name, DbName) of - [] -> - open_db(DbName, Server, Options, From); -diff --git a/src/couchdb/couch_stats_aggregator.erl b/src/couchdb/couch_stats_aggregator.erl -index 6090355d5..c3e2e7fe6 100644 ---- a/src/couchdb/couch_stats_aggregator.erl -+++ b/src/couchdb/couch_stats_aggregator.erl -@@ -139,7 +139,7 @@ handle_call(collect_sample, _, {OldTRef, SampleInterval}) -> - end, couch_stats_collector:all(absolute)), - - Values = Incs ++ Abs, -- Now = erlang:now(), -+ Now = os:timestamp(), - lists:foreach(fun({{Key, Rate}, Agg}) -> - NewAgg = case proplists:lookup(Key, Values) of - none -> -diff --git a/src/couchdb/couch_task_status.erl b/src/couchdb/couch_task_status.erl -index e23b56089..eb80d26c4 100644 ---- a/src/couchdb/couch_task_status.erl -+++ b/src/couchdb/couch_task_status.erl -@@ -82,7 +82,7 @@ get(Prop) -> - - maybe_persist(TaskProps0) -> - {LastUpdateTime, Frequency} = erlang:get(task_status_update), -- case timer:now_diff(Now = now(), LastUpdateTime) >= Frequency of -+ case timer:now_diff(Now = os:timestamp(), LastUpdateTime) >= Frequency of - true -> - put(task_status_update, {Now, Frequency}), - TaskProps = ?set(TaskProps0, updated_on, timestamp(Now)), -@@ -145,7 +145,7 @@ code_change(_OldVsn, State, _Extra) -> - - - timestamp() -> -- timestamp(now()). -+ timestamp(os:timestamp()). - - timestamp({Mega, Secs, _}) -> - Mega * 1000000 + Secs. -diff --git a/src/couchdb/couch_uuids.erl b/src/couchdb/couch_uuids.erl -index 581aba97a..514b756ca 100644 ---- a/src/couchdb/couch_uuids.erl -+++ b/src/couchdb/couch_uuids.erl -@@ -36,7 +36,7 @@ utc_random() -> - utc_suffix(couch_util:to_hex(crypto:strong_rand_bytes(9))). - - utc_suffix(Suffix) -> -- Now = {_, _, Micro} = now(), -+ Now = {_, _, Micro} = os:timestamp(), - Nowish = calendar:now_to_universal_time(Now), - Nowsecs = calendar:datetime_to_gregorian_seconds(Nowish), - Then = calendar:datetime_to_gregorian_seconds({{1970, 1, 1}, {0, 0, 0}}), -diff --git a/test/couchdb/couchdb_http_proxy_tests.erl b/test/couchdb/couchdb_http_proxy_tests.erl -index 03ceca7c2..7414c4a96 100644 ---- a/test/couchdb/couchdb_http_proxy_tests.erl -+++ b/test/couchdb/couchdb_http_proxy_tests.erl -@@ -467,7 +467,7 @@ recv_body(ReqId, Acc) -> - %% Copy from couch test_util @ master branch - - now_us() -> -- {MegaSecs, Secs, MicroSecs} = now(), -+ {MegaSecs, Secs, MicroSecs} = os:timestamp(), - (MegaSecs * 1000000 + Secs) * 1000000 + MicroSecs. - - stop_sync(Name) -> -diff --git a/test/couchdb/include/couch_eunit.hrl.in b/test/couchdb/include/couch_eunit.hrl.in -index 063b3dbb2..bfa0a0637 100644 ---- a/test/couchdb/include/couch_eunit.hrl.in -+++ b/test/couchdb/include/couch_eunit.hrl.in -@@ -25,21 +25,21 @@ - - -define(tempfile, - fun() -> -- {A, B, C} = erlang:now(), -+ {A, B, C} = os:timestamp(), - N = node(), - FileName = lists:flatten(io_lib:format("~p-~p.~p.~p", [N, A, B, C])), - filename:join([?TEMPDIR, FileName]) - end). - -define(tempdb, - fun() -> -- Nums = tuple_to_list(erlang:now()), -+ Nums = tuple_to_list(os:timestamp()), - Prefix = "eunit-test-db", - Suffix = lists:concat([integer_to_list(Num) || Num <- Nums]), - list_to_binary(Prefix ++ "-" ++ Suffix) - end). - -define(docid, - fun() -> -- {A, B, C} = erlang:now(), -+ {A, B, C} = os:timestamp(), - lists:flatten(io_lib:format("~p~p~p", [A, B, C])) - end). - diff --git a/couchdb-0023-Deprecation-crypto-rand_uniform-2-rand-uniform-1.patch b/couchdb-0023-Deprecation-crypto-rand_uniform-2-rand-uniform-1.patch index 605f5b0..68a1e8e 100644 --- a/couchdb-0023-Deprecation-crypto-rand_uniform-2-rand-uniform-1.patch +++ b/couchdb-0023-Deprecation-crypto-rand_uniform-2-rand-uniform-1.patch @@ -1,3 +1,4 @@ +From aed6a4f6cdd118d492085b37e229aa8322ac6e17 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 17:00:20 +0300 Subject: [PATCH] Deprecation: crypto:rand_uniform/2 -> rand:uniform/1 @@ -5,7 +6,7 @@ Subject: [PATCH] Deprecation: crypto:rand_uniform/2 -> rand:uniform/1 Signed-off-by: Peter Lemenkov diff --git a/src/couchdb/couch_uuids.erl b/src/couchdb/couch_uuids.erl -index 514b756ca..c0e1a3032 100644 +index 082a96526..ae6aab69b 100644 --- a/src/couchdb/couch_uuids.erl +++ b/src/couchdb/couch_uuids.erl @@ -84,7 +84,7 @@ new_prefix() -> diff --git a/couchdb-0024-Deprecation-erlang-get_stacktrace-0.patch b/couchdb-0024-Deprecation-erlang-get_stacktrace-0.patch index 1967b8c..1393ed3 100644 --- a/couchdb-0024-Deprecation-erlang-get_stacktrace-0.patch +++ b/couchdb-0024-Deprecation-erlang-get_stacktrace-0.patch @@ -1,3 +1,4 @@ +From 4c355cfe3a88b82c1b8a64b873421b790bd94bc4 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 17:12:31 +0300 Subject: [PATCH] Deprecation: erlang:get_stacktrace/0 @@ -5,7 +6,7 @@ Subject: [PATCH] Deprecation: erlang:get_stacktrace/0 Signed-off-by: Peter Lemenkov diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl -index 4e4528a4c..ed78eb8e6 100644 +index 896dde36a..1264c7adb 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -358,23 +358,19 @@ handle_request_int(MochiReq, DefaultFun, diff --git a/couchdb-0025-Don-t-use-compat-wrapper-over-random-and-rand.patch b/couchdb-0025-Don-t-use-compat-wrapper-over-random-and-rand.patch index 13e6281..d8a35c0 100644 --- a/couchdb-0025-Don-t-use-compat-wrapper-over-random-and-rand.patch +++ b/couchdb-0025-Don-t-use-compat-wrapper-over-random-and-rand.patch @@ -1,3 +1,4 @@ +From efa64416a06ad03e0444700376f02ea890378fb2 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 17:17:08 +0300 Subject: [PATCH] Don't use compat wrapper over random and rand diff --git a/couchdb-0026-Ensure-that-error_logger-is-running.patch b/couchdb-0026-Ensure-that-error_logger-is-running.patch index af39080..67df699 100644 --- a/couchdb-0026-Ensure-that-error_logger-is-running.patch +++ b/couchdb-0026-Ensure-that-error_logger-is-running.patch @@ -1,3 +1,4 @@ +From e2ea93d08724df60d1d8496cdd314f9636784260 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Tue, 12 Mar 2019 17:55:30 +0300 Subject: [PATCH] Ensure that error_logger is running diff --git a/couchdb.spec b/couchdb.spec index e88d73c..59f9bf5 100644 --- a/couchdb.spec +++ b/couchdb.spec @@ -30,7 +30,7 @@ Patch18: couchdb-0018-Revert-disable-tests-failing-on-ARM.patch Patch19: couchdb-0019-Increase-various-eunit-test-timeouts.patch Patch20: couchdb-0020-Fix-CouchDB-stopping-in-tests.patch Patch21: couchdb-0021-Build-with-Erlang-21.patch -Patch22: couchdb-0022-Deprecation-erlang-now-0-os-timestamp-0.patch +Patch22: couchdb-0022-Deprecation-erlang-now-0-erlang-timestamp-0.patch Patch23: couchdb-0023-Deprecation-crypto-rand_uniform-2-rand-uniform-1.patch Patch24: couchdb-0024-Deprecation-erlang-get_stacktrace-0.patch Patch25: couchdb-0025-Don-t-use-compat-wrapper-over-random-and-rand.patch