From 03cb15a1a63d169826a3c325e3bfd75dfafa7a35 Mon Sep 17 00:00:00 2001 From: John Date: Mon, 1 Jul 2024 23:04:22 +0200 Subject: [PATCH] belle-sip: update to 5.3.74. --- common/shlibs | 2 +- srcpkgs/belle-sip/patches/cmake.patch | 11 +++++ srcpkgs/belle-sip/patches/musl.patch | 60 +++++++++++++++++---------- srcpkgs/belle-sip/template | 11 +++-- 4 files changed, 55 insertions(+), 29 deletions(-) create mode 100644 srcpkgs/belle-sip/patches/cmake.patch diff --git a/common/shlibs b/common/shlibs index 23b6a476e92..f49f711d3cf 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3565,7 +3565,7 @@ libspa-vulkan.so libspa-vulkan-0.3.6_1 libshp.so.4 shapelib-1.6.0_1 libantlr3c.so libantlr3c-3.4_1 libbzrtp.so.0 bzrtp-1.0.6_1 -libbellesip.so.1 belle-sip-4.4.0_1 +libbelle-sip.so.1 belle-sip-5.3.62_1 libKPim6EventViews.so.6 eventviews-24.02.0_1 libKPim6IncidenceEditor.so.6 incidenceeditor-24.02.0_1 libmediastreamer.so.11 mediastreamer-4.4.0_1 diff --git a/srcpkgs/belle-sip/patches/cmake.patch b/srcpkgs/belle-sip/patches/cmake.patch new file mode 100644 index 00000000000..2f1e28d52f4 --- /dev/null +++ b/srcpkgs/belle-sip/patches/cmake.patch @@ -0,0 +1,11 @@ +--- a/CMakeLists.txt 2024-06-27 15:37:37.000000000 +0200 ++++ - 2024-07-03 16:55:19.299642100 +0200 +@@ -221,7 +221,7 @@ + + + include(CMakePackageConfigHelpers) +-set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}") ++set(CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME}/") + configure_package_config_file("cmake/${PROJECT_NAME}Config.cmake.in" "${PROJECT_BINARY_DIR}/${PROJECT_NAME}Config.cmake" + INSTALL_DESTINATION "${CMAKE_MODULES_INSTALL_DIR}" + NO_SET_AND_CHECK_MACRO diff --git a/srcpkgs/belle-sip/patches/musl.patch b/srcpkgs/belle-sip/patches/musl.patch index 806402719ce..23ef45d98af 100644 --- a/srcpkgs/belle-sip/patches/musl.patch +++ b/srcpkgs/belle-sip/patches/musl.patch @@ -1,26 +1,42 @@ ---- a/src/belle_sip_resolver.c 2018-02-21 17:30:40.474348393 +0100 -+++ b/src/belle_sip_resolver.c 2018-02-21 17:30:40.474348393 +0100 -@@ -459,7 +459,11 @@ - } - - static void append_dns_result(belle_sip_simple_resolver_context_t *ctx, struct addrinfo **ai_list, struct sockaddr *addr, socklen_t addrlen){ -+#if defined(__GLIBC__) - char host[NI_MAXHOST + 1]; -+#else -+ char host[1026]; -+#endif +--- a/src/belle_sip_resolver.c 2024-06-27 15:37:37.000000000 +0200 ++++ - 2024-07-01 23:26:59.821646473 +0200 +@@ -680,7 +680,11 @@ + struct addrinfo **ai_list, + struct sockaddr *addr, + socklen_t addrlen) { +- char host[NI_MAXHOST + 1]; ++ #if defined(__GLIBC__) ++ char host[NI_MAXHOST + 1]; ++ #else ++ char host[1026]; ++ #endif int gai_err; - int family=ctx->family; + int family = ctx->family; -@@ -529,7 +533,11 @@ - append_dns_result(ctx,&ctx->ai_list,(struct sockaddr*)&sin,sizeof(sin)); - if (rr.ttl < BELLE_SIP_RESOLVER_CONTEXT(ctx)->min_ttl) BELLE_SIP_RESOLVER_CONTEXT(ctx)->min_ttl = rr.ttl; +@@ -754,7 +758,11 @@ + if (rr.ttl < BELLE_SIP_RESOLVER_CONTEXT(ctx)->min_ttl) + BELLE_SIP_RESOLVER_CONTEXT(ctx)->min_ttl = rr.ttl; } else if ((ctx->type == DNS_T_SRV) && (rr.class == DNS_C_IN) && (rr.type == DNS_T_SRV)) { -+#if defined(__GLIBC__) - char host[NI_MAXHOST + 1]; -+#else -+ char host[1026]; -+#endif +- char host[NI_MAXHOST + 1]; ++ #if defined(__GLIBC__) ++ char host[NI_MAXHOST + 1]; ++ #else ++ char host[1026]; ++ #endif struct dns_srv *srv = &any.srv; - belle_sip_dns_srv_t * b_srv=belle_sip_dns_srv_create(srv); - snprintf(host, sizeof(host), "[target:%s port:%d prio:%d weight:%d]", srv->target, srv->port, srv->priority, srv->weight); + belle_sip_dns_srv_t *b_srv = belle_sip_dns_srv_create(srv); + snprintf(host, sizeof(host), "[target:%s port:%d prio:%d weight:%d]", srv->target, srv->port, +@@ -992,7 +1000,12 @@ + dns_resource_record_t *rr = dns_parse_resource_record(dnsPacket, rdlen + 11); + belle_sip_free(dnsPacket); + +- char host[NI_MAXHOST + 1]; ++ #if defined(__GLIBC__) ++ char host[NI_MAXHOST + 1]; ++ #else ++ char host[1026]; ++ #endif ++ + belle_sip_dns_srv_t *b_srv = belle_sip_dns_srv_create_dns_service(rr); + dns_free_resource_record(rr); + snprintf(host, sizeof(host), "[target:%s port:%d prio:%d weight:%d]", b_srv->target, b_srv->port, diff --git a/srcpkgs/belle-sip/template b/srcpkgs/belle-sip/template index cce2fbf56f4..98b1156fd3c 100644 --- a/srcpkgs/belle-sip/template +++ b/srcpkgs/belle-sip/template @@ -1,24 +1,23 @@ # Template file for 'belle-sip' pkgname=belle-sip -version=5.2.111 +version=5.3.74 revision=1 build_style=cmake -configure_args="-DENABLE_STRICT=OFF -DENABLE_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON - -DCMAKE_MODULE_PATH=/usr/lib/cmake" -makedepends="mbedtls-devel libantlr3c bctoolbox-devel zlib-devel belr-devel" +configure_args="-DENABLE_STRICT=OFF -DENABLE_UNIT_TESTS=NO -DCMAKE_SKIP_INSTALL_RPATH=ON + -DCMAKE_MODULE_PATH=/usr/lib/cmake -DBUILD_SHARED_LIBS=TRUE" +makedepends="mbedtls-devel bctoolbox-devel zlib-devel belr-devel" short_desc="SIP (RFC3261) implementation written in C" maintainer="John " license="GPL-2.0-or-later" homepage="https://www.linphone.org" distfiles="https://gitlab.linphone.org/BC/public/belle-sip/-/archive/${version}/belle-sip-${version}.tar.gz" -checksum=e1f74e2bd9c6afaca796f1a3a529e44f84b99f532bc3fbf5e4e5260938aebdc6 +checksum=7534b34a575cc2a76d3ccbab16d6acc8c2e675a67b9075509889477d2e8539cd belle-sip-devel_package() { depends="${sourcepkg}>=${version}_${revision}" short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" vmove "usr/lib/*.so" vmove usr/lib/pkgconfig vmove usr/lib/cmake