diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile index 577d1ce6cb53..55b6ab3d83ce 100644 --- a/net/liblinphone/Makefile +++ b/net/liblinphone/Makefile @@ -1,63 +1,61 @@ PORTNAME= liblinphone -DISTVERSION= 5.2.37 -PORTREVISION= 1 +DISTVERSION= 5.2.94 CATEGORIES= net MAINTAINER= bofh@FreeBSD.org COMMENT= SIP library supporting voice/video calls and text messaging WWW= https://www.linphone.org/technical-corner/liblinphone.html LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/LICENSE.txt BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pystache>=0:textproc/py-pystache@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}six>=0:devel/py-six@${PY_FLAVOR} \ doxygen:devel/doxygen \ xsd>0:devel/xsd LIB_DEPENDS= libbctoolbox.so:net/bctoolbox \ libbelcard.so:deskutils/belcard \ libbellesip.so:net/belle-sip \ libbelr.so:textproc/belr \ libbzrtp.so:security/bzrtp \ libjsoncpp.so:devel/jsoncpp \ liblime.so:security/lime \ libmediastreamer.so:net/mediastreamer \ libortp.so:net/ortp \ libsoci_core.so:databases/soci \ libxerces-c.so:textproc/xerces-c3 USES= cmake compiler:c++17-lang gnome iconv pkgconfig python:build sqlite USE_GITLAB= yes GL_SITE= https://gitlab.linphone.org/BC GL_ACCOUNT= public -GL_TAGNAME= f8c1a652c2e014d1bdec9fc8d2a1996571970a9d USE_GNOME= libxml2 USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ -DCMAKE_SKIP_INSTALL_RPATH=ON \ -DENABLE_FLEXIAPI=NO \ -DENABLE_NLS=NO \ -DENABLE_QRCODE=NO \ -DENABLE_STATIC=NO \ -DENABLE_STRICT=NO \ -DENABLE_UNIT_TESTS=NO OPTIONS_DEFINE= LDAP VIDEO OPTIONS_DEFAULT= LDAP VIDEO OPTIONS_SUB= yes LDAP_LIB_DEPENDS= libsasl2.so:security/cyrus-sasl2 LDAP_USES= ldap LDAP_CMAKE_BOOL= ENABLE_LDAP VIDEO_CMAKE_BOOL= ENABLE_VIDEO post-patch: .for h in xml conference-info conference-info-linphone-extension @${REINPLACE_CMD} '/^#error/d' ${WRKSRC}/src/xml/${h}.h .endfor post-install: ${RM} -r ${STAGEDIR}${PREFIX}/share/doc/${DISTNAME} .include diff --git a/net/liblinphone/distinfo b/net/liblinphone/distinfo index e49d990319ce..75e5aa7d913c 100644 --- a/net/liblinphone/distinfo +++ b/net/liblinphone/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1679182414 -SHA256 (public-liblinphone-f8c1a652c2e014d1bdec9fc8d2a1996571970a9d_GL0.tar.gz) = db32c4adcf5711efd4e3568e5561dc21aadb79539cec40b66ed61beb7fe637c8 -SIZE (public-liblinphone-f8c1a652c2e014d1bdec9fc8d2a1996571970a9d_GL0.tar.gz) = 23062549 +TIMESTAMP = 1690570546 +SHA256 (liblinphone-5.2.94.tar.bz2) = 16ce8966a0dda7eb67a3e1ee027beff9e1c24fd459acd703e311e93791cd9526 +SIZE (liblinphone-5.2.94.tar.bz2) = 20421039 diff --git a/net/liblinphone/files/patch-console_linphonec.c b/net/liblinphone/files/patch-console_linphonec.c index 016c55b10a49..cc527ad05a93 100644 --- a/net/liblinphone/files/patch-console_linphonec.c +++ b/net/liblinphone/files/patch-console_linphonec.c @@ -1,29 +1,29 @@ ---- console/linphonec.c.orig 2023-03-18 23:42:17 UTC +--- console/linphonec.c.orig 2023-07-28 13:53:32 UTC +++ console/linphonec.c @@ -4,7 +4,7 @@ * Copyright (C) 2002 Florian Winterstein * Copyright (C) 2000 Simon MORLAT * - * This file is part of Liblinphone + * This file is part of Liblinphone * (see https://gitlab.linphone.org/BC/public/liblinphone). * * This program is free software: you can redistribute it and/or modify @@ -962,7 +962,7 @@ static int * */ static int -linphonec_idle_call () +linphonec_idle_call (void) { LinphoneCore *opm=linphonec; -@@ -1271,7 +1271,7 @@ static int +@@ -1272,7 +1272,7 @@ static int * -1 on error */ static int -handle_configfile_migration() +handle_configfile_migration(void) { #if !defined(_WIN32_WCE) char *old_cfg_gui; diff --git a/net/liblinphone/files/patch-coreapi_linphonecore.c b/net/liblinphone/files/patch-coreapi_linphonecore.c index a5ebc80a27af..f7d59a6bc31c 100644 --- a/net/liblinphone/files/patch-coreapi_linphonecore.c +++ b/net/liblinphone/files/patch-coreapi_linphonecore.c @@ -1,11 +1,11 @@ ---- coreapi/linphonecore.c.orig 2023-03-17 13:29:37 UTC +--- coreapi/linphonecore.c.orig 2023-07-28 13:53:32 UTC +++ coreapi/linphonecore.c -@@ -781,7 +781,7 @@ static void _close_log_collection_file(void) { +@@ -799,7 +799,7 @@ static void _close_log_collection_file(void) { } } -#if (!__ANDROID__ && !__APPLE__) || (__ANDROID__ && __ANDROID_API__ < 21) +#if (!__ANDROID__ && !__APPLE__ && !__FreeBSD__) || (__ANDROID__ && __ANDROID_API__ < 21) static const char* getprogname() { #if defined(__GLIBC__) return program_invocation_short_name; diff --git a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp index a6fa44138a6f..c708bbc57796 100644 --- a/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp +++ b/net/liblinphone/files/patch-src_ldap_ldap-contact-provider.cpp @@ -1,14 +1,14 @@ ---- src/ldap/ldap-contact-provider.cpp.orig 2023-03-17 13:29:37 UTC +--- src/ldap/ldap-contact-provider.cpp.orig 2023-07-28 13:53:32 UTC +++ src/ldap/ldap-contact-provider.cpp -@@ -221,11 +221,6 @@ void LdapContactProvider::initializeLdap(){ +@@ -227,11 +227,6 @@ void LdapContactProvider::initializeLdap(){ ms_error("[LDAP] Cannot initialize address to %s : %x (%s), err %x (%s)",mConfig["server"].c_str(), ret, ldap_err2string(ret), err, ldap_err2string(err)); mCurrentAction = ACTION_ERROR; }else if(mConfig.count("use_tls")>0 && mConfig["use_tls"] == "1"){ - if(mConfig.count("use_sal")>0 && mConfig["use_sal"] == "1"){// Using Sal give an IP for a domain. So check the domain rather than the IP. - belle_generic_uri_t *serverUri = belle_generic_uri_parse(mConfig["server"].c_str()); - std::string hostname = belle_generic_uri_get_host(serverUri); - ldap_set_option(mLd, LDAP_OPT_X_TLS_PEER_CN, &hostname[0]); - } mTlsConnectionId = -1; mCurrentAction = ACTION_WAIT_TLS_CONNECT; mTlsConnectionTimeout = time(NULL); diff --git a/net/liblinphone/files/patch-src_utils_utils.cpp b/net/liblinphone/files/patch-src_utils_utils.cpp index 2f2740c34d25..714fe8227663 100644 --- a/net/liblinphone/files/patch-src_utils_utils.cpp +++ b/net/liblinphone/files/patch-src_utils_utils.cpp @@ -1,54 +1,54 @@ ---- src/utils/utils.cpp.orig 2023-03-17 13:29:37 UTC +--- src/utils/utils.cpp.orig 2023-07-28 13:53:32 UTC +++ src/utils/utils.cpp -@@ -148,7 +148,7 @@ string Utils::unicodeToUtf8 (uint32_t ic) { +@@ -149,7 +149,7 @@ string Utils::unicodeToUtf8 (uint32_t ic) { string Utils::unicodeToUtf8 (uint32_t ic) { string result; - + result.resize(5); size_t size = 0; if (ic < 0x80) { -@@ -222,12 +222,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { +@@ -223,12 +223,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { tm tCopy = t; time_t result; - #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19) - long adjustTimezone; - #else - time_t adjustTimezone; - #endif - #if TARGET_IPHONE_SIMULATOR result = timegm(&tCopy); adjustTimezone = 0; -@@ -235,11 +229,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { +@@ -236,11 +230,6 @@ time_t Utils::getTmAsTimeT (const tm &t) { // mktime uses local time => It's necessary to adjust the timezone to get an UTC time. result = mktime(&tCopy); - #if defined(LINPHONE_WINDOWS_UNIVERSAL) || defined(LINPHONE_MSC_VER_GREATER_19) - _get_timezone(&adjustTimezone); - #else - adjustTimezone = timezone; - #endif #endif if (result == time_t(-1)) { -@@ -249,7 +238,7 @@ time_t Utils::getTmAsTimeT (const tm &t) { +@@ -250,7 +239,7 @@ time_t Utils::getTmAsTimeT (const tm &t) { return time_t(-1); } - return result - time_t(adjustTimezone); + return result; } std::string Utils::getTimeAsString (const std::string &format, time_t t) { -@@ -327,7 +316,7 @@ map Utils::parseCapabilityDesc +@@ -328,7 +317,7 @@ map Utils::parseCapabilityDesc if (std::getline(capversion, cap, '/') && std::getline(capversion, version, '/')){ result[cap] = Utils::Version(version); }else result[cap] = Utils::Version(1, 0); - + } return result; }