Date: Fri, 4 Aug 2023 06:21:31 GMT From: Felix Palmen <zirias@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: fa94499a13eb - main - net/liblinphone: Update to 5.2.94 Message-ID: <202308040621.3746LV7Q019450@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa94499a13eb85019d3e6e7a4cec63d5de07fdd9 commit fa94499a13eb85019d3e6e7a4cec63d5de07fdd9 Author: Felix Palmen <zirias@FreeBSD.org> AuthorDate: 2023-07-28 19:08:04 +0000 Commit: Felix Palmen <zirias@FreeBSD.org> CommitDate: 2023-08-04 06:20:54 +0000 net/liblinphone: Update to 5.2.94 Approved by: bofh (maintainer, by private message) Differential Revision: https://reviews.freebsd.org/D41227 --- net/liblinphone/Makefile | 4 +--- net/liblinphone/distinfo | 6 +++--- net/liblinphone/files/patch-console_linphonec.c | 4 ++-- net/liblinphone/files/patch-coreapi_linphonecore.c | 4 ++-- .../files/patch-src_ldap_ldap-contact-provider.cpp | 4 ++-- net/liblinphone/files/patch-src_utils_utils.cpp | 12 ++++++------ 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/net/liblinphone/Makefile b/net/liblinphone/Makefile index 577d1ce6cb53..55b6ab3d83ce 100644 --- a/net/liblinphone/Makefile +++ b/net/liblinphone/Makefile @@ -1,6 +1,5 @@ PORTNAME= liblinphone -DISTVERSION= 5.2.37 -PORTREVISION= 1 +DISTVERSION= 5.2.94 CATEGORIES= net MAINTAINER= bofh@FreeBSD.org @@ -30,7 +29,6 @@ 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 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,4 +1,4 @@ ---- 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 <flox@gmx.net> @@ -18,7 +18,7 @@ { LinphoneCore *opm=linphonec; -@@ -1271,7 +1271,7 @@ static int +@@ -1272,7 +1272,7 @@ static int * -1 on error */ static int 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,6 +1,6 @@ ---- 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) { } } 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,6 +1,6 @@ ---- 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"){ 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,6 +1,6 @@ ---- 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; @@ -9,7 +9,7 @@ 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; @@ -22,7 +22,7 @@ #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); @@ -34,7 +34,7 @@ #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); } @@ -43,7 +43,7 @@ } std::string Utils::getTimeAsString (const std::string &format, time_t t) { -@@ -327,7 +316,7 @@ map<string, Utils::Version> Utils::parseCapabilityDesc +@@ -328,7 +317,7 @@ map<string, Utils::Version> Utils::parseCapabilityDesc if (std::getline(capversion, cap, '/') && std::getline(capversion, version, '/')){ result[cap] = Utils::Version(version); }else result[cap] = Utils::Version(1, 0);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202308040621.3746LV7Q019450>