From nobody Wed Jun 15 16:49:45 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C954D83190E; Wed, 15 Jun 2022 16:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LNWVx51qWz3DPG; Wed, 15 Jun 2022 16:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655311785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2q27cH9a7dhTq4trxdLSvrnvSxbqrld0eI9sNYh9mg=; b=oHzX/NvPMHNeBKlcgF8+sPL1YR3T0OXO+iHriaj7jc4GvSdQAZURhl3Z1+QLfDdYHPEsCW 8r0ao4W8B8V1Bc8g6avfDqjWg/dRGnoqIhWkQSJCgMEOR50cFb3M2/2izN8DWTRIrUa3RJ jpjXfRBTHgo45i0imnbcDICdQiAapwgAs9F11PTSIqhu5xPLTf/4/ff8bb1fbwNSM0ZdfX pMq5p1RkwR544OrIdj9CrI4G5zDKtldehKL2yMBpuXOBV6lQr0ZE9tfDah2TGMjluQgLUg 0vhLZ3CN0Qh+mpW8gxMow/7BfpZr6zfD8VjDJTxSHHXXObrcOjGLBXWWMGYxow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 8877022503; Wed, 15 Jun 2022 16:49:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25FGnjmN080072; Wed, 15 Jun 2022 16:49:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FGnj67080071; Wed, 15 Jun 2022 16:49:45 GMT (envelope-from git) Date: Wed, 15 Jun 2022 16:49:45 GMT Message-Id: <202206151649.25FGnj67080071@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: d6a4b03cc357 - main - net/belle-sip: Update version 1.6.3=>5.1.32 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d6a4b03cc35791f60731bb8b21861ad90f9dd856 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655311785; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=E2q27cH9a7dhTq4trxdLSvrnvSxbqrld0eI9sNYh9mg=; b=RVMWrPuAPoJhkBHmlUZQy+56n8fiJtKXFjFMXOxwSMj4RxZijEyDtXdu27g72CwtHoQLzb Ck+1s09slUfZ7GbttUyHP1Nr4WQAW7MSLPxjcnHkQTvxFqPJA8zEHLjvE2yu2GojjFNycw 0CWW2hEAw7A6kabehl1kIadhhQivApQQMoijdoVEJWiFVI8qmUu5wmg44V84F/MwxlMmiD YL/1E385KBXVL5saovgFhW0V7WwlpHrw6wIQ2XT4DUgRt5v53cOcHjNox3aUVlp9kkHvgI Id4qswOZhVpYqf1/ri6cMelgdWJOWaqng6EZs457g0JTO5pIJnYBFw2SlJW49Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655311785; a=rsa-sha256; cv=none; b=QKY9lRh3i/SKCYbiLHfO8/eszifM8tFvwafb9i/MjrAtjm5foaK1f0BNXjECtqLhVRBlMQ d6OCD1WHs0VOnIiUCB3qfEhuX6omTxG8Ds0ZQ9aaO6VCpV5WhjOic88xwZuMf8s9+GB74u XOV9PbwZsPe34oeG0KkU15kBnAMB7ftcj8i5zyD7CSozvRrYD3yNCPdWuCLTuRcnUgHal7 3jxqlHF12U5Lr/1S0lxGcOXbzfuGSTJbCpyjbZPL1AtWj8X5UyJTwjzgcnLpi6K2wWA/vJ IgUHm+TB+Dw8dZjo0LCn6a+VFCgc1ArMrx+jirR0Auo7G4wrTaKG+SmtmE5KpA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=d6a4b03cc35791f60731bb8b21861ad90f9dd856 commit d6a4b03cc35791f60731bb8b21861ad90f9dd856 Author: Muhammad Moinur Rahman AuthorDate: 2022-06-15 16:46:52 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2022-06-15 16:46:52 +0000 net/belle-sip: Update version 1.6.3=>5.1.32 - Update MASTER_SITES - Update LICENSE_FILE PR: 264680 Reported by: vvd@unislabs.com Relnotes: https://gitlab.linphone.org/BC/public/belle-sip/-/tags/5.1.32 --- net/belle-sip/Makefile | 27 ++++++++------------ net/belle-sip/distinfo | 8 +++--- .../files/patch-src-belle_sip_headers_impl.c | 19 +++++++------- .../files/patch-src_belle__sip__internal.h | 4 +-- net/belle-sip/files/patch-src_dns.c | 10 -------- net/belle-sip/files/patch-src_dns_dns.c | 29 ++++++++++++++++++++++ net/belle-sip/pkg-plist | 13 ++++++---- 7 files changed, 62 insertions(+), 48 deletions(-) diff --git a/net/belle-sip/Makefile b/net/belle-sip/Makefile index 5d7d89c93a03..2fdacd158025 100644 --- a/net/belle-sip/Makefile +++ b/net/belle-sip/Makefile @@ -1,33 +1,28 @@ PORTNAME= belle-sip -PORTVERSION= 1.6.3 +PORTVERSION= 5.1.32 CATEGORIES= net java -MASTER_SITES= https://www.linphone.org/releases/sources/belle-sip/ \ - http://www.antlr3.org/download/:source2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ - antlr-3.4-complete.jar:source2 -EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +MASTER_SITES= https://gitlab.linphone.org/BC/public/${PORTNAME}/-/archive/${PORTVERSION}/ MAINTAINER= bofh@FreeBSD.org COMMENT= SIP (RFC 3261) implementation written in C LICENSE= GPLv2+ -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libantlr3c.so:devel/libantlr3c \ - libbctoolbox.so:net/bctoolbox + libbctoolbox.so:net/bctoolbox \ + libbelr.so:textproc/belr -USES= cmake cpe +USES= cmake cpe tar:bz2 CPE_VENDOR= linphone USE_JAVA= yes -USE_LDCONFIG= yes - -CMAKE_ARGS= -DENABLE_STATIC=NO -DENABLE_STRICT=NO -DENABLE_TESTS=NO \ - -DANTLR3_JAR_PATH:FILEPATH=${WRKDIR}/antlr3.jar JAVA_BUILD= jre -WRKSRC= ${WRKDIR}/${DISTNAME}-0 +USE_LDCONFIG= yes -post-extract: - @${CP} ${DISTDIR}/antlr-3.4-complete.jar ${WRKDIR}/antlr3.jar +CMAKE_ARGS= -DCMAKE_PREFIX_PATH=${LOCALBASE} \ + -DENABLE_STATIC=NO \ + -DENABLE_STRICT=NO \ + -DENABLE_TESTS=NO post-patch: @${REINPLACE_CMD} '/clock_gettime/d' ${WRKSRC}/CMakeLists.txt diff --git a/net/belle-sip/distinfo b/net/belle-sip/distinfo index dbadde2f8d91..908def37d6b8 100644 --- a/net/belle-sip/distinfo +++ b/net/belle-sip/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1506002640 -SHA256 (belle-sip-1.6.3.tar.gz) = 3f3807078b177e50a5ed97aaf8d7f6e77532df3205153e1b2957f557df9ba568 -SIZE (belle-sip-1.6.3.tar.gz) = 610200 -SHA256 (antlr-3.4-complete.jar) = 9d3e866b610460664522520f73b81777b5626fb0a282a5952b9800b751550bf7 -SIZE (antlr-3.4-complete.jar) = 2388361 +TIMESTAMP = 1655298787 +SHA256 (belle-sip-5.1.32.tar.bz2) = 877153308e6e284e078b9f395d67270c001da41b186a839b2f679c4cf6600104 +SIZE (belle-sip-5.1.32.tar.bz2) = 3430809 diff --git a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c index cf9490bf0c1a..cd486881507c 100644 --- a/net/belle-sip/files/patch-src-belle_sip_headers_impl.c +++ b/net/belle-sip/files/patch-src-belle_sip_headers_impl.c @@ -1,7 +1,7 @@ ---- src/belle_sip_headers_impl.c.orig 2016-08-11 09:23:59 UTC +--- src/belle_sip_headers_impl.c.orig 2022-05-18 04:20:06 UTC +++ src/belle_sip_headers_impl.c -@@ -1672,11 +1672,6 @@ BELLESIP_EXPORT time_t belle_sip_header_ - char tmp2[16] ={0}; +@@ -1873,11 +1873,6 @@ BELLESIP_EXPORT time_t belle_sip_header_date_get_time( + char tmp2[17] ={0}; int i,j; time_t seconds; -#if defined(BELLE_SIP_WINDOWS_UNIVERSAL) || defined(BELLE_SIP_MSC_VER_GREATER_19) @@ -10,17 +10,16 @@ - time_t adjust_timezone; -#endif - /* time headers are in GMT as spec says */ -@@ -1698,26 +1693,12 @@ BELLESIP_EXPORT time_t belle_sip_header_ - return (time_t)-1; + sscanf(obj->date,"%3c,%d %16s %d %d:%d:%d",tmp1,&ret.tm_mday,tmp2, +@@ -1899,25 +1894,11 @@ success: success: ret.tm_isdst=0; -- + -#if TARGET_IPHONE_SIMULATOR - /* 'timezone' is buggy on iOS simulator, use the timegm() function to convert to UTC timestamp - and discard the adjust timezone value */ - seconds = timegm(&ret); +- seconds = timegm(&ret); - adjust_timezone = 0; -#else - seconds = mktime(&ret); @@ -31,7 +30,7 @@ -#endif -#endif - - if (seconds==(time_t)-1){ + if (seconds==(time_t)-1) { - belle_sip_error("mktime() failed: %s",strerror(errno)); + belle_sip_error("timegm() failed: %s",strerror(errno)); return (time_t)-1; @@ -40,4 +39,4 @@ + return seconds; } - BELLESIP_EXPORT void belle_sip_header_date_set_time(belle_sip_header_date_t *obj, const time_t *utc_time){ + BELLESIP_EXPORT void belle_sip_header_date_set_time(belle_sip_header_date_t *obj, const time_t *utc_time) { diff --git a/net/belle-sip/files/patch-src_belle__sip__internal.h b/net/belle-sip/files/patch-src_belle__sip__internal.h index 51f8eddcda66..761204be2fa1 100644 --- a/net/belle-sip/files/patch-src_belle__sip__internal.h +++ b/net/belle-sip/files/patch-src_belle__sip__internal.h @@ -1,6 +1,6 @@ ---- src/belle_sip_internal.h.orig 2015-10-19 11:43:47 UTC +--- src/belle_sip_internal.h.orig 2022-05-18 04:20:06 UTC +++ src/belle_sip_internal.h -@@ -23,6 +23,7 @@ +@@ -25,6 +25,7 @@ #include #include #include diff --git a/net/belle-sip/files/patch-src_dns.c b/net/belle-sip/files/patch-src_dns.c deleted file mode 100644 index 1b7070ae4b69..000000000000 --- a/net/belle-sip/files/patch-src_dns.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/dns.c.orig 2015-10-19 11:43:47 UTC -+++ src/dns.c -@@ -4345,6 +4345,7 @@ int dns_resconf_loadfromresolv(struct dn - union res_sockaddr_union addresses[3]; - int i,error; - -+ memset(&res, 0, sizeof(res)); - if ((error = res_ninit(&res))) { - return error; - } diff --git a/net/belle-sip/files/patch-src_dns_dns.c b/net/belle-sip/files/patch-src_dns_dns.c new file mode 100644 index 000000000000..1d0afcd3c7c4 --- /dev/null +++ b/net/belle-sip/files/patch-src_dns_dns.c @@ -0,0 +1,29 @@ +--- src/dns/dns.c.orig 2022-06-15 16:24:13 UTC ++++ src/dns/dns.c +@@ -5012,7 +5012,7 @@ static int guess_scope_id(void){ + struct ifaddrs *ifp; + struct ifaddrs *ifpstart; + int scope_id = -1; +- ++ + if (getifaddrs(&ifpstart) < 0) { + return -1; + } +@@ -5035,7 +5035,7 @@ static int guess_scope_id(void){ + } + } + freeifaddrs(ifpstart); +- ++ + return scope_id; + } + +@@ -5044,7 +5044,7 @@ int dns_resconf_loadfromresolv(struct dns_resolv_conf + union res_sockaddr_union addresses[3]; + int i,error,write_index; + +- ++ memset(&res, 0, sizeof(res)); + if ((error = res_ninit(&res))) { + return error; + } diff --git a/net/belle-sip/pkg-plist b/net/belle-sip/pkg-plist index edce3a9205d7..de6d9cb1fc1e 100644 --- a/net/belle-sip/pkg-plist +++ b/net/belle-sip/pkg-plist @@ -14,8 +14,10 @@ include/belle-sip/list.h include/belle-sip/listener.h include/belle-sip/listeningpoint.h include/belle-sip/mainloop.h +include/belle-sip/mdns_register.h include/belle-sip/message.h include/belle-sip/object.h +include/belle-sip/object++.hh include/belle-sip/parameters.h include/belle-sip/provider.h include/belle-sip/refresher.h @@ -27,9 +29,10 @@ include/belle-sip/types.h include/belle-sip/utils.h include/belle-sip/wakelock.h lib/libbellesip.so -lib/libbellesip.so.0 +lib/libbellesip.so.1 libdata/pkgconfig/belle-sip.pc -share/BelleSIP/cmake/BelleSIPConfig.cmake -share/BelleSIP/cmake/BelleSIPConfigVersion.cmake -share/BelleSIP/cmake/BelleSIPTargets-%%CMAKE_BUILD_TYPE%%.cmake -share/BelleSIP/cmake/BelleSIPTargets.cmake +lib/cmake/BelleSIP/BelleSIPConfig.cmake +lib/cmake/BelleSIP/BelleSIPConfigVersion.cmake +lib/cmake/BelleSIP/BelleSIPTargets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/BelleSIP/BelleSIPTargets.cmake +share/belr/grammars/sdp_grammar