From: Johan Oudinet <johan.oudinet@gmail.com>
To: buildroot@buildroot.org
Cc: Johan Oudinet <johan.oudinet@gmail.com>
Subject: [Buildroot] [PATCH 01/18] package/erlang-stun: renamed from erlang-p1-stun
Date: Wed, 7 Aug 2024 16:33:01 +0200 [thread overview]
Message-ID: <20240807143318.439619-2-johan.oudinet@gmail.com> (raw)
In-Reply-To: <20240807143318.439619-1-johan.oudinet@gmail.com>
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
next prev parent reply other threads:[~2024-08-07 14:34 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-07 14:33 [Buildroot] [PATCH 00/18] Update Ejabberd and its dependencies Johan Oudinet
2024-08-07 14:33 ` Johan Oudinet [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240807143318.439619-2-johan.oudinet@gmail.com \
--to=johan.oudinet@gmail.com \
--cc=buildroot@buildroot.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox