Skip to contentSkip to conversation

Update Ejabberd and its dependencies

PATCH Superseded Johan Oudinet 2 participants 22 messages Aug 7, 2024 – Aug 26, 2024

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Johan Oudinet

author
#0 lore raw

cover Update Ejabberd and its dependencies

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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#1 lore raw

PATCH 1/18 package/erlang-stun: renamed from erlang-p1-stun

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 <[email protected]>
---
 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
DEVELOPERS +1 -1
index c472aa4c53..abd36c0c59 100644
@@ -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/
package/Config.in +1 -1
index 0472ec2daf..7dc4f99ec2 100644
@@ -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"
package/ejabberd/Config.in +1 -1
index e24c7fee6b..fb35a87306 100644
@@ -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
package/ejabberd/ejabberd.mk +1 -1
index 574f9492e8..1df8145496 100644
@@ -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
package/erlang-p1-sip/0001-correct-include.patch deleted +0 -31
deleted file mode 100644
index 90d68b5184..0000000000
@@ -1,31 +0,0 @@
-From 5ad4f871df7cbbc973708cb7380c3410b20bde1c Mon Sep 17 00:00:00 2001
-From: Philipp Huebner <[email protected]>
-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 <[email protected]>
-Signed-off-by: Johan Oudinet <[email protected]>
----
- 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
-
package/erlang-p1-sip/Config.in +1 -1
index 70cf819a37..74494d3c94 100644
@@ -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
package/erlang-p1-sip/erlang-p1-sip.mk +1 -1
index 61f728cb1b..45c70e8899 100644
@@ -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))
package/erlang-p1-stun/erlang-p1-stun.mk deleted +0 -14
deleted file mode 100644
index 7438bd2186..0000000000
@@ -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))
package/erlang-stun/Config.in renamed from package/erlang-p1-stun/Config.in +2 -2
similarity index 71%
rename from package/erlang-p1-stun/Config.in
rename to package/erlang-stun/Config.in
index 70cdd91599..dcf3817a2d 100644
@@ -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
package/erlang-stun/erlang-stun.hash renamed from package/erlang-p1-stun/erlang-p1-stun.hash +1 -1
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
@@ -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
package/erlang-stun/erlang-stun.mk new file +14 -0
new file mode 100644
index 0000000000..abfb1c3853
@@ -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))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#2 lore raw

PATCH 2/18 package/erlang-fast-xml: renamed from erlang-p1-xml

In reply to 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 <[email protected]>
---
 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
DEVELOPERS +1 -1
index abd36c0c59..24841dcc6e 100644
@@ -1656,6 +1656,7 @@ N:	Johan Oudinet <[email protected]>
 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/
package/Config.in +1 -1
index 7dc4f99ec2..4e2f992abe 100644
@@ -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"
package/ejabberd/Config.in +1 -1
index fb35a87306..295b0e7744 100644
@@ -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
package/ejabberd/ejabberd.mk +1 -1
index 1df8145496..e49560d3a7 100644
@@ -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
package/erlang-fast-xml/Config.in new file +8 -0
new file mode 100644
index 0000000000..04d6634fe8
@@ -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
package/erlang-fast-xml/erlang-fast-xml.hash renamed from package/erlang-p1-xml/erlang-p1-xml.hash +1 -1
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
@@ -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
package/erlang-fast-xml/erlang-fast-xml.mk new file +18 -0
new file mode 100644
index 0000000000..a04e3f5e09
@@ -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))
package/erlang-p1-xml/Config.in deleted +0 -8
deleted file mode 100644
index 504501d912..0000000000
@@ -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
package/erlang-p1-xml/erlang-p1-xml.mk deleted +0 -18
deleted file mode 100644
index eee2c74c03..0000000000
@@ -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))
package/erlang-p1-xmpp/0001-fix-includes.patch deleted +0 -16
deleted file mode 100644
index f02037fdc1..0000000000
@@ -1,16 +0,0 @@
-Without this patch, rebar fails to find include file fxml.hrl.
-
-Signed-off-by: Christophe Romain <[email protected]>
-
-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().
package/erlang-p1-xmpp/Config.in +1 -1
index c67dc832b7..9cd1a75198 100644
@@ -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
package/erlang-p1-xmpp/erlang-p1-xmpp.mk +3 -3
index 2deb25b315..f8ec0b9823 100644
@@ -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))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#3 lore raw

PATCH 3/18 package/erlang-xmpp: renamed from erlang-p1-xmpp

In reply to 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 <[email protected]>
---
 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
DEVELOPERS +1 -1
index 24841dcc6e..8318fb5cb4 100644
@@ -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/
package/Config.in +1 -1
index 4e2f992abe..27902475cb 100644
@@ -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"
package/ejabberd/0003-correct-includes.patch deleted +0 -1807

1,807 lines not on this page · raw message

package/ejabberd/Config.in +1 -1
index 295b0e7744..e631e665d1 100644
@@ -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
package/ejabberd/ejabberd.mk +2 -2
index e49560d3a7..3824f2a530 100644
@@ -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
package/erlang-p1-xmpp/erlang-p1-xmpp.mk deleted +0 -17
deleted file mode 100644
index f8ec0b9823..0000000000
@@ -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))
package/erlang-xmpp/Config.in renamed from package/erlang-p1-xmpp/Config.in +3 -3
similarity index 78%
rename from package/erlang-p1-xmpp/Config.in
rename to package/erlang-xmpp/Config.in
index 9cd1a75198..d41c413445 100644
@@ -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
package/erlang-xmpp/erlang-xmpp.hash renamed from package/erlang-p1-xmpp/erlang-p1-xmpp.hash +1 -1
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
@@ -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
package/erlang-xmpp/erlang-xmpp.mk new file +17 -0
new file mode 100644
index 0000000000..66d7223346
@@ -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))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#4 lore raw

PATCH 4/18 package/erlang-p1-utils: bump version to 1.0.26

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-utils/erlang-p1-utils.hash +1 -1
index aa8d25bfa6..7f5d213693 100644
@@ -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
package/erlang-p1-utils/erlang-p1-utils.mk +1 -1
index 8b00ee1462..fd9a8f1684 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#5 lore raw

PATCH 5/18 package/erlang-p1-cache-tab: bump version to 1.0.31

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-cache-tab/erlang-p1-cache-tab.hash +1 -1
index 83c40f37d7..9662c39aca 100644
@@ -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
package/erlang-p1-cache-tab/erlang-p1-cache-tab.mk +1 -1
index e2479b8214..07d28fd2d4 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#6 lore raw

PATCH 6/18 package/erlang-p1-tls: bump version to 1.1.21

In reply to Johan Oudinet

The license hash has changed because of a year update at the beginning of the file.

Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-tls/erlang-p1-tls.hash +2 -2
index 9a14a44293..b88844b3c1 100644
@@ -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
package/erlang-p1-tls/erlang-p1-tls.mk +1 -1
index c16a124068..3fa849d133 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#7 lore raw

PATCH 7/18 package/erlang-p1-stringprep: bump version to 1.0.30

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-stringprep/erlang-p1-stringprep.hash +1 -1
index 50a48af0a4..6df5048dce 100644
@@ -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
package/erlang-p1-stringprep/erlang-p1-stringprep.mk +1 -1
index 09e339f57a..4f925c0682 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#8 lore raw

PATCH 8/18 package/erlang-fast-yaml: renamed from erlang-p1-yaml

In reply to 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 <[email protected]>
---
 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
DEVELOPERS +1 -1
index 8318fb5cb4..3ecdb4a93c 100644
@@ -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/
package/Config.in +1 -1
index 27902475cb..c2b361309e 100644
@@ -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"
package/ejabberd/Config.in +1 -1
index e631e665d1..f46e40035d 100644
@@ -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
package/ejabberd/ejabberd.mk +1 -1
index 3824f2a530..58b544fb84 100644
@@ -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
package/erlang-fast-yaml/Config.in renamed from package/erlang-p1-yaml/Config.in +3 -3
similarity index 51%
rename from package/erlang-p1-yaml/Config.in
rename to package/erlang-fast-yaml/Config.in
index 2ab78d1296..8c9d47f044 100644
@@ -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
package/erlang-fast-yaml/erlang-fast-yaml.hash renamed from package/erlang-p1-yaml/erlang-p1-yaml.hash +1 -1
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
@@ -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
package/erlang-fast-yaml/erlang-fast-yaml.mk new file +20 -0
new file mode 100644
index 0000000000..675dba0839
@@ -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))
package/erlang-p1-yaml/erlang-p1-yaml.mk deleted +0 -20
deleted file mode 100644
index 17f4910ee1..0000000000
@@ -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))
package/erlang-p1-yconf/Config.in +1 -1
index 3777ebbe14..987b511878 100644
@@ -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.
package/erlang-p1-yconf/erlang-p1-yconf.mk +1 -1
index 81f7462884..bc72f282a9 100644
@@ -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))
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#9 lore raw

PATCH 9/18 package/erlang-p1-yconf: bump version to 1.0.16

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-yconf/erlang-p1-yconf.hash +1 -1
index 25d873b58a..dc2ac9937e 100644
@@ -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
package/erlang-p1-yconf/erlang-p1-yconf.mk +1 -1
index bc72f282a9..297ab20bb2 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#10 lore raw

PATCH 10/18 package/erlang-p1-oauth2: bump version to 0.6.14

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-oauth2/erlang-p1-oauth2.hash +1 -1
index ac87485d5b..dd2f8782b7 100644
@@ -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
package/erlang-p1-oauth2/erlang-p1-oauth2.mk +1 -1
index b01a391963..09bb0e6752 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#11 lore raw

PATCH 11/18 package/erlang-p1-pkix: bump version to 1.0.10

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-pkix/erlang-p1-pkix.hash +1 -1
index 2b9c4cc93f..a1fdad63e0 100644
@@ -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
package/erlang-p1-pkix/erlang-p1-pkix.mk +1 -1
index 90c4122184..ba3d88a30a 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#12 lore raw

PATCH 12/18 package/erlang-eimp: bump version to 1.0.23

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-eimp/erlang-eimp.hash | 2 +-
 package/erlang-eimp/erlang-eimp.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/erlang-eimp/erlang-eimp.hash +1 -1
index 26e8addd2d..e9ef9c693e 100644
@@ -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
package/erlang-eimp/erlang-eimp.mk +1 -1
index 68d0d9e9ed..1e1a5ece43 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#13 lore raw

PATCH 13/18 package/erlang-p1-mqtree: bump version to 1.0.17

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-mqtree/erlang-p1-mqtree.hash +1 -1
index 4ce3295ed3..ff92cd42b2 100644
@@ -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
package/erlang-p1-mqtree/erlang-p1-mqtree.mk +1 -1
index d606f737aa..96b607f88d 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#14 lore raw

PATCH 14/18 package/erlang-jose: bump version to 1.11.10

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 package/erlang-jose/erlang-jose.hash | 2 +-
 package/erlang-jose/erlang-jose.mk   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
package/erlang-jose/erlang-jose.hash +1 -1
index 1e763fd5ba..abcf11b1d1 100644
@@ -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
package/erlang-jose/erlang-jose.mk +1 -1
index 4df5173b2c..f147afd5a7 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#15 lore raw

PATCH 15/18 package/erlang-p1-acme: bump version to 1.0.23

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-acme/erlang-p1-acme.hash +1 -1
index e417d4b181..0894176fbd 100644
@@ -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
package/erlang-p1-acme/erlang-p1-acme.mk +1 -1
index cb8c7a8a19..5c7c5cc9e9 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#16 lore raw

PATCH 16/18 package/erlang-p1-sip: bump version to 1.0.54

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-sip/erlang-p1-sip.hash +1 -1
index 87c0742bfc..d2e40e8fdc 100644
@@ -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
package/erlang-p1-sip/erlang-p1-sip.mk +1 -1
index 45c70e8899..36758b8681 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#17 lore raw

PATCH 17/18 package/erlang-p1-zlib: bump version to 1.0.13

In reply to Johan Oudinet
Signed-off-by Johan Oudinet <[email protected]>
---
 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(-)
package/erlang-p1-zlib/erlang-p1-zlib.hash +1 -1
index fa8cdacd8c..9d4399b9a0 100644
@@ -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
package/erlang-p1-zlib/erlang-p1-zlib.mk +1 -1
index da55d310af..fd20464cc9 100644
@@ -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
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#18 lore raw

PATCH 18/18 package/ejabberd: bump version to 24.07

In reply to 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 <[email protected]>
---
 ...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(-)
package/ejabberd/0001-Makefile.in-do-not-download-or-compile-dependencies.patch +11 -12
index abcc8975b2..69f25304b5 100644
@@ -1,37 +1,36 @@
-From bf3571da4a68a6a857ab7ad8256f8276b3687a38 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet <[email protected]>
-Date: Fri, 13 May 2022 14:22:37 +0200
+From bfcc72e5bb96fc9fc1f3558191a1a3f40c7f159a Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <[email protected]>
+Date: Fri, 2 Aug 2024 17:32:37 +0200
 Subject: [PATCH] Makefile.in: do not download or compile dependencies
 
-Signed-off-by: Johan Oudinet <[email protected]>
-[Bernd: updated for version 23.04]
-Signed-off-by: Bernd Kuhls <[email protected]>
+Signed-off-by: Johan Oudinet <[email protected]>
+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
package/ejabberd/0002-fix-ejabberdctl.patch +9 -10
index ae28f3a632..89504d11c5 100644
@@ -1,30 +1,29 @@
-From 4283f675f21d3923e200092cec6418014a03ad52 Mon Sep 17 00:00:00 2001
-From: Johan Oudinet <[email protected]>
-Date: Thu, 26 Dec 2019 17:06:34 +0100
+From d403c0bca48f2678c70763c3faca41c9adc76658 Mon Sep 17 00:00:00 2001
+From: Johan Oudinet <[email protected]>
+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 <[email protected]>
-[Bernd: updated for version 23.04]
-Signed-off-by: Bernd Kuhls <[email protected]>
+Signed-off-by: Johan Oudinet <[email protected]>
+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
package/ejabberd/S50ejabberd +37 -35

89 lines not on this page · raw message

package/ejabberd/check-erlang-lib +20 -19
index 63f8bf1926..4e51b54294 100755
@@ -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
package/ejabberd/ejabberd.hash +2 -2
index 15e879be19..e6d9b2560e 100644
@@ -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
package/ejabberd/ejabberd.mk +3 -2
index 58b544fb84..df9fc1c1d0 100644
@@ -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)
Signature · 6 lines
2.34.1

_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#19 lore raw

Re: [Buildroot] [PATCH 18/18] package/ejabberd: bump version to 24.07

Hello Johan,

Quoted 4 lines · On Wed, 7 Aug 2024 16:33:18 +0200 Johan Oudinet <[email protected]>…

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

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
#20 lore raw
In reply to Johan Oudinet

Hello Johan,

Thanks for the patch series.

Quoted 4 lines · On Wed, 7 Aug 2024 16:33:00 +0200 Johan Oudinet <[email protected]>…

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

Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin
Embedded Linux and Kernel engineering and training
https://bootlin.com
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot
author
#21 lore raw

Hello Thomas,

Quoted 12 lines · Thomas Petazzoni
Quoted 4 lines · On Wed, 7 Aug 2024 16:33:00 +0200 Johan Oudinet <[email protected]>…

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...

Quoted 6 lines

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.

Quoted 9 lines

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.

Quoted 2 lines

- Can we separate the rename from the bump?

Yes, I can.

Quoted 3 lines

- 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.

Signature · 5 lines
Johan
_______________________________________________
buildroot mailing list
[email protected]
https://lists.buildroot.org/mailman/listinfo/buildroot