mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-09-08 23:51:08 -09:00
Code Issues Packages Projects Releases Wiki Activity

package/sofia-sip: bump version to 1.13.18

Browse Source 
https://github.com/freeswitch/sofia-sip/compare/v1.13.17...v1.13.18

Removed patches which are included in this release.

Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Bernd Kuhls
2026-08-11 20:19:23 +02:00
committed by Julien Olivain
parent a0d58864d0
commit bb254e2304
4 changed files with 2 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
package/sofia-sip/0001-Fix-incompatible-pointer-type-in-sip_basic-c.patch
View File

@@ -1,27 +0,0 @@
From 46b02f0655af0a9594e805f09a8ee99278f84777 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomi=20L=C3=A4hteenm=C3=A4ki?= <lihis@lihis.net>
Date: Mon, 19 Feb 2024 09:06:20 +0200
Subject: [PATCH] Fix incompatible pointer type in sip_basic.c
Closes #248
Upstream: https://github.com/freeswitch/sofia-sip/pull/249
Signed-off-by: Bernd Kuhls <bernd@kuhls.net>
---
libsofia-sip-ua/sip/sip_basic.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libsofia-sip-ua/sip/sip_basic.c b/libsofia-sip-ua/sip/sip_basic.c
index 3444fb25..82e824e3 100644
--- a/libsofia-sip-ua/sip/sip_basic.c
+++ b/libsofia-sip-ua/sip/sip_basic.c
@@ -2901,7 +2901,7 @@ issize_t sip_identity_d(su_home_t *home, sip_header_t *h, char *s, isize_t slen)
ext = strchr(ppt, ';');
if (ext) {
- msg_param_t *params = su_alloc(home, sizeof(msg_param_t));
+ msg_param_t const *params = su_alloc(home, sizeof(msg_param_t));
if (msg_params_d(home, &ext, &params) >= 0) {
id->id_info_params = params;
}

109
package/sofia-sip/0002-fix-static-build-with-openssl-3.2.0.patch
View File

@@ -1,109 +0,0 @@
From 145f80df25d23492ed3aa01b3750d7c002964332 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Fri, 5 Jan 2024 23:15:00 +0100
Subject: [PATCH] fix static build with openssl >= 3.2.0
Rename tls_free into sofia_sip_tls_free as openssl also defines tls_free
since version 3.2.0 and
https://github.com/openssl/openssl/commit/1853d20a008a85d327f4faa9e07be40a85549f8e
resulting in the following static build failure:
/home/autobuild/autobuild/instance-12/output-1/host/lib/gcc/powerpc-buildroot-linux-uclibcspe/8.4.0/../../../../powerpc-buildroot-linux-uclibcspe/bin/ld: /home/autobuild/autobuild/instance-12/output-1/host/bin/../powerpc-buildroot-linux-uclibcspe/sysroot/usr/lib/libssl.a(libssl-lib-tls_common.o): in function `tls_free':
tls_common.c:(.text+0x808): multiple definition of `tls_free'; ../libsofia-sip-ua/.libs/libsofia-sip-ua.a(tport_tls.o):tport_tls.c:(.text+0x1128): first defined here
Fixes:
- http://autobuild.buildroot.org/results/ee862bdafd44c8c56f77e2702ee0a7462634fa0b
Upstream: https://github.com/freeswitch/sofia-sip/pull/240
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
libsofia-sip-ua/tport/tport_tls.c | 10 +++++-----
libsofia-sip-ua/tport/tport_tls.h | 2 +-
libsofia-sip-ua/tport/tport_type_tls.c | 4 ++--
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/libsofia-sip-ua/tport/tport_tls.c b/libsofia-sip-ua/tport/tport_tls.c
index a17186de..0739c93f 100644
--- a/libsofia-sip-ua/tport/tport_tls.c
+++ b/libsofia-sip-ua/tport/tport_tls.c
@@ -460,7 +460,7 @@ int tls_init_context(tls_t *tls, tls_issues_t const *ti)
return 0;
}
-void tls_free(tls_t *tls)
+void sofia_sip_tls_free(tls_t *tls)
{
int ret;
if (!tls)
@@ -473,7 +473,7 @@ void tls_free(tls_t *tls)
/* The return value -1 means that the connection wasn't actually established */
/* so it should be safe to not call shutdown again. We need to clear the eror */
/* queue for other connections though. */
- tls_log_errors(3, "tls_free", 0);
+ tls_log_errors(3, "sofia_sip_tls_free", 0);
ret = 1;
}
} while (ret != 1);
@@ -514,7 +514,7 @@ tls_t *tls_init_master(tls_issues_t *ti)
if (tls_init_context(tls, ti) < 0) {
int err = errno;
- tls_free(tls);
+ sofia_sip_tls_free(tls);
errno = err;
return NULL;
}
@@ -544,7 +544,7 @@ tls_t *tls_init_master(tls_issues_t *ti)
if (tls->bio_con == NULL) {
tls_log_errors(1, "tls_init_master", 0);
- tls_free(tls);
+ sofia_sip_tls_free(tls);
errno = EIO;
return NULL;
}
@@ -581,7 +581,7 @@ tls_t *tls_init_secondary(tls_t *master, int sock, int accept)
if (tls->con == NULL) {
tls_log_errors(1, "tls_init_secondary", 0);
- tls_free(tls);
+ sofia_sip_tls_free(tls);
errno = EIO;
return NULL;
}
diff --git a/libsofia-sip-ua/tport/tport_tls.h b/libsofia-sip-ua/tport/tport_tls.h
index e8d04a14..3a5fde22 100644
--- a/libsofia-sip-ua/tport/tport_tls.h
+++ b/libsofia-sip-ua/tport/tport_tls.h
@@ -81,7 +81,7 @@ typedef struct tport_tls_primary_s {
tls_t *tls_init_master(tls_issues_t *tls_issues);
tls_t *tls_init_secondary(tls_t *tls_master, int sock, int accept);
-void tls_free(tls_t *tls);
+void sofia_sip_tls_free(tls_t *tls);
int tls_get_socket(tls_t *tls);
void tls_log_errors(unsigned level, char const *s, unsigned long e);
ssize_t tls_read(tls_t *tls);
diff --git a/libsofia-sip-ua/tport/tport_type_tls.c b/libsofia-sip-ua/tport/tport_type_tls.c
index e030e706..fa72eed8 100644
--- a/libsofia-sip-ua/tport/tport_type_tls.c
+++ b/libsofia-sip-ua/tport/tport_type_tls.c
@@ -276,7 +276,7 @@ static int tport_tls_init_master(tport_primary_t *pri,
static void tport_tls_deinit_primary(tport_primary_t *pri)
{
tport_tls_primary_t *tlspri = (tport_tls_primary_t *)pri;
- tls_free(tlspri->tlspri_master), tlspri->tlspri_master = NULL;
+ sofia_sip_tls_free(tlspri->tlspri_master), tlspri->tlspri_master = NULL;
}
static int tport_tls_init_secondary(tport_t *self, int socket, int accepted,
@@ -303,7 +303,7 @@ static void tport_tls_deinit_secondary(tport_t *self)
/* XXX - PPe: does the tls_shutdown zap everything but socket? */
if (tlstp->tlstp_context != NULL)
- tls_free(tlstp->tlstp_context);
+ sofia_sip_tls_free(tlstp->tlstp_context);
tlstp->tlstp_context = NULL;
su_free(self->tp_home, tlstp->tlstp_buffer);

2
package/sofia-sip/sofia-sip.hash
View File

@@ -1,4 +1,4 @@
# Locally computed
sha256 daca3d961b6aa2974ad5d3be69ed011726c3e4d511b2a0d4cb6d878821a2de7a sofia-sip-1.13.17.tar.gz
sha256 d2ad4e64753a7c9843b766b8de8081d9c1d7acfaeb53c12b3aed7fdb9235766c sofia-sip-1.13.18.tar.gz
sha256 e1c0890440efe31b6cd2ee2abf895eb917c787799f079133f5809414d90d5d60 COPYING
sha256 b402ae58cf355b33be8fa023f704a039e3d41ecaccd2bbcda43ca31d703e4556 COPYRIGHTS

2
package/sofia-sip/sofia-sip.mk
View File

@@ -4,7 +4,7 @@
#
################################################################################
SOFIA_SIP_VERSION = 1.13.17
SOFIA_SIP_VERSION = 1.13.18
SOFIA_SIP_SITE = $(call github,freeswitch,sofia-sip,v$(SOFIA_SIP_VERSION))
SOFIA_SIP_INSTALL_STAGING = YES
# Fetched from github, no pre-generated configure script provided