From nobody Fri May 13 22:29:02 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 A492E1ACFA8B; Fri, 13 May 2022 22:29:02 +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 4L0Nbf2qcYz3l2n; Fri, 13 May 2022 22:29:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652480942; 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=CgMXRbkDAKo7lQ3UvL8idNuPewFPGbbdfGCjp8g2VZ4=; b=OiIkU363R65TumJqL+A7hlvdZ4Z4eNOpT9x2kGT+Y8Y+qsEtx1OBfWc0NoBqZf9H8AVPY9 mW3Z+kJv2ztJN9PhAWPy87FpxwckFrhKduYt9Xsx/1JP34UpPlCK0LCKY1WgOxFUw6nq+d mrWwotm+cPmHx4yfNuw+PJC+KUM0o306hmZMv5thq0iMnvZ9uCCG+DY4K94aRgn4MpYARM zRWQj9t9M/OMw/42F0w+ybbULV9mi7BJVv+PgPiRgQCz0rDyVDeyQizi1CeSh5xKYgPs0A I13m2tt9Om4TMgk8oX6Moo2sMLlhfx7KYuZvmU6BZCmMqXUEKLEDBKrShqHASw== 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 2A58C31EB; Fri, 13 May 2022 22:29:02 +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 24DMT2HW038936; Fri, 13 May 2022 22:29:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24DMT2de038935; Fri, 13 May 2022 22:29:02 GMT (envelope-from git) Date: Fri, 13 May 2022 22:29:02 GMT Message-Id: <202205132229.24DMT2de038935@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 8d2283b7663c - main - net/asterisk18: Update to 18.12.0 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: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8d2283b7663ce9116cd203e5752e89d2d466ca64 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652480942; 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=CgMXRbkDAKo7lQ3UvL8idNuPewFPGbbdfGCjp8g2VZ4=; b=Jcysj8A9vEaO4kFDKHh2jIZyr22q6XQifuBKGB/LIeeLh95QLf2hfm2hNs6KCgfakKbWF4 Z3W+XpZddbivFq3FgcDpS0Apmv8UAUrUZw+d6MPcecP0NHyeoSC113J0vOXGpOUcBT/n01 Jm0IQ7XgZIXwemn92mMDrMCAP1rnjc47ypcbOmE/p/0u9PAY1pAYqdgKLGTD2HYr1nkrxo R5J0erSV28F4FhpwWQy+OdgAINveERK/NTqFQcShk6+KceKFl3WmeyDgQ+FWT7bI+egneK 7OIK8BAH/YPixlhVGA16YG4M9/6Z0tWIsX/fpX3n8YFbNqhnrEGuKhsvxTiKdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652480942; a=rsa-sha256; cv=none; b=hgUv34YVVu7bLe3WsTNCq1kugVVfkF3GOpwmxvi20D6PrMJpn+0O222gFLeE1G6GOgrKUP /HlVk8n+UuRVwqtSJvGeWuCa7ZmVHWW+jQAXg1n8wJskCSUbCwkoBot6HZT9aJZJBas0aW dHUDTIgg/gqgkoQCtGFEUv2t0o5WC7qbY1BFRvACk1ve3P21gh+ExV/6tN8rmyBGAe7Gxq 8iJMQsv3D5ylPVTY7cya0PuUkBlAXPpC31SLTZ7i+7ktbUwM0G3jXP9S7Kz88IYOJB+Sy1 KIf0AwZU0G45SnI7Ahqf8ehf3iIuq1q520f9sAPHnyvlOdQ5HpgLj/KgLHxljQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=8d2283b7663ce9116cd203e5752e89d2d466ca64 commit 8d2283b7663ce9116cd203e5752e89d2d466ca64 Author: Guido Falsi AuthorDate: 2022-05-13 22:27:22 +0000 Commit: Guido Falsi CommitDate: 2022-05-13 22:27:22 +0000 net/asterisk18: Update to 18.12.0 - Embedded pjproject updated from 2.10 to 2.12 - Fix terminfo detection by adding the correct path to detection code [1] - Add note to pkg-descr to explain that the misc/terminfo-db port is required to get color in the console - Remove trailing whitespace Reported by: ogogon@ogogon.org (via email) [1] --- net/asterisk18/Makefile | 7 ++--- net/asterisk18/distinfo | 10 +++---- net/asterisk18/files/asterisk.in | 4 +-- net/asterisk18/files/patch-configure | 49 +++++++++++++++++----------------- net/asterisk18/files/patch-main_term.c | 10 +++++++ net/asterisk18/pkg-message | 4 +++ net/asterisk18/pkg-plist | 3 +++ 7 files changed, 53 insertions(+), 34 deletions(-) diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 5011e63ab92e..c0096ead9d8a 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -1,5 +1,5 @@ PORTNAME= asterisk -PORTVERSION= 18.11.3 +PORTVERSION= 18.12.0 CATEGORIES= net MASTER_SITES= https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 MASTER_SITE_SUBDIR= asterisk/ \ @@ -27,7 +27,7 @@ USE_GITHUB= nodefault EXTRACT_ONLY:= ${DISTNAME}${EXTRACT_SUFX} -PJSIP_VERSION= 2.10 +PJSIP_VERSION= 2.12 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ @@ -60,7 +60,7 @@ OPTIONS_DEFINE= ASTVERSION BACKTRACE CURL EXCHANGE FREETDS G729 LDAP LUA MACRO SPANDSP SRTP SYSINFO URIPARSER XMLDOC XMPP OPTIONS_DEFAULT= CURL FREETDS GSM LUA MACRO MP3PLAYER NEWT ODBC OPUS MYSQL PGSQL \ PJSIP PORTAUDIO RADIUS SNMP SPANDSP SPEEX SRTP URIPARSER \ - VORBIS XMLDOC + VORBIS XMLDOC OPTIONS_DEFINE_i386= DAHDI OPTIONS_DEFINE_amd64= DAHDI @@ -246,6 +246,7 @@ post-extract-OPUS-on: post-patch: @${REINPLACE_CMD} -e 's|/var/lib|${PREFIX}/share|g' ${WRKSRC}/configs/samples/musiconhold.conf.sample @${REINPLACE_CMD} -e 's/@XMLSTARLET@//' ${WRKSRC}/makeopts.in + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/main/term.c .if exists(${FILESDIR}/.asterisk.makeopts) ${CP} ${FILESDIR}/.asterisk.makeopts ${WRKSRC}/menuselect.makeopts .endif diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo index f4755d546632..a5128bf50c03 100644 --- a/net/asterisk18/distinfo +++ b/net/asterisk18/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1650998867 -SHA256 (asterisk/asterisk-18.11.3.tar.gz) = ed3132010e3dbba2b2439f9481318c27c35a9b968488044db8d46e262701644d -SIZE (asterisk/asterisk-18.11.3.tar.gz) = 28078155 +TIMESTAMP = 1652367065 +SHA256 (asterisk/asterisk-18.12.0.tar.gz) = b88f912a98f03e927594c72b2f029d80175492b137c72d32daf966be00e8b8f1 +SIZE (asterisk/asterisk-18.12.0.tar.gz) = 28127630 SHA256 (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 8b28a59cfa53b59c76e0a191704f0708e3d83acffab8c5e6f25dfc599f0123f9 SIZE (asterisk/asterisk-core-sounds-en-g729-1.5.tar.gz) = 1551123 SHA256 (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 0147ca9a97f0c550227aacb7793499057c4d2c64e021c95f93722f27d5549585 SIZE (asterisk/asterisk-moh-opsound-g729-2.03.tar.gz) = 1103000 SHA256 (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 572a3c956371ed62b44a4bcd973db10eb4c84f3040cf7156e3acfad3b6bf3ded SIZE (asterisk/traud-asterisk-opus-83e1b458c77e0e287adeca494eeb79edb077b0ff_GH0.tar.gz) = 24044 -SHA256 (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 936a4c5b98601b52325463a397ddf11ab4106c6a7b04f8dc7cdd377efbb597de -SIZE (asterisk/pjsip-pjproject-2.10_GH0.tar.gz) = 8768705 +SHA256 (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a +SIZE (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = 9658564 diff --git a/net/asterisk18/files/asterisk.in b/net/asterisk18/files/asterisk.in index aaa2ce8cdd8f..5fab82c5700e 100644 --- a/net/asterisk18/files/asterisk.in +++ b/net/asterisk18/files/asterisk.in @@ -69,7 +69,7 @@ asterisk_stop() if [ ${asterisk_stopsleep} -gt 0 ]; then sleep ${asterisk_stopsleep} fi - $command -nqrx 'core stop now' + $command -rx 'core stop now' wait_for_pids $rc_pid } @@ -80,7 +80,7 @@ asterisk_reload() return 1 fi echo 'Reloading asterisk.' - $command -nqrx 'reload' + $command -rx 'reload' } run_rc_command "$1" diff --git a/net/asterisk18/files/patch-configure b/net/asterisk18/files/patch-configure index 423e14aad59a..a66863381c74 100644 --- a/net/asterisk18/files/patch-configure +++ b/net/asterisk18/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig 2020-07-09 15:39:17 UTC +--- configure.orig 2022-05-05 17:09:31 UTC +++ configure -@@ -4687,8 +4687,6 @@ case "${host_os}" in +@@ -5156,8 +5156,6 @@ case "${host_os}" in ;; dragonfly*|freebsd*) ac_default_prefix=/usr/local @@ -9,7 +9,7 @@ ;; openbsd*) ac_default_prefix=/usr/local -@@ -20355,6 +20353,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6 +@@ -22983,6 +22981,8 @@ printf %s "checking for getifaddrs() support... " >&6; cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -17,34 +17,35 @@ + #include #include int - main () -@@ -29514,6 +29514,8 @@ fi + main (void) +@@ -32380,6 +32380,8 @@ for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do - for ver in 5.3 5.2 5.1; do + for ver in ${LUA_VERSIONS:-5.4 5.3 5.2 5.1}; do +vernodot=`echo ${ver} | sed 's/\.//'` + if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then pbxlibdir="" # if --with-LUA=DIR has been specified, use it. -@@ -29528,13 +29530,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; +@@ -32394,14 +32396,14 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; ast_ext_lib_check_save_CFLAGS="${CFLAGS}" CFLAGS="${CFLAGS} " - as_ac_Lib=`$as_echo "ac_cv_lib_lua${ver}''_luaL_newstate" | $as_tr_sh` --{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 --$as_echo_n "checking for luaL_newstate in -llua${ver}... " >&6; } -+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5 -+$as_echo_n "checking for luaL_newstate in -llua-${ver}... " >&6; } - if eval \${$as_ac_Lib+:} false; then : - $as_echo_n "(cached) " >&6 - else + as_ac_Lib=`printf "%s\n" "ac_cv_lib_lua${ver}""_luaL_newstate" | $as_tr_sh` +-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua${ver}" >&5 +-printf %s "checking for luaL_newstate in -llua${ver}... " >&6; } ++{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for luaL_newstate in -llua-${ver}" >&5 ++printf %s "checking for luaL_newstate in -llua-${ver}... " >&6; } + if eval test \${$as_ac_Lib+y} + then : + printf %s "(cached) " >&6 + else $as_nop ac_check_lib_save_LIBS=$LIBS -LIBS="-llua${ver} ${pbxlibdir} -lm $LIBS" +LIBS="-llua-${ver} ${pbxlibdir} -lm $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ -@@ -29576,7 +29578,7 @@ fi +@@ -32442,7 +32444,7 @@ fi # now check for the header. if test "${AST_LUA_FOUND}" = "yes"; then @@ -53,18 +54,18 @@ # if --with-LUA=DIR has been specified, use it. if test "x${LUA_DIR}" != "x"; then LUA_INCLUDE="-I${LUA_DIR}/include" -@@ -29586,8 +29588,8 @@ fi +@@ -32452,8 +32454,8 @@ fi # check for the header ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}" -- as_ac_Header=`$as_echo "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` --ac_fn_c_check_header_mongrel "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" -+ as_ac_Header=`$as_echo "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh` -+ac_fn_c_check_header_mongrel "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default" - if eval test \"x\$"$as_ac_Header"\" = x"yes"; then : +- as_ac_Header=`printf "%s\n" "ac_cv_header_lua${ver}/lua.h" | $as_tr_sh` +-ac_fn_c_check_header_compile "$LINENO" "lua${ver}/lua.h" "$as_ac_Header" "$ac_includes_default" ++ as_ac_Header=`printf "%s\n" "ac_cv_header_lua${vernodot}/lua.h" | $as_tr_sh` ++ac_fn_c_check_header_compile "$LINENO" "lua${vernodot}/lua.h" "$as_ac_Header" "$ac_includes_default" + if eval test \"x\$"$as_ac_Header"\" = x"yes" + then : LUA_HEADER_FOUND=1 - else -@@ -29614,9 +29616,9 @@ fi +@@ -32480,9 +32482,9 @@ fi if test "x${PBX_LUA}" = "x1" ; then if test x"${LUA_DIR}" = x; then diff --git a/net/asterisk18/files/patch-main_term.c b/net/asterisk18/files/patch-main_term.c new file mode 100644 index 000000000000..dc7ede7d4e12 --- /dev/null +++ b/net/asterisk18/files/patch-main_term.c @@ -0,0 +1,10 @@ +--- main/term.c.orig 2022-04-14 21:53:34 UTC ++++ main/term.c +@@ -46,6 +46,7 @@ static const char * const termpath[] = { + static char quitdata[80] = ""; + + static const char * const termpath[] = { ++ "%%LOCALBASE%%/share/terminfo", + "/usr/share/terminfo", + "/usr/local/share/misc/terminfo", + "/usr/lib/terminfo", diff --git a/net/asterisk18/pkg-message b/net/asterisk18/pkg-message index 5b79202b6b21..c32bcc7656ec 100644 --- a/net/asterisk18/pkg-message +++ b/net/asterisk18/pkg-message @@ -33,6 +33,10 @@ * https://wiki.asterisk.org/wiki/display/AST/Using+Menuselect+to+Select+Asterisk+Options * http://www.asteriskdocs.org/en/3rd_Edition/asterisk-book-html-chunk/installing_base_configuration.html#Installing_id293213 + + NOTE: To get color output in the asterisk console you need to install + the misc/terminfo-db port + EOM } ] diff --git a/net/asterisk18/pkg-plist b/net/asterisk18/pkg-plist index a376b7f08236..73c2dc1911e7 100644 --- a/net/asterisk18/pkg-plist +++ b/net/asterisk18/pkg-plist @@ -1,5 +1,6 @@ @sample %%ETCDIR%%/acl.conf.sample @sample %%ETCDIR%%/adsi.conf.sample +@sample %%ETCDIR%%/aeap.conf.sample @sample %%ETCDIR%%/agents.conf.sample @sample %%ETCDIR%%/alarmreceiver.conf.sample @sample %%ETCDIR%%/alsa.conf.sample @@ -257,6 +258,8 @@ include/asterisk/poll-compat.h include/asterisk/presencestate.h include/asterisk/privacy.h include/asterisk/pval.h +include/asterisk/res_aeap.h +include/asterisk/res_aeap_message.h include/asterisk/res_audiosocket.h include/asterisk/res_fax.h include/asterisk/res_hep.h