* [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies
@ 2024-08-07 14:33 Johan Oudinet
2024-08-07 14:33 ` [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun Johan Oudinet
` (18 more replies)
0 siblings, 19 replies; 22+ messages in thread
From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw)
To: buildroot; +Cc: Johan Oudinet
Ejabberd has many dependencies. Update all of them to the versions
needed by ejabberd 24.07. Take the opportunity to rename the erlang
packages that were misnamed so far in order to remove some patches.
Such patches were here only to fix the location of such packages in
other packages that expect to find them in a different place.
Johan Oudinet (18):
package/erlang-stun: renamed from erlang-p1-stun
package/erlang-fast-xml: renamed from erlang-p1-xml
package/erlang-xmpp: renamed from erlang-p1-xmpp
package/erlang-p1-utils: bump version to 1.0.26
package/erlang-p1-cache-tab: bump version to 1.0.31
package/erlang-p1-tls: bump version to 1.1.21
package/erlang-p1-stringprep: bump version to 1.0.30
package/erlang-fast-yaml: renamed from erlang-p1-yaml
package/erlang-p1-yconf: bump version to 1.0.16
package/erlang-p1-oauth2: bump version to 0.6.14
package/erlang-p1-pkix: bump version to 1.0.10
package/erlang-eimp: bump version to 1.0.23
package/erlang-p1-mqtree: bump version to 1.0.17
package/erlang-jose: bump version to 1.11.10
package/erlang-p1-acme: bump version to 1.0.23
package/erlang-p1-sip: bump version to 1.0.54
package/erlang-p1-zlib: bump version to 1.0.13
package/ejabberd: bump version to 24.07
DEVELOPERS | 8 +-
package/Config.in | 8 +-
...not-download-or-compile-dependencies.patch | 23 +-
package/ejabberd/0002-fix-ejabberdctl.patch | 19 +-
package/ejabberd/0003-correct-includes.patch | 1807 -----------------
package/ejabberd/Config.in | 8 +-
package/ejabberd/S50ejabberd | 72 +-
package/ejabberd/check-erlang-lib | 39 +-
package/ejabberd/ejabberd.hash | 4 +-
package/ejabberd/ejabberd.mk | 11 +-
package/erlang-eimp/erlang-eimp.hash | 2 +-
package/erlang-eimp/erlang-eimp.mk | 2 +-
package/erlang-fast-xml/Config.in | 8 +
.../erlang-fast-xml.hash} | 2 +-
package/erlang-fast-xml/erlang-fast-xml.mk | 18 +
.../Config.in | 6 +-
.../erlang-fast-yaml.hash} | 2 +-
package/erlang-fast-yaml/erlang-fast-yaml.mk | 20 +
package/erlang-jose/erlang-jose.hash | 2 +-
package/erlang-jose/erlang-jose.mk | 2 +-
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 +-
.../erlang-p1-sip/0001-correct-include.patch | 31 -
package/erlang-p1-sip/Config.in | 2 +-
package/erlang-p1-sip/erlang-p1-sip.hash | 2 +-
package/erlang-p1-sip/erlang-p1-sip.mk | 4 +-
.../erlang-p1-stringprep.hash | 2 +-
.../erlang-p1-stringprep.mk | 2 +-
package/erlang-p1-stun/erlang-p1-stun.mk | 14 -
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/Config.in | 8 -
package/erlang-p1-xml/erlang-p1-xml.mk | 18 -
.../erlang-p1-xmpp/0001-fix-includes.patch | 16 -
package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 17 -
package/erlang-p1-yaml/erlang-p1-yaml.mk | 20 -
package/erlang-p1-yconf/Config.in | 2 +-
package/erlang-p1-yconf/erlang-p1-yconf.hash | 2 +-
package/erlang-p1-yconf/erlang-p1-yconf.mk | 4 +-
package/erlang-p1-zlib/erlang-p1-zlib.hash | 2 +-
package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +-
.../{erlang-p1-stun => erlang-stun}/Config.in | 4 +-
.../erlang-stun.hash} | 2 +-
package/erlang-stun/erlang-stun.mk | 14 +
.../{erlang-p1-xmpp => erlang-xmpp}/Config.in | 8 +-
.../erlang-xmpp.hash} | 2 +-
package/erlang-xmpp/erlang-xmpp.mk | 17 +
57 files changed, 218 insertions(+), 2070 deletions(-)
delete mode 100644 package/ejabberd/0003-correct-includes.patch
create mode 100644 package/erlang-fast-xml/Config.in
rename package/{erlang-p1-yaml/erlang-p1-yaml.hash => erlang-fast-xml/erlang-fast-xml.hash} (50%)
create mode 100644 package/erlang-fast-xml/erlang-fast-xml.mk
rename package/{erlang-p1-yaml => erlang-fast-yaml}/Config.in (51%)
rename package/{erlang-p1-stun/erlang-p1-stun.hash => erlang-fast-yaml/erlang-fast-yaml.hash} (50%)
create mode 100644 package/erlang-fast-yaml/erlang-fast-yaml.mk
delete mode 100644 package/erlang-p1-sip/0001-correct-include.patch
delete mode 100644 package/erlang-p1-stun/erlang-p1-stun.mk
delete mode 100644 package/erlang-p1-xml/Config.in
delete mode 100644 package/erlang-p1-xml/erlang-p1-xml.mk
delete mode 100644 package/erlang-p1-xmpp/0001-fix-includes.patch
delete mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.mk
delete mode 100644 package/erlang-p1-yaml/erlang-p1-yaml.mk
rename package/{erlang-p1-stun => erlang-stun}/Config.in (71%)
rename package/{erlang-p1-xml/erlang-p1-xml.hash => erlang-stun/erlang-stun.hash} (51%)
create mode 100644 package/erlang-stun/erlang-stun.mk
rename package/{erlang-p1-xmpp => erlang-xmpp}/Config.in (70%)
rename package/{erlang-p1-xmpp/erlang-p1-xmpp.hash => erlang-xmpp/erlang-xmpp.hash} (51%)
create mode 100644 package/erlang-xmpp/erlang-xmpp.mk
--
2.34.1
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
^ permalink raw reply [flat|nested] 22+ messages in thread* [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 02/18] package/erlang-fast-xml: renamed from erlang-p1-xml Johan Oudinet ` (17 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet and bump version to 1.2.14. This package is renamed to avoid having to fix other packages that expect to find its content inside a stun/ directory instead of p1_stun/. Thus, remove the corresponding patch from the erlang-p1-sip package. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/ejabberd/Config.in | 2 +- package/ejabberd/ejabberd.mk | 2 +- .../erlang-p1-sip/0001-correct-include.patch | 31 ------------------- package/erlang-p1-sip/Config.in | 2 +- package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- package/erlang-p1-stun/erlang-p1-stun.mk | 14 --------- .../{erlang-p1-stun => erlang-stun}/Config.in | 4 +-- .../erlang-stun.hash} | 2 +- package/erlang-stun/erlang-stun.mk | 14 +++++++++ 11 files changed, 23 insertions(+), 54 deletions(-) delete mode 100644 package/erlang-p1-sip/0001-correct-include.patch delete mode 100644 package/erlang-p1-stun/erlang-p1-stun.mk rename package/{erlang-p1-stun => erlang-stun}/Config.in (71%) rename package/{erlang-p1-stun/erlang-p1-stun.hash => erlang-stun/erlang-stun.hash} (51%) create mode 100644 package/erlang-stun/erlang-stun.mk diff --git a/DEVELOPERS b/DEVELOPERS index c472aa4c53..abd36c0c59 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1668,7 +1668,6 @@ F: package/erlang-p1-oauth2/ F: package/erlang-p1-pkix/ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ -F: package/erlang-p1-stun/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ F: package/erlang-p1-xml/ @@ -1676,6 +1675,7 @@ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ +F: package/erlang-stun/ F: package/forge/ F: package/nginx-dav-ext/ F: package/vis-network/ diff --git a/package/Config.in b/package/Config.in index 0472ec2daf..7dc4f99ec2 100644 --- a/package/Config.in +++ b/package/Config.in @@ -685,7 +685,6 @@ menu "Erlang libraries/modules" source "package/erlang-p1-pkix/Config.in" source "package/erlang-p1-sip/Config.in" source "package/erlang-p1-stringprep/Config.in" - source "package/erlang-p1-stun/Config.in" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" source "package/erlang-p1-xml/Config.in" @@ -693,6 +692,7 @@ menu "Erlang libraries/modules" source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-yconf/Config.in" source "package/erlang-p1-zlib/Config.in" + source "package/erlang-stun/Config.in" endmenu endif source "package/execline/Config.in" diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index e24c7fee6b..fb35a87306 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -14,7 +14,6 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_PKIX # runtime select BR2_PACKAGE_ERLANG_P1_SIP select BR2_PACKAGE_ERLANG_P1_STRINGPREP - select BR2_PACKAGE_ERLANG_P1_STUN select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_ERLANG_P1_XML @@ -22,6 +21,7 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_YAML select BR2_PACKAGE_ERLANG_P1_YCONF # runtime select BR2_PACKAGE_ERLANG_P1_ZLIB + select BR2_PACKAGE_ERLANG_STUN select BR2_PACKAGE_GETENT select BR2_PACKAGE_OPENSSL help diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 574f9492e8..1df8145496 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -11,7 +11,7 @@ EJABBERD_LICENSE_FILES = COPYING EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ - erlang-p1-stringprep erlang-p1-stun erlang-p1-tls \ + erlang-p1-stringprep erlang-stun erlang-p1-tls \ erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp diff --git a/package/erlang-p1-sip/0001-correct-include.patch b/package/erlang-p1-sip/0001-correct-include.patch deleted file mode 100644 index 90d68b5184..0000000000 --- a/package/erlang-p1-sip/0001-correct-include.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5ad4f871df7cbbc973708cb7380c3410b20bde1c Mon Sep 17 00:00:00 2001 -From: Philipp Huebner <debalance@debian.org> -Date: Tue, 1 Dec 2020 23:07:51 +0100 -Subject: [PATCH] correct include - -This part of the code was moved into it's own project and was packaged -separately by me. To make the build process work, this small fix is -necessary. - -Author: Philipp Huebner <debalance@debian.org> -Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> ---- - src/esip_socket.erl | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/esip_socket.erl b/src/esip_socket.erl -index 4154faa..db5fa92 100644 ---- a/src/esip_socket.erl -+++ b/src/esip_socket.erl -@@ -37,7 +37,7 @@ - - -include("esip.hrl"). - -include("esip_lib.hrl"). ---include_lib("stun/include/stun.hrl"). -+-include_lib("p1_stun/include/stun.hrl"). - - -define(TCP_SEND_TIMEOUT, 15000). - -define(CONNECT_TIMEOUT, 20000). --- -2.28.0 - diff --git a/package/erlang-p1-sip/Config.in b/package/erlang-p1-sip/Config.in index 70cf819a37..74494d3c94 100644 --- a/package/erlang-p1-sip/Config.in +++ b/package/erlang-p1-sip/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_ERLANG_P1_SIP bool "erlang-p1-sip" - select BR2_PACKAGE_ERLANG_P1_STUN select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS + select BR2_PACKAGE_ERLANG_STUN help SIP library for Erlang diff --git a/package/erlang-p1-sip/erlang-p1-sip.mk b/package/erlang-p1-sip/erlang-p1-sip.mk index 61f728cb1b..45c70e8899 100644 --- a/package/erlang-p1-sip/erlang-p1-sip.mk +++ b/package/erlang-p1-sip/erlang-p1-sip.mk @@ -8,7 +8,7 @@ ERLANG_P1_SIP_VERSION = 1.0.49 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 -ERLANG_P1_SIP_DEPENDENCIES = erlang-p1-stun erlang-p1-tls erlang-p1-utils +ERLANG_P1_SIP_DEPENDENCIES = erlang-stun erlang-p1-tls erlang-p1-utils ERLANG_P1_SIP_INSTALL_STAGING = YES $(eval $(rebar-package)) diff --git a/package/erlang-p1-stun/erlang-p1-stun.mk b/package/erlang-p1-stun/erlang-p1-stun.mk deleted file mode 100644 index 7438bd2186..0000000000 --- a/package/erlang-p1-stun/erlang-p1-stun.mk +++ /dev/null @@ -1,14 +0,0 @@ -################################################################################ -# -# erlang-p1-stun -# -################################################################################ - -ERLANG_P1_STUN_VERSION = 1.2.7 -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 -ERLANG_P1_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils -ERLANG_P1_STUN_INSTALL_STAGING = YES - -$(eval $(rebar-package)) diff --git a/package/erlang-p1-stun/Config.in b/package/erlang-stun/Config.in similarity index 71% rename from package/erlang-p1-stun/Config.in rename to package/erlang-stun/Config.in index 70cdd91599..dcf3817a2d 100644 --- a/package/erlang-p1-stun/Config.in +++ b/package/erlang-stun/Config.in @@ -1,5 +1,5 @@ -config BR2_PACKAGE_ERLANG_P1_STUN - bool "erlang-p1-stun" +config BR2_PACKAGE_ERLANG_STUN + bool "erlang-stun" select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS help diff --git a/package/erlang-p1-stun/erlang-p1-stun.hash b/package/erlang-stun/erlang-stun.hash similarity index 51% rename from package/erlang-p1-stun/erlang-p1-stun.hash rename to package/erlang-stun/erlang-stun.hash index 49e1963ff0..c248e89ea8 100644 --- a/package/erlang-p1-stun/erlang-p1-stun.hash +++ b/package/erlang-stun/erlang-stun.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86 erlang-p1-stun-1.2.7.tar.gz +sha256 110b06572c6208fdeaa60c32cd549e6798f0a719d51bef97608c2aaa61151c11 erlang-stun-1.2.14.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-stun/erlang-stun.mk b/package/erlang-stun/erlang-stun.mk new file mode 100644 index 0000000000..abfb1c3853 --- /dev/null +++ b/package/erlang-stun/erlang-stun.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# erlang-stun +# +################################################################################ + +ERLANG_STUN_VERSION = 1.2.14 +ERLANG_STUN_SITE = $(call github,processone,stun,$(ERLANG_STUN_VERSION)) +ERLANG_STUN_LICENSE = Apache-2.0 +ERLANG_STUN_LICENSE_FILES = LICENSE.txt +ERLANG_STUN_DEPENDENCIES = erlang-p1-tls erlang-p1-utils +ERLANG_STUN_INSTALL_STAGING = YES + +$(eval $(rebar-package)) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 02/18] package/erlang-fast-xml: renamed from erlang-p1-xml 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 03/18] package/erlang-xmpp: renamed from erlang-p1-xmpp Johan Oudinet ` (16 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet and bump version to 1.1.52. This package has been renamed to avoid patching other packages that expect to find it in a fast_xml/ directory. Delete the corresponding patch in the erlang-p1-xmpp package. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/ejabberd/Config.in | 2 +- package/ejabberd/ejabberd.mk | 2 +- package/erlang-fast-xml/Config.in | 8 ++++++++ .../erlang-fast-xml.hash} | 2 +- package/erlang-fast-xml/erlang-fast-xml.mk | 18 ++++++++++++++++++ package/erlang-p1-xml/Config.in | 8 -------- package/erlang-p1-xml/erlang-p1-xml.mk | 18 ------------------ package/erlang-p1-xmpp/0001-fix-includes.patch | 16 ---------------- package/erlang-p1-xmpp/Config.in | 2 +- package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 6 +++--- 12 files changed, 35 insertions(+), 51 deletions(-) create mode 100644 package/erlang-fast-xml/Config.in rename package/{erlang-p1-xml/erlang-p1-xml.hash => erlang-fast-xml/erlang-fast-xml.hash} (50%) create mode 100644 package/erlang-fast-xml/erlang-fast-xml.mk delete mode 100644 package/erlang-p1-xml/Config.in delete mode 100644 package/erlang-p1-xml/erlang-p1-xml.mk delete mode 100644 package/erlang-p1-xmpp/0001-fix-includes.patch diff --git a/DEVELOPERS b/DEVELOPERS index abd36c0c59..24841dcc6e 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1656,6 +1656,7 @@ N: Johan Oudinet <johan.oudinet@gmail.com> F: package/ejabberd/ F: package/erlang-base64url/ F: package/erlang-eimp/ +F: package/erlang-fast-xml/ F: package/erlang-goldrush/ F: package/erlang-idna/ F: package/erlang-jiffy/ @@ -1670,7 +1671,6 @@ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ -F: package/erlang-p1-xml/ F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ diff --git a/package/Config.in b/package/Config.in index 7dc4f99ec2..4e2f992abe 100644 --- a/package/Config.in +++ b/package/Config.in @@ -673,6 +673,7 @@ if BR2_PACKAGE_ERLANG menu "Erlang libraries/modules" source "package/erlang-base64url/Config.in" source "package/erlang-eimp/Config.in" + source "package/erlang-fast-xml/Config.in" source "package/erlang-goldrush/Config.in" source "package/erlang-idna/Config.in" source "package/erlang-jiffy/Config.in" @@ -687,7 +688,6 @@ menu "Erlang libraries/modules" source "package/erlang-p1-stringprep/Config.in" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" - source "package/erlang-p1-xml/Config.in" source "package/erlang-p1-xmpp/Config.in" source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-yconf/Config.in" diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index fb35a87306..295b0e7744 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_EJABBERD depends on BR2_PACKAGE_ERLANG depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep select BR2_PACKAGE_ERLANG_EIMP + select BR2_PACKAGE_ERLANG_FAST_XML select BR2_PACKAGE_ERLANG_IDNA # runtime select BR2_PACKAGE_ERLANG_JIFFY # runtime select BR2_PACKAGE_ERLANG_JOSE # runtime @@ -16,7 +17,6 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_XMPP select BR2_PACKAGE_ERLANG_P1_YAML select BR2_PACKAGE_ERLANG_P1_YCONF # runtime diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 1df8145496..e49560d3a7 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -12,7 +12,7 @@ EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ erlang-p1-stringprep erlang-stun erlang-p1-tls \ - erlang-p1-utils erlang-p1-xml erlang-p1-xmpp erlang-p1-yaml \ + erlang-p1-utils erlang-fast-xml erlang-p1-xmpp erlang-p1-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch diff --git a/package/erlang-fast-xml/Config.in b/package/erlang-fast-xml/Config.in new file mode 100644 index 0000000000..04d6634fe8 --- /dev/null +++ b/package/erlang-fast-xml/Config.in @@ -0,0 +1,8 @@ +config BR2_PACKAGE_ERLANG_FAST_XML + bool "erlang-fast-xml" + select BR2_PACKAGE_ERLANG_P1_UTILS + select BR2_PACKAGE_EXPAT + help + XML utilities for Erlang + + https://github.com/processone/fast_xml diff --git a/package/erlang-p1-xml/erlang-p1-xml.hash b/package/erlang-fast-xml/erlang-fast-xml.hash similarity index 50% rename from package/erlang-p1-xml/erlang-p1-xml.hash rename to package/erlang-fast-xml/erlang-fast-xml.hash index 379ca7ef88..df5557080c 100644 --- a/package/erlang-p1-xml/erlang-p1-xml.hash +++ b/package/erlang-fast-xml/erlang-fast-xml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 02bcdb0a4350080a10b52de85c11de982e5f7cf2150f5b1b888f7a95ccb31265 erlang-p1-xml-1.1.49.tar.gz +sha256 2f705191a029ca7df7e62a6cd8622701da59a9e221f8514d2c2b1a5c1d23c739 erlang-fast-xml-1.1.52.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-fast-xml/erlang-fast-xml.mk b/package/erlang-fast-xml/erlang-fast-xml.mk new file mode 100644 index 0000000000..a04e3f5e09 --- /dev/null +++ b/package/erlang-fast-xml/erlang-fast-xml.mk @@ -0,0 +1,18 @@ +################################################################################ +# +# erlang-fast-xml +# +################################################################################ + +ERLANG_FAST_XML_VERSION = 1.1.52 +ERLANG_FAST_XML_SITE = $(call github,processone,fast_xml,$(ERLANG_FAST_XML_VERSION)) +ERLANG_FAST_XML_LICENSE = Apache-2.0 +ERLANG_FAST_XML_LICENSE_FILES = LICENSE.txt +ERLANG_FAST_XML_DEPENDENCIES = expat erlang-p1-utils +HOST_ERLANG_FAST_XML_DEPENDENCIES = host-expat host-erlang-p1-utils +ERLANG_FAST_XML_INSTALL_STAGING = YES + +ERLANG_FAST_XML_USE_AUTOCONF = YES + +$(eval $(rebar-package)) +$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xml/Config.in b/package/erlang-p1-xml/Config.in deleted file mode 100644 index 504501d912..0000000000 --- a/package/erlang-p1-xml/Config.in +++ /dev/null @@ -1,8 +0,0 @@ -config BR2_PACKAGE_ERLANG_P1_XML - bool "erlang-p1-xml" - select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_EXPAT - help - XML utilities for Erlang - - https://github.com/processone/xml diff --git a/package/erlang-p1-xml/erlang-p1-xml.mk b/package/erlang-p1-xml/erlang-p1-xml.mk deleted file mode 100644 index eee2c74c03..0000000000 --- a/package/erlang-p1-xml/erlang-p1-xml.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################################################################ -# -# erlang-p1-xml -# -################################################################################ - -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 -ERLANG_P1_XML_DEPENDENCIES = expat erlang-p1-utils -HOST_ERLANG_P1_XML_DEPENDENCIES = host-expat host-erlang-p1-utils -ERLANG_P1_XML_INSTALL_STAGING = YES - -ERLANG_P1_XML_USE_AUTOCONF = YES - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xmpp/0001-fix-includes.patch b/package/erlang-p1-xmpp/0001-fix-includes.patch deleted file mode 100644 index f02037fdc1..0000000000 --- a/package/erlang-p1-xmpp/0001-fix-includes.patch +++ /dev/null @@ -1,16 +0,0 @@ -Without this patch, rebar fails to find include file fxml.hrl. - -Signed-off-by: Christophe Romain <cromain@process-one.net> - -diff --git a/include/xmpp.hrl b/include/xmpp.hrl -index afa5f61..678858e 100644 ---- a/include/xmpp.hrl -+++ b/include/xmpp.hrl -@@ -25,7 +25,7 @@ - -include("ns.hrl"). - -include("jid.hrl"). - -include("xmpp_codec.hrl"). ---include_lib("fast_xml/include/fxml.hrl"). -+-include_lib("p1_xml/include/fxml.hrl"). - - -type stanza() :: iq() | presence() | message(). diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-p1-xmpp/Config.in index c67dc832b7..9cd1a75198 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-p1-xmpp/Config.in @@ -4,8 +4,8 @@ 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_FAST_XML select BR2_PACKAGE_ERLANG_IDNA - select BR2_PACKAGE_ERLANG_P1_XML select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk index 2deb25b315..f8ec0b9823 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk @@ -9,9 +9,9 @@ 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 ERLANG_P1_XMPP_INSTALL_STAGING = YES -ERLANG_P1_XMPP_DEPENDENCIES = erlang-p1-xml erlang-p1-stringprep \ - erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-p1-xml -HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-p1-xml +ERLANG_P1_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \ + erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml +HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-fast-xml $(eval $(rebar-package)) $(eval $(host-rebar-package)) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 03/18] package/erlang-xmpp: renamed from erlang-p1-xmpp 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 02/18] package/erlang-fast-xml: renamed from erlang-p1-xml Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 04/18] package/erlang-p1-utils: bump version to 1.0.26 Johan Oudinet ` (15 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet and bump version to 1.8.3. This package has been renamed to avoid patching the packages that expect it to find its content inside the xmpp/ directory. Thus, remove the corresponding patch in the ejabberd package. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/ejabberd/0003-correct-includes.patch | 1807 ----------------- package/ejabberd/Config.in | 2 +- package/ejabberd/ejabberd.mk | 4 +- package/erlang-p1-xmpp/erlang-p1-xmpp.mk | 17 - .../{erlang-p1-xmpp => erlang-xmpp}/Config.in | 6 +- .../erlang-xmpp.hash} | 2 +- package/erlang-xmpp/erlang-xmpp.mk | 17 + 9 files changed, 26 insertions(+), 1833 deletions(-) delete mode 100644 package/ejabberd/0003-correct-includes.patch delete mode 100644 package/erlang-p1-xmpp/erlang-p1-xmpp.mk rename package/{erlang-p1-xmpp => erlang-xmpp}/Config.in (78%) rename package/{erlang-p1-xmpp/erlang-p1-xmpp.hash => erlang-xmpp/erlang-xmpp.hash} (51%) create mode 100644 package/erlang-xmpp/erlang-xmpp.mk diff --git a/DEVELOPERS b/DEVELOPERS index 24841dcc6e..8318fb5cb4 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1671,11 +1671,11 @@ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ -F: package/erlang-p1-xmpp/ F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ F: package/erlang-stun/ +F: package/erlang-xmpp/ F: package/forge/ F: package/nginx-dav-ext/ F: package/vis-network/ diff --git a/package/Config.in b/package/Config.in index 4e2f992abe..27902475cb 100644 --- a/package/Config.in +++ b/package/Config.in @@ -688,11 +688,11 @@ menu "Erlang libraries/modules" source "package/erlang-p1-stringprep/Config.in" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" - source "package/erlang-p1-xmpp/Config.in" source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-yconf/Config.in" source "package/erlang-p1-zlib/Config.in" source "package/erlang-stun/Config.in" + source "package/erlang-xmpp/Config.in" endmenu endif source "package/execline/Config.in" diff --git a/package/ejabberd/0003-correct-includes.patch b/package/ejabberd/0003-correct-includes.patch deleted file mode 100644 index 338aa28fd2..0000000000 --- a/package/ejabberd/0003-correct-includes.patch +++ /dev/null @@ -1,1807 +0,0 @@ -From 710b6f7c0cfc9ab300d03f12538da3e26c35207b Mon Sep 17 00:00:00 2001 -From: Philipp Huebner <debalance@debian.org> -Date: Tue, 31 May 2022 10:30:52 +0200 -Subject: [PATCH] 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> -Original: https://salsa.debian.org/ejabberd-packaging-team/ejabberd/-/blob/master/debian/patches/src.includes.patch -Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls <bernd@kuhls.net> ---- - src/ejabberd_auth.erl | 2 +- - src/ejabberd_auth_anonymous.erl | 2 +- - src/ejabberd_auth_jwt.erl | 2 +- - src/ejabberd_auth_mnesia.erl | 2 +- - src/ejabberd_auth_sql.erl | 2 +- - src/ejabberd_bosh.erl | 2 +- - src/ejabberd_c2s.erl | 2 +- - src/ejabberd_captcha.erl | 2 +- - src/ejabberd_http.erl | 2 +- - src/ejabberd_http_ws.erl | 2 +- - src/ejabberd_iq.erl | 2 +- - src/ejabberd_local.erl | 2 +- - src/ejabberd_oauth.erl | 2 +- - src/ejabberd_oauth_rest.erl | 2 +- - src/ejabberd_oauth_sql.erl | 2 +- - src/ejabberd_piefxis.erl | 4 ++-- - src/ejabberd_router.erl | 2 +- - src/ejabberd_router_multicast.erl | 2 +- - src/ejabberd_s2s.erl | 2 +- - src/ejabberd_s2s_in.erl | 2 +- - src/ejabberd_s2s_out.erl | 2 +- - src/ejabberd_service.erl | 2 +- - src/ejabberd_sm.erl | 2 +- - src/ejabberd_web.erl | 2 +- - src/ejabberd_web_admin.erl | 2 +- - src/ejabberd_websocket.erl | 2 +- - src/ejabberd_xmlrpc.erl | 2 +- - src/ext_mod.erl | 2 +- - src/gen_iq_handler.erl | 2 +- - src/gen_pubsub_node.erl | 2 +- - src/gen_pubsub_nodetree.erl | 2 +- - src/jd2ejd.erl | 2 +- - src/misc.erl | 2 +- - src/mod_adhoc.erl | 2 +- - src/mod_admin_extra.erl | 2 +- - src/mod_admin_update_sql.erl | 2 +- - src/mod_announce.erl | 2 +- - src/mod_announce_mnesia.erl | 2 +- - src/mod_announce_sql.erl | 2 +- - src/mod_avatar.erl | 2 +- - src/mod_block_strangers.erl | 2 +- - src/mod_blocking.erl | 2 +- - src/mod_bosh.erl | 2 +- - src/mod_caps.erl | 2 +- - src/mod_carboncopy.erl | 2 +- - src/mod_client_state.erl | 2 +- - src/mod_configure.erl | 2 +- - src/mod_conversejs.erl | 2 +- - src/mod_delegation.erl | 2 +- - src/mod_disco.erl | 2 +- - src/mod_fail2ban.erl | 2 +- - src/mod_host_meta.erl | 2 +- - src/mod_http_api.erl | 2 +- - src/mod_http_upload.erl | 2 +- - src/mod_http_upload_quota.erl | 2 +- - src/mod_jidprep.erl | 2 +- - src/mod_last.erl | 2 +- - src/mod_legacy_auth.erl | 2 +- - src/mod_mam.erl | 2 +- - src/mod_mam_mnesia.erl | 2 +- - src/mod_mam_sql.erl | 2 +- - src/mod_metrics.erl | 2 +- - src/mod_mix.erl | 2 +- - src/mod_mix_pam.erl | 2 +- - src/mod_mqtt_bridge_session.erl | 2 +- - src/mod_mqtt_session.erl | 2 +- - src/mod_mqtt_ws.erl | 2 +- - src/mod_muc.erl | 2 +- - src/mod_muc_admin.erl | 2 +- - src/mod_muc_log.erl | 2 +- - src/mod_muc_mnesia.erl | 2 +- - src/mod_muc_room.erl | 2 +- - src/mod_muc_rtbl.erl | 2 +- - src/mod_muc_sql.erl | 2 +- - src/mod_multicast.erl | 2 +- - src/mod_offline.erl | 2 +- - src/mod_offline_mnesia.erl | 2 +- - src/mod_offline_sql.erl | 2 +- - src/mod_ping.erl | 2 +- - src/mod_pres_counter.erl | 2 +- - src/mod_privacy.erl | 2 +- - src/mod_privacy_mnesia.erl | 2 +- - src/mod_privacy_sql.erl | 2 +- - src/mod_private.erl | 2 +- - src/mod_private_mnesia.erl | 2 +- - src/mod_private_sql.erl | 2 +- - src/mod_privilege.erl | 2 +- - src/mod_proxy65_service.erl | 2 +- - src/mod_pubsub.erl | 2 +- - src/mod_push.erl | 2 +- - src/mod_push_keepalive.erl | 2 +- - src/mod_push_mnesia.erl | 2 +- - src/mod_push_sql.erl | 2 +- - src/mod_register.erl | 2 +- - src/mod_register_web.erl | 2 +- - src/mod_roster.erl | 2 +- - src/mod_roster_mnesia.erl | 2 +- - src/mod_roster_sql.erl | 2 +- - src/mod_s2s_dialback.erl | 2 +- - src/mod_service_log.erl | 2 +- - src/mod_shared_roster.erl | 2 +- - src/mod_shared_roster_ldap.erl | 2 +- - src/mod_shared_roster_mnesia.erl | 2 +- - src/mod_shared_roster_sql.erl | 2 +- - src/mod_sic.erl | 2 +- - src/mod_sip.erl | 2 +- - src/mod_sip_proxy.erl | 2 +- - src/mod_sip_registrar.erl | 2 +- - src/mod_stats.erl | 2 +- - src/mod_stream_mgmt.erl | 2 +- - src/mod_stun_disco.erl | 2 +- - src/mod_time.erl | 2 +- - src/mod_vcard.erl | 2 +- - src/mod_vcard_ldap.erl | 2 +- - src/mod_vcard_mnesia.erl | 2 +- - src/mod_vcard_sql.erl | 2 +- - src/mod_vcard_xupdate.erl | 2 +- - src/mod_version.erl | 2 +- - src/node_flat.erl | 2 +- - src/node_flat_sql.erl | 2 +- - src/nodetree_tree.erl | 2 +- - src/nodetree_tree_sql.erl | 2 +- - src/prosody2ejabberd.erl | 4 ++-- - src/pubsub_subscription.erl | 2 +- - src/pubsub_subscription_sql.erl | 2 +- - test/suite.hrl | 8 ++++---- - tools/xml_compress_gen.erl | 2 +- - 127 files changed, 132 insertions(+), 132 deletions(-) - -diff --git a/src/ejabberd_auth.erl b/src/ejabberd_auth.erl -index 027983e61..06150f34a 100644 ---- a/src/ejabberd_auth.erl -+++ b/src/ejabberd_auth.erl -@@ -50,7 +50,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). -diff --git a/src/ejabberd_auth_anonymous.erl b/src/ejabberd_auth_anonymous.erl -index 056d475f8..9284c10f6 100644 ---- a/src/ejabberd_auth_anonymous.erl -+++ b/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, -diff --git a/src/ejabberd_auth_jwt.erl b/src/ejabberd_auth_jwt.erl -index e4b251a03..8074d8612 100644 ---- a/src/ejabberd_auth_jwt.erl -+++ b/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"). - - %%%---------------------------------------------------------------------- -diff --git a/src/ejabberd_auth_mnesia.erl b/src/ejabberd_auth_mnesia.erl -index d52dde868..468ae4b19 100644 ---- a/src/ejabberd_auth_mnesia.erl -+++ b/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(), -diff --git a/src/ejabberd_auth_sql.erl b/src/ejabberd_auth_sql.erl -index 566152695..a730d61bc 100644 ---- a/src/ejabberd_auth_sql.erl -+++ b/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"). -diff --git a/src/ejabberd_bosh.erl b/src/ejabberd_bosh.erl -index 06aaacda9..e0c72f74b 100644 ---- a/src/ejabberd_bosh.erl -+++ b/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"). - -diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl -index d7b3a3340..670e57516 100644 ---- a/src/ejabberd_c2s.erl -+++ b/src/ejabberd_c2s.erl -@@ -51,7 +51,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"). -diff --git a/src/ejabberd_captcha.erl b/src/ejabberd_captcha.erl -index 12ab5abb8..e2d400a48 100644 ---- a/src/ejabberd_captcha.erl -+++ b/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"). -diff --git a/src/ejabberd_http.erl b/src/ejabberd_http.erl -index f29f36063..34ac89190 100644 ---- a/src/ejabberd_http.erl -+++ b/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("ejabberd_stacktrace.hrl"). - -include_lib("kernel/include/file.hrl"). -diff --git a/src/ejabberd_http_ws.erl b/src/ejabberd_http_ws.erl -index e14ca69e6..83986a69b 100644 ---- a/src/ejabberd_http_ws.erl -+++ b/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"). - -diff --git a/src/ejabberd_iq.erl b/src/ejabberd_iq.erl -index b4957dd55..53f476962 100644 ---- a/src/ejabberd_iq.erl -+++ b/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"). - -diff --git a/src/ejabberd_local.erl b/src/ejabberd_local.erl -index 5147a7481..7376acbd7 100644 ---- a/src/ejabberd_local.erl -+++ b/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"). - -diff --git a/src/ejabberd_oauth.erl b/src/ejabberd_oauth.erl -index ba369c1f2..6f4f6d9c8 100644 ---- a/src/ejabberd_oauth.erl -+++ b/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"). -diff --git a/src/ejabberd_oauth_rest.erl b/src/ejabberd_oauth_rest.erl -index 1a18e2655..36301cfaf 100644 ---- a/src/ejabberd_oauth_rest.erl -+++ b/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()), -diff --git a/src/ejabberd_oauth_sql.erl b/src/ejabberd_oauth_sql.erl -index ecb1625c7..8513a430b 100644 ---- a/src/ejabberd_oauth_sql.erl -+++ b/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() -> -diff --git a/src/ejabberd_piefxis.erl b/src/ejabberd_piefxis.erl -index 01fa24852..5ce3077d5 100644 ---- a/src/ejabberd_piefxis.erl -+++ b/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"). - -diff --git a/src/ejabberd_router.erl b/src/ejabberd_router.erl -index 3a2c6f318..b80e893cc 100644 ---- a/src/ejabberd_router.erl -+++ b/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(). -diff --git a/src/ejabberd_router_multicast.erl b/src/ejabberd_router_multicast.erl -index 773a3788e..ab341df09 100644 ---- a/src/ejabberd_router_multicast.erl -+++ b/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()}). -diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl -index 378a55a43..a31e2d14d 100644 ---- a/src/ejabberd_s2s.erl -+++ b/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"). -diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl -index ab8bb4503..7e8aa79b0 100644 ---- a/src/ejabberd_s2s_in.erl -+++ b/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(). -diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl -index b9ae1abb3..dadd50a6f 100644 ---- a/src/ejabberd_s2s_out.erl -+++ b/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"). - -diff --git a/src/ejabberd_service.erl b/src/ejabberd_service.erl -index 3afa64f37..14c0259df 100644 ---- a/src/ejabberd_service.erl -+++ b/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"). - -diff --git a/src/ejabberd_sm.erl b/src/ejabberd_sm.erl -index c9317b81c..6464801fe 100644 ---- a/src/ejabberd_sm.erl -+++ b/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"). -diff --git a/src/ejabberd_web.erl b/src/ejabberd_web.erl -index 5152e2b38..a2cf3c682 100644 ---- a/src/ejabberd_web.erl -+++ b/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"). - -diff --git a/src/ejabberd_web_admin.erl b/src/ejabberd_web_admin.erl -index ac3d4ec9b..e63231a46 100644 ---- a/src/ejabberd_web_admin.erl -+++ b/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"). - -diff --git a/src/ejabberd_websocket.erl b/src/ejabberd_websocket.erl -index 21123eb23..b9df5304b 100644 ---- a/src/ejabberd_websocket.erl -+++ b/src/ejabberd_websocket.erl -@@ -46,7 +46,7 @@ - - -include("logger.hrl"). - ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - - -include("ejabberd_http.hrl"). - -diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl -index 741bf8422..78f001d24 100644 ---- a/src/ejabberd_xmlrpc.erl -+++ b/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(), -diff --git a/src/ext_mod.erl b/src/ext_mod.erl -index 32f1f6fc8..066b40935 100644 ---- a/src/ext_mod.erl -+++ b/src/ext_mod.erl -@@ -46,7 +46,7 @@ - -include("ejabberd_web_admin.hrl"). - -include("logger.hrl"). - -include("translate.hrl"). ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - - -define(REPOS, "https://github.com/processone/ejabberd-contrib"). - -diff --git a/src/gen_iq_handler.erl b/src/gen_iq_handler.erl -index 72fc0ae30..27c517493 100644 ---- a/src/gen_iq_handler.erl -+++ b/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"). - -diff --git a/src/gen_pubsub_node.erl b/src/gen_pubsub_node.erl -index baf0ae444..5b3fd426a 100644 ---- a/src/gen_pubsub_node.erl -+++ b/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()). -diff --git a/src/gen_pubsub_nodetree.erl b/src/gen_pubsub_nodetree.erl -index 1fd198208..821cdac45 100644 ---- a/src/gen_pubsub_nodetree.erl -+++ b/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(). - -diff --git a/src/jd2ejd.erl b/src/jd2ejd.erl -index 1a8dbb87a..390abcc8a 100644 ---- a/src/jd2ejd.erl -+++ b/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 -diff --git a/src/misc.erl b/src/misc.erl -index c08610524..d812865ba 100644 ---- a/src/misc.erl -+++ b/src/misc.erl -@@ -51,7 +51,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()}. -diff --git a/src/mod_adhoc.erl b/src/mod_adhoc.erl -index 3075366c4..2ad402cd7 100644 ---- a/src/mod_adhoc.erl -+++ b/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) -> -diff --git a/src/mod_admin_extra.erl b/src/mod_admin_extra.erl -index 9b88176fb..c49d5400b 100644 ---- a/src/mod_admin_extra.erl -+++ b/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 -diff --git a/src/mod_admin_update_sql.erl b/src/mod_admin_update_sql.erl -index 74d30b3e3..5d7528fc5 100644 ---- a/src/mod_admin_update_sql.erl -+++ b/src/mod_admin_update_sql.erl -@@ -39,7 +39,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"). - -diff --git a/src/mod_announce.erl b/src/mod_announce.erl -index 7f6df0df5..56db12f0b 100644 ---- a/src/mod_announce.erl -+++ b/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"). - -diff --git a/src/mod_announce_mnesia.erl b/src/mod_announce_mnesia.erl -index e0ef13907..c5ec48921 100644 ---- a/src/mod_announce_mnesia.erl -+++ b/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"). - -diff --git a/src/mod_announce_sql.erl b/src/mod_announce_sql.erl -index 20ec78295..2aa8b112c 100644 ---- a/src/mod_announce_sql.erl -+++ b/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"). -diff --git a/src/mod_avatar.erl b/src/mod_avatar.erl -index 58b4a8af6..1d01e867a 100644 ---- a/src/mod_avatar.erl -+++ b/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"). -diff --git a/src/mod_block_strangers.erl b/src/mod_block_strangers.erl -index 8595b4aa0..ba01af0f9 100644 ---- a/src/mod_block_strangers.erl -+++ b/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"). - -diff --git a/src/mod_blocking.erl b/src/mod_blocking.erl -index 75f9aa0b9..42e7281a4 100644 ---- a/src/mod_blocking.erl -+++ b/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"). - -diff --git a/src/mod_bosh.erl b/src/mod_bosh.erl -index dfe7482e3..6f5db9417 100644 ---- a/src/mod_bosh.erl -+++ b/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"). -diff --git a/src/mod_caps.erl b/src/mod_caps.erl -index 65287826c..58c573502 100644 ---- a/src/mod_caps.erl -+++ b/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"). - -diff --git a/src/mod_carboncopy.erl b/src/mod_carboncopy.erl -index c9fe73b0a..ad9524428 100644 ---- a/src/mod_carboncopy.erl -+++ b/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. -diff --git a/src/mod_client_state.erl b/src/mod_client_state.erl -index 5b38560e3..5fa594eff 100644 ---- a/src/mod_client_state.erl -+++ b/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). -diff --git a/src/mod_configure.erl b/src/mod_configure.erl -index 3aec8e106..624e6ee8e 100644 ---- a/src/mod_configure.erl -+++ b/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"). -diff --git a/src/mod_conversejs.erl b/src/mod_conversejs.erl -index 64e2a48d0..6b40d1ee4 100644 ---- a/src/mod_conversejs.erl -+++ b/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/src/mod_delegation.erl b/src/mod_delegation.erl -index 919c53a7b..c84d4a062 100644 ---- a/src/mod_delegation.erl -+++ b/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. -diff --git a/src/mod_disco.erl b/src/mod_disco.erl -index 2b77cf762..0d8cd4749 100644 ---- a/src/mod_disco.erl -+++ b/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"). - -diff --git a/src/mod_fail2ban.erl b/src/mod_fail2ban.erl -index cd5fb07fc..8d09b2f15 100644 ---- a/src/mod_fail2ban.erl -+++ b/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)). -diff --git a/src/mod_host_meta.erl b/src/mod_host_meta.erl -index e1f7f141b..357dc7661 100644 ---- a/src/mod_host_meta.erl -+++ b/src/mod_host_meta.erl -@@ -38,7 +38,7 @@ - - -include("logger.hrl"). - ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - - -include("ejabberd_http.hrl"). - -diff --git a/src/mod_http_api.erl b/src/mod_http_api.erl -index 514a8632c..62030a16f 100644 ---- a/src/mod_http_api.erl -+++ b/src/mod_http_api.erl -@@ -33,7 +33,7 @@ - format_arg/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"). -diff --git a/src/mod_http_upload.erl b/src/mod_http_upload.erl -index 4efce9c5c..53072cd1e 100644 ---- a/src/mod_http_upload.erl -+++ b/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"). - -diff --git a/src/mod_http_upload_quota.erl b/src/mod_http_upload_quota.erl -index 7c2742280..b803e34e0 100644 ---- a/src/mod_http_upload_quota.erl -+++ b/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"). -diff --git a/src/mod_jidprep.erl b/src/mod_jidprep.erl -index c1b2ad1ec..029be581d 100644 ---- a/src/mod_jidprep.erl -+++ b/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. -diff --git a/src/mod_last.erl b/src/mod_last.erl -index be7abd561..a23346f1a 100644 ---- a/src/mod_last.erl -+++ b/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"). -diff --git a/src/mod_legacy_auth.erl b/src/mod_legacy_auth.erl -index 98daa18ad..d2239ce2b 100644 ---- a/src/mod_legacy_auth.erl -+++ b/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(). -diff --git a/src/mod_mam.erl b/src/mod_mam.erl -index 7c40b17fc..3ba1448e8 100644 ---- a/src/mod_mam.erl -+++ b/src/mod_mam.erl -@@ -48,7 +48,7 @@ - delete_old_messages_batch/5, delete_old_messages_status/1, delete_old_messages_abort/1, - remove_message_from_archive/3]). - ---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"). -diff --git a/src/mod_mam_mnesia.erl b/src/mod_mam_mnesia.erl -index f9e366860..c7340d0a9 100644 ---- a/src/mod_mam_mnesia.erl -+++ b/src/mod_mam_mnesia.erl -@@ -32,7 +32,7 @@ - is_empty_for_user/2, is_empty_for_room/3, delete_old_messages_batch/5]). - - -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"). - -diff --git a/src/mod_mam_sql.erl b/src/mod_mam_sql.erl -index b21e84a7b..626b87d65 100644 ---- a/src/mod_mam_sql.erl -+++ b/src/mod_mam_sql.erl -@@ -34,7 +34,7 @@ - delete_old_messages_batch/4, count_messages_to_delete/3]). - - -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"). -diff --git a/src/mod_metrics.erl b/src/mod_metrics.erl -index e3dd397f7..df333038a 100644 ---- a/src/mod_metrics.erl -+++ b/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]). -diff --git a/src/mod_mix.erl b/src/mod_mix.erl -index 7066911b9..51ed5e1fb 100644 ---- a/src/mod_mix.erl -+++ b/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"). -diff --git a/src/mod_mix_pam.erl b/src/mod_mix_pam.erl -index 7bd6f2a71..a5bc5860f 100644 ---- a/src/mod_mix_pam.erl -+++ b/src/mod_mix_pam.erl -@@ -36,7 +36,7 @@ - webadmin_user/4, - webadmin_page/3]). - ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - -include("logger.hrl"). - -include("mod_roster.hrl"). - -include("translate.hrl"). -diff --git a/src/mod_mqtt_bridge_session.erl b/src/mod_mqtt_bridge_session.erl -index 7d38632d4..0627fb55f 100644 ---- a/src/mod_mqtt_bridge_session.erl -+++ b/src/mod_mqtt_bridge_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"). - -include_lib("public_key/include/public_key.hrl"). - - -type error_reason() :: -diff --git a/src/mod_mqtt_session.erl b/src/mod_mqtt_session.erl -index 37ea8ce02..e88ea64fa 100644 ---- a/src/mod_mqtt_session.erl -+++ b/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"). - -include_lib("public_key/include/public_key.hrl"). - - -record(state, {vsn = ?VSN :: integer(), -diff --git a/src/mod_mqtt_ws.erl b/src/mod_mqtt_ws.erl -index 236f0b2d7..7c1f91561 100644 ---- a/src/mod_mqtt_ws.erl -+++ b/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"). - -diff --git a/src/mod_muc.erl b/src/mod_muc.erl -index e1da09a7e..3a8c45108 100644 ---- a/src/mod_muc.erl -+++ b/src/mod_muc.erl -@@ -79,7 +79,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"). -diff --git a/src/mod_muc_admin.erl b/src/mod_muc_admin.erl -index 234f065d3..3c10fecaf 100644 ---- a/src/mod_muc_admin.erl -+++ b/src/mod_muc_admin.erl -@@ -49,7 +49,7 @@ - get_room_pid/2, get_room_history/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("ejabberd_http.hrl"). -diff --git a/src/mod_muc_log.erl b/src/mod_muc_log.erl -index 9e724de32..24d57a343 100644 ---- a/src/mod_muc_log.erl -+++ b/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"). - -diff --git a/src/mod_muc_mnesia.erl b/src/mod_muc_mnesia.erl -index 4a5192d2f..ba45a2775 100644 ---- a/src/mod_muc_mnesia.erl -+++ b/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, {}). -diff --git a/src/mod_muc_room.erl b/src/mod_muc_room.erl -index f66e32036..6a5189efa 100644 ---- a/src/mod_muc_room.erl -+++ b/src/mod_muc_room.erl -@@ -71,7 +71,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"). -diff --git a/src/mod_muc_rtbl.erl b/src/mod_muc_rtbl.erl -index d5fe3bbfd..e2c501e7c 100644 ---- a/src/mod_muc_rtbl.erl -+++ b/src/mod_muc_rtbl.erl -@@ -27,7 +27,7 @@ - - -behaviour(gen_mod). - ---include_lib("xmpp/include/xmpp.hrl"). -+-include_lib("p1_xmpp/include/xmpp.hrl"). - -include("logger.hrl"). - -include("translate.hrl"). - -include("mod_muc_room.hrl"). -diff --git a/src/mod_muc_sql.erl b/src/mod_muc_sql.erl -index 1c72a5bd2..6f8425241 100644 ---- a/src/mod_muc_sql.erl -+++ b/src/mod_muc_sql.erl -@@ -43,7 +43,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"). -diff --git a/src/mod_multicast.erl b/src/mod_multicast.erl -index 9b418049a..5f84feb33 100644 ---- a/src/mod_multicast.erl -+++ b/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, -diff --git a/src/mod_offline.erl b/src/mod_offline.erl -index 4840ced5f..629b4d15a 100644 ---- a/src/mod_offline.erl -+++ b/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"). - -diff --git a/src/mod_offline_mnesia.erl b/src/mod_offline_mnesia.erl -index 2cd511dfa..a7bb30812 100644 ---- a/src/mod_offline_mnesia.erl -+++ b/src/mod_offline_mnesia.erl -@@ -33,7 +33,7 @@ - remove_old_messages_batch/4]). - -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"). - -diff --git a/src/mod_offline_sql.erl b/src/mod_offline_sql.erl -index a3b9d0545..bad4e45f2 100644 ---- a/src/mod_offline_sql.erl -+++ b/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, remove_old_messages_batch/3]). - ---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"). -diff --git a/src/mod_ping.erl b/src/mod_ping.erl -index 9ac6e9bad..7b50b68c8 100644 ---- a/src/mod_ping.erl -+++ b/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"). - -diff --git a/src/mod_pres_counter.erl b/src/mod_pres_counter.erl -index 7359260bc..3772f2a9c 100644 ---- a/src/mod_pres_counter.erl -+++ b/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}). -diff --git a/src/mod_privacy.erl b/src/mod_privacy.erl -index 37f1eb8bc..e2d0ee04d 100644 ---- a/src/mod_privacy.erl -+++ b/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"). - -diff --git a/src/mod_privacy_mnesia.erl b/src/mod_privacy_mnesia.erl -index 78eeb9b82..cf0cbc754 100644 ---- a/src/mod_privacy_mnesia.erl -+++ b/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"). - -diff --git a/src/mod_privacy_sql.erl b/src/mod_privacy_sql.erl -index 10ec92e0b..241fa6792 100644 ---- a/src/mod_privacy_sql.erl -+++ b/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"). -diff --git a/src/mod_private.erl b/src/mod_private.erl -index 52768291d..304dc5c25 100644 ---- a/src/mod_private.erl -+++ b/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"). -diff --git a/src/mod_private_mnesia.erl b/src/mod_private_mnesia.erl -index e3619dc2a..3828989d7 100644 ---- a/src/mod_private_mnesia.erl -+++ b/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"). - -diff --git a/src/mod_private_sql.erl b/src/mod_private_sql.erl -index a1bb38c82..07772c036 100644 ---- a/src/mod_private_sql.erl -+++ b/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"). -diff --git a/src/mod_privilege.erl b/src/mod_privilege.erl -index 3862b33c7..9d6b290c9 100644 ---- a/src/mod_privilege.erl -+++ b/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. -diff --git a/src/mod_proxy65_service.erl b/src/mod_proxy65_service.erl -index 297c59bb6..124c47490 100644 ---- a/src/mod_proxy65_service.erl -+++ b/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"). - -diff --git a/src/mod_pubsub.erl b/src/mod_pubsub.erl -index b8f4c4905..071bb3327 100644 ---- a/src/mod_pubsub.erl -+++ b/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"). -diff --git a/src/mod_push.erl b/src/mod_push.erl -index c911bb6ac..117c6bd49 100644 ---- a/src/mod_push.erl -+++ b/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). -diff --git a/src/mod_push_keepalive.erl b/src/mod_push_keepalive.erl -index 9463ec7d9..bcdfb516f 100644 ---- a/src/mod_push_keepalive.erl -+++ b/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. -diff --git a/src/mod_push_mnesia.erl b/src/mod_push_mnesia.erl -index 4e3baa342..f982991f2 100644 ---- a/src/mod_push_mnesia.erl -+++ b/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"). - - %%%------------------------------------------------------------------- -diff --git a/src/mod_push_sql.erl b/src/mod_push_sql.erl -index 7a433a57d..43e8dbb19 100644 ---- a/src/mod_push_sql.erl -+++ b/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"). -diff --git a/src/mod_register.erl b/src/mod_register.erl -index 7b05d4fff..45dac2ca0 100644 ---- a/src/mod_register.erl -+++ b/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) -> -diff --git a/src/mod_register_web.erl b/src/mod_register_web.erl -index 03e35cbf4..cea523fae 100644 ---- a/src/mod_register_web.erl -+++ b/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"). - -diff --git a/src/mod_roster.erl b/src/mod_roster.erl -index 7ea3dac81..1a9933a8f 100644 ---- a/src/mod_roster.erl -+++ b/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"). -diff --git a/src/mod_roster_mnesia.erl b/src/mod_roster_mnesia.erl -index 3ef93a4dc..d74cb7640 100644 ---- a/src/mod_roster_mnesia.erl -+++ b/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 -diff --git a/src/mod_roster_sql.erl b/src/mod_roster_sql.erl -index 67d9697f7..a8462f5ff 100644 ---- a/src/mod_roster_sql.erl -+++ b/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 -diff --git a/src/mod_s2s_dialback.erl b/src/mod_s2s_dialback.erl -index cd0a9b8f6..2ddd8a9f5 100644 ---- a/src/mod_s2s_dialback.erl -+++ b/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"). - -diff --git a/src/mod_service_log.erl b/src/mod_service_log.erl -index c387ce04c..4cc818434 100644 ---- a/src/mod_service_log.erl -+++ b/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, -diff --git a/src/mod_shared_roster.erl b/src/mod_shared_roster.erl -index 579992739..700b0c89c 100644 ---- a/src/mod_shared_roster.erl -+++ b/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"). - -diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl -index 7c97ce011..5aaf6ff53 100644 ---- a/src/mod_shared_roster_ldap.erl -+++ b/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"). -diff --git a/src/mod_shared_roster_mnesia.erl b/src/mod_shared_roster_mnesia.erl -index 447fa174d..8d700bbe7 100644 ---- a/src/mod_shared_roster_mnesia.erl -+++ b/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 -diff --git a/src/mod_shared_roster_sql.erl b/src/mod_shared_roster_sql.erl -index d921e5474..a4f3cfb03 100644 ---- a/src/mod_shared_roster_sql.erl -+++ b/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"). -diff --git a/src/mod_sic.erl b/src/mod_sic.erl -index 94f82e10b..5a2389e7c 100644 ---- a/src/mod_sic.erl -+++ b/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) -> -diff --git a/src/mod_sip.erl b/src/mod_sip.erl -index 13fcfa6c4..7abdf1023 100644 ---- a/src/mod_sip.erl -+++ b/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 -diff --git a/src/mod_sip_proxy.erl b/src/mod_sip_proxy.erl -index dbd17a9d6..70d861e12 100644 ---- a/src/mod_sip_proxy.erl -+++ b/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. - -diff --git a/src/mod_sip_registrar.erl b/src/mod_sip_registrar.erl -index 970a45256..825478840 100644 ---- a/src/mod_sip_registrar.erl -+++ b/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). -diff --git a/src/mod_stats.erl b/src/mod_stats.erl -index 492a486b9..79163f03a 100644 ---- a/src/mod_stats.erl -+++ b/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) -> -diff --git a/src/mod_stream_mgmt.erl b/src/mod_stream_mgmt.erl -index 7b02b2e48..737f81219 100644 ---- a/src/mod_stream_mgmt.erl -+++ b/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"). -diff --git a/src/mod_stun_disco.erl b/src/mod_stun_disco.erl -index 9f77cc1a8..085048017 100644 ---- a/src/mod_stun_disco.erl -+++ b/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). - -diff --git a/src/mod_time.erl b/src/mod_time.erl -index c954761c2..659c767fa 100644 ---- a/src/mod_time.erl -+++ b/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) -> -diff --git a/src/mod_vcard.erl b/src/mod_vcard.erl -index 87bb22080..a6bc0fa0f 100644 ---- a/src/mod_vcard.erl -+++ b/src/mod_vcard.erl -@@ -45,7 +45,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"). -diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl -index b07a83cfc..29dcb5226 100644 ---- a/src/mod_vcard_ldap.erl -+++ b/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). -diff --git a/src/mod_vcard_mnesia.erl b/src/mod_vcard_mnesia.erl -index f877f91bd..0bbe993c0 100644 ---- a/src/mod_vcard_mnesia.erl -+++ b/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"). -diff --git a/src/mod_vcard_sql.erl b/src/mod_vcard_sql.erl -index 7d1c00e11..d770baa6a 100644 ---- a/src/mod_vcard_sql.erl -+++ b/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"). -diff --git a/src/mod_vcard_xupdate.erl b/src/mod_vcard_xupdate.erl -index d169b78f4..4f244c587 100644 ---- a/src/mod_vcard_xupdate.erl -+++ b/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). -diff --git a/src/mod_version.erl b/src/mod_version.erl -index 64b7ba278..5caa4231d 100644 ---- a/src/mod_version.erl -+++ b/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) -> -diff --git a/src/node_flat.erl b/src/node_flat.erl -index c64adb3ef..d94a84734 100644 ---- a/src/node_flat.erl -+++ b/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, -diff --git a/src/node_flat_sql.erl b/src/node_flat_sql.erl -index 9a98fed65..66c690bf7 100644 ---- a/src/node_flat_sql.erl -+++ b/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"). - -diff --git a/src/nodetree_tree.erl b/src/nodetree_tree.erl -index ea8d35c50..361a3734b 100644 ---- a/src/nodetree_tree.erl -+++ b/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, -diff --git a/src/nodetree_tree_sql.erl b/src/nodetree_tree_sql.erl -index ccb2b0e2a..6722cf44f 100644 ---- a/src/nodetree_tree_sql.erl -+++ b/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"). - -diff --git a/src/prosody2ejabberd.erl b/src/prosody2ejabberd.erl -index 951993cc0..8582d4537 100644 ---- a/src/prosody2ejabberd.erl -+++ b/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"). -diff --git a/src/pubsub_subscription.erl b/src/pubsub_subscription.erl -index db947bb64..23e87e054 100644 ---- a/src/pubsub_subscription.erl -+++ b/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">>). -diff --git a/src/pubsub_subscription_sql.erl b/src/pubsub_subscription_sql.erl -index 839d1589c..dc336a340 100644 ---- a/src/pubsub_subscription_sql.erl -+++ b/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">>). -diff --git a/test/suite.hrl b/test/suite.hrl -index d8ea3e23b..9c6bc3f42 100644 ---- a/test/suite.hrl -+++ b/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>">>). -diff --git a/tools/xml_compress_gen.erl b/tools/xml_compress_gen.erl -index c3c494c8c..80ff83f79 100644 ---- a/tools/xml_compress_gen.erl -+++ b/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]). --- -2.39.2 - diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index 295b0e7744..e631e665d1 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -17,11 +17,11 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_ERLANG_P1_XMPP select BR2_PACKAGE_ERLANG_P1_YAML select BR2_PACKAGE_ERLANG_P1_YCONF # runtime select BR2_PACKAGE_ERLANG_P1_ZLIB select BR2_PACKAGE_ERLANG_STUN + select BR2_PACKAGE_ERLANG_XMPP select BR2_PACKAGE_GETENT select BR2_PACKAGE_OPENSSL help diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index e49560d3a7..3824f2a530 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -12,8 +12,8 @@ EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ erlang-p1-stringprep erlang-stun erlang-p1-tls \ - erlang-p1-utils erlang-fast-xml erlang-p1-xmpp erlang-p1-yaml \ - erlang-p1-zlib host-erlang-p1-utils host-erlang-p1-xmpp + erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-p1-yaml \ + erlang-p1-zlib host-erlang-p1-utils host-erlang-xmpp # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch # updates Makefile.in diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk b/package/erlang-p1-xmpp/erlang-p1-xmpp.mk deleted file mode 100644 index f8ec0b9823..0000000000 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.mk +++ /dev/null @@ -1,17 +0,0 @@ -################################################################################ -# -# erlang-p1-xmpp -# -################################################################################ - -ERLANG_P1_XMPP_VERSION = 1.6.2 -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 -ERLANG_P1_XMPP_INSTALL_STAGING = YES -ERLANG_P1_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \ - erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml -HOST_ERLANG_P1_XMPP_DEPENDENCIES = host-erlang-fast-xml - -$(eval $(rebar-package)) -$(eval $(host-rebar-package)) diff --git a/package/erlang-p1-xmpp/Config.in b/package/erlang-xmpp/Config.in similarity index 78% rename from package/erlang-p1-xmpp/Config.in rename to package/erlang-xmpp/Config.in index 9cd1a75198..d41c413445 100644 --- a/package/erlang-p1-xmpp/Config.in +++ b/package/erlang-xmpp/Config.in @@ -1,8 +1,8 @@ -comment "erlang-p1-xmpp needs a toolchain w/ C++" +comment "erlang-xmpp needs a toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP -config BR2_PACKAGE_ERLANG_P1_XMPP - bool "erlang-p1-xmpp" +config BR2_PACKAGE_ERLANG_XMPP + bool "erlang-xmpp" depends on BR2_INSTALL_LIBSTDCPP # erlang-p1-stringprep select BR2_PACKAGE_ERLANG_FAST_XML select BR2_PACKAGE_ERLANG_IDNA diff --git a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash b/package/erlang-xmpp/erlang-xmpp.hash similarity index 51% rename from package/erlang-p1-xmpp/erlang-p1-xmpp.hash rename to package/erlang-xmpp/erlang-xmpp.hash index 62325786a5..df509886f8 100644 --- a/package/erlang-p1-xmpp/erlang-p1-xmpp.hash +++ b/package/erlang-xmpp/erlang-xmpp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 c227e3a32af4973308120aa726b945c2d3ab7187d47343fe65eb30e95bade0b0 erlang-p1-xmpp-1.6.2.tar.gz +sha256 2a099bdfb129c416fae6f7e713d94ad39153cf2e7bf6b277a970136190a28ff2 erlang-xmpp-1.8.3.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-xmpp/erlang-xmpp.mk b/package/erlang-xmpp/erlang-xmpp.mk new file mode 100644 index 0000000000..66d7223346 --- /dev/null +++ b/package/erlang-xmpp/erlang-xmpp.mk @@ -0,0 +1,17 @@ +################################################################################ +# +# erlang-xmpp +# +################################################################################ + +ERLANG_XMPP_VERSION = 1.8.3 +ERLANG_XMPP_SITE = $(call github,processone,xmpp,$(ERLANG_XMPP_VERSION)) +ERLANG_XMPP_LICENSE = Apache-2.0 +ERLANG_XMPP_LICENSE_FILES = LICENSE.txt +ERLANG_XMPP_INSTALL_STAGING = YES +ERLANG_XMPP_DEPENDENCIES = erlang-fast-xml erlang-p1-stringprep \ + erlang-p1-tls erlang-p1-utils erlang-p1-zlib host-erlang-fast-xml +HOST_ERLANG_XMPP_DEPENDENCIES = host-erlang-fast-xml + +$(eval $(rebar-package)) +$(eval $(host-rebar-package)) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 04/18] package/erlang-p1-utils: bump version to 1.0.26 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (2 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 03/18] package/erlang-xmpp: renamed from erlang-p1-xmpp Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 05/18] package/erlang-p1-cache-tab: bump version to 1.0.31 Johan Oudinet ` (14 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 aa8d25bfa6..7f5d213693 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 c62f93ab5ea8d9251d9acda2abf576352d50f4a3299972549180a5387656746a erlang-p1-utils-1.0.25.tar.gz +sha256 bf00dced9f892ec5972c0ff4f9861b391cbffe1a763c73dcfa622c500a1cc55b erlang-p1-utils-1.0.26.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 8b00ee1462..fd9a8f1684 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.25 +ERLANG_P1_UTILS_VERSION = 1.0.26 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 05/18] package/erlang-p1-cache-tab: bump version to 1.0.31 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (3 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 04/18] package/erlang-p1-utils: bump version to 1.0.26 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 06/18] package/erlang-p1-tls: bump version to 1.1.21 Johan Oudinet ` (13 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 83c40f37d7..9662c39aca 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 c506d2aa2e59f1e0086ce32234618189d557a767312179cc1c8df19754131ca2 erlang-p1-cache-tab-1.0.30.tar.gz +sha256 7d30cacd91b4a691e1e4bb458df895fd71803853a624bd0afaba0db4dbfc3f15 erlang-p1-cache-tab-1.0.31.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 e2479b8214..07d28fd2d4 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.30 +ERLANG_P1_CACHE_TAB_VERSION = 1.0.31 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 06/18] package/erlang-p1-tls: bump version to 1.1.21 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (4 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 05/18] package/erlang-p1-cache-tab: bump version to 1.0.31 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 07/18] package/erlang-p1-stringprep: bump version to 1.0.30 Johan Oudinet ` (12 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet The license hash has changed because of a year update at the beginning of the file. 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 9a14a44293..b88844b3c1 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 8c38768998e8ee0aa2bf5831bc25deeb4ea2e08bd52e26b2abfd654504fbe4f9 erlang-p1-tls-1.1.16.tar.gz -sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt +sha256 08235a436f2222d6caf6b17e4e1471c65bf677dd2f5659d9174160dad4f51b7a erlang-p1-tls-1.1.21.tar.gz +sha256 823a9f2a803502343d969639e581c206d415cef3089ddcbc4f7cc02de201b8da LICENSE.txt diff --git a/package/erlang-p1-tls/erlang-p1-tls.mk b/package/erlang-p1-tls/erlang-p1-tls.mk index c16a124068..3fa849d133 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.16 +ERLANG_P1_TLS_VERSION = 1.1.21 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 07/18] package/erlang-p1-stringprep: bump version to 1.0.30 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (5 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 06/18] package/erlang-p1-tls: bump version to 1.1.21 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 08/18] package/erlang-fast-yaml: renamed from erlang-p1-yaml Johan Oudinet ` (11 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 50a48af0a4..6df5048dce 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 b07daf2148829d513caf2931d463550e70252a78ef99696dcf444d61d93bf940 erlang-p1-stringprep-1.0.29.tar.gz +sha256 8fc39340e73b0f77c2c77ebb486c5c2309ea3ec46afa16cc03db35d200e3a5f5 erlang-p1-stringprep-1.0.30.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 09e339f57a..4f925c0682 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.29 +ERLANG_P1_STRINGPREP_VERSION = 1.0.30 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 08/18] package/erlang-fast-yaml: renamed from erlang-p1-yaml 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (6 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 07/18] package/erlang-p1-stringprep: bump version to 1.0.30 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 09/18] package/erlang-p1-yconf: bump version to 1.0.16 Johan Oudinet ` (10 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet and bump version to 1.0.37. The upstream project has been renamed from p1_yaml to fast_yaml. Use the same name so packages that depends on it, find its content in the fast_yaml/ directory. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- DEVELOPERS | 2 +- package/Config.in | 2 +- package/ejabberd/Config.in | 2 +- package/ejabberd/ejabberd.mk | 2 +- .../Config.in | 6 +++--- .../erlang-fast-yaml.hash} | 2 +- package/erlang-fast-yaml/erlang-fast-yaml.mk | 20 +++++++++++++++++++ package/erlang-p1-yaml/erlang-p1-yaml.mk | 20 ------------------- package/erlang-p1-yconf/Config.in | 2 +- package/erlang-p1-yconf/erlang-p1-yconf.mk | 2 +- 10 files changed, 30 insertions(+), 30 deletions(-) rename package/{erlang-p1-yaml => erlang-fast-yaml}/Config.in (51%) rename package/{erlang-p1-yaml/erlang-p1-yaml.hash => erlang-fast-yaml/erlang-fast-yaml.hash} (50%) create mode 100644 package/erlang-fast-yaml/erlang-fast-yaml.mk delete mode 100644 package/erlang-p1-yaml/erlang-p1-yaml.mk diff --git a/DEVELOPERS b/DEVELOPERS index 8318fb5cb4..3ecdb4a93c 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1657,6 +1657,7 @@ F: package/ejabberd/ F: package/erlang-base64url/ F: package/erlang-eimp/ F: package/erlang-fast-xml/ +F: package/erlang-fast-yaml/ F: package/erlang-goldrush/ F: package/erlang-idna/ F: package/erlang-jiffy/ @@ -1671,7 +1672,6 @@ F: package/erlang-p1-sip/ F: package/erlang-p1-stringprep/ F: package/erlang-p1-tls/ F: package/erlang-p1-utils/ -F: package/erlang-p1-yaml/ F: package/erlang-p1-yconf/ F: package/erlang-p1-zlib/ F: package/erlang-stun/ diff --git a/package/Config.in b/package/Config.in index 27902475cb..c2b361309e 100644 --- a/package/Config.in +++ b/package/Config.in @@ -674,6 +674,7 @@ menu "Erlang libraries/modules" source "package/erlang-base64url/Config.in" source "package/erlang-eimp/Config.in" source "package/erlang-fast-xml/Config.in" + source "package/erlang-fast-yaml/Config.in" source "package/erlang-goldrush/Config.in" source "package/erlang-idna/Config.in" source "package/erlang-jiffy/Config.in" @@ -688,7 +689,6 @@ menu "Erlang libraries/modules" source "package/erlang-p1-stringprep/Config.in" source "package/erlang-p1-tls/Config.in" source "package/erlang-p1-utils/Config.in" - source "package/erlang-p1-yaml/Config.in" source "package/erlang-p1-yconf/Config.in" source "package/erlang-p1-zlib/Config.in" source "package/erlang-stun/Config.in" diff --git a/package/ejabberd/Config.in b/package/ejabberd/Config.in index e631e665d1..f46e40035d 100644 --- a/package/ejabberd/Config.in +++ b/package/ejabberd/Config.in @@ -4,6 +4,7 @@ config BR2_PACKAGE_EJABBERD depends on BR2_INSTALL_LIBSTDCPP # jiffy, stringprep select BR2_PACKAGE_ERLANG_EIMP select BR2_PACKAGE_ERLANG_FAST_XML + select BR2_PACKAGE_ERLANG_FAST_YAML select BR2_PACKAGE_ERLANG_IDNA # runtime select BR2_PACKAGE_ERLANG_JIFFY # runtime select BR2_PACKAGE_ERLANG_JOSE # runtime @@ -17,7 +18,6 @@ config BR2_PACKAGE_EJABBERD select BR2_PACKAGE_ERLANG_P1_STRINGPREP select BR2_PACKAGE_ERLANG_P1_TLS select BR2_PACKAGE_ERLANG_P1_UTILS - select BR2_PACKAGE_ERLANG_P1_YAML select BR2_PACKAGE_ERLANG_P1_YCONF # runtime select BR2_PACKAGE_ERLANG_P1_ZLIB select BR2_PACKAGE_ERLANG_STUN diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 3824f2a530..58b544fb84 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -12,7 +12,7 @@ EJABBERD_CPE_ID_VENDOR = process-one EJABBERD_DEPENDENCIES = getent openssl erlang-eimp host-erlang-lager \ erlang-lager erlang-p1-cache-tab erlang-p1-sip \ erlang-p1-stringprep erlang-stun erlang-p1-tls \ - erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-p1-yaml \ + erlang-p1-utils erlang-fast-xml erlang-xmpp erlang-fast-yaml \ erlang-p1-zlib host-erlang-p1-utils host-erlang-xmpp # 0001-Makefile.in-do-not-download-or-compile-dependencies.patch diff --git a/package/erlang-p1-yaml/Config.in b/package/erlang-fast-yaml/Config.in similarity index 51% rename from package/erlang-p1-yaml/Config.in rename to package/erlang-fast-yaml/Config.in index 2ab78d1296..8c9d47f044 100644 --- a/package/erlang-p1-yaml/Config.in +++ b/package/erlang-fast-yaml/Config.in @@ -1,8 +1,8 @@ -config BR2_PACKAGE_ERLANG_P1_YAML - bool "erlang-p1-yaml" +config BR2_PACKAGE_ERLANG_FAST_YAML + bool "erlang-fast-yaml" select BR2_PACKAGE_ERLANG_P1_UTILS select BR2_PACKAGE_LIBYAML help Erlang wrapper for libyaml C library - https://github.com/processone/p1_yaml + https://github.com/processone/fast_yaml diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.hash b/package/erlang-fast-yaml/erlang-fast-yaml.hash similarity index 50% rename from package/erlang-p1-yaml/erlang-p1-yaml.hash rename to package/erlang-fast-yaml/erlang-fast-yaml.hash index 0138f82047..863781725d 100644 --- a/package/erlang-p1-yaml/erlang-p1-yaml.hash +++ b/package/erlang-fast-yaml/erlang-fast-yaml.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 6794470ef35fb3985c4e9aa0ed8d3a0b44e7a5c7bf4c5a1efbeca42060db6806 erlang-p1-yaml-1.0.36.tar.gz +sha256 a8d632d97282cfdf54a0172df59d8641f37de690dd886d0b2e4ef0d4ff876077 erlang-fast-yaml-1.0.37.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-fast-yaml/erlang-fast-yaml.mk b/package/erlang-fast-yaml/erlang-fast-yaml.mk new file mode 100644 index 0000000000..675dba0839 --- /dev/null +++ b/package/erlang-fast-yaml/erlang-fast-yaml.mk @@ -0,0 +1,20 @@ +################################################################################ +# +# erlang-fast-yaml +# +################################################################################ + +ERLANG_FAST_YAML_VERSION = 1.0.37 +ERLANG_FAST_YAML_SITE = $(call github,processone,fast_yaml,$(ERLANG_FAST_YAML_VERSION)) +ERLANG_FAST_YAML_LICENSE = Apache-2.0 +ERLANG_FAST_YAML_LICENSE_FILES = LICENSE.txt +ERLANG_FAST_YAML_DEPENDENCIES = libyaml erlang-p1-utils + +define ERLANG_FAST_YAML_REMOVE_PATHS + $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config + $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config +endef + +ERLANG_FAST_YAML_POST_PATCH_HOOKS = ERLANG_FAST_YAML_REMOVE_PATHS + +$(eval $(rebar-package)) diff --git a/package/erlang-p1-yaml/erlang-p1-yaml.mk b/package/erlang-p1-yaml/erlang-p1-yaml.mk deleted file mode 100644 index 17f4910ee1..0000000000 --- a/package/erlang-p1-yaml/erlang-p1-yaml.mk +++ /dev/null @@ -1,20 +0,0 @@ -################################################################################ -# -# erlang-p1-yaml -# -################################################################################ - -ERLANG_P1_YAML_VERSION = 1.0.36 -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 -ERLANG_P1_YAML_DEPENDENCIES = libyaml erlang-p1-utils - -define ERLANG_P1_YAML_REMOVE_PATHS - $(SED) "s/ -I\/usr\/local\/include//" $(@D)/rebar.config - $(SED) "s/ -L\/usr\/local\/lib//" $(@D)/rebar.config -endef - -ERLANG_P1_YAML_POST_PATCH_HOOKS = ERLANG_P1_YAML_REMOVE_PATHS - -$(eval $(rebar-package)) diff --git a/package/erlang-p1-yconf/Config.in b/package/erlang-p1-yconf/Config.in index 3777ebbe14..987b511878 100644 --- a/package/erlang-p1-yconf/Config.in +++ b/package/erlang-p1-yconf/Config.in @@ -1,5 +1,5 @@ config BR2_PACKAGE_ERLANG_P1_YCONF bool "erlang-p1-yconf" - select BR2_PACKAGE_ERLANG_P1_YAML + select BR2_PACKAGE_ERLANG_FAST_YAML help YAML configuration processor. diff --git a/package/erlang-p1-yconf/erlang-p1-yconf.mk b/package/erlang-p1-yconf/erlang-p1-yconf.mk index 81f7462884..bc72f282a9 100644 --- a/package/erlang-p1-yconf/erlang-p1-yconf.mk +++ b/package/erlang-p1-yconf/erlang-p1-yconf.mk @@ -8,6 +8,6 @@ ERLANG_P1_YCONF_VERSION = 1.0.15 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 -ERLANG_P1_YCONF_DEPENDENCIES = erlang-p1-yaml +ERLANG_P1_YCONF_DEPENDENCIES = erlang-fast-yaml $(eval $(rebar-package)) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 09/18] package/erlang-p1-yconf: bump version to 1.0.16 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (7 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 08/18] package/erlang-fast-yaml: renamed from erlang-p1-yaml Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 10/18] package/erlang-p1-oauth2: bump version to 0.6.14 Johan Oudinet ` (9 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 25d873b58a..dc2ac9937e 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 0280358c868977105104cfffa7b1fa2c5bf7856243cee9b7df974dc54904e4da erlang-p1-yconf-1.0.15.tar.gz +sha256 0f33a381cc580dc43284581e61e531293d1d358e35a32e51b8b4fda7b462eba1 erlang-p1-yconf-1.0.16.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 bc72f282a9..297ab20bb2 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.15 +ERLANG_P1_YCONF_VERSION = 1.0.16 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 10/18] package/erlang-p1-oauth2: bump version to 0.6.14 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (8 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 09/18] package/erlang-p1-yconf: bump version to 1.0.16 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 11/18] package/erlang-p1-pkix: bump version to 1.0.10 Johan Oudinet ` (8 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 ac87485d5b..dd2f8782b7 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 2a33d96ab007b77759f48613a65794351569e7d2d800700b71e50448eed0e3b8 erlang-p1-oauth2-0.6.11.tar.gz +sha256 6437184239ea3053584834771776062c4e055e897dc6ca94dd8f960f393d891c erlang-p1-oauth2-0.6.14.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 b01a391963..09bb0e6752 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.11 +ERLANG_P1_OAUTH2_VERSION = 0.6.14 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 11/18] package/erlang-p1-pkix: bump version to 1.0.10 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (9 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 10/18] package/erlang-p1-oauth2: bump version to 0.6.14 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 12/18] package/erlang-eimp: bump version to 1.0.23 Johan Oudinet ` (7 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 2b9c4cc93f..a1fdad63e0 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 a9adf7d16494c1a1b572b46fc9ee1d28996b3d4bcb7a433395dfe120cee0c0ae erlang-p1-pkix-1.0.9.tar.gz +sha256 da6279d3f8ee31ef04de2b82fb0d42ce8dcd72cedb9a8e6ae7b18e42590cb108 erlang-p1-pkix-1.0.10.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 90c4122184..ba3d88a30a 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.9 +ERLANG_P1_PKIX_VERSION = 1.0.10 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 12/18] package/erlang-eimp: bump version to 1.0.23 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (10 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 11/18] package/erlang-p1-pkix: bump version to 1.0.10 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 13/18] package/erlang-p1-mqtree: bump version to 1.0.17 Johan Oudinet ` (6 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 26e8addd2d..e9ef9c693e 100644 --- a/package/erlang-eimp/erlang-eimp.hash +++ b/package/erlang-eimp/erlang-eimp.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 7023b86bc7cf3551fd876a1361ceb2443bdf1c1be9f98a4d9a9a90eda3353b51 erlang-eimp-1.0.22.tar.gz +sha256 923d9fb5abd7fca36188441e6871e2d2da2f8fc95ed42d78406eb431df587b28 erlang-eimp-1.0.23.tar.gz sha256 cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30 LICENSE.txt diff --git a/package/erlang-eimp/erlang-eimp.mk b/package/erlang-eimp/erlang-eimp.mk index 68d0d9e9ed..1e1a5ece43 100644 --- a/package/erlang-eimp/erlang-eimp.mk +++ b/package/erlang-eimp/erlang-eimp.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_EIMP_VERSION = 1.0.22 +ERLANG_EIMP_VERSION = 1.0.23 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 13/18] package/erlang-p1-mqtree: bump version to 1.0.17 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (11 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 12/18] package/erlang-eimp: bump version to 1.0.23 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 14/18] package/erlang-jose: bump version to 1.11.10 Johan Oudinet ` (5 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: 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 4ce3295ed3..ff92cd42b2 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 8d6b2d780d3d6e23a2d205406b30bf96c722f6c8b336a83182d5455e665ae866 erlang-p1-mqtree-1.0.15.tar.gz +sha256 a2b7a000efdc2f4a55b84b5b6cdde000c905856a05fdbd9911275fb9207f7a5b erlang-p1-mqtree-1.0.17.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 d606f737aa..96b607f88d 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.15 +ERLANG_P1_MQTREE_VERSION = 1.0.17 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 14/18] package/erlang-jose: bump version to 1.11.10 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (12 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 13/18] package/erlang-p1-mqtree: bump version to 1.0.17 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 15/18] package/erlang-p1-acme: bump version to 1.0.23 Johan Oudinet ` (4 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- package/erlang-jose/erlang-jose.hash | 2 +- package/erlang-jose/erlang-jose.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-jose/erlang-jose.hash b/package/erlang-jose/erlang-jose.hash index 1e763fd5ba..abcf11b1d1 100644 --- a/package/erlang-jose/erlang-jose.hash +++ b/package/erlang-jose/erlang-jose.hash @@ -1,3 +1,3 @@ # Locally calculated -sha256 2186b93ad20d386e6db9f673c135c48568a55de42b5a1d839518c65509af4ea5 erlang-jose-1.11.5.tar.gz +sha256 57c0ebfb0fd41d52bb22ff0398af75acf378475751c0a127af726b7385659ba7 erlang-jose-1.11.10.tar.gz sha256 6397e2bd9a35a64c1bb798b937071fbe49d90667f717e65c74a0d0fe93d5c1be LICENSE.md diff --git a/package/erlang-jose/erlang-jose.mk b/package/erlang-jose/erlang-jose.mk index 4df5173b2c..f147afd5a7 100644 --- a/package/erlang-jose/erlang-jose.mk +++ b/package/erlang-jose/erlang-jose.mk @@ -4,7 +4,7 @@ # ################################################################################ -ERLANG_JOSE_VERSION = 1.11.5 +ERLANG_JOSE_VERSION = 1.11.10 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 15/18] package/erlang-p1-acme: bump version to 1.0.23 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (13 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 14/18] package/erlang-jose: bump version to 1.11.10 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 16/18] package/erlang-p1-sip: bump version to 1.0.54 Johan Oudinet ` (3 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- package/erlang-p1-acme/erlang-p1-acme.hash | 2 +- package/erlang-p1-acme/erlang-p1-acme.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-acme/erlang-p1-acme.hash b/package/erlang-p1-acme/erlang-p1-acme.hash index e417d4b181..0894176fbd 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 a445b66e76acdf1342eda166344004473bf4f45ad7e7f5ae38fb0333d896eb2d erlang-p1-acme-1.0.22.tar.gz +sha256 59a0113022c87afe25a8664fba76739b0ad481e25081599e0b69a098f6d628ed erlang-p1-acme-1.0.23.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 cb8c7a8a19..5c7c5cc9e9 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.22 +ERLANG_P1_ACME_VERSION = 1.0.23 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 16/18] package/erlang-p1-sip: bump version to 1.0.54 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (14 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 15/18] package/erlang-p1-acme: bump version to 1.0.23 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 17/18] package/erlang-p1-zlib: bump version to 1.0.13 Johan Oudinet ` (2 subsequent siblings) 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- package/erlang-p1-sip/erlang-p1-sip.hash | 2 +- package/erlang-p1-sip/erlang-p1-sip.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-sip/erlang-p1-sip.hash b/package/erlang-p1-sip/erlang-p1-sip.hash index 87c0742bfc..d2e40e8fdc 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 895a143fc90f0222649d103dd524def7fed6665c52600c2bba61e9f69d132372 erlang-p1-sip-1.0.49.tar.gz +sha256 9336f02ea99cfad359c78c50fdd9c3061aac7b31966abdc3223f56b3ed7cc377 erlang-p1-sip-1.0.54.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 45c70e8899..36758b8681 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.49 +ERLANG_P1_SIP_VERSION = 1.0.54 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 17/18] package/erlang-p1-zlib: bump version to 1.0.13 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (15 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 16/18] package/erlang-p1-sip: bump version to 1.0.54 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 Johan Oudinet 2024-08-07 19:51 ` [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Thomas Petazzoni via buildroot 18 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- package/erlang-p1-zlib/erlang-p1-zlib.hash | 2 +- package/erlang-p1-zlib/erlang-p1-zlib.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.hash b/package/erlang-p1-zlib/erlang-p1-zlib.hash index fa8cdacd8c..9d4399b9a0 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 f2e7a3d17bbd752ad3ffd8a24c7948bf7c211c67c953a98c03110ddc497798d1 erlang-p1-zlib-1.0.12.tar.gz +sha256 ae14f266e50c843a46bfcd5fc480112416cd542e82d68c5a97927118ddfb8187 erlang-p1-zlib-1.0.13.tar.gz sha256 c835791cd41a32f8ef40e2255d141ab7faec2f28fab68bbd685c6110fb83be4e LICENSE.txt diff --git a/package/erlang-p1-zlib/erlang-p1-zlib.mk b/package/erlang-p1-zlib/erlang-p1-zlib.mk index da55d310af..fd20464cc9 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.12 +ERLANG_P1_ZLIB_VERSION = 1.0.13 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 ^ permalink raw reply related [flat|nested] 22+ messages in thread
* [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (16 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 17/18] package/erlang-p1-zlib: bump version to 1.0.13 Johan Oudinet @ 2024-08-07 14:33 ` Johan Oudinet 2024-08-07 19:53 ` Thomas Petazzoni via buildroot 2024-08-07 19:51 ` [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Thomas Petazzoni via buildroot 18 siblings, 1 reply; 22+ messages in thread From: Johan Oudinet @ 2024-08-07 14:33 UTC (permalink / raw) To: buildroot; +Cc: Johan Oudinet and update the two patches accordingly. Ejabberd now uses rebar3 by default, so use the --with-rebar configure option to set the correct rebar binary to use. Take the opportunity to fix warnings reported by utils/check-package. Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> --- ...not-download-or-compile-dependencies.patch | 23 +++--- package/ejabberd/0002-fix-ejabberdctl.patch | 19 +++-- package/ejabberd/S50ejabberd | 72 ++++++++++--------- package/ejabberd/check-erlang-lib | 39 +++++----- package/ejabberd/ejabberd.hash | 4 +- package/ejabberd/ejabberd.mk | 5 +- 6 files changed, 82 insertions(+), 80 deletions(-) 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 abcc8975b2..69f25304b5 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,37 +1,36 @@ -From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet <johan.oudinet@gmail.com> -Date: Fri, 13 May 2022 14:22:37 +0200 +From bfcc72e5bb96fc9fc1f3558191a1a3f40c7f159a Mon Sep 17 00:00:00 2001 +From: Johan Oudinet <johan.oudinet@gmail.com> +Date: Fri, 2 Aug 2024 17:32:37 +0200 Subject: [PATCH] Makefile.in: do not download or compile dependencies -Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls <bernd@kuhls.net> +Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> +Upstream: N/A, not upstreamable --- Makefile.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in -index ab0e9d967..6e54168a7 100644 +index 5adf241d5..74aad3156 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -155,7 +155,7 @@ else - endif - endif +@@ -201,7 +201,7 @@ endif + #' main targets + # -all: scripts deps src +all: scripts src deps: $(DEPSDIR)/.got -@@ -169,7 +169,7 @@ $(DEPSDIR)/.built: $(DEPSDIR)/.got +@@ -215,7 +215,7 @@ $(DEPSDIR)/.got: $(DEPSDIR)/.built: $(DEPSDIR)/.got $(REBAR) compile && :> $(DEPSDIR)/.built -src: $(DEPSDIR)/.built +src: $(REBAR) $(SKIPDEPS) compile + $(EXPLICIT_ELIXIR_COMPILE) - update: -- 2.34.1 diff --git a/package/ejabberd/0002-fix-ejabberdctl.patch b/package/ejabberd/0002-fix-ejabberdctl.patch index ae28f3a632..89504d11c5 100644 --- a/package/ejabberd/0002-fix-ejabberdctl.patch +++ b/package/ejabberd/0002-fix-ejabberdctl.patch @@ -1,30 +1,29 @@ -From 4283f675f21d3923e200092cec6418014a03ad52 Mon Sep 17 00:00:00 2001 -From: Johan Oudinet <johan.oudinet@gmail.com> -Date: Thu, 26 Dec 2019 17:06:34 +0100 +From d403c0bca48f2678c70763c3faca41c9adc76658 Mon Sep 17 00:00:00 2001 +From: Johan Oudinet <johan.oudinet@gmail.com> +Date: Fri, 2 Aug 2024 17:39:07 +0200 Subject: [PATCH] fix ejabberdctl Change default values so ejabberdctl run commands as ejabberd user. -Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> -[Bernd: updated for version 23.04] -Signed-off-by: Bernd Kuhls <bernd@kuhls.net> +Signed-off-by: Johan Oudinet <johan.oudinet@gmail.com> +Upstream: N/A (specific to buildroot) --- ejabberdctl.template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ejabberdctl.template b/ejabberdctl.template -index a940c3df7..5166e5a27 100755 +index 83ec7e1bd..513c48c25 100755 --- a/ejabberdctl.template +++ b/ejabberdctl.template -@@ -17,7 +17,7 @@ SCRIPT_DIR=$(cd "${0%/*}" && pwd) +@@ -17,7 +17,7 @@ ERTS_VSN="{{erts_vsn}}" ERL="{{erl}}" - IEX="{{bindir}}/iex" EPMD="{{epmd}}" + IEX="{{iexpath}}" -INSTALLUSER="{{installuser}}" +INSTALLUSER=ejabberd # check the proper system user is used case $(id -un) in -- -2.20.1 +2.34.1 diff --git a/package/ejabberd/S50ejabberd b/package/ejabberd/S50ejabberd index 83513bdc83..5d01034fb2 100644 --- a/package/ejabberd/S50ejabberd +++ b/package/ejabberd/S50ejabberd @@ -3,52 +3,54 @@ # Start/stop ejabberd # +DAEMON=ejabberd CTL=/usr/sbin/ejabberdctl DEFAULT=/etc/ejabberd/ejabberdctl.cfg INSTALLUSER=ejabberd RUNDIR=/var/run/ejabberd # Read default configuration file if present. +# shellcheck source=/dev/null [ -r "$DEFAULT" ] && . "$DEFAULT" # Create RUNDIR. mkrundir() { - install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" + install -d -o "$INSTALLUSER" -g "$INSTALLUSER" "$RUNDIR" } case "$1" in - start) - mkrundir || exit 1 - printf "Starting ejabberd... " - "$CTL" start - # Wait until ejabberd is up and running. - if "$CTL" started; then - echo "done" - else - echo "failed" - fi - ;; - stop) - printf "Stopping ejabberd... " - "$CTL" stop > /dev/null - if [ $? -eq 3 ] || "$CTL" stopped; then - echo "OK" - else - echo "failed" - fi - ;; - status) - "$CTL" status - ;; - restart|force-reload) - "$0" stop || true - "$0" start - ;; - live) - mkrundir || exit 1 - "$CTL" live - ;; - *) - echo "Usage: $0 {start|stop|status|restart|force-reload|live}" - exit 1 + start) + mkrundir || exit 1 + printf 'Starting %s: ' "$DAEMON" + "$CTL" start + # Wait until ejabberd is up and running. + if "$CTL" started; then + echo "done" + else + echo "failed" + fi + ;; + stop) + printf 'Stopping %s: ' "$DAEMON" + "$CTL" stop > /dev/null + if [ $? -eq 3 ] || "$CTL" stopped; then + echo "OK" + else + echo "failed" + fi + ;; + status) + "$CTL" status + ;; + restart|force-reload) + "$0" stop || true + "$0" start + ;; + live) + mkrundir || exit 1 + "$CTL" live + ;; + *) + echo "Usage: $0 {start|stop|status|restart|force-reload|live}" + exit 1 esac diff --git a/package/ejabberd/check-erlang-lib b/package/ejabberd/check-erlang-lib index 63f8bf1926..4e51b54294 100755 --- a/package/ejabberd/check-erlang-lib +++ b/package/ejabberd/check-erlang-lib @@ -9,9 +9,9 @@ # without calling erlang. usage() { - cat <<EOF + cat <<EOF Usage: - $0 library + $0 library Look for Erlang's library in TARGET_DIR/usr/lib/erlang/lib. If the library is found, it returns the path to the latest version, @@ -24,15 +24,15 @@ EOF } die () { - echo "$@" >&2 - exit 1 + echo "$@" >&2 + exit 1 } if [ $# -ne 1 ]; then - usage - exit 0 + usage + exit 0 else - library="$1" + library="$1" fi target_dir="${TARGET_DIR:-output/target}" @@ -40,16 +40,17 @@ target_dir="${TARGET_DIR:-output/target}" [ -d "$target_dir" ] || die "TARGET_DIR is not a directory. Please \ specify the TARGET_DIR environment variable." -case "$(ls -1d -- "$target_dir/usr/lib/erlang/lib/$library-"* | wc -l)" in - 0) - echo "not found" - ;; - 1) - echo "$target_dir/usr/lib/erlang/lib/$library-"* \ - | sed -e "s,^$target_dir,," - ;; - *) - die "Several versions of $library have been found. Please \ - remove the unused ones." - ;; +case "$(find "$target_dir/usr/lib/erlang/lib" -maxdepth 1 \ + -name "$library-*" -type d | wc -l)" in + 0) + echo "not found" + ;; + 1) + echo "$target_dir/usr/lib/erlang/lib/$library-"* \ + | sed -e "s,^$target_dir,," + ;; + *) + die "Several versions of $library have been found. Please \ + remove the unused ones." + ;; esac diff --git a/package/ejabberd/ejabberd.hash b/package/ejabberd/ejabberd.hash index 15e879be19..e6d9b2560e 100644 --- a/package/ejabberd/ejabberd.hash +++ b/package/ejabberd/ejabberd.hash @@ -1,4 +1,4 @@ -# From https://static.process-one.net/ejabberd/downloads/23.04/ejabberd-23.04.tar.gz.sum -sha256 6ff1d41a1ff6261a0c846193647d8ec143e82142859bf1cfdc62299022ceb2ad ejabberd-23.04.tar.gz +# From https://static.process-one.net/ejabberd/downloads/24.07/ejabberd-24.07.tar.gz.sum +sha256 c0fb746acba81a5db41de97c03968c1f681a13b1b6c1a895b7182e33820c18d9 ejabberd-24.07.tar.gz # Locally computed sha256 469bb8cfa3ef22c102875ff31932450c075e6908ff3f7d36893485c0c30898eb COPYING diff --git a/package/ejabberd/ejabberd.mk b/package/ejabberd/ejabberd.mk index 58b544fb84..df9fc1c1d0 100644 --- a/package/ejabberd/ejabberd.mk +++ b/package/ejabberd/ejabberd.mk @@ -4,7 +4,7 @@ # ################################################################################ -EJABBERD_VERSION = 23.04 +EJABBERD_VERSION = 24.07 EJABBERD_SITE = https://static.process-one.net/ejabberd/downloads/$(EJABBERD_VERSION) EJABBERD_LICENSE = GPL-2.0+ with OpenSSL exception EJABBERD_LICENSE_FILES = COPYING @@ -36,7 +36,8 @@ EJABBERD_CONF_ENV = \ EJABBERD_CONF_OPTS = \ --enable-system-deps \ - --disable-erlang-version-check + --disable-erlang-version-check \ + --with-rebar="$(HOST_DIR)/bin/rebar" define EJABBERD_INSTALL_TARGET_CMDS $(TARGET_MAKE_ENV) $(MAKE) DESTDIR=$(TARGET_DIR) all install -C $(@D) -- 2.34.1 _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 2024-08-07 14:33 ` [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 Johan Oudinet @ 2024-08-07 19:53 ` Thomas Petazzoni via buildroot 0 siblings, 0 replies; 22+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-08-07 19:53 UTC (permalink / raw) To: Johan Oudinet; +Cc: buildroot Hello Johan, On Wed, 7 Aug 2024 16:33:18 +0200 Johan Oudinet <johan.oudinet@gmail.com> wrote: > and update the two patches accordingly. Ejabberd now uses rebar3 by > default, so use the --with-rebar configure option to set the correct > rebar binary to use. Take the opportunity to fix warnings reported by > utils/check-package. Would it be possible to split the changes into multiple patches, i.e fix the check-package warnings first, and then bump (or the other around) ? Also, if you fix some check-package warnings, make sure to remove the corresponding ignore lines from .checkpackageignore: package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch lib_patch.Upstream package/ejabberd/0002-fix-ejabberdctl.patch lib_patch.Upstream package/ejabberd/0003-correct-includes.patch lib_patch.Upstream package/ejabberd/S50ejabberd Shellcheck lib_sysv.Indent lib_sysv.Variables package/ejabberd/check-erlang-lib Shellcheck Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet ` (17 preceding siblings ...) 2024-08-07 14:33 ` [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 Johan Oudinet @ 2024-08-07 19:51 ` Thomas Petazzoni via buildroot 2024-08-26 14:51 ` Johan Oudinet 18 siblings, 1 reply; 22+ messages in thread From: Thomas Petazzoni via buildroot @ 2024-08-07 19:51 UTC (permalink / raw) To: Johan Oudinet; +Cc: buildroot Hello Johan, Thanks for the patch series. On Wed, 7 Aug 2024 16:33:00 +0200 Johan Oudinet <johan.oudinet@gmail.com> wrote: > Johan Oudinet (18): > package/erlang-stun: renamed from erlang-p1-stun > package/erlang-fast-xml: renamed from erlang-p1-xml > package/erlang-xmpp: renamed from erlang-p1-xmpp I was a bit confused about these patches. I was wondering why the name of the package mattered, and why it was influencing where the files installed by this package are actually installed... If I understand correctly, it all comes from: $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1)))) which derives the ERLANG_APP name from the package name, so erlang-p1-stun becomes p1_stun. Is that correct? I think it's quite unique in Buildroot to do something like this. Other packages normally install their stuff into a location that isn't dependent on the package name chosen by Buildroot. That being said, I assume your changes are OK, but: - Why are we renaming only those 3 packages, and not the numerous other erlang-p1 packages ? - Can we separate the rename from the bump? - We should add Config.in.legacy entries matching the name of the old packages, so that the new packages get automatically selected Thanks! Thomas -- Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies 2024-08-07 19:51 ` [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Thomas Petazzoni via buildroot @ 2024-08-26 14:51 ` Johan Oudinet 0 siblings, 0 replies; 22+ messages in thread From: Johan Oudinet @ 2024-08-26 14:51 UTC (permalink / raw) To: Thomas Petazzoni; +Cc: buildroot Hello Thomas, On Wed, Aug 7, 2024 at 9:51 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > On Wed, 7 Aug 2024 16:33:00 +0200 > Johan Oudinet <johan.oudinet@gmail.com> wrote: > > > Johan Oudinet (18): > > package/erlang-stun: renamed from erlang-p1-stun > > package/erlang-fast-xml: renamed from erlang-p1-xml > > package/erlang-xmpp: renamed from erlang-p1-xmpp > > I was a bit confused about these patches. I was wondering why the name > of the package mattered, and why it was influencing where the files > installed by this package are actually installed... > > If I understand correctly, it all comes from: > > $(2)_ERLANG_APP = $(subst -,_,$(patsubst erlang-%,%,$(patsubst host-%,%,$(1)))) > > which derives the ERLANG_APP name from the package name, so > erlang-p1-stun becomes p1_stun. Is that correct? That's correct. > > I think it's quite unique in Buildroot to do something like this. Other > packages normally install their stuff into a location that isn't > dependent on the package name chosen by Buildroot. > > That being said, I assume your changes are OK, but: > > - Why are we renaming only those 3 packages, and not the numerous other > erlang-p1 packages ? I tried to minimize the number of renaming and did it only for packages where there was at least one patch in another package that was here only because of the incorrect name. > > - Can we separate the rename from the bump? Yes, I can. > > - We should add Config.in.legacy entries matching the name of the old > packages, so that the new packages get automatically selected Ok. I completely forgot about this legacy file. Thanks for the reminder. I'll do the changes and submit a v2 of this patch series. Thanks. -- Johan _______________________________________________ buildroot mailing list buildroot@buildroot.org https://lists.buildroot.org/mailman/listinfo/buildroot ^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2024-08-26 14:52 UTC | newest] Thread overview: 22+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 02/18] package/erlang-fast-xml: renamed from erlang-p1-xml Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 03/18] package/erlang-xmpp: renamed from erlang-p1-xmpp Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 04/18] package/erlang-p1-utils: bump version to 1.0.26 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 05/18] package/erlang-p1-cache-tab: bump version to 1.0.31 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 06/18] package/erlang-p1-tls: bump version to 1.1.21 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 07/18] package/erlang-p1-stringprep: bump version to 1.0.30 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 08/18] package/erlang-fast-yaml: renamed from erlang-p1-yaml Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 09/18] package/erlang-p1-yconf: bump version to 1.0.16 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 10/18] package/erlang-p1-oauth2: bump version to 0.6.14 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 11/18] package/erlang-p1-pkix: bump version to 1.0.10 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 12/18] package/erlang-eimp: bump version to 1.0.23 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 13/18] package/erlang-p1-mqtree: bump version to 1.0.17 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 14/18] package/erlang-jose: bump version to 1.11.10 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 15/18] package/erlang-p1-acme: bump version to 1.0.23 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 16/18] package/erlang-p1-sip: bump version to 1.0.54 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 17/18] package/erlang-p1-zlib: bump version to 1.0.13 Johan Oudinet 2024-08-07 14:33 ` [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07 Johan Oudinet 2024-08-07 19:53 ` Thomas Petazzoni via buildroot 2024-08-07 19:51 ` [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Thomas Petazzoni via buildroot 2024-08-26 14:51 ` Johan Oudinet
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.