From e5c499b18f3a2ea6b37fbd9f3d0ecde1672f3019 Mon Sep 17 00:00:00 2001 From: landry Date: Sat, 10 Jul 2021 16:56:03 +0000 Subject: [PATCH] telephony/linphone/bctoolbox: update to 5.0.0 --- telephony/linphone/bctoolbox/Makefile | 3 +-- telephony/linphone/bctoolbox/distinfo | 4 ++-- .../bctoolbox/patches/patch-include_bctoolbox_port_h | 4 ++-- .../bctoolbox/patches/patch-src_CMakeLists_txt | 6 +++--- .../linphone/bctoolbox/patches/patch-src_utils_port_c | 10 +++++----- telephony/linphone/bctoolbox/pkg/PLIST | 3 ++- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/telephony/linphone/bctoolbox/Makefile b/telephony/linphone/bctoolbox/Makefile index ca031afb721..3c36eeee62a 100644 --- a/telephony/linphone/bctoolbox/Makefile +++ b/telephony/linphone/bctoolbox/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.1.1.1 2021/07/10 12:03:19 landry Exp $ +# $OpenBSD: Makefile,v 1.2 2021/07/10 16:56:03 landry Exp $ COMMENT = utilities library used by linphone stack -V = 4.5.15 MODULE = bctoolbox SHARED_LIBS += bctoolbox 0.0 # 1 diff --git a/telephony/linphone/bctoolbox/distinfo b/telephony/linphone/bctoolbox/distinfo index ff26370c03e..01cbd32d2cc 100644 --- a/telephony/linphone/bctoolbox/distinfo +++ b/telephony/linphone/bctoolbox/distinfo @@ -1,2 +1,2 @@ -SHA256 (bctoolbox-4.5.15.tar.gz) = u+hv4oiAPXb1hv490K5WQHh1Vf8pZWB/Ts3sXo2JdrI= -SIZE (bctoolbox-4.5.15.tar.gz) = 176172 +SHA256 (bctoolbox-5.0.0.tar.gz) = s2rEbBQ4C+eyWxiPPdLkkyJNO/W+4wsXK0p49hd1yO4= +SIZE (bctoolbox-5.0.0.tar.gz) = 178893 diff --git a/telephony/linphone/bctoolbox/patches/patch-include_bctoolbox_port_h b/telephony/linphone/bctoolbox/patches/patch-include_bctoolbox_port_h index f2abd8265b9..e72a56a9c70 100644 --- a/telephony/linphone/bctoolbox/patches/patch-include_bctoolbox_port_h +++ b/telephony/linphone/bctoolbox/patches/patch-include_bctoolbox_port_h @@ -1,9 +1,9 @@ -$OpenBSD: patch-include_bctoolbox_port_h,v 1.1.1.1 2021/07/10 12:03:19 landry Exp $ +$OpenBSD: patch-include_bctoolbox_port_h,v 1.2 2021/07/10 16:56:03 landry Exp $ Index: include/bctoolbox/port.h --- include/bctoolbox/port.h.orig +++ include/bctoolbox/port.h -@@ -686,7 +686,7 @@ BCTBX_PUBLIC uint64_t bctbx_str_to_uint64(const uint8_ +@@ -780,7 +780,7 @@ BCTBX_PUBLIC uint64_t bctbx_str_to_uint64(const uint8_ #define IN6_IS_ADDR_MULTICAST(i) (((uint8_t *) (i))[0] == 0xff) #endif diff --git a/telephony/linphone/bctoolbox/patches/patch-src_CMakeLists_txt b/telephony/linphone/bctoolbox/patches/patch-src_CMakeLists_txt index 01439949baf..b30e3471cc3 100644 --- a/telephony/linphone/bctoolbox/patches/patch-src_CMakeLists_txt +++ b/telephony/linphone/bctoolbox/patches/patch-src_CMakeLists_txt @@ -1,9 +1,9 @@ -$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2021/07/10 12:03:19 landry Exp $ +$OpenBSD: patch-src_CMakeLists_txt,v 1.2 2021/07/10 16:56:03 landry Exp $ Index: src/CMakeLists.txt --- src/CMakeLists.txt.orig +++ src/CMakeLists.txt -@@ -150,6 +150,8 @@ if(ENABLE_SHARED) +@@ -151,6 +151,8 @@ if(ENABLE_SHARED) target_compile_definitions(bctoolbox PRIVATE "-DBCTBX_EXPORTS") endif() set_target_properties(bctoolbox PROPERTIES LINKER_LANGUAGE "CXX") @@ -12,7 +12,7 @@ Index: src/CMakeLists.txt if(NOT ANDROID) # Do not version shared library on Android set_target_properties(bctoolbox PROPERTIES SOVERSION ${BCTOOLBOX_SO_VERSION}) -@@ -173,6 +175,7 @@ if(ENABLE_SHARED) +@@ -174,6 +176,7 @@ if(ENABLE_SHARED) endif() if(ENABLE_TESTS_COMPONENT) add_library(bctoolbox-tester SHARED ${BCTOOLBOX_TESTER_SOURCE_FILES}) diff --git a/telephony/linphone/bctoolbox/patches/patch-src_utils_port_c b/telephony/linphone/bctoolbox/patches/patch-src_utils_port_c index 9a39f04c3c7..e1ba4d41d27 100644 --- a/telephony/linphone/bctoolbox/patches/patch-src_utils_port_c +++ b/telephony/linphone/bctoolbox/patches/patch-src_utils_port_c @@ -1,4 +1,4 @@ -$OpenBSD: patch-src_utils_port_c,v 1.1.1.1 2021/07/10 12:03:19 landry Exp $ +$OpenBSD: patch-src_utils_port_c,v 1.2 2021/07/10 16:56:03 landry Exp $ no AI_V4MAPPED or AI_ALL @@ -7,7 +7,7 @@ one chunk from https://svnweb.freebsd.org/ports/head/net/bctoolbox/files/patch-s Index: src/utils/port.c --- src/utils/port.c.orig +++ src/utils/port.c -@@ -1090,7 +1090,9 @@ static struct addrinfo *convert_to_v4mapped(const stru +@@ -1107,7 +1107,9 @@ static struct addrinfo *convert_to_v4mapped(const stru struct sockaddr_in6 *sin6; struct sockaddr_in *sin; v4m=_bctbx_alloc_addrinfo(AF_INET6, it->ai_socktype, it->ai_protocol); @@ -17,7 +17,7 @@ Index: src/utils/port.c sin6=(struct sockaddr_in6*)v4m->ai_addr; sin=(struct sockaddr_in*)it->ai_addr; sin6->sin6_family=AF_INET6; -@@ -1108,7 +1110,7 @@ static struct addrinfo *convert_to_v4mapped(const stru +@@ -1125,7 +1127,7 @@ static struct addrinfo *convert_to_v4mapped(const stru return res; } @@ -26,7 +26,7 @@ Index: src/utils/port.c /* * SHAME !!! bionic's getaddrinfo does not implement the AI_V4MAPPED flag ! -@@ -1306,11 +1308,12 @@ static struct addrinfo * _bctbx_name_to_addrinfo(int f +@@ -1323,11 +1325,12 @@ static struct addrinfo * _bctbx_name_to_addrinfo(int f hints.ai_family=family; if (numeric_only) hints.ai_flags=AI_NUMERICSERV|AI_NUMERICHOST; hints.ai_socktype=socktype; @@ -40,7 +40,7 @@ Index: src/utils/port.c err=bctbx_getaddrinfo(ipaddress,serv,&hints,&res); if (err!=0){ -@@ -1421,7 +1424,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct +@@ -1438,7 +1441,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct if (htonl(0x0064ff9b) == #ifdef _MSC_VER ((in6->sin6_addr.u.Word[0] << 16) & in6->sin6_addr.u.Word[1]) diff --git a/telephony/linphone/bctoolbox/pkg/PLIST b/telephony/linphone/bctoolbox/pkg/PLIST index 83a6a6f7b3c..7fae376c0ee 100644 --- a/telephony/linphone/bctoolbox/pkg/PLIST +++ b/telephony/linphone/bctoolbox/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.1.1.1 2021/07/10 12:03:19 landry Exp $ +@comment $OpenBSD: PLIST,v 1.2 2021/07/10 16:56:03 landry Exp $ include/bctoolbox/ include/bctoolbox/charconv.h include/bctoolbox/compiler.h @@ -13,6 +13,7 @@ include/bctoolbox/param_string.h include/bctoolbox/parser.h include/bctoolbox/port.h include/bctoolbox/regex.h +include/bctoolbox/utils.hh include/bctoolbox/vconnect.h include/bctoolbox/vfs.h include/bctoolbox/vfs_encrypted.hh