From nobody Fri Aug 08 23:06:23 2025 X-Original-To: dev-commits-ports-main@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 4bzKQl4jS6z64KTT; Fri, 08 Aug 2025 23:06:23 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bzKQl43G9z446C; Fri, 08 Aug 2025 23:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754694383; 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=dOChjwzQ+tdLmVQ/cz/FAHkSq4J6k/LOPmDcPs9UzRM=; b=Wm8d/jWOK+qJ8/NBjahqcN5zzRh8jCEr17jC7QW0GxH9YJdgotmnIBenbPTF6Cofhg2stA 05eSHf9/9DckIbawqN+zVdg1FdqP83vMgXg0lToj82pe5k/N8ZpH+7gR53CpDhaweNAr2x QZ3Y5lC1RQDKLxiaxTHPou2db5+yrlHgPtdyMwj6GkXg/bUqBv+36U41RbAyC1HVkM6GLY r2+LDMOJpADPQiABQO4Ayzz1xArtTgZC+f6rMt2AG+u/M1Yy7VxXWvQnxTuUoQmCANMvC1 eXoo/wHaKmpOrWAe/a4cL3cM2Z5sh71Dmm0REtI7Jzft4fWXH9wIUB51nnI69g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1754694383; 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=dOChjwzQ+tdLmVQ/cz/FAHkSq4J6k/LOPmDcPs9UzRM=; b=gNMDE0oubOzdnvOranKBCy7DOjJc8yRhFLdkSqdYXGhyZRcXo7S5EjtLNlVthJYKt53Y0H WOcwmThRV+Af9LUcd/8EscqNhe8cGdFbDuEsMcTROpxnCZJU3tIfvrXcSDddfMIjVO3FhG 6bXzPx2P+Os8RJdy88IjU1WxAZUlXLpdffPwY4I8Gh3t702r9q/fIJOag6rPb/Ddvay4fl SBQChhk6/QpwGo2hGZPuPvFCOVeTALQETuhbbieiKSl1dsaJOJ9ewWW4N3YiiIzzZYgK8C DpaA3qWdMUNVCFwJcbpROaStjhoFthSitTFdPQQSr8bfAPpsfjsACL0SHKhCjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1754694383; a=rsa-sha256; cv=none; b=unWkFbrXRJ5Q4blRDlXnul3cSYIoHJ/tqMHUCoWx7qQGmDwr+e1Lu/AG17u7Rser3YwF8i rHa/hhNuHijrMVLU1OrSAspLBhr0GEdKsw9HM4OLvHXYlhbEaHjmhy4YlYqnpBbTzvhNQB nF1NUhpksoUSfZBc9TquOmV9tqtIzd8X12eCJPCMueHgqXSzOuAsv/AUbIWmnD1bzZawpa 7jP/9vtUabLfVYTbS/ckeOWZzknasdEEZ4KYkCs9jJY1oMwGI7TWCJ4a6LjzekHVkbhdL6 yxPEOqlz1pytEVswzcbQnIhPxLEpRXcIgXLXNjBm+m5qsfDqn3dkOYb9fjFSsg== 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 4bzKQl3W03zwVy; Fri, 08 Aug 2025 23:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 578N6NuZ001248; Fri, 8 Aug 2025 23:06:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 578N6NM8001245; Fri, 8 Aug 2025 23:06:23 GMT (envelope-from git) Date: Fri, 8 Aug 2025 23:06:23 GMT Message-Id: <202508082306.578N6NM8001245@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 7aa69c618b14 - main - net/asterisk-chan_sccp: Update 4.3.3 => 4.3.5.20231205 (4.3.5 with several patches after release) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7aa69c618b1491817cd4dc1e74ce9fb55935ed82 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=7aa69c618b1491817cd4dc1e74ce9fb55935ed82 commit 7aa69c618b1491817cd4dc1e74ce9fb55935ed82 Author: Vladimir Druzenko AuthorDate: 2025-08-08 22:57:10 +0000 Commit: Vladimir Druzenko CommitDate: 2025-08-08 22:57:10 +0000 net/asterisk-chan_sccp: Update 4.3.3 => 4.3.5.20231205 (4.3.5 with several patches after release) Changelogs: https://github.com/chan-sccp/chan-sccp/releases/tag/v4.3.4 https://github.com/chan-sccp/chan-sccp/releases/tag/v4.3.5 https://github.com/chan-sccp/chan-sccp/compare/v4.3.5...2e21051 Improve port: - Add flavors asterisk20 and asterisk22. - Set default flavor to asterisk22. - Fix dependencies. - Fix warnings from portclippy. - Parameterize CONFLICTS_INSTALL. PR: 288423 Approved by: Diederik de Groot (maintainer, timeout 2 weeks) --- net/asterisk-chan_sccp/Makefile | 34 +++++++----------- net/asterisk-chan_sccp/distinfo | 6 ++-- net/asterisk-chan_sccp/files/patch-src_define.h | 4 +-- .../files/patch-src_pbx__impl_ast116_ast116.c | 41 ++++++++++++++++++++++ 4 files changed, 59 insertions(+), 26 deletions(-) diff --git a/net/asterisk-chan_sccp/Makefile b/net/asterisk-chan_sccp/Makefile index a9efae0693e4..991dd2eb0291 100644 --- a/net/asterisk-chan_sccp/Makefile +++ b/net/asterisk-chan_sccp/Makefile @@ -1,7 +1,6 @@ PORTNAME= chan_sccp DISTVERSIONPREFIX= v -DISTVERSION= 4.3.3 -PORTREVISION= 2 +DISTVERSION= 4.3.5.20231205 CATEGORIES= net PKGNAMEPREFIX= asterisk- @@ -12,38 +11,35 @@ WWW= https://sourceforge.net/projects/chan-sccp-b/ LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/COPYING -FLAVORS= asterisk18 -FLAVOR?= ${FLAVORS:[1]} - LIB_DEPENDS= libltdl.so:devel/libltdl -USES= autoreconf:2.69 compiler:c11 gettext-tools iconv libtool \ - localbase ssl +FLAVORS= asterisk18 asterisk20 asterisk22 +FLAVOR?= ${FLAVORS:[3]} + +${FLAVOR}_PKGNAMEPREFIX= ${FLAVOR}- +${FLAVOR}_BUILD_DEPENDS= asterisk:net/${FLAVOR} +${FLAVOR}_RUN_DEPENDS= asterisk:net/${FLAVOR} +USES= autoreconf:2.69 compiler:c11 gettext-tools iconv:wchar_t \ + libtool ssl USE_GITHUB= yes GH_ACCOUNT= chan-sccp GH_PROJECT= chan-sccp +GH_TAGNAME= 2e2105182824dc0ffda40f607290eb309d03a963 GNU_CONFIGURE= yes CONFIGURE_ARGS= --enable-advanced-functions \ - --with-hash-size=3001 \ - ${ICONV_CONFIGURE_ARG} + --with-hash-size=3001 INSTALL_TARGET= install-strip +CFLAGS+= -D_ASTERISK_VERSION=${FLAVOR:C|([a-zA-Z]+)||} -CPPFLAGS+= -I${ICONV_INCLUDE_PATH} -LDFLAGS+= -L${LOCALBASE}/lib \ - ${ICONV_LIB} +CONFLICTS_INSTALL= ${FLAVORS:N${FLAVOR}:C|(.+)|\1-${PORTNAME}|} PLIST_FILES= etc/asterisk/sccp.conf.annotated \ "@sample etc/asterisk/sccp.conf.sample" \ lib/asterisk/modules/chan_sccp.so \ share/asterisk/documentation/thirdparty/chan_sccp-en_US.xml -asterisk18_PKGNAMEPREFIX= asterisk18- -asterisk18_CONFLICTS_INSTALL= asterisk13-chan_sccp asterisk16-chan_sccp -asterisk18_BUILD_DEPENDS= asterisk:net/asterisk18 -asterisk18_RUN_DEPENDS= asterisk:net/asterisk18 - OPTIONS_DEFINE= CONFERENCE VIDEO OPTIONS_DEFAULT= CONFERENCE VIDEO CONFERENCE_DESC= Enable Conference Support @@ -52,10 +48,6 @@ VIDEO_DESC= Enable Video Support CONFERENCE_CONFIGURE_ENABLE= conference VIDEO_CONFIGURE_ENABLE= video -.if ${FLAVOR} == asterisk18 -CONFIGURE_ARGS+= --with-asterisk-version=18 -.endif - post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/asterisk ${INSTALL_DATA} ${WRKSRC}/conf/sccp.conf \ diff --git a/net/asterisk-chan_sccp/distinfo b/net/asterisk-chan_sccp/distinfo index ec80554d7202..194acd42c70d 100644 --- a/net/asterisk-chan_sccp/distinfo +++ b/net/asterisk-chan_sccp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603703805 -SHA256 (chan-sccp-chan-sccp-v4.3.3_GH0.tar.gz) = 970961c2b7128e840c09e3ce994bc109c9526e81a90ffbc72b6e6bffe860ad82 -SIZE (chan-sccp-chan-sccp-v4.3.3_GH0.tar.gz) = 1677723 +TIMESTAMP = 1753333333 +SHA256 (chan-sccp-chan-sccp-v4.3.5.20231205-2e2105182824dc0ffda40f607290eb309d03a963_GH0.tar.gz) = 696b52d91147c0ee921f38a3f24de8359ccbd7622f264a2d1aa6c67a742162dc +SIZE (chan-sccp-chan-sccp-v4.3.5.20231205-2e2105182824dc0ffda40f607290eb309d03a963_GH0.tar.gz) = 1677691 diff --git a/net/asterisk-chan_sccp/files/patch-src_define.h b/net/asterisk-chan_sccp/files/patch-src_define.h index 5b2d175fb693..ce1846d7b7d7 100644 --- a/net/asterisk-chan_sccp/files/patch-src_define.h +++ b/net/asterisk-chan_sccp/files/patch-src_define.h @@ -1,6 +1,6 @@ ---- src/define.h.orig 2020-10-24 14:42:40 UTC +--- src/define.h.orig 2021-12-29 10:49:04 UTC +++ src/define.h -@@ -98,10 +98,10 @@ SCCP_LINE unsigned long long ___bswap_64(unsigned long +@@ -96,10 +96,10 @@ SCCP_LINE unsigned long long ___bswap_64(unsigned long # define htolel(x) (uint16_t)(x) # define htoles(x) (uint16_t)(x) # else diff --git a/net/asterisk-chan_sccp/files/patch-src_pbx__impl_ast116_ast116.c b/net/asterisk-chan_sccp/files/patch-src_pbx__impl_ast116_ast116.c new file mode 100644 index 000000000000..57d4afa24dd5 --- /dev/null +++ b/net/asterisk-chan_sccp/files/patch-src_pbx__impl_ast116_ast116.c @@ -0,0 +1,41 @@ +--- src/pbx_impl/ast116/ast116.c.orig 2021-12-29 10:49:04 UTC ++++ src/pbx_impl/ast116/ast116.c +@@ -3063,10 +3063,12 @@ DECLARE_PBX_CHANNEL_STRGET(name) + DECLARE_PBX_CHANNEL_STRGET(linkedid) + DECLARE_PBX_CHANNEL_STRGET(context) + DECLARE_PBX_CHANNEL_STRSET(context) ++#if _ASTERISK_VERSION < 21 + DECLARE_PBX_CHANNEL_STRGET(macroexten) + DECLARE_PBX_CHANNEL_STRSET(macroexten) + DECLARE_PBX_CHANNEL_STRGET(macrocontext) + DECLARE_PBX_CHANNEL_STRSET(macrocontext) ++#endif + DECLARE_PBX_CHANNEL_STRGET(call_forward) + DECLARE_PBX_CHANNEL_STRSET(call_forward) + +@@ -3534,10 +3536,12 @@ const PbxInterface iPbx = { + setChannelExten: sccp_astwrap_set_channel_exten, + getChannelContext: sccp_astwrap_get_channel_context, + setChannelContext: sccp_astwrap_set_channel_context, ++#if _ASTERISK_VERSION < 21 + getChannelMacroExten: sccp_astwrap_get_channel_macroexten, + setChannelMacroExten: sccp_astwrap_set_channel_macroexten, + getChannelMacroContext: sccp_astwrap_get_channel_macrocontext, + setChannelMacroContext: sccp_astwrap_set_channel_macrocontext, ++#endif + getChannelCallForward: sccp_astwrap_get_channel_call_forward, + setChannelCallForward: sccp_astwrap_set_channel_call_forward, + +@@ -3685,10 +3689,12 @@ const PbxInterface iPbx = { + .setChannelExten = sccp_astwrap_set_channel_exten, + .getChannelContext = sccp_astwrap_get_channel_context, + .setChannelContext = sccp_astwrap_set_channel_context, ++#if _ASTERISK_VERSION < 21 + .getChannelMacroExten = sccp_astwrap_get_channel_macroexten, + .setChannelMacroExten = sccp_astwrap_set_channel_macroexten, + .getChannelMacroContext = sccp_astwrap_get_channel_macrocontext, + .setChannelMacroContext = sccp_astwrap_set_channel_macrocontext, ++#endif + .getChannelCallForward = sccp_astwrap_get_channel_call_forward, + .setChannelCallForward = sccp_astwrap_set_channel_call_forward, +