[gentoo-commits] repo/gentoo:master commit in: dev-erlang/idna/files/, dev-erlang/idna/

[Sam James]

commit:     3a7c112932469d726e68fe8f48b234ad7a95d35a
Author:     Florian Schmaus <flo <AT> geekplace <DOT> eu>
AuthorDate: Thu Apr  8 17:55:40 2021 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jun  1 09:35:32 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a7c1129

dev-erlang/idna: fix "remove unicode_util_compat" patch

The existing patch was incomplete, unicode_util_compat had also to be
patched out of src/idna.app.src. Otherwise ejabberd would potentially
fail with

Apr 07 21:04:38 example.org ejabberdctl[606236]: 2021-04-07 21:04:38.066241+02:00 [critical] Failed to start ejabberd application: Exception occurred during configuration processing.
Apr 07 21:04:38 example.org ejabberdctl[606236]: ** exception error: nif_not_loaded
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in function  erlang:nif_error/1
Apr 07 21:04:38 example.org ejabberdctl[606236]:       called as erlang:nif_error(nif_not_loaded)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from jid:string_to_usr/1 (src/jid.erl, line 121)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from jid:decode/1 (src/jid.erl, line 136)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from econf:'-domain/0-fun-0-'/1 (src/econf.erl, line 479)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from yconf:'-list/2-fun-0-'/3 (src/yconf.erl, line 542)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from lists:mapfoldl/3 (lists.erl, line 1358)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from yconf:'-list/2-fun-1-'/3 (src/yconf.erl, line 538)
Apr 07 21:04:38 example.org ejabberdctl[606236]:    in call from yconf:'-non_empty/1-fun-0-'/2 (src/yconf.erl, line 523)
Apr 07 21:04:38 example.org systemd[1]: ejabberd.service: Main process exited, code=exited, status=1/FAILURE

Bug: https://bugs.gentoo.org/766686
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 ...Remove-dependency-on-unicode_util_compat.patch} | 55 ++++++++++++++++++++--
 .../{idna-6.0.0.ebuild => idna-6.0.0-r1.ebuild}    |  6 +--
 2 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/dev-erlang/idna/files/idna-remove-unicode_util_compat.diff b/dev-erlang/idna/files/0001-Remove-dependency-on-unicode_util_compat.patch
similarity index 67%
rename from dev-erlang/idna/files/idna-remove-unicode_util_compat.diff
rename to dev-erlang/idna/files/0001-Remove-dependency-on-unicode_util_compat.patch
index d369cefbf2a..0737b184236 100644
--- a/dev-erlang/idna/files/idna-remove-unicode_util_compat.diff
+++ b/dev-erlang/idna/files/0001-Remove-dependency-on-unicode_util_compat.patch
@@ -1,5 +1,34 @@
+From 9c91cd33265f4706e5e614349b879c059ffaeaf9 Mon Sep 17 00:00:00 2001
+From: Florian Schmaus <flo@×××××××××.eu>
+Date: Thu, 8 Apr 2021 19:43:43 +0200
+Subject: [PATCH] Remove dependency on unicode_util_compat
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Newer erlang versions, and this includes all dev-lang/erlang version
+currently in ::gentoo, do not require unicode_util_compat.
+
+This is based on
+https://github.com/benoitc/erlang-idna/pull/31/. Holger Weiß suggested
+to additionaly patch unicode_util_compat out of
+src/idna.app.src. Thanks Holger. :)
+
+Signed-off-by: Florian Schmaus <flo@×××××××××.eu>
+Suggested-by: Holger Weiß <holger@×××××××××××××××.de>
+---
+ rebar.config         |  2 +-
+ rebar.config.script  | 11 -----------
+ rebar.lock           |  6 ------
+ src/idna.app.src     |  2 +-
+ src/idna.erl         | 10 +++++-----
+ src/idna_context.erl |  4 ++--
+ 6 files changed, 9 insertions(+), 26 deletions(-)
+ delete mode 100644 rebar.config.script
+ delete mode 100644 rebar.lock
+
 diff --git a/rebar.config b/rebar.config
-index 84fd954..cd02013 100644
+index 84fd954aea01..cd0201386367 100644
 --- a/rebar.config
 +++ b/rebar.config
 @@ -1,3 +1,3 @@
@@ -9,7 +38,7 @@ index 84fd954..cd02013 100644
 +{deps, []}.
 diff --git a/rebar.config.script b/rebar.config.script
 deleted file mode 100644
-index d2bce94..0000000
+index d2bce945b8b2..000000000000
 --- a/rebar.config.script
 +++ /dev/null
 @@ -1,11 +0,0 @@
@@ -26,7 +55,7 @@ index d2bce94..0000000
 -end.
 diff --git a/rebar.lock b/rebar.lock
 deleted file mode 100644
-index 15fc8a1..0000000
+index 15fc8a117070..000000000000
 --- a/rebar.lock
 +++ /dev/null
 @@ -1,6 +0,0 @@
@@ -36,8 +65,21 @@ index 15fc8a1..0000000
 -{pkg_hash,[
 - {<<"unicode_util_compat">>, <<"D869E4C68901DD9531385BB0C8C40444EBF624E60B6962D95952775CAC5E90CD">>}]}
 -].
+diff --git a/src/idna.app.src b/src/idna.app.src
+index a6a75374351b..d6475067c2ad 100644
+--- a/src/idna.app.src
++++ b/src/idna.app.src
+@@ -3,7 +3,7 @@
+   {vsn, "6.0.0"},
+   {modules, []},
+   {registered, []},
+-  {applications, [kernel, stdlib, unicode_util_compat]},
++  {applications, [kernel, stdlib]},
+ 
+   {maintainers, ["Benoit Chesneau"]},
+   {licenses, ["BSD"]},
 diff --git a/src/idna.erl b/src/idna.erl
-index 5f010b3..32b1745 100644
+index 3436dd995477..24d96b810ceb 100644
 --- a/src/idna.erl
 +++ b/src/idna.erl
 @@ -333,7 +333,7 @@ lowercase_list([], true) ->
@@ -80,7 +122,7 @@ index 5f010b3..32b1745 100644
      [CP|Str] -> [CP|characters_to_nfc_list(Str)];
      [] -> []
 diff --git a/src/idna_context.erl b/src/idna_context.erl
-index afcb814..a09ff1f 100644
+index afcb814956e3..a09ff1f92992 100644
 --- a/src/idna_context.erl
 +++ b/src/idna_context.erl
 @@ -28,7 +28,7 @@ valid_contextj(Label, Pos) ->
@@ -101,3 +143,6 @@ index afcb814..a09ff1f 100644
      #{ ccc := ?virama_combining_class } -> true;
      _ -> false
    end;
+-- 
+2.30.2
+

diff --git a/dev-erlang/idna/idna-6.0.0.ebuild b/dev-erlang/idna/idna-6.0.0-r1.ebuild
similarity index 73%
rename from dev-erlang/idna/idna-6.0.0.ebuild
rename to dev-erlang/idna/idna-6.0.0-r1.ebuild
index 597fc28fad4..853b273e7c8 100644
--- a/dev-erlang/idna/idna-6.0.0.ebuild
+++ b/dev-erlang/idna/idna-6.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -21,5 +21,5 @@ DOCS=( CHANGELOG README.md )
 S="${WORKDIR}/erlang-idna-${PV}"
 
 # Removes dependency to workaround for older erlang versions.
-# Patch from https://github.com/benoitc/erlang-idna/pull/31
-PATCHES=( "${FILESDIR}/idna-remove-unicode_util_compat.diff" )
+# Patch based on https://github.com/benoitc/erlang-idna/pull/31
+PATCHES=( "${FILESDIR}/0001-Remove-dependency-on-unicode_util_compat.patch" )