diff --git a/.elixir.metadata b/.elixir.metadata index 6bc963f..93fa067 100644 --- a/.elixir.metadata +++ b/.elixir.metadata @@ -1,2 +1,2 @@ -2ae1b2e4c9a62fe8fc36b5da23c6d9ab8646463f SOURCES/elixir-1.13.4-doc.zip -d0269a1bd2e5256a1842b5b201649e9a39227bb2 SOURCES/elixir-1.13.4.tar.gz +6128fded7a7d634c78c3a5ffceb56b23fe28f698 SOURCES/elixir-1.15.2-doc.zip +3c164bf31b339cd90f73efae6344c005af872223 SOURCES/elixir-1.15.2.tar.gz diff --git a/SOURCES/elixir-0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch b/SOURCES/elixir-0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch new file mode 100644 index 0000000..09dd6ca --- /dev/null +++ b/SOURCES/elixir-0001-Use-PID-valid-for-32-bit-systems-closes-12741.patch @@ -0,0 +1,21 @@ +From: =?UTF-8?q?Jos=C3=A9=20Valim?= +Date: Sun, 2 Jul 2023 10:28:58 +0200 +Subject: [PATCH] Use PID valid for 32-bit systems, closes #12741 + + +diff --git a/lib/logger/test/logger/formatter_test.exs b/lib/logger/test/logger/formatter_test.exs +index 82a2ac6a9..2ea4ca08b 100644 +--- a/lib/logger/test/logger/formatter_test.exs ++++ b/lib/logger/test/logger/formatter_test.exs +@@ -116,9 +116,9 @@ test "format with format string" do + format = format(compiled, :error, nil, nil, meta: :data) + assert IO.chardata_to_string(format) == "meta=data " + +- pid = :erlang.list_to_pid(~c"<0.123.4>") ++ pid = :erlang.list_to_pid(~c"<0.123.0>") + format = format(compiled, :error, nil, nil, meta: :data, pid: pid) +- assert IO.chardata_to_string(format) == "meta=data pid=<0.123.4> " ++ assert IO.chardata_to_string(format) == "meta=data pid=<0.123.0> " + + # Hack to get the same predictable reference for every test run. + ref = diff --git a/SOURCES/elixir-0002-Use-PID-valid-for-32-bit-systems-followup-to-12741.patch b/SOURCES/elixir-0002-Use-PID-valid-for-32-bit-systems-followup-to-12741.patch new file mode 100644 index 0000000..2af5ab7 --- /dev/null +++ b/SOURCES/elixir-0002-Use-PID-valid-for-32-bit-systems-followup-to-12741.patch @@ -0,0 +1,32 @@ +From: Peter Lemenkov +Date: Fri, 7 Jul 2023 19:55:11 +0200 +Subject: [PATCH] Use PID valid for 32-bit systems, followup to #12741 + +Signed-off-by: Peter Lemenkov + +diff --git a/lib/iex/test/iex/helpers_test.exs b/lib/iex/test/iex/helpers_test.exs +index ec0b58554..1dee4bf7a 100644 +--- a/lib/iex/test/iex/helpers_test.exs ++++ b/lib/iex/test/iex/helpers_test.exs +@@ -1364,8 +1364,8 @@ test "reloads Erlang modules" do + + describe "pid/1,3" do + test "builds a PID from string" do +- assert inspect(pid("0.32767.3276")) == "#PID<0.32767.3276>" +- assert inspect(pid("0.5.6")) == "#PID<0.5.6>" ++ assert inspect(pid("0.32767.0")) == "#PID<0.32767.0>" ++ assert inspect(pid("0.5.0")) == "#PID<0.5.0>" + + assert_raise ArgumentError, fn -> + pid("0.6.-6") +@@ -1381,8 +1381,8 @@ test "builds a PID from atom" do + end + + test "builds a PID from integers" do +- assert inspect(pid(0, 32767, 3276)) == "#PID<0.32767.3276>" +- assert inspect(pid(0, 5, 6)) == "#PID<0.5.6>" ++ assert inspect(pid(0, 32767, 0)) == "#PID<0.32767.0>" ++ assert inspect(pid(0, 5, 0)) == "#PID<0.5.0>" + + assert_raise FunctionClauseError, fn -> + pid(0, 6, -6) diff --git a/SPECS/elixir.spec b/SPECS/elixir.spec index 30c7040..88b4ba3 100644 --- a/SPECS/elixir.spec +++ b/SPECS/elixir.spec @@ -5,7 +5,7 @@ %global __with_rebar3 0 Name: elixir -Version: 1.13.4 +Version: 1.15.2 Release: 1%{?dist} Summary: A modern approach to programming for the Erlang VM @@ -40,6 +40,16 @@ BuildRequires: erlang-xmerl BuildRequires: git BuildRequires: sed BuildRequires: make +Requires: erlang-compiler%{_isa} +Requires: erlang-crypto%{_isa} +Requires: erlang-erts%{_isa} +Requires: erlang-inets%{_isa} +Requires: erlang-kernel%{_isa} +Requires: erlang-parsetools%{_isa} +Requires: erlang-public_key%{_isa} +Requires: erlang-sasl%{_isa} +Requires: erlang-stdlib%{_isa} +Requires: erlang-tools%{_isa} %description @@ -150,6 +160,9 @@ HTML documentation for eex, elixir, iex, logger and mix. %doc docs/doc/eex docs/doc/elixir docs/doc/iex docs/doc/logger docs/doc/mix %changelog +* Fri Jul 7 2023 Peter Lemenkov - 1.15.2-1 +- New upstream release (Erlang 24-26 compatible) + * Thu Jun 23 2022 Peter Lemenkov - 1.13.4-1 - New upstream release