[Buildroot] [PATCH 00/20] Update Ejabberd and its dependencies

[Buildroot] [PATCH 00/20] Update Ejabberd and its dependencies

[Johan Oudinet]

Ejabberd has many dependencies. Update all of them to the versions
needed by ejabberd-21.12.

Johan Oudinet (20):
  package/erlang-idna: remove unicode_util_compat library
  package/erlang-lager: bump version to 3.9.1
  package/erlang-p1-utils: bump version to 1.0.23
  package/erlang-p1-cache-tab: bump version to 1.0.29
  package/erlang-p1-tls: bump version to 1.1.13
  package/erlang-p1-stringprep: bump version to 1.0.27
  package/erlang-p1-xml: bump version to 1.1.49
  package/erlang-p1-xmpp: bump version to 1.5.6
  package/erlang-p1-yaml: bump version to 1.0.32
  package/erlang-p1-yconf: bump version to 1.0.12
  package/erlang-p1-oauth2: bump version to 0.6.10
  package/erlang-p1-pkix: bump version to 1.0.8
  package/erlang-eimp: bump version to 1.0.21
  package/erlang-p1-mqtree: bump version to 1.0.14
  package/erlang-jose: bump version to 1.11.1
  package/erlang-p1-acme: bump version to 1.0.16
  package/erlang-p1-stun: bump version to 1.0.47
  package/erlang-p1-sip: bump version to 1.0.47
  package/erlang-p1-zlib: bump version to 1.0.10
  package/ejabberd: bump version to 21.12

 ...not-download-or-compile-dependencies.patch |   24 +-
 package/ejabberd/0003-fix-includes.patch      | 1614 +++++++++++++++++
 package/ejabberd/ejabberd.hash                |    2 +-
 package/ejabberd/ejabberd.mk                  |    5 +-
 package/erlang-eimp/erlang-eimp.hash          |    2 +-
 package/erlang-eimp/erlang-eimp.mk            |    2 +-
 ...1-remove-unicode_util_compat_library.patch |   92 +
 package/erlang-jose/erlang-jose.hash          |    4 +-
 package/erlang-jose/erlang-jose.mk            |    2 +-
 package/erlang-lager/erlang-lager.hash        |    4 +-
 package/erlang-lager/erlang-lager.mk          |    2 +-
 ...ipt-remove-extra-dependency-to-base6.patch |   26 -
 package/erlang-p1-acme/erlang-p1-acme.hash    |    2 +-
 package/erlang-p1-acme/erlang-p1-acme.mk      |    2 +-
 .../erlang-p1-cache-tab.hash                  |    2 +-
 .../erlang-p1-cache-tab.mk                    |    2 +-
 .../erlang-p1-mqtree/erlang-p1-mqtree.hash    |    2 +-
 package/erlang-p1-mqtree/erlang-p1-mqtree.mk  |    2 +-
 .../erlang-p1-oauth2/erlang-p1-oauth2.hash    |    2 +-
 package/erlang-p1-oauth2/erlang-p1-oauth2.mk  |    2 +-
 package/erlang-p1-pkix/erlang-p1-pkix.hash    |    2 +-
 package/erlang-p1-pkix/erlang-p1-pkix.mk      |    2 +-
 package/erlang-p1-sip/erlang-p1-sip.hash      |    4 +-
 package/erlang-p1-sip/erlang-p1-sip.mk        |    2 +-
 .../erlang-p1-stringprep.hash                 |    2 +-
 .../erlang-p1-stringprep.mk                   |    2 +-
 package/erlang-p1-stun/erlang-p1-stun.hash    |    2 +-
 package/erlang-p1-stun/erlang-p1-stun.mk      |    2 +-
 package/erlang-p1-tls/erlang-p1-tls.hash      |    4 +-
 package/erlang-p1-tls/erlang-p1-tls.mk        |    2 +-
 package/erlang-p1-utils/erlang-p1-utils.hash  |    2 +-
 package/erlang-p1-utils/erlang-p1-utils.mk    |    2 +-
 package/erlang-p1-xml/erlang-p1-xml.hash      |    2 +-
 package/erlang-p1-xml/erlang-p1-xml.mk        |    2 +-
 package/erlang-p1-xmpp/Config.in              |    1 +
 package/erlang-p1-xmpp/erlang-p1-xmpp.hash    |    2 +-
 package/erlang-p1-xmpp/erlang-p1-xmpp.mk      |    2 +-
 package/erlang-p1-yaml/erlang-p1-yaml.hash    |    2 +-
 package/erlang-p1-yaml/erlang-p1-yaml.mk      |    2 +-
 package/erlang-p1-yconf/erlang-p1-yconf.hash  |    2 +-
 package/erlang-p1-yconf/erlang-p1-yconf.mk    |    2 +-
 package/erlang-p1-zlib/erlang-p1-zlib.hash    |    4 +-
 package/erlang-p1-zlib/erlang-p1-zlib.mk      |    2 +-
 43 files changed, 1764 insertions(+), 82 deletions(-)
 create mode 100644 package/ejabberd/0003-fix-includes.patch
 create mode 100644 package/erlang-idna/0001-remove-unicode_util_compat_library.patch
 delete mode 100644 package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch

-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 01/20] package/erlang-idna: remove unicode_util_compat library

[Johan Oudinet]

This library is not needed for the erlang version packaged in
Buildroot. Since it has been recently removed from erlang-idna
upstream repository but not included in any release yet, backport this
commit as a patch to this version.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 ...1-remove-unicode_util_compat_library.patch | 92 +++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 package/erlang-idna/0001-remove-unicode_util_compat_library.patch

diff --git a/package/erlang-idna/0001-remove-unicode_util_compat_library.patch b/package/erlang-idna/0001-remove-unicode_util_compat_library.patch
new file mode 100644
index 0000000000..788e633879
--- /dev/null
+++ b/package/erlang-idna/0001-remove-unicode_util_compat_library.patch
@@ -0,0 +1,92 @@
+From 230a9175a5edb1b1a47fb09af2f4341eab93b1b0 Mon Sep 17 00:00:00 2001
+From: Benoit Chesneau <bchesneau@gmail.com>
+Date: Sat, 5 Dec 2020 11:31:24 +0100
+Subject: [PATCH] remove unicode_util_compat library
+
+remove unicode_util_compat library and support only Erlang >= 20. This
+change simplify the stack and prepare future change to support specific
+features of Erlang 23 and sup.
+---
+ src/idna.app.src     |  2 +-
+ src/idna.erl         | 10 +++++-----
+ src/idna_context.erl |  4 ++--
+ 3 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/src/idna.app.src b/src/idna.app.src
+index a6a7537..d647506 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 3436dd9..24d96b8 100644
+--- a/src/idna.erl
++++ b/src/idna.erl
+@@ -333,7 +333,7 @@ lowercase_list([], true) ->
+ lowercase_list([], false) ->
+   throw(unchanged);
+ lowercase_list(CPs0, Changed) ->
+-  case unicode_util_compat:lowercase(CPs0) of
++  case unicode_util:lowercase(CPs0) of
+     [Char|CPs] when Char =:= hd(CPs0) -> [Char|lowercase_list(CPs, Changed)];
+     [Char|CPs] -> append(Char,lowercase_list(CPs, true));
+     [] -> lowercase_list([], Changed)
+@@ -346,9 +346,9 @@ lowercase_bin(CP1, <<CP2/utf8, Bin/binary>>, Changed)
+   when CP1 < 128, CP2 < 256 ->
+   [CP1|lowercase_bin(CP2, Bin, Changed)];
+ lowercase_bin(CP1, Bin, Changed) ->
+-  case unicode_util_compat:lowercase([CP1|Bin]) of
++  case unicode_util:lowercase([CP1|Bin]) of
+     [CP1|CPs] ->
+-      case unicode_util_compat:cp(CPs) of
++      case unicode_util:cp(CPs) of
+         [Next|Rest] ->
+           [CP1|lowercase_bin(Next, Rest, Changed)];
+         [] when Changed ->
+@@ -357,7 +357,7 @@ lowercase_bin(CP1, Bin, Changed) ->
+           throw(unchanged)
+       end;
+     [Char|CPs] ->
+-      case unicode_util_compat:cp(CPs) of
++      case unicode_util:cp(CPs) of
+         [Next|Rest] ->
+           [Char|lowercase_bin(Next, Rest, true)];
+         [] ->
+@@ -374,7 +374,7 @@ append(GC, Str) when is_list(GC) -> GC ++ Str.
+ 
+ 
+ characters_to_nfc_list(CD) ->
+-  case unicode_util_compat:nfc(CD) of
++  case unicode_util:nfc(CD) of
+     [CPs|Str] when is_list(CPs) -> CPs ++ characters_to_nfc_list(Str);
+     [CP|Str] -> [CP|characters_to_nfc_list(Str)];
+     [] -> []
+diff --git a/src/idna_context.erl b/src/idna_context.erl
+index afcb814..a09ff1f 100644
+--- a/src/idna_context.erl
++++ b/src/idna_context.erl
+@@ -28,7 +28,7 @@ valid_contextj(Label, Pos) ->
+ valid_contextj(16#200c, Label, Pos) ->
+   if
+      Pos > 0 ->
+-       case unicode_util_compat:lookup(lists:nth(Pos, Label)) of
++       case unicode_util:lookup(lists:nth(Pos, Label)) of
+          #{ ccc := ?virama_combining_class } -> true;
+          _ ->
+            valid_contextj_1(Label, Pos)
+@@ -38,7 +38,7 @@ valid_contextj(16#200c, Label, Pos) ->
+   end;
+ 
+ valid_contextj(16#200d, Label, Pos) when Pos > 0 ->
+-  case unicode_util_compat:lookup(lists:nth(Pos, Label)) of
++  case unicode_util:lookup(lists:nth(Pos, Label)) of
+     #{ ccc := ?virama_combining_class } -> true;
+     _ -> false
+   end;
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 01/20] package/erlang-idna: remove unicode_util_compat library

[Yann E. MORIN]

Johan, All,

On 2022-05-16 15:13 +0200, Johan Oudinet spake thusly:
> This library is not needed for the erlang version packaged in
> Buildroot. Since it has been recently removed from erlang-idna
> upstream repository but not included in any release yet, backport this
> commit as a patch to this version.

We're still on elran-idna 6.0.0.

But as there's been no new release sine 2020-12-05, and no new commit
since about the same day, and since the patch you are adding is the only
commit since 6.1.1., maybe we should just bump to the latest commit in
the repository?

Regards,
Yann E. MORIN.

> Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
> ---
>  ...1-remove-unicode_util_compat_library.patch | 92 +++++++++++++++++++
>  1 file changed, 92 insertions(+)
>  create mode 100644 package/erlang-idna/0001-remove-unicode_util_compat_library.patch
> 
> diff --git a/package/erlang-idna/0001-remove-unicode_util_compat_library.patch b/package/erlang-idna/0001-remove-unicode_util_compat_library.patch
> new file mode 100644
> index 0000000000..788e633879
> --- /dev/null
> +++ b/package/erlang-idna/0001-remove-unicode_util_compat_library.patch
> @@ -0,0 +1,92 @@
> +From 230a9175a5edb1b1a47fb09af2f4341eab93b1b0 Mon Sep 17 00:00:00 2001
> +From: Benoit Chesneau <bchesneau@gmail.com>
> +Date: Sat, 5 Dec 2020 11:31:24 +0100
> +Subject: [PATCH] remove unicode_util_compat library
> +
> +remove unicode_util_compat library and support only Erlang >= 20. This
> +change simplify the stack and prepare future change to support specific
> +features of Erlang 23 and sup.
> +---
> + src/idna.app.src     |  2 +-
> + src/idna.erl         | 10 +++++-----
> + src/idna_context.erl |  4 ++--
> + 3 files changed, 8 insertions(+), 8 deletions(-)
> +
> +diff --git a/src/idna.app.src b/src/idna.app.src
> +index a6a7537..d647506 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 3436dd9..24d96b8 100644
> +--- a/src/idna.erl
> ++++ b/src/idna.erl
> +@@ -333,7 +333,7 @@ lowercase_list([], true) ->
> + lowercase_list([], false) ->
> +   throw(unchanged);
> + lowercase_list(CPs0, Changed) ->
> +-  case unicode_util_compat:lowercase(CPs0) of
> ++  case unicode_util:lowercase(CPs0) of
> +     [Char|CPs] when Char =:= hd(CPs0) -> [Char|lowercase_list(CPs, Changed)];
> +     [Char|CPs] -> append(Char,lowercase_list(CPs, true));
> +     [] -> lowercase_list([], Changed)
> +@@ -346,9 +346,9 @@ lowercase_bin(CP1, <<CP2/utf8, Bin/binary>>, Changed)
> +   when CP1 < 128, CP2 < 256 ->
> +   [CP1|lowercase_bin(CP2, Bin, Changed)];
> + lowercase_bin(CP1, Bin, Changed) ->
> +-  case unicode_util_compat:lowercase([CP1|Bin]) of
> ++  case unicode_util:lowercase([CP1|Bin]) of
> +     [CP1|CPs] ->
> +-      case unicode_util_compat:cp(CPs) of
> ++      case unicode_util:cp(CPs) of
> +         [Next|Rest] ->
> +           [CP1|lowercase_bin(Next, Rest, Changed)];
> +         [] when Changed ->
> +@@ -357,7 +357,7 @@ lowercase_bin(CP1, Bin, Changed) ->
> +           throw(unchanged)
> +       end;
> +     [Char|CPs] ->
> +-      case unicode_util_compat:cp(CPs) of
> ++      case unicode_util:cp(CPs) of
> +         [Next|Rest] ->
> +           [Char|lowercase_bin(Next, Rest, true)];
> +         [] ->
> +@@ -374,7 +374,7 @@ append(GC, Str) when is_list(GC) -> GC ++ Str.
> + 
> + 
> + characters_to_nfc_list(CD) ->
> +-  case unicode_util_compat:nfc(CD) of
> ++  case unicode_util:nfc(CD) of
> +     [CPs|Str] when is_list(CPs) -> CPs ++ characters_to_nfc_list(Str);
> +     [CP|Str] -> [CP|characters_to_nfc_list(Str)];
> +     [] -> []
> +diff --git a/src/idna_context.erl b/src/idna_context.erl
> +index afcb814..a09ff1f 100644
> +--- a/src/idna_context.erl
> ++++ b/src/idna_context.erl
> +@@ -28,7 +28,7 @@ valid_contextj(Label, Pos) ->
> + valid_contextj(16#200c, Label, Pos) ->
> +   if
> +      Pos > 0 ->
> +-       case unicode_util_compat:lookup(lists:nth(Pos, Label)) of
> ++       case unicode_util:lookup(lists:nth(Pos, Label)) of
> +          #{ ccc := ?virama_combining_class } -> true;
> +          _ ->
> +            valid_contextj_1(Label, Pos)
> +@@ -38,7 +38,7 @@ valid_contextj(16#200c, Label, Pos) ->
> +   end;
> + 
> + valid_contextj(16#200d, Label, Pos) when Pos > 0 ->
> +-  case unicode_util_compat:lookup(lists:nth(Pos, Label)) of
> ++  case unicode_util:lookup(lists:nth(Pos, Label)) of
> +     #{ ccc := ?virama_combining_class } -> true;
> +     _ -> false
> +   end;
> -- 
> 2.34.1
> 
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

Re: [Buildroot] [PATCH 01/20] package/erlang-idna: remove unicode_util_compat library

[Johan Oudinet]

Hi Yann, All,

On Mon, May 16, 2022 at 11:32 PM Yann E. MORIN <yann.morin.1998@free.fr> wrote:
> We're still on elran-idna 6.0.0.
>
> But as there's been no new release sine 2020-12-05, and no new commit
> since about the same day, and since the patch you are adding is the only
> commit since 6.1.1., maybe we should just bump to the latest commit in
> the repository?

Initially, I haven't bumped the version to 6.1.1 for two reasons:
- ejabberd still depends on 6.0.0 and I was not sure if it would be
compatible with a more recent version of this library.
- The changelog says version 6.1.0 dropped support for rebar2. I was
afraid it would be difficult to integrate such a version in Buildroot,
because the rebar infrastructure is based on rebar2. I have no idea
how long it would take to add support for rebar3 in buildroot.

Since my goal was to upgrade ejabberd, I took the simple path to
backport the only needed patch to drop the dependency on
unicode_util_compat library.
However, you're right it would be cleaner to bump the version of this
erlang package to master. I've just done that and it was easier than
expected and ejabberd still works with this version. I'm sending a new
version of the whole series. Thanks.
-- 
Johan
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 02/20] package/erlang-lager: bump version to 3.9.1

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-lager/erlang-lager.hash | 4 ++--
 package/erlang-lager/erlang-lager.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/erlang-lager/erlang-lager.hash b/package/erlang-lager/erlang-lager.hash
index 40291af392..282d112d3b 100644
--- a/package/erlang-lager/erlang-lager.hash
+++ b/package/erlang-lager/erlang-lager.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 c5bb4ba6f918e90d2e6671c3996d72c61f2a589b65c151b3df8011d046362981 erlang-lager-3.6.10.tar.gz
-sha256 809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0 LICENSE
+sha256  13316ba3006b174cf6b085ad13ed19ec0f618f10b83fc3530a072cdf4b50668b  erlang-lager-3.9.1.tar.gz
+sha256  809fa1ed21450f59827d1e9aec720bbc4b687434fa22283c6cb5dd82a47ab9c0  LICENSE
diff --git a/package/erlang-lager/erlang-lager.mk b/package/erlang-lager/erlang-lager.mk
index a698bce8d5..7ff27ec0f2 100644
--- a/package/erlang-lager/erlang-lager.mk
+++ b/package/erlang-lager/erlang-lager.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_LAGER_VERSION = 3.6.10
+ERLANG_LAGER_VERSION = 3.9.1
 ERLANG_LAGER_SITE = $(call github,erlang-lager,lager,$(ERLANG_LAGER_VERSION))
 ERLANG_LAGER_LICENSE = Apache-2.0
 ERLANG_LAGER_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 03/20] package/erlang-p1-utils: bump version to 1.0.23

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-utils/erlang-p1-utils.hash | 2 +-
 package/erlang-p1-utils/erlang-p1-utils.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-utils/erlang-p1-utils.hash b/package/erlang-p1-utils/erlang-p1-utils.hash
index dec7c26039..082622098e 100644
--- a/package/erlang-p1-utils/erlang-p1-utils.hash
+++ b/package/erlang-p1-utils/erlang-p1-utils.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  234b88227f61ef03a6177d97ed062c62a22760b6fd189a5a24d2fd1599d95ac9  erlang-p1-utils-1.0.20.tar.gz
+sha256  05f29bc55a51840c84f4055b89d4cc312078badc5571a5962f15348fa5d87015  erlang-p1-utils-1.0.23.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-utils/erlang-p1-utils.mk b/package/erlang-p1-utils/erlang-p1-utils.mk
index 084382cd2b..5804c2531d 100644
--- a/package/erlang-p1-utils/erlang-p1-utils.mk
+++ b/package/erlang-p1-utils/erlang-p1-utils.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_UTILS_VERSION = 1.0.20
+ERLANG_P1_UTILS_VERSION = 1.0.23
 ERLANG_P1_UTILS_SITE = $(call github,processone,p1_utils,$(ERLANG_P1_UTILS_VERSION))
 ERLANG_P1_UTILS_LICENSE = Apache-2.0
 ERLANG_P1_UTILS_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 04/20] package/erlang-p1-cache-tab: bump version to 1.0.29

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash | 2 +-
 package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
index 85a92cf0b2..9f03bdbfae 100644
--- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
+++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  32cb3a3017f53e66bd1c2b75f60a2c4a14f00f375582a3c511ea39266b2385b9  erlang-p1-cache-tab-1.0.25.tar.gz
+sha256  b11299eebafab6f1f5670650c48b10d9fa607ab092b4be8a976982e3f2b37526  erlang-p1-cache-tab-1.0.29.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
index f3253d1cd7..046235f24c 100644
--- a/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
+++ b/package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_CACHE_TAB_VERSION = 1.0.25
+ERLANG_P1_CACHE_TAB_VERSION = 1.0.29
 ERLANG_P1_CACHE_TAB_SITE = $(call github,processone,cache_tab,$(ERLANG_P1_CACHE_TAB_VERSION))
 ERLANG_P1_CACHE_TAB_LICENSE = Apache-2.0
 ERLANG_P1_CACHE_TAB_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 05/20] package/erlang-p1-tls: bump version to 1.1.13

[Johan Oudinet]

The copyright year in the license file has been updated to 2022, hence
the new hash for the license.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-tls/erlang-p1-tls.hash | 4 ++--
 package/erlang-p1-tls/erlang-p1-tls.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/erlang-p1-tls/erlang-p1-tls.hash b/package/erlang-p1-tls/erlang-p1-tls.hash
index 475223b986..32d90ef7a0 100644
--- a/package/erlang-p1-tls/erlang-p1-tls.hash
+++ b/package/erlang-p1-tls/erlang-p1-tls.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  97fd0a398751fc63b28df016e92a08ea98d083f7d5e3f32380a92de1ee86ca0e  erlang-p1-tls-1.1.9.tar.gz
-sha256  6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a  LICENSE.txt
+sha256  5377671fed74a61518a742bc52d73941039d6e3c6e192133c7feaf5a83e1275b  erlang-p1-tls-1.1.13.tar.gz
+sha256  a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d  LICENSE.txt
diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk
index 9e7d4c7c73..1f79bf90c1 100644
--- a/package/erlang-p1-tls/erlang-p1-tls.mk
+++ b/package/erlang-p1-tls/erlang-p1-tls.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_TLS_VERSION = 1.1.9
+ERLANG_P1_TLS_VERSION = 1.1.13
 ERLANG_P1_TLS_SITE = $(call github,processone,fast_tls,$(ERLANG_P1_TLS_VERSION))
 ERLANG_P1_TLS_LICENSE = Apache-2.0
 ERLANG_P1_TLS_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 06/20] package/erlang-p1-stringprep: bump version to 1.0.27

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-stringprep/erlang-p1-stringprep.hash | 2 +-
 package/erlang-p1-stringprep/erlang-p1-stringprep.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
index e23cc4f38b..eec611829a 100644
--- a/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
+++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.hash
@@ -1,5 +1,5 @@
 # Locally calculated
-sha256  47f9f8ee901f47b7f62c5140ea09f113efe7fedd5e8ffb92d50f51c5e11fb67f  erlang-p1-stringprep-1.0.23.tar.gz
+sha256  cdc2ffa6ba2171f55b78e69cfce5dab6099cbb6bc6955d88c5c53b0cf24d13af  erlang-p1-stringprep-1.0.27.tar.gz
 sha256  f44415631770cb818de6d92f3961fdfe6e407a5154f84b87cc06ac27323e919c  LICENSE.ALL
 sha256  42aef2a1337ef1f45ae2832aa5aa268c79b2560fb1f3ebab519629372cb24ffe  LICENSE.TCL
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
index 580f4a9aa9..233be52c58 100644
--- a/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
+++ b/package/erlang-p1-stringprep/erlang-p1-stringprep.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STRINGPREP_VERSION = 1.0.23
+ERLANG_P1_STRINGPREP_VERSION = 1.0.27
 ERLANG_P1_STRINGPREP_SITE = $(call github,processone,stringprep,$(ERLANG_P1_STRINGPREP_VERSION))
 ERLANG_P1_STRINGPREP_LICENSE = TCL (tools/*.tcl), Apache-2.0 (rest)
 ERLANG_P1_STRINGPREP_LICENSE_FILES = LICENSE.ALL LICENSE.TCL LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 07/20] package/erlang-p1-xml: bump version to 1.1.49

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-xml/erlang-p1-xml.hash | 2 +-
 package/erlang-p1-xml/erlang-p1-xml.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-p1-xml/erlang-p1-xml.hash
index f2a4ab83e0..379ca7ef88 100644
--- a/package/erlang-p1-xml/erlang-p1-xml.hash
+++ b/package/erlang-p1-xml/erlang-p1-xml.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  739f37a161a570071469ab1f3d8fc232f004ea616700fe7e46b6d8afa9d03a60  erlang-p1-xml-1.1.44.tar.gz
+sha256  02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265  erlang-p1-xml-1.1.49.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk
index 5730181ac6..eee2c74c03 100644
--- a/package/erlang-p1-xml/erlang-p1-xml.mk
+++ b/package/erlang-p1-xml/erlang-p1-xml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_XML_VERSION = 1.1.44
+ERLANG_P1_XML_VERSION = 1.1.49
 ERLANG_P1_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_P1_XML_VERSION))
 ERLANG_P1_XML_LICENSE = Apache-2.0
 ERLANG_P1_XML_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 08/20] package/erlang-p1-xmpp: bump version to 1.5.6

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-xmpp/Config.in           | 1 +
 package/erlang-p1-xmpp/erlang-p1-xmpp.hash | 2 +-
 package/erlang-p1-xmpp/erlang-p1-xmpp.mk   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in
index 6e40fed10a..c67dc832b7 100644
--- a/package/erlang-p1-xmpp/Config.in
+++ b/package/erlang-p1-xmpp/Config.in
@@ -4,6 +4,7 @@ comment "erlang-p1-xmpp needs a toolchain w/ C++"
 config BR2_PACKAGE_ERLANG_P1_XMPP
 	bool "erlang-p1-xmpp"
 	depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep
+	select BR2_PACKAGE_ERLANG_IDNA
 	select BR2_PACKAGE_ERLANG_P1_XML
 	select BR2_PACKAGE_ERLANG_P1_STRINGPREP
 	select BR2_PACKAGE_ERLANG_P1_TLS
diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
index d0a761fcac..fce23c09c6 100644
--- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
+++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  65c73ffaf8faab5d6fc7d42ada0b5a380f20f3e46056ad98614d81922322d9a2  erlang-p1-xmpp-1.4.10.tar.gz
+sha256  bde03ad371aad3e171ebe94a5b3b84daa4b8dd7ee37e9979ff373cd65370e725  erlang-p1-xmpp-1.5.6.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
index f903cb945d..fc63b5ffc2 100644
--- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
+++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_XMPP_VERSION = 1.4.10
+ERLANG_P1_XMPP_VERSION = 1.5.6
 ERLANG_P1_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_P1_XMPP_VERSION))
 ERLANG_P1_XMPP_LICENSE = Apache-2.0
 ERLANG_P1_XMPP_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 09/20] package/erlang-p1-yaml: bump version to 1.0.32

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-yaml/erlang-p1-yaml.hash | 2 +-
 package/erlang-p1-yaml/erlang-p1-yaml.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-p1-yaml/erlang-p1-yaml.hash
index 955a000930..89123dfd83 100644
--- a/package/erlang-p1-yaml/erlang-p1-yaml.hash
+++ b/package/erlang-p1-yaml/erlang-p1-yaml.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  8f53308438e4d1613562acb586b4c4540569d8305097508c40e6f261fe4216cd  erlang-p1-yaml-1.0.28.tar.gz
+sha256  6d5c823dd895b736b98325d88893a63c054964d7bde9a8e150fc4df5f4165065  erlang-p1-yaml-1.0.32.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk
index e42ff5fe38..6acb6fe059 100644
--- a/package/erlang-p1-yaml/erlang-p1-yaml.mk
+++ b/package/erlang-p1-yaml/erlang-p1-yaml.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_YAML_VERSION = 1.0.28
+ERLANG_P1_YAML_VERSION = 1.0.32
 ERLANG_P1_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_P1_YAML_VERSION))
 ERLANG_P1_YAML_LICENSE = Apache-2.0
 ERLANG_P1_YAML_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 10/20] package/erlang-p1-yconf: bump version to 1.0.12

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-yconf/erlang-p1-yconf.hash | 2 +-
 package/erlang-p1-yconf/erlang-p1-yconf.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.hash b/package/erlang-p1-yconf/erlang-p1-yconf.hash
index 97e71f85cd..990f08dce9 100644
--- a/package/erlang-p1-yconf/erlang-p1-yconf.hash
+++ b/package/erlang-p1-yconf/erlang-p1-yconf.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  ab0f7462b8d03d18be1587fa9cfb227923055f765fca4459b4bb42ccef971329  erlang-p1-yconf-1.0.8.tar.gz
+sha256  e88f74c3950630e0ca7be41cbe2332d3ca600241f37779a862bdcc46f9031877  erlang-p1-yconf-1.0.12.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.mk b/package/erlang-p1-yconf/erlang-p1-yconf.mk
index 3e3a10ae15..682ca08ff2 100644
--- a/package/erlang-p1-yconf/erlang-p1-yconf.mk
+++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_YCONF_VERSION = 1.0.8
+ERLANG_P1_YCONF_VERSION = 1.0.12
 ERLANG_P1_YCONF_SITE = $(call github,processone,yconf,$(ERLANG_P1_YCONF_VERSION))
 ERLANG_P1_YCONF_LICENSE = Apache-2.0
 ERLANG_P1_YCONF_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 11/20] package/erlang-p1-oauth2: bump version to 0.6.10

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-oauth2/erlang-p1-oauth2.hash | 2 +-
 package/erlang-p1-oauth2/erlang-p1-oauth2.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
index a6d00aa96e..7a0304e86a 100644
--- a/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
+++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  c5cf0d2a9f5874c289cc6044945f4771a79007bda812e5269dea3a4c92fc8811  erlang-p1-oauth2-0.6.7.tar.gz
+sha256  625e6d96a212cc2cf8a63c36ee698072791d85acbaae18e5820ba144cdaca869  erlang-p1-oauth2-0.6.10.tar.gz
 sha256  0ecddd0a5e35b7fcdab451f54c5bb688fac8365cdf6b0da0ac64b7895a0770f3  LICENSE
diff --git a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
index d7dd45b252..50ac9fbda5 100644
--- a/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
+++ b/package/erlang-p1-oauth2/erlang-p1-oauth2.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_OAUTH2_VERSION = 0.6.7
+ERLANG_P1_OAUTH2_VERSION = 0.6.10
 ERLANG_P1_OAUTH2_SITE = $(call github,processone,p1_oauth2,$(ERLANG_P1_OAUTH2_VERSION))
 ERLANG_P1_OAUTH2_LICENSE = MIT
 ERLANG_P1_OAUTH2_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 12/20] package/erlang-p1-pkix: bump version to 1.0.8

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-pkix/erlang-p1-pkix.hash | 2 +-
 package/erlang-p1-pkix/erlang-p1-pkix.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.hash b/package/erlang-p1-pkix/erlang-p1-pkix.hash
index b0ee7d58ba..c58dc5c2c5 100644
--- a/package/erlang-p1-pkix/erlang-p1-pkix.hash
+++ b/package/erlang-p1-pkix/erlang-p1-pkix.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  3a39c4ca74f93efa0e4de4c37f9e4d073b1aeb142ad669f12588ad2b3c39724e  erlang-p1-pkix-1.0.6.tar.gz
+sha256  257171bec3fe495cd390c3a987131893a0a1a0b22e5973ac3cba9c354cb72324  erlang-p1-pkix-1.0.8.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/erlang-p1-pkix/erlang-p1-pkix.mk b/package/erlang-p1-pkix/erlang-p1-pkix.mk
index 12ae042138..a7ecb08ad9 100644
--- a/package/erlang-p1-pkix/erlang-p1-pkix.mk
+++ b/package/erlang-p1-pkix/erlang-p1-pkix.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_PKIX_VERSION = 1.0.6
+ERLANG_P1_PKIX_VERSION = 1.0.8
 ERLANG_P1_PKIX_SITE = $(call github,processone,pkix,$(ERLANG_P1_PKIX_VERSION))
 ERLANG_P1_PKIX_LICENSE = Apache-2.0
 ERLANG_P1_PKIX_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 13/20] package/erlang-eimp: bump version to 1.0.21

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-eimp/erlang-eimp.hash | 2 +-
 package/erlang-eimp/erlang-eimp.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-eimp/erlang-eimp.hash b/package/erlang-eimp/erlang-eimp.hash
index 28d22be16d..5845815c60 100644
--- a/package/erlang-eimp/erlang-eimp.hash
+++ b/package/erlang-eimp/erlang-eimp.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  1a529fa6e8264d3cad43861db417a1e841b28c0601aa847857fa0d6a81935922  erlang-eimp-1.0.17.tar.gz
+sha256  25e4e1178280d6fb98ee5e582ade393f7c5404c546638bcde86a6ebcb6757d90  erlang-eimp-1.0.21.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk
index d066961cd3..27bb2203c2 100644
--- a/package/erlang-eimp/erlang-eimp.mk
+++ b/package/erlang-eimp/erlang-eimp.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_EIMP_VERSION = 1.0.17
+ERLANG_EIMP_VERSION = 1.0.21
 ERLANG_EIMP_SITE = $(call github,processone,eimp,$(ERLANG_EIMP_VERSION))
 ERLANG_EIMP_LICENSE = Apache-2.0
 ERLANG_EIMP_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 14/20] package/erlang-p1-mqtree: bump version to 1.0.14

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-mqtree/erlang-p1-mqtree.hash | 2 +-
 package/erlang-p1-mqtree/erlang-p1-mqtree.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
index cf1a880cb8..b91a0cdaa0 100644
--- a/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
+++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  4f86e272a97152d3f5166dad583dc1b5bda9582f6777f6294fb8328def8b2189  erlang-p1-mqtree-1.0.10.tar.gz
+sha256  b0b5506f43fd2ef8f72b3d5f42ece4dd22d872f9be2a9120affb7c6ae047597f  erlang-p1-mqtree-1.0.14.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE
diff --git a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
index 19e31ef1b2..9e66bebbaa 100644
--- a/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
+++ b/package/erlang-p1-mqtree/erlang-p1-mqtree.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_MQTREE_VERSION = 1.0.10
+ERLANG_P1_MQTREE_VERSION = 1.0.14
 ERLANG_P1_MQTREE_SITE = $(call github,processone,mqtree,$(ERLANG_P1_MQTREE_VERSION))
 ERLANG_P1_MQTREE_LICENSE = Apache-2.0
 ERLANG_P1_MQTREE_LICENSE_FILES = LICENSE
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 15/20] package/erlang-jose: bump version to 1.11.1

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-jose/erlang-jose.hash | 4 ++--
 package/erlang-jose/erlang-jose.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/erlang-jose/erlang-jose.hash b/package/erlang-jose/erlang-jose.hash
index 71a1543d92..75e6f0a041 100644
--- a/package/erlang-jose/erlang-jose.hash
+++ b/package/erlang-jose/erlang-jose.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256 d55a9d3a1697833fed555a21f1aeb2727af88193995cb6ffa945d4b6749d0e8d erlang-jose-1.9.0.tar.gz
-sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md
+sha256  87cdcb9df6f943c97772e5d90bed87555a72c8957ce2cb901df259050e18e7bb  erlang-jose-1.11.1.tar.gz
+sha256  6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be  LICENSE.md
diff --git a/package/erlang-jose/erlang-jose.mk b/package/erlang-jose/erlang-jose.mk
index 43ed22a9f7..b31a60aa3e 100644
--- a/package/erlang-jose/erlang-jose.mk
+++ b/package/erlang-jose/erlang-jose.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_JOSE_VERSION = 1.9.0
+ERLANG_JOSE_VERSION = 1.11.1
 ERLANG_JOSE_SITE = $(call github,potatosalad,erlang-jose,$(ERLANG_JOSE_VERSION))
 ERLANG_JOSE_LICENSE = MIT
 ERLANG_JOSE_LICENSE_FILES = LICENSE.md
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 16/20] package/erlang-p1-acme: bump version to 1.0.16

[Johan Oudinet]

and remove the unnecessary patch.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 ...ipt-remove-extra-dependency-to-base6.patch | 26 -------------------
 package/erlang-p1-acme/erlang-p1-acme.hash    |  2 +-
 package/erlang-p1-acme/erlang-p1-acme.mk      |  2 +-
 3 files changed, 2 insertions(+), 28 deletions(-)
 delete mode 100644 package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch

diff --git a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch b/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch
deleted file mode 100644
index a27730e23c..0000000000
--- a/package/erlang-p1-acme/0001-rebar.config.script-remove-extra-dependency-to-base6.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From a2422fdf4097d1f5f8c8f88bbe08b9a0f3c35fe6 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Wed, 25 Nov 2020 22:38:22 +0100
-Subject: [PATCH] rebar.config.script: remove extra dependency to base64url
-
-Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
----
- rebar.config.script | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/rebar.config.script b/rebar.config.script
-index a63895e..41b2970 100644
---- a/rebar.config.script
-+++ b/rebar.config.script
-@@ -62,7 +62,7 @@ Cfg2 = case IsRebar3 of
-                [{plugin_dir, filename:join([filename:dirname(SCRIPT),"plugins"])},
-                 {plugins, [override_deps_versions]}] ++
-                 ModCfg(CONFIG, [deps], fun(V) ->
--                   V ++ [{base64url, ".*", {git, "git://github.com/dvv/base64url.git", {tag, "v1.0"}}}]
-+                   V
-                 end, [])
-        end,
- 
--- 
-2.29.2
-
diff --git a/package/erlang-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash
index af13e88b1a..7cecb6dfc0 100644
--- a/package/erlang-p1-acme/erlang-p1-acme.hash
+++ b/package/erlang-p1-acme/erlang-p1-acme.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  e17ba49f45b72200470bc2f176b315bec1028d07a4817859052f98c0a7259632  erlang-p1-acme-1.0.9.tar.gz
+sha256  58d4b7e97e677bd5a8aa3c1e52514a37cfa0985cad8b5f45cd05889843c4fdd9  erlang-p1-acme-1.0.16.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-acme/erlang-p1-acme.mk b/package/erlang-p1-acme/erlang-p1-acme.mk
index 21c155e206..c9cd1c4f33 100644
--- a/package/erlang-p1-acme/erlang-p1-acme.mk
+++ b/package/erlang-p1-acme/erlang-p1-acme.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_ACME_VERSION = 1.0.9
+ERLANG_P1_ACME_VERSION = 1.0.16
 ERLANG_P1_ACME_SITE = $(call github,processone,p1_acme,$(ERLANG_P1_ACME_VERSION))
 ERLANG_P1_ACME_LICENSE = Apache-2.0
 ERLANG_P1_ACME_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 17/20] package/erlang-p1-stun: bump version to 1.0.47

[Johan Oudinet]

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-stun/erlang-p1-stun.hash | 2 +-
 package/erlang-p1-stun/erlang-p1-stun.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-p1-stun/erlang-p1-stun.hash
index fb56b8f4e6..aef122b4a6 100644
--- a/package/erlang-p1-stun/erlang-p1-stun.hash
+++ b/package/erlang-p1-stun/erlang-p1-stun.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  05d2f31f172883d2301a93cd141e6b930dfdd01e10b6aacf806becc3674973d8  erlang-p1-stun-1.0.39.tar.gz
+sha256  f9b82949b54778a4b766dca5509eef4475e1dbc165a449974dbd0cc54c6f84a2  erlang-p1-stun-1.0.47.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt
diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk
index f762e7f45c..ce117e20b5 100644
--- a/package/erlang-p1-stun/erlang-p1-stun.mk
+++ b/package/erlang-p1-stun/erlang-p1-stun.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_STUN_VERSION = 1.0.39
+ERLANG_P1_STUN_VERSION = 1.0.47
 ERLANG_P1_STUN_SITE = $(call github,processone,stun,$(ERLANG_P1_STUN_VERSION))
 ERLANG_P1_STUN_LICENSE = Apache-2.0
 ERLANG_P1_STUN_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 18/20] package/erlang-p1-sip: bump version to 1.0.47

[Johan Oudinet]

The copyright year in the license file has been updated to 2022, hence
the new license hash.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-sip/erlang-p1-sip.hash | 4 ++--
 package/erlang-p1-sip/erlang-p1-sip.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash
index e52371e404..b20df00280 100644
--- a/package/erlang-p1-sip/erlang-p1-sip.hash
+++ b/package/erlang-p1-sip/erlang-p1-sip.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  b46349a7077d8e5f36a216ada4a5c0b51ef3d66005606beb0ea3962069f215a7  erlang-p1-sip-1.0.38.tar.gz
-sha256  6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a  LICENSE.txt
+sha256  1de406bc59c30e2697b8b29cc0ad0e370e6f5a5d777d37e022d195586b80643d  erlang-p1-sip-1.0.47.tar.gz
+sha256  c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e  LICENSE.txt
diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk
index 2d2f0110c3..f0e999ec54 100644
--- a/package/erlang-p1-sip/erlang-p1-sip.mk
+++ b/package/erlang-p1-sip/erlang-p1-sip.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_SIP_VERSION = 1.0.38
+ERLANG_P1_SIP_VERSION = 1.0.47
 ERLANG_P1_SIP_SITE = $(call github,processone,esip,$(ERLANG_P1_SIP_VERSION))
 ERLANG_P1_SIP_LICENSE = Apache-2.0
 ERLANG_P1_SIP_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 19/20] package/erlang-p1-zlib: bump version to 1.0.10

[Johan Oudinet]

The copyright year in the license file has been updated to 2022, hence
the new license hash.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 package/erlang-p1-zlib/erlang-p1-zlib.hash | 4 ++--
 package/erlang-p1-zlib/erlang-p1-zlib.mk   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash
index 7ce58762f8..f48aba90ea 100644
--- a/package/erlang-p1-zlib/erlang-p1-zlib.hash
+++ b/package/erlang-p1-zlib/erlang-p1-zlib.hash
@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  f0ac60336b2ddf55ac4f58934580cb8f02dba440d68feb607be312dd35d91269  erlang-p1-zlib-1.0.9.tar.gz
-sha256  6cd4871db940d055cf272c12c10e0c08febdc94362e404390758fde34b4ce01a  LICENSE.txt
+sha256  cef52f8f28229bf7229b53d225a6a9865acf5bdeaf16a40f81bbeb226615be99  erlang-p1-zlib-1.0.10.tar.gz
+sha256  a401e98a7eef1c741b3e8b1a46a21730b4a1bc7020e4ec1a8c2a44dbd7f0ba5d  LICENSE.txt
diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk
index 0e6ee298ef..fdffb6ed3e 100644
--- a/package/erlang-p1-zlib/erlang-p1-zlib.mk
+++ b/package/erlang-p1-zlib/erlang-p1-zlib.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-ERLANG_P1_ZLIB_VERSION = 1.0.9
+ERLANG_P1_ZLIB_VERSION = 1.0.10
 ERLANG_P1_ZLIB_SITE = $(call github,processone,ezlib,$(ERLANG_P1_ZLIB_VERSION))
 ERLANG_P1_ZLIB_LICENSE = Apache-2.0
 ERLANG_P1_ZLIB_LICENSE_FILES = LICENSE.txt
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot

[Buildroot] [PATCH 20/20] package/ejabberd: bump version to 21.12

[Johan Oudinet]

And update the patches accordingly. Also add a patch to adjust the
includes to find the corresponding libraries.

Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
---
 ...not-download-or-compile-dependencies.patch |   24 +-
 package/ejabberd/0003-fix-includes.patch      | 1614 +++++++++++++++++
 package/ejabberd/ejabberd.hash                |    2 +-
 package/ejabberd/ejabberd.mk                  |    5 +-
 4 files changed, 1630 insertions(+), 15 deletions(-)
 create mode 100644 package/ejabberd/0003-fix-includes.patch

diff --git a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
index ffacb6dafd..58213ed2e6 100644
--- a/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
+++ b/package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch
@@ -1,6 +1,6 @@
-From cb583beba1acba55112fbb4636c1c73d9ae691a0 Mon Sep 17 00:00:00 2001
+From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001
 From: Johan Oudinet <johan.oudinet@gmail.com>
-Date: Fri, 20 Nov 2020 00:33:30 +0100
+Date: Fri, 13 May 2022 14:22:37 +0200
 Subject: [PATCH] Makefile.in: do not download or compile dependencies
 
 Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
@@ -9,27 +9,27 @@ Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com>
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/Makefile.in b/Makefile.in
-index abd64835..06f876bb 100644
+index ab0e9d967..6e54168a7 100644
 --- a/Makefile.in
 +++ b/Makefile.in
-@@ -97,7 +97,7 @@ ifneq ($(INSTALLGROUP),)
-   G_USER=-g $(INSTALLGROUP)
+@@ -139,7 +139,7 @@ else
+ endif
  endif
  
 -all: deps src
 +all: src
  
- deps: deps/.got
+ deps: $(DEPSDIR)/.got
  
-@@ -111,7 +111,7 @@ deps/.built: deps/.got
- 	$(REBAR) configure-deps
- 	$(REBAR) compile && :> deps/.built
+@@ -153,7 +153,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got
+ 	$(CONFIGURE_DEPS)
+ 	$(REBAR) compile && :> $(DEPSDIR)/.built
  
--src: deps/.built
+-src: $(DEPSDIR)/.built
 +src:
- 	$(REBAR) skip_deps=true compile
+ 	$(REBAR) $(SKIPDEPS) compile
  
  update:
 -- 
-2.29.2
+2.34.1
 
diff --git a/package/ejabberd/0003-fix-includes.patch b/package/ejabberd/0003-fix-includes.patch
new file mode 100644
index 0000000000..825068db70
--- /dev/null
+++ b/package/ejabberd/0003-fix-includes.patch
@@ -0,0 +1,1614 @@
+Description: correct includes
+ Many parts of ejabberd code were moved into their own projects and are packaged
+ separately by me. To make the build process work, several includes must be
+ adjusted for the corresponding libraries to be found.
+Author: Philipp Huebner <debalance@debian.org>
+
+Index: ejabberd/src/ejabberd_auth.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_auth.erl
++++ ejabberd/src/ejabberd_auth.erl
+@@ -48,7 +48,7 @@
+ 
+ -export([auth_modules/1, convert_to_scram/1]).
+ 
+--include_lib("xmpp/include/scram.hrl").
++-include_lib("p1_xmpp/include/scram.hrl").
+ -include("logger.hrl").
+ 
+ -define(SALT_LENGTH, 16).
+Index: ejabberd/src/ejabberd_auth_anonymous.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_auth_anonymous.erl
++++ ejabberd/src/ejabberd_auth_anonymous.erl
+@@ -45,7 +45,7 @@
+ 	 plain_password_required/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ start(Host) ->
+     ejabberd_hooks:add(sm_register_connection_hook, Host,
+Index: ejabberd/src/ejabberd_auth_jwt.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_auth_jwt.erl
++++ ejabberd/src/ejabberd_auth_jwt.erl
+@@ -36,7 +36,7 @@
+ %% 'ejabberd_hooks' callback:
+ -export([check_decoded_jwt/5]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ %%%----------------------------------------------------------------------
+Index: ejabberd/src/ejabberd_auth_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_auth_mnesia.erl
++++ ejabberd/src/ejabberd_auth_mnesia.erl
+@@ -37,7 +37,7 @@
+ -export([need_transform/1, transform/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/scram.hrl").
++-include_lib("p1_xmpp/include/scram.hrl").
+ -include("ejabberd_auth.hrl").
+ 
+ -record(reg_users_counter, {vhost = <<"">> :: binary(),
+Index: ejabberd/src/ejabberd_auth_sql.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_auth_sql.erl
++++ ejabberd/src/ejabberd_auth_sql.erl
+@@ -35,7 +35,7 @@
+ 	 remove_user/2, store_type/1, plain_password_required/1,
+ 	 export/1, which_users_exists/2]).
+ 
+--include_lib("xmpp/include/scram.hrl").
++-include_lib("p1_xmpp/include/scram.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("ejabberd_auth.hrl").
+Index: ejabberd/src/ejabberd_bosh.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_bosh.erl
++++ ejabberd/src/ejabberd_bosh.erl
+@@ -43,7 +43,7 @@
+ 	 code_change/4]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include("bosh.hrl").
+ 
+Index: ejabberd/src/ejabberd_c2s.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_c2s.erl
++++ ejabberd/src/ejabberd_c2s.erl
+@@ -47,7 +47,7 @@
+ 	 reply/2, copy_state/2, set_timeout/2, route/2, format_reason/2,
+ 	 host_up/1, host_down/1, send_ws_ping/1, bounce_message_queue/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_roster.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/ejabberd_captcha.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_captcha.erl
++++ ejabberd/src/ejabberd_captcha.erl
+@@ -42,7 +42,7 @@
+ 	 host_up/1, host_down/1,
+ 	 config_reloaded/0, process_iq/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/ejabberd_http.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_http.erl
++++ ejabberd/src/ejabberd_http.erl
+@@ -37,7 +37,7 @@
+ -export([init/3]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include_lib("kernel/include/file.hrl").
+ 
+Index: ejabberd/src/ejabberd_http_ws.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_http_ws.erl
++++ ejabberd/src/ejabberd_http_ws.erl
+@@ -36,7 +36,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/ejabberd_iq.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_iq.erl
++++ ejabberd/src/ejabberd_iq.erl
+@@ -34,7 +34,7 @@
+ -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+ 	 terminate/2, code_change/3]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_stacktrace.hrl").
+ 
+Index: ejabberd/src/ejabberd_local.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_local.erl
++++ ejabberd/src/ejabberd_local.erl
+@@ -47,7 +47,7 @@
+ 
+ -include("logger.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_stacktrace.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/ejabberd_oauth.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_oauth.erl
++++ ejabberd/src/ejabberd_oauth.erl
+@@ -54,7 +54,7 @@
+          oauth_add_client_implicit/3,
+          oauth_remove_client/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+ -include("ejabberd_web_admin.hrl").
+Index: ejabberd/src/ejabberd_oauth_rest.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_oauth_rest.erl
++++ ejabberd/src/ejabberd_oauth_rest.erl
+@@ -36,7 +36,7 @@
+ 
+ -include("ejabberd_oauth.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ init() ->
+     rest:start(ejabberd_config:get_myname()),
+Index: ejabberd/src/ejabberd_oauth_sql.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_oauth_sql.erl
++++ ejabberd/src/ejabberd_oauth_sql.erl
+@@ -37,7 +37,7 @@
+ 
+ -include("ejabberd_oauth.hrl").
+ -include("ejabberd_sql_pt.hrl").
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("logger.hrl").
+ 
+ init() ->
+Index: ejabberd/src/ejabberd_piefxis.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_piefxis.erl
++++ ejabberd/src/ejabberd_piefxis.erl
+@@ -38,9 +38,9 @@
+ 
+ -define(CHUNK_SIZE, 1024*20). %20k
+ 
+--include_lib("xmpp/include/scram.hrl").
++-include_lib("p1_xmpp/include/scram.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("mod_roster.hrl").
+ 
+Index: ejabberd/src/ejabberd_router.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_router.erl
++++ ejabberd/src/ejabberd_router.erl
+@@ -69,7 +69,7 @@
+ 
+ -include("logger.hrl").
+ -include("ejabberd_router.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_stacktrace.hrl").
+ 
+ -callback init() -> any().
+Index: ejabberd/src/ejabberd_router_multicast.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_router_multicast.erl
++++ ejabberd/src/ejabberd_router_multicast.erl
+@@ -42,7 +42,7 @@
+ 	 terminate/2, code_change/3, update_to_in_wrapped/2]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(route_multicast, {domain = <<"">> :: binary() | '_',
+ 			  pid = self() :: pid()}).
+Index: ejabberd/src/ejabberd_s2s.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_s2s.erl
++++ ejabberd/src/ejabberd_s2s.erl
+@@ -52,7 +52,7 @@
+ -export([get_info_s2s_connections/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_commands.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/ejabberd_s2s_in.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_s2s_in.erl
++++ ejabberd/src/ejabberd_s2s_in.erl
+@@ -41,7 +41,7 @@
+ -export([stop_async/1, close/1, close/2, send/2, update_state/2, establish/1,
+ 	 host_up/1, host_down/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ 
+ -type state() :: xmpp_stream_in:state().
+Index: ejabberd/src/ejabberd_s2s_out.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_s2s_out.erl
++++ ejabberd/src/ejabberd_s2s_out.erl
+@@ -39,7 +39,7 @@
+ -export([start/3, start_link/3, connect/1, close/1, close/2, stop_async/1, send/2,
+ 	 route/2, establish/1, update_state/2, host_up/1, host_down/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/ejabberd_service.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_service.erl
++++ ejabberd/src/ejabberd_service.erl
+@@ -35,7 +35,7 @@
+ %% API
+ -export([send/2, close/1, close/2, stop_async/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/ejabberd_sm.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_sm.erl
++++ ejabberd/src/ejabberd_sm.erl
+@@ -85,7 +85,7 @@
+ 	 handle_info/2, terminate/2, code_change/3]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_commands.hrl").
+ -include("ejabberd_sm.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/ejabberd_web.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_web.erl
++++ ejabberd/src/ejabberd_web.erl
+@@ -33,7 +33,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/ejabberd_web_admin.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_web_admin.erl
++++ ejabberd/src/ejabberd_web_admin.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/ejabberd_websocket.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_websocket.erl
++++ ejabberd/src/ejabberd_websocket.erl
+@@ -45,7 +45,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/ejabberd_xmlrpc.erl
+===================================================================
+--- ejabberd.orig/src/ejabberd_xmlrpc.erl
++++ ejabberd/src/ejabberd_xmlrpc.erl
+@@ -39,7 +39,7 @@
+ -include("ejabberd_http.hrl").
+ -include("mod_roster.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state,
+ 	{auth = noauth        :: noauth | map(),
+Index: ejabberd/src/gen_iq_handler.erl
+===================================================================
+--- ejabberd.orig/src/gen_iq_handler.erl
++++ ejabberd/src/gen_iq_handler.erl
+@@ -35,7 +35,7 @@
+ -deprecated([{add_iq_handler, 6}, {handle, 5}, {iqdisc, 1}]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ -include("ejabberd_stacktrace.hrl").
+ 
+Index: ejabberd/src/gen_pubsub_node.erl
+===================================================================
+--- ejabberd.orig/src/gen_pubsub_node.erl
++++ ejabberd/src/gen_pubsub_node.erl
+@@ -25,7 +25,7 @@
+ 
+ -module(gen_pubsub_node).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -type(host() :: mod_pubsub:host()).
+ -type(nodeId() :: mod_pubsub:nodeId()).
+Index: ejabberd/src/gen_pubsub_nodetree.erl
+===================================================================
+--- ejabberd.orig/src/gen_pubsub_nodetree.erl
++++ ejabberd/src/gen_pubsub_nodetree.erl
+@@ -36,7 +36,7 @@
+ 	ServerHost :: binary(),
+ 	Opts :: [any()]) -> atom().
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -callback terminate(Host :: host(), ServerHost :: binary()) -> atom().
+ 
+Index: ejabberd/src/jd2ejd.erl
+===================================================================
+--- ejabberd.orig/src/jd2ejd.erl
++++ ejabberd/src/jd2ejd.erl
+@@ -31,7 +31,7 @@
+ -export([import_file/1, import_dir/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%----------------------------------------------------------------------
+ %%% API
+Index: ejabberd/src/misc.erl
+===================================================================
+--- ejabberd.orig/src/misc.erl
++++ ejabberd/src/misc.erl
+@@ -50,7 +50,7 @@
+ 	     {encode_base64, 1}]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("kernel/include/file.hrl").
+ 
+ -type distance_cache() :: #{{string(), string()} => non_neg_integer()}.
+Index: ejabberd/src/mod_adhoc.erl
+===================================================================
+--- ejabberd.orig/src/mod_adhoc.erl
++++ ejabberd/src/mod_adhoc.erl
+@@ -39,7 +39,7 @@
+ 	 mod_options/1, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/mod_admin_extra.erl
+===================================================================
+--- ejabberd.orig/src/mod_admin_extra.erl
++++ ejabberd/src/mod_admin_extra.erl
+@@ -85,7 +85,7 @@
+ -include("mod_roster.hrl").
+ -include("mod_privacy.hrl").
+ -include("ejabberd_sm.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%
+ %%% gen_mod
+Index: ejabberd/src/mod_admin_update_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_admin_update_sql.erl
++++ ejabberd/src/mod_admin_update_sql.erl
+@@ -37,7 +37,7 @@
+ 
+ -include("logger.hrl").
+ -include("ejabberd_commands.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_announce.erl
+===================================================================
+--- ejabberd.orig/src/mod_announce.erl
++++ ejabberd/src/mod_announce.erl
+@@ -51,7 +51,7 @@
+ 	 announce_all_hosts_motd_delete/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_announce_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_announce_mnesia.erl
++++ ejabberd/src/mod_announce_mnesia.erl
+@@ -31,7 +31,7 @@
+ 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3]).
+ -export([need_transform/1, transform/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ -include("logger.hrl").
+ 
+Index: ejabberd/src/mod_announce_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_announce_sql.erl
++++ ejabberd/src/mod_announce_sql.erl
+@@ -32,7 +32,7 @@
+ 	 get_motd/1, is_motd_user/2, set_motd_user/2, import/3,
+ 	 export/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_announce.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("logger.hrl").
+Index: ejabberd/src/mod_avatar.erl
+===================================================================
+--- ejabberd.orig/src/mod_avatar.erl
++++ ejabberd/src/mod_avatar.erl
+@@ -31,7 +31,7 @@
+ -export([pubsub_publish_item/6, vcard_iq_convert/1, vcard_iq_publish/1,
+ 	 get_sm_features/5]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("pubsub.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_block_strangers.erl
+===================================================================
+--- ejabberd.orig/src/mod_block_strangers.erl
++++ ejabberd/src/mod_block_strangers.erl
+@@ -34,7 +34,7 @@
+ 
+ -export([filter_packet/1, filter_offline_msg/1, filter_subscription/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_blocking.erl
+===================================================================
+--- ejabberd.orig/src/mod_blocking.erl
++++ ejabberd/src/mod_blocking.erl
+@@ -33,7 +33,7 @@
+ 	 disco_features/5, mod_options/1, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_bosh.erl
+===================================================================
+--- ejabberd.orig/src/mod_bosh.erl
++++ ejabberd/src/mod_bosh.erl
+@@ -40,7 +40,7 @@
+ 
+ -include("logger.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include("bosh.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_caps.erl
+===================================================================
+--- ejabberd.orig/src/mod_caps.erl
++++ ejabberd/src/mod_caps.erl
+@@ -54,7 +54,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_caps.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_carboncopy.erl
+===================================================================
+--- ejabberd.orig/src/mod_carboncopy.erl
++++ ejabberd/src/mod_carboncopy.erl
+@@ -42,7 +42,7 @@
+ -export([list/2]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -type direction() :: sent | received.
+Index: ejabberd/src/mod_client_state.erl
+===================================================================
+--- ejabberd.orig/src/mod_client_state.erl
++++ ejabberd/src/mod_client_state.erl
+@@ -42,7 +42,7 @@
+ 	 c2s_copy_session/2, c2s_session_resumed/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(CSI_QUEUE_MAX, 100).
+Index: ejabberd/src/mod_configure.erl
+===================================================================
+--- ejabberd.orig/src/mod_configure.erl
++++ ejabberd/src/mod_configure.erl
+@@ -39,7 +39,7 @@
+ 	 depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sm.hrl").
+ -include("translate.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+Index: ejabberd/src/mod_delegation.erl
+===================================================================
+--- ejabberd.orig/src/mod_delegation.erl
++++ ejabberd/src/mod_delegation.erl
+@@ -42,7 +42,7 @@
+ 	 disco_local_identity/5, disco_sm_identity/5]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -type route_type() :: ejabberd_sm | ejabberd_local.
+Index: ejabberd/src/mod_disco.erl
+===================================================================
+--- ejabberd.orig/src/mod_disco.erl
++++ ejabberd/src/mod_disco.erl
+@@ -42,7 +42,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("mod_roster.hrl").
+ 
+Index: ejabberd/src/mod_fail2ban.erl
+===================================================================
+--- ejabberd.orig/src/mod_fail2ban.erl
++++ ejabberd/src/mod_fail2ban.erl
+@@ -42,7 +42,7 @@
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("ejabberd_commands.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(CLEAN_INTERVAL, timer:minutes(10)).
+Index: ejabberd/src/mod_http_api.erl
+===================================================================
+--- ejabberd.orig/src/mod_http_api.erl
++++ ejabberd/src/mod_http_api.erl
+@@ -32,7 +32,7 @@
+ -export([start/2, stop/1, reload/3, process/2, depends/2,
+ 	 mod_options/1, mod_doc/0]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/mod_http_upload.erl
+===================================================================
+--- ejabberd.orig/src/mod_http_upload.erl
++++ ejabberd/src/mod_http_upload.erl
+@@ -87,7 +87,7 @@
+ 	 expand_host/2]).
+ 
+ -include("ejabberd_http.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_http_upload_quota.erl
+===================================================================
+--- ejabberd.orig/src/mod_http_upload_quota.erl
++++ ejabberd/src/mod_http_upload_quota.erl
+@@ -51,7 +51,7 @@
+ %% ejabberd_hooks callback.
+ -export([handle_slot_request/6]).
+ 
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ -include_lib("kernel/include/file.hrl").
+Index: ejabberd/src/mod_jidprep.erl
+===================================================================
+--- ejabberd.orig/src/mod_jidprep.erl
++++ ejabberd/src/mod_jidprep.erl
+@@ -41,7 +41,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%--------------------------------------------------------------------
+ %% gen_mod callbacks.
+Index: ejabberd/src/mod_last.erl
+===================================================================
+--- ejabberd.orig/src/mod_last.erl
++++ ejabberd/src/mod_last.erl
+@@ -38,7 +38,7 @@
+ 	 register_user/2, depends/2, privacy_check_packet/4]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("mod_last.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_legacy_auth.erl
+===================================================================
+--- ejabberd.orig/src/mod_legacy_auth.erl
++++ ejabberd/src/mod_legacy_auth.erl
+@@ -29,7 +29,7 @@
+ %% hooks
+ -export([c2s_unauthenticated_packet/2, c2s_stream_features/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -type c2s_state() :: ejabberd_c2s:state().
+Index: ejabberd/src/mod_mam.erl
+===================================================================
+--- ejabberd.orig/src/mod_mam.erl
++++ ejabberd/src/mod_mam.erl
+@@ -45,7 +45,7 @@
+ 	 is_empty_for_user/2, is_empty_for_room/3, check_create_room/4,
+ 	 process_iq/3, store_mam_message/7, make_id/0, wrap_as_mucsub/2, select/7]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_muc_room.hrl").
+ -include("ejabberd_commands.hrl").
+Index: ejabberd/src/mod_mam_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_mam_mnesia.erl
++++ ejabberd/src/mod_mam_mnesia.erl
+@@ -32,7 +32,7 @@
+ 	 is_empty_for_user/2, is_empty_for_room/3]).
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_mam.hrl").
+ 
+Index: ejabberd/src/mod_mam_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_mam_sql.erl
++++ ejabberd/src/mod_mam_sql.erl
+@@ -33,7 +33,7 @@
+ 	 is_empty_for_user/2, is_empty_for_room/3, select_with_mucsub/6]).
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_mam.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_metrics.erl
+===================================================================
+--- ejabberd.orig/src/mod_metrics.erl
++++ ejabberd/src/mod_metrics.erl
+@@ -29,7 +29,7 @@
+ -behaviour(gen_mod).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -export([start/2, stop/1, mod_opt_type/1, mod_options/1, depends/2, reload/3]).
+Index: ejabberd/src/mod_mix.erl
+===================================================================
+--- ejabberd.orig/src/mod_mix.erl
++++ ejabberd/src/mod_mix.erl
+@@ -41,7 +41,7 @@
+ 	 process_mam_query/1,
+ 	 process_pubsub_query/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/mod_mix_pam.erl
+===================================================================
+--- ejabberd.orig/src/mod_mix_pam.erl
++++ ejabberd/src/mod_mix_pam.erl
+@@ -33,7 +33,7 @@
+ 	 remove_user/2,
+ 	 process_iq/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_mqtt_session.erl
+===================================================================
+--- ejabberd.orig/src/mod_mqtt_session.erl
++++ ejabberd/src/mod_mqtt_session.erl
+@@ -28,7 +28,7 @@
+ 
+ -include("logger.hrl").
+ -include("mqtt.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(state, {vsn = ?VSN            :: integer(),
+                 version               :: undefined | mqtt_version(),
+Index: ejabberd/src/mod_mqtt_ws.erl
+===================================================================
+--- ejabberd.orig/src/mod_mqtt_ws.erl
++++ ejabberd/src/mod_mqtt_ws.erl
+@@ -29,7 +29,7 @@
+ -export([init/1, handle_call/3, handle_cast/2, handle_info/2,
+ 	 terminate/2, code_change/3, format_status/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_http.hrl").
+ -include("logger.hrl").
+ 
+Index: ejabberd/src/mod_muc.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc.erl
++++ ejabberd/src/mod_muc.erl
+@@ -77,7 +77,7 @@
+ 	 mod_opt_type/1, mod_options/1, depends/2]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc.hrl").
+ -include("mod_muc_room.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_muc_admin.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc_admin.erl
++++ ejabberd/src/mod_muc_admin.erl
+@@ -44,7 +44,7 @@
+ 	 web_page_host/3, mod_options/1, get_commands_spec/0, find_hosts/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc.hrl").
+ -include("mod_muc_room.hrl").
+ -include("ejabberd_http.hrl").
+Index: ejabberd/src/mod_muc_log.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc_log.erl
++++ ejabberd/src/mod_muc_log.erl
+@@ -42,7 +42,7 @@
+ 	 mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_muc_room.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_muc_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc_mnesia.erl
++++ ejabberd/src/mod_muc_mnesia.erl
+@@ -44,7 +44,7 @@
+ 
+ -include("mod_muc.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include_lib("stdlib/include/ms_transform.hrl").
+ 
+ -record(state, {}).
+Index: ejabberd/src/mod_muc_room.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc_room.erl
++++ ejabberd/src/mod_muc_room.erl
+@@ -68,7 +68,7 @@
+ 	 code_change/4]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ -include("mod_muc_room.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/mod_muc_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_muc_sql.erl
++++ ejabberd/src/mod_muc_sql.erl
+@@ -42,7 +42,7 @@
+ -export([set_affiliation/6, set_affiliations/4, get_affiliation/5,
+ 	 get_affiliations/3, search_affiliation/4]).
+ 
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_muc.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_multicast.erl
+===================================================================
+--- ejabberd.orig/src/mod_multicast.erl
++++ ejabberd/src/mod_multicast.erl
+@@ -45,7 +45,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(multicastc, {rserver :: binary(),
+ 		     response,
+Index: ejabberd/src/mod_offline.erl
+===================================================================
+--- ejabberd.orig/src/mod_offline.erl
++++ ejabberd/src/mod_offline.erl
+@@ -69,7 +69,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/mod_offline_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_offline_mnesia.erl
++++ ejabberd/src/mod_offline_mnesia.erl
+@@ -32,7 +32,7 @@
+ 	 remove_all_messages/2, count_messages/2, import/1]).
+ -export([need_transform/1, transform/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_offline.hrl").
+ -include("logger.hrl").
+ 
+Index: ejabberd/src/mod_offline_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_offline_sql.erl
++++ ejabberd/src/mod_offline_sql.erl
+@@ -32,7 +32,7 @@
+ 	 read_message/3, remove_message/3, read_all_messages/2,
+ 	 remove_all_messages/2, count_messages/2, import/1, export/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_offline.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_ping.erl
+===================================================================
+--- ejabberd.orig/src/mod_ping.erl
++++ ejabberd/src/mod_ping.erl
+@@ -35,7 +35,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_pres_counter.erl
+===================================================================
+--- ejabberd.orig/src/mod_pres_counter.erl
++++ ejabberd/src/mod_pres_counter.erl
+@@ -32,7 +32,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -record(pres_counter,
+ 	{dir, start, count, logged = false}).
+Index: ejabberd/src/mod_privacy.erl
+===================================================================
+--- ejabberd.orig/src/mod_privacy.erl
++++ ejabberd/src/mod_privacy.erl
+@@ -41,7 +41,7 @@
+ 	 mod_opt_type/1, mod_options/1, depends/2]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_privacy_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_privacy_mnesia.erl
++++ ejabberd/src/mod_privacy_mnesia.erl
+@@ -32,7 +32,7 @@
+ 	 remove_list/3, use_cache/1, import/1]).
+ -export([need_transform/1, transform/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("logger.hrl").
+ 
+Index: ejabberd/src/mod_privacy_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_privacy_sql.erl
++++ ejabberd/src/mod_privacy_sql.erl
+@@ -34,7 +34,7 @@
+ 
+ -export([item_to_raw/1, raw_to_item/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_privacy.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_private.erl
+===================================================================
+--- ejabberd.orig/src/mod_private.erl
++++ ejabberd/src/mod_private.erl
+@@ -40,7 +40,7 @@
+ -export([get_commands_spec/0, bookmarks_to_pep/2]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ -include("ejabberd_commands.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_private_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_private_mnesia.erl
++++ ejabberd/src/mod_private_mnesia.erl
+@@ -31,7 +31,7 @@
+ 	 use_cache/1, import/3]).
+ -export([need_transform/1, transform/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ -include("logger.hrl").
+ 
+Index: ejabberd/src/mod_private_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_private_sql.erl
++++ ejabberd/src/mod_private_sql.erl
+@@ -29,7 +29,7 @@
+ -export([init/2, set_data/3, get_data/3, get_all_data/2, del_data/2,
+ 	 import/3, export/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_private.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("logger.hrl").
+Index: ejabberd/src/mod_privilege.erl
+===================================================================
+--- ejabberd.orig/src/mod_privilege.erl
++++ ejabberd/src/mod_privilege.erl
+@@ -41,7 +41,7 @@
+ 	 process_presence_out/1, process_presence_in/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -type roster_permission() :: both | get | set.
+Index: ejabberd/src/mod_proxy65_service.erl
+===================================================================
+--- ejabberd.orig/src/mod_proxy65_service.erl
++++ ejabberd/src/mod_proxy65_service.erl
+@@ -38,7 +38,7 @@
+ 	 delete_listener/1, route/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ -include("ejabberd_stacktrace.hrl").
+ 
+Index: ejabberd/src/mod_pubsub.erl
+===================================================================
+--- ejabberd.orig/src/mod_pubsub.erl
++++ ejabberd/src/mod_pubsub.erl
+@@ -40,7 +40,7 @@
+ -protocol({xep, 248, '0.2'}).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("pubsub.hrl").
+ -include("mod_roster.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_push.erl
+===================================================================
+--- ejabberd.orig/src/mod_push.erl
++++ ejabberd/src/mod_push.erl
+@@ -51,7 +51,7 @@
+ 
+ -include("ejabberd_commands.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PUSH_CACHE, push_cache).
+Index: ejabberd/src/mod_push_keepalive.erl
+===================================================================
+--- ejabberd.orig/src/mod_push_keepalive.erl
++++ ejabberd/src/mod_push_keepalive.erl
+@@ -36,7 +36,7 @@
+ 	 c2s_handle_cast/2, c2s_handle_info/2, c2s_stanza/3]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PUSH_BEFORE_TIMEOUT_PERIOD, 120000). % 2 minutes.
+Index: ejabberd/src/mod_push_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_push_mnesia.erl
++++ ejabberd/src/mod_push_mnesia.erl
+@@ -35,7 +35,7 @@
+ 
+ -include_lib("stdlib/include/ms_transform.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_push.hrl").
+ 
+ %%%-------------------------------------------------------------------
+Index: ejabberd/src/mod_push_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_push_sql.erl
++++ ejabberd/src/mod_push_sql.erl
+@@ -31,7 +31,7 @@
+ 	 lookup_sessions/3, lookup_sessions/2, lookup_sessions/1,
+ 	 delete_session/3, delete_old_sessions/2, export/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("mod_push.hrl").
+Index: ejabberd/src/mod_register.erl
+===================================================================
+--- ejabberd.orig/src/mod_register.erl
++++ ejabberd/src/mod_register.erl
+@@ -40,7 +40,7 @@
+ -deprecated({try_register, 4}).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/mod_register_web.erl
+===================================================================
+--- ejabberd.orig/src/mod_register_web.erl
++++ ejabberd/src/mod_register_web.erl
+@@ -34,7 +34,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("ejabberd_http.hrl").
+ 
+Index: ejabberd/src/mod_roster.erl
+===================================================================
+--- ejabberd.orig/src/mod_roster.erl
++++ ejabberd/src/mod_roster.erl
+@@ -54,7 +54,7 @@
+ 	 depends/2, set_item_and_notify_clients/3]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_roster.hrl").
+ -include("ejabberd_http.hrl").
+ -include("ejabberd_web_admin.hrl").
+Index: ejabberd/src/mod_roster_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_roster_mnesia.erl
++++ ejabberd/src/mod_roster_mnesia.erl
+@@ -37,7 +37,7 @@
+ 
+ -include("mod_roster.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%===================================================================
+ %%% API
+Index: ejabberd/src/mod_roster_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_roster_sql.erl
++++ ejabberd/src/mod_roster_sql.erl
+@@ -38,7 +38,7 @@
+ -include("mod_roster.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ 
+ %%%===================================================================
+ %%% API
+Index: ejabberd/src/mod_s2s_dialback.erl
+===================================================================
+--- ejabberd.orig/src/mod_s2s_dialback.erl
++++ ejabberd/src/mod_s2s_dialback.erl
+@@ -33,7 +33,7 @@
+ 	 s2s_in_features/2, s2s_out_init/2, s2s_out_closed/2,
+ 	 s2s_out_tls_verify/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/mod_service_log.erl
+===================================================================
+--- ejabberd.orig/src/mod_service_log.erl
++++ ejabberd/src/mod_service_log.erl
+@@ -34,7 +34,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ start(Host, _Opts) ->
+     ejabberd_hooks:add(user_send_packet, Host, ?MODULE,
+Index: ejabberd/src/mod_shared_roster.erl
+===================================================================
+--- ejabberd.orig/src/mod_shared_roster.erl
++++ ejabberd/src/mod_shared_roster.erl
+@@ -43,7 +43,7 @@
+ 
+ -include("logger.hrl").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -include("mod_roster.hrl").
+ 
+Index: ejabberd/src/mod_shared_roster_ldap.erl
+===================================================================
+--- ejabberd.orig/src/mod_shared_roster_ldap.erl
++++ ejabberd/src/mod_shared_roster_ldap.erl
+@@ -43,7 +43,7 @@
+ 	 depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_roster.hrl").
+ -include("eldap.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_shared_roster_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_shared_roster_mnesia.erl
++++ ejabberd/src/mod_shared_roster_mnesia.erl
+@@ -37,7 +37,7 @@
+ -include("mod_roster.hrl").
+ -include("mod_shared_roster.hrl").
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %%%===================================================================
+ %%% API
+Index: ejabberd/src/mod_shared_roster_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_shared_roster_sql.erl
++++ ejabberd/src/mod_shared_roster_sql.erl
+@@ -35,7 +35,7 @@
+ 	 add_user_to_group/3, remove_user_from_group/3, import/3,
+ 	 export/1]).
+ 
+--include_lib("xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
+ -include("mod_roster.hrl").
+ -include("mod_shared_roster.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_sic.erl
+===================================================================
+--- ejabberd.orig/src/mod_sic.erl
++++ ejabberd/src/mod_sic.erl
+@@ -35,7 +35,7 @@
+ 	 process_sm_iq/1, mod_options/1, depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/mod_sip.erl
+===================================================================
+--- ejabberd.orig/src/mod_sip.erl
++++ ejabberd/src/mod_sip.erl
+@@ -55,7 +55,7 @@ mod_doc() ->
+ 	 locate/1, mod_opt_type/1, mod_options/1, depends/2,
+          mod_doc/0]).
+ 
+--include_lib("esip/include/esip.hrl").
++-include_lib("p1_sip/include/esip.hrl").
+ 
+ %%%===================================================================
+ %%% API
+Index: ejabberd/src/mod_sip_proxy.erl
+===================================================================
+--- ejabberd.orig/src/mod_sip_proxy.erl
++++ ejabberd/src/mod_sip_proxy.erl
+@@ -39,7 +39,7 @@
+ 	 code_change/4]).
+ 
+ -include("logger.hrl").
+--include_lib("esip/include/esip.hrl").
++-include_lib("p1_sip/include/esip.hrl").
+ 
+ -define(SIGN_LIFETIME, 300). %% in seconds.
+ 
+Index: ejabberd/src/mod_sip_registrar.erl
+===================================================================
+--- ejabberd.orig/src/mod_sip_registrar.erl
++++ ejabberd/src/mod_sip_registrar.erl
+@@ -41,7 +41,7 @@
+ 	 terminate/2, code_change/3]).
+ 
+ -include("logger.hrl").
+--include_lib("esip/include/esip.hrl").
++-include_lib("p1_sip/include/esip.hrl").
+ 
+ -define(CALL_TIMEOUT, timer:seconds(30)).
+ -define(DEFAULT_EXPIRES, 3600).
+Index: ejabberd/src/mod_stats.erl
+===================================================================
+--- ejabberd.orig/src/mod_stats.erl
++++ ejabberd/src/mod_stats.erl
+@@ -35,7 +35,7 @@
+ 	 mod_options/1, depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/mod_stream_mgmt.erl
+===================================================================
+--- ejabberd.orig/src/mod_stream_mgmt.erl
++++ ejabberd/src/mod_stream_mgmt.erl
+@@ -37,7 +37,7 @@
+ %% adjust pending session timeout / access queue
+ -export([get_resume_timeout/1, set_resume_timeout/2, queue_find/2]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include_lib("p1_utils/include/p1_queue.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_stun_disco.erl
+===================================================================
+--- ejabberd.orig/src/mod_stun_disco.erl
++++ ejabberd/src/mod_stun_disco.erl
+@@ -55,7 +55,7 @@
+ 
+ -include("logger.hrl").
+ -include("translate.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -define(STUN_MODULE, ejabberd_stun).
+ 
+Index: ejabberd/src/mod_time.erl
+===================================================================
+--- ejabberd.orig/src/mod_time.erl
++++ ejabberd/src/mod_time.erl
+@@ -36,7 +36,7 @@
+ 	 mod_options/1, depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/mod_vcard.erl
+===================================================================
+--- ejabberd.orig/src/mod_vcard.erl
++++ ejabberd/src/mod_vcard.erl
+@@ -44,7 +44,7 @@
+ -export([route/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ -include("translate.hrl").
+ -include("ejabberd_stacktrace.hrl").
+Index: ejabberd/src/mod_vcard_ldap.erl
+===================================================================
+--- ejabberd.orig/src/mod_vcard_ldap.erl
++++ ejabberd/src/mod_vcard_ldap.erl
+@@ -40,7 +40,7 @@
+ 
+ -include("logger.hrl").
+ -include("eldap.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PROCNAME, ejabberd_mod_vcard_ldap).
+Index: ejabberd/src/mod_vcard_mnesia.erl
+===================================================================
+--- ejabberd.orig/src/mod_vcard_mnesia.erl
++++ ejabberd/src/mod_vcard_mnesia.erl
+@@ -33,7 +33,7 @@
+ -export([need_transform/1, transform/1]).
+ -export([mod_opt_type/1, mod_options/1, mod_doc/0]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ -include("logger.hrl").
+ -include("translate.hrl").
+Index: ejabberd/src/mod_vcard_sql.erl
+===================================================================
+--- ejabberd.orig/src/mod_vcard_sql.erl
++++ ejabberd/src/mod_vcard_sql.erl
+@@ -32,7 +32,7 @@
+ 	 search_fields/1, search_reported/1, import/3, export/1]).
+ -export([is_search_supported/1]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("mod_vcard.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_sql_pt.hrl").
+Index: ejabberd/src/mod_vcard_xupdate.erl
+===================================================================
+--- ejabberd.orig/src/mod_vcard_xupdate.erl
++++ ejabberd/src/mod_vcard_xupdate.erl
+@@ -37,7 +37,7 @@
+ -export([compute_hash/1]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(VCARD_XUPDATE_CACHE, vcard_xupdate_cache).
+Index: ejabberd/src/mod_version.erl
+===================================================================
+--- ejabberd.orig/src/mod_version.erl
++++ ejabberd/src/mod_version.erl
+@@ -35,7 +35,7 @@
+ 	 mod_opt_type/1, mod_options/1, depends/2, mod_doc/0]).
+ 
+ -include("logger.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ start(Host, _Opts) ->
+Index: ejabberd/src/node_flat.erl
+===================================================================
+--- ejabberd.orig/src/node_flat.erl
++++ ejabberd/src/node_flat.erl
+@@ -34,7 +34,7 @@
+ -author('christophe.romain@process-one.net').
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ -export([init/3, terminate/2, options/0, features/0,
+     create_node_permission/6, create_node/2, delete_node/1,
+Index: ejabberd/src/node_flat_sql.erl
+===================================================================
+--- ejabberd.orig/src/node_flat_sql.erl
++++ ejabberd/src/node_flat_sql.erl
+@@ -35,7 +35,7 @@
+ 
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/nodetree_tree.erl
+===================================================================
+--- ejabberd.orig/src/nodetree_tree.erl
++++ ejabberd/src/nodetree_tree.erl
+@@ -41,7 +41,7 @@
+ -include_lib("stdlib/include/ms_transform.hrl").
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -export([init/3, terminate/2, options/0, set_node/1,
+Index: ejabberd/src/nodetree_tree_sql.erl
+===================================================================
+--- ejabberd.orig/src/nodetree_tree_sql.erl
++++ ejabberd/src/nodetree_tree_sql.erl
+@@ -39,7 +39,7 @@
+ 
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("ejabberd_sql_pt.hrl").
+ -include("translate.hrl").
+ 
+Index: ejabberd/src/prosody2ejabberd.erl
+===================================================================
+--- ejabberd.orig/src/prosody2ejabberd.erl
++++ ejabberd/src/prosody2ejabberd.erl
+@@ -27,8 +27,8 @@
+ %% API
+ -export([from_dir/1]).
+ 
+--include_lib("xmpp/include/scram.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/scram.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("mod_roster.hrl").
+ -include("mod_offline.hrl").
+Index: ejabberd/src/pubsub_subscription.erl
+===================================================================
+--- ejabberd.orig/src/pubsub_subscription.erl
++++ ejabberd/src/pubsub_subscription.erl
+@@ -38,7 +38,7 @@
+     read_subscription/3, write_subscription/4]).
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
+Index: ejabberd/src/pubsub_subscription_sql.erl
+===================================================================
+--- ejabberd.orig/src/pubsub_subscription_sql.erl
++++ ejabberd/src/pubsub_subscription_sql.erl
+@@ -34,7 +34,7 @@
+     get_options_xform/2, parse_options_xform/1]).
+ 
+ -include("pubsub.hrl").
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("translate.hrl").
+ 
+ -define(PUBSUB_DELIVER, <<"pubsub#deliver">>).
+Index: ejabberd/test/suite.hrl
+===================================================================
+--- ejabberd.orig/test/suite.hrl
++++ ejabberd/test/suite.hrl
+@@ -1,8 +1,8 @@
+ -include_lib("common_test/include/ct.hrl").
+--include_lib("fast_xml/include/fxml.hrl").
+--include_lib("xmpp/include/jid.hrl").
+--include_lib("xmpp/include/ns.hrl").
+--include_lib("xmpp/include/xmpp_codec.hrl").
++-include_lib("p1_xml/include/fxml.hrl").
++-include_lib("p1_xmpp/include/jid.hrl").
++-include_lib("p1_xmpp/include/ns.hrl").
++-include_lib("p1_xmpp/include/xmpp_codec.hrl").
+ -include("mod_proxy65.hrl").
+ 
+ -define(STREAM_TRAILER, <<"</stream:stream>">>).
+Index: ejabberd/tools/xml_compress_gen.erl
+===================================================================
+--- ejabberd.orig/tools/xml_compress_gen.erl
++++ ejabberd/tools/xml_compress_gen.erl
+@@ -24,7 +24,7 @@
+ -module(xml_compress_gen).
+ -author("pawel@process-one.net").
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ 
+ %% API
+ -export([archive_analyze/3, process_stats/1, gen_code/3]).
+Index: ejabberd/src/mod_conversejs.erl
+===================================================================
+--- ejabberd.orig/src/mod_conversejs.erl
++++ ejabberd/src/mod_conversejs.erl
+@@ -32,7 +32,7 @@
+ -export([start/2, stop/1, reload/3, process/2, depends/2,
+          mod_opt_type/1, mod_options/1, mod_doc/0]).
+ 
+--include_lib("xmpp/include/xmpp.hrl").
++-include_lib("p1_xmpp/include/xmpp.hrl").
+ -include("logger.hrl").
+ -include("ejabberd_http.hrl").
+ -include("translate.hrl").
diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash
index 0d57ada5bb..53a7402f77 100644
--- a/package/ejabberd/ejabberd.hash
+++ b/package/ejabberd/ejabberd.hash
@@ -1,3 +1,3 @@
 # Locally computed
-sha256  9e922b938458ae9d72d4e5fdd2d08a1fbad651aae47c9a9d15b79d0bbd1e11f8  ejabberd-20.07.tgz
+sha256  b6e6739947d3678525b14ee280cedb1a04280c83ea17a4741795aac99fbdad47  ejabberd-21.12.tgz
 sha256  469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb  COPYING
diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk
index 2b23701ddf..5b8ed3edd0 100644
--- a/package/ejabberd/ejabberd.mk
+++ b/package/ejabberd/ejabberd.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-EJABBERD_VERSION = 20.07
+EJABBERD_VERSION = 21.12
 EJABBERD_SOURCE = ejabberd-$(EJABBERD_VERSION).tgz
 EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION)
 EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception
@@ -16,7 +16,8 @@ EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \
 	erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \
 	erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp
 
-# 0001-remove-make-targets-for-deps.patch updates Makefile.in
+# 0001-Makefile.in-do-not-download-or-compile-dependencies.patch
+# updates Makefile.in
 EJABBERD_USE_AUTOCONF = YES
 EJABBERD_AUTORECONF = YES
 
-- 
2.34.1

_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot