package/erlang-stun: renamed from erlang-p1-stun

This package is renamed to avoid fixing 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>
[yann.morin.1998@free.fr: update .checkpackageignore]
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>

.checkpackageignore

@@ -473,7 +473,6 @@ package/elftosb/0001-fixes-includes.patch lib_patch.Upstream
 package/elftosb/0002-force-cxx-compiler.patch lib_patch.Upstream
 package/elfutils/0001-Add-a-enable-disable-progs-configure-option.patch lib_patch.Upstream
 package/elfutils/0002-Really-make-Werror-conditional-to-BUILD_WERROR.patch lib_patch.Upstream
-package/erlang-p1-sip/0001-correct-include.patch lib_patch.Upstream
 package/erlang-p1-xmpp/0001-fix-includes.patch lib_patch.Upstream
 package/erlang-rebar/0001-src-rebar_port_compiler-add-fPIC-to-LDFLAGS-by-defau.patch lib_patch.Upstream
 package/espeak/0001-Fix-build-of-shared-library-on-architectures-needing.patch lib_patch.Upstream

Config.in.legacy

@@ -146,6 +146,13 @@ endif
 
 comment "Legacy options removed in 2024.11"
 
+config BR2_PACKAGE_ERLANG_P1_STUN
+	bool "erlang-p1-stun has been renamed"
+	select BR2_LEGACY
+	select BR2_PACKAGE_ERLANG_STUN
+	help
+	  The erlang-p1-stun package has been renamed to erlang-stun.
+
 config BR2_PACKAGE_FBV_GIF
 	bool "fbv GIF support has been removed"
 	select BR2_LEGACY

DEVELOPERS

@@ -1676,7 +1676,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/
@@ -1684,6 +1683,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

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

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

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

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

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
 

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

package/erlang-p1-stun/erlang-p1-stun.mk

@@ -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-p1-stun/Config.in → 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

package/erlang-p1-stun/erlang-p1-stun.hash → package/erlang-stun/erlang-stun.hash

@@ -1,3 +1,3 @@
 # Locally calculated
-sha256  d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86  erlang-p1-stun-1.2.7.tar.gz
+sha256  d7e9d3d591a88a91abf053c068f7152495e37d17f4c9ac58992c544d6f8f5e86  erlang-stun-1.2.7.tar.gz
 sha256  cfc7749b96f63bd31c3c42b5c471bf756814053e847c10f3eb003417bc523d30  LICENSE.txt

package/erlang-stun/erlang-stun.mk

@@ -0,0 +1,14 @@
+################################################################################
+#
+# erlang-stun
+#
+################################################################################
+
+ERLANG_STUN_VERSION = 1.2.7
+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))