From nobody Thu Aug 18 19:16:57 2022 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 4M7vlG08m7z4Z44y; Thu, 18 Aug 2022 19:16:58 +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 4M7vlF6mv6z3SBh; Thu, 18 Aug 2022 19:16:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660850217; 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=2OePN7zxhBcEnSKrcqnUoHOjV9OmrBTa+hSwWJrn12E=; b=B0KLojR4/ks1d+vgO1KHw93oT92PkPq0nqFL2Dan8jpsCuXRsO3pRofQOP8nv69UwcLvH7 QSfviQBtUqifpyU7NDJLCUAR7Ytgj/ZttQRQrA8LL6qKS1XthsEa2SuKQm1UVNqjFM+T+q p8DJAlTj4VGefxaLaNa/SAtMk1oXO4HY/pVLh6nIh60kReWNHXYSiXR6v5CWvYTHXfO9gD 8UmqOaSK9UOlpX18DOqaP8a5uYKZgmkY1jMxRyTSWIRUBDkq63YIngXvDZ7FN9Qhpw/IMd R8I3zJ+x9KgH5rCeZS/z8H80T0rn2yNkmQpjYwU4mIZOOm44CdfkxcxsKafvBA== 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 4M7vlF5tMDzQDl; Thu, 18 Aug 2022 19:16:57 +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 27IJGvuN075404; Thu, 18 Aug 2022 19:16:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27IJGvqd075403; Thu, 18 Aug 2022 19:16:57 GMT (envelope-from git) Date: Thu, 18 Aug 2022 19:16:57 GMT Message-Id: <202208181916.27IJGvqd075403@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: 1f56f29226a8 - main - net/asterisk18: Update to 18.14.0 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 1f56f29226a8ca5c56e271d2ddd55f2af41fe4f1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660850217; 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=2OePN7zxhBcEnSKrcqnUoHOjV9OmrBTa+hSwWJrn12E=; b=fUmmOJ6hEEbDgycijoG8U4J+BjyPXP828V6KlNhReGGOGeN9QZI0gWOdd+TZG+EuYvf7fk ZGB2Jh8pj2xJrYSrtzvLxBPh2n0rCfX2bZxdqzs4W7i/XwlUG574xgkJuzPQFKxPCEqF+7 CuT8aeJ/KDYClET6QJ66Sw191A2X0EyNygMV1uziZT89dVh1R5F5LzipfsQF1gbVdZD9+t saAdREb36Xb8mlkgeGdV9PuJhchoTwefFo/8UARGrRCnKmtmSJQDY+HJP8GrXcd1Oh2l4a igFMTiy1fABPppIqfPAXjZ0t+uiKbSHu8GPuzneZi3GYQH1o+6bygFHs9uqaVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660850217; a=rsa-sha256; cv=none; b=u3YxoBmo9leub/UkCTENrCWCeWtzulR6QJsnLNt3X6J3mjza/0sX+Wj/6p6o27cvRodbns hd5FKeDQdr/tyHVMRtmBze2j3eqPl4TRrbE2N9XUMKKkbWdeTgE1UohiI5+3x9C/AeOYP3 uo4BApHzoBKhCDpLoVDY0zUCDmrAFLMrfnn+fyXDBCdydKnVH/qz+F122ccmof5nV+l5Cm 88EsET0ILMRos/XFOgT6VzQY4et4t5t8sydPEvycGXELYc8u7xsg5+4Pj5x8eFleKqiQV2 pESLVznkueroyMTEzfj7rfDqN2w6aX4ZIv0Y6LUNJILobOlshpDKoTC2iAAE8w== 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=1f56f29226a8ca5c56e271d2ddd55f2af41fe4f1 commit 1f56f29226a8ca5c56e271d2ddd55f2af41fe4f1 Author: Guido Falsi AuthorDate: 2022-08-18 19:16:30 +0000 Commit: Guido Falsi CommitDate: 2022-08-18 19:16:30 +0000 net/asterisk18: Update to 18.14.0 --- net/asterisk18/Makefile | 4 ++-- net/asterisk18/distinfo | 10 +++++----- net/asterisk18/files/patch-Makefile | 34 +++++++++++++++++----------------- net/asterisk18/pkg-plist | 2 ++ 4 files changed, 26 insertions(+), 24 deletions(-) diff --git a/net/asterisk18/Makefile b/net/asterisk18/Makefile index 00b091245c4c..b354d93cc05b 100644 --- a/net/asterisk18/Makefile +++ b/net/asterisk18/Makefile @@ -1,5 +1,5 @@ PORTNAME= asterisk -PORTVERSION= 18.13.0 +PORTVERSION= 18.14.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.12 +PJSIP_VERSION= 2.12.1 GNU_CONFIGURE= yes CONFIGURE_ARGS= --datarootdir=${DATADIR} \ --with-ilbc=internal \ diff --git a/net/asterisk18/distinfo b/net/asterisk18/distinfo index 9205af26e9ac..cf1d9a30b6d4 100644 --- a/net/asterisk18/distinfo +++ b/net/asterisk18/distinfo @@ -1,11 +1,11 @@ -TIMESTAMP = 1656004930 -SHA256 (asterisk/asterisk-18.13.0.tar.gz) = 92681b928b75309860ebfd192ad8d1db3df3cdaebab401a2abc666ffaea096bf -SIZE (asterisk/asterisk-18.13.0.tar.gz) = 28127627 +TIMESTAMP = 1660841174 +SHA256 (asterisk/asterisk-18.14.0.tar.gz) = c79a728688e1d8faaf3915be81b88b6e324f314dd377de791e37dfa6d081a246 +SIZE (asterisk/asterisk-18.14.0.tar.gz) = 28193615 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.12_GH0.tar.gz) = b3b94d9be4aba8f6d2d1cb164603e81b0a6ee17352f9e2ba5b58e325e610ca5a -SIZE (asterisk/pjsip-pjproject-2.12_GH0.tar.gz) = 9658564 +SHA256 (asterisk/pjsip-pjproject-2.12.1_GH0.tar.gz) = d0feef6963b07934e821ba4328aecb4c36358515c1b3e507da5874555d713533 +SIZE (asterisk/pjsip-pjproject-2.12.1_GH0.tar.gz) = 9660659 diff --git a/net/asterisk18/files/patch-Makefile b/net/asterisk18/files/patch-Makefile index 8efa81789178..b63c2c5294a0 100644 --- a/net/asterisk18/files/patch-Makefile +++ b/net/asterisk18/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig 2020-09-09 15:43:27 UTC +--- Makefile.orig 2022-07-28 15:51:18 UTC +++ Makefile -@@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +@@ -144,7 +144,7 @@ OVERWRITE=y OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -9,7 +9,7 @@ # Asterisk.conf is located in ASTETCDIR or by using the -C flag # when starting Asterisk -@@ -162,7 +162,7 @@ LINKER_SYMBOL_PREFIX= +@@ -168,7 +168,7 @@ LINKER_SYMBOL_PREFIX= #_ASTCFLAGS+=-DOLD_DSP_ROUTINES # Default install directory for DAHDI hooks. @@ -18,7 +18,7 @@ # If the file .asterisk.makeopts is present in your home directory, you can # include all of your favorite menuselect options so that every time you download -@@ -222,7 +222,7 @@ endif +@@ -228,7 +228,7 @@ ifeq ($(OSARCH),FreeBSD) ifeq ($(OSARCH),FreeBSD) # -V is understood by BSD Make, not by GNU make. @@ -27,7 +27,7 @@ _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi) endif -@@ -466,8 +466,12 @@ endif +@@ -475,8 +475,12 @@ endif $(INSTALL) -m 644 $$n "$(DESTDIR)$(ASTDATADIR)/static-http/docs" ; \ done \ fi @@ -41,7 +41,7 @@ done $(MAKE) -C sounds install find rest-api -name "*.json" | while read x; do \ -@@ -565,7 +569,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI +@@ -545,7 +549,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI "$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \ "$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \ "$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \ @@ -50,7 +50,7 @@ installdirs: @for i in $(INSTALLDIRS); do \ -@@ -577,7 +581,7 @@ installdirs: +@@ -557,7 +561,7 @@ main-bininstall: main-bininstall: +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTLIBDIR="$(ASTLIBDIR)" $(SUBMAKE) -C main bininstall @@ -59,7 +59,7 @@ $(INSTALL) -m 755 contrib/scripts/astversion "$(DESTDIR)$(ASTSBINDIR)/" $(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/" $(INSTALL) -m 755 contrib/scripts/autosupport "$(DESTDIR)$(ASTSBINDIR)/" -@@ -598,10 +602,10 @@ endif +@@ -578,10 +582,10 @@ endif if [ -f contrib/firmware/iax/iaxy.bin ] ; then \ $(INSTALL) -m 644 contrib/firmware/iax/iaxy.bin "$(DESTDIR)$(ASTDATADIR)/firmware/iax/iaxy.bin"; \ fi @@ -74,16 +74,16 @@ $(SUBDIRS_INSTALL): +@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install -@@ -716,7 +720,7 @@ ifneq ($(filter ~%,$(DESTDIR)),) - @exit 1 +@@ -706,7 +710,7 @@ endif endif --install: badshell bininstall datafiles -+install: badshell bininstall datafiles samples + +-install: badshell versioncheck bininstall datafiles ++install: badshell versioncheck bininstall datafiles samples @if [ -x /usr/sbin/asterisk-post-install ]; then \ /usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \ fi -@@ -761,23 +765,10 @@ upgrade: bininstall +@@ -751,23 +755,10 @@ define INSTALL_CONFIGS # (2) the extension to strip off define INSTALL_CONFIGS @for x in $(1)/*$(2); do \ @@ -107,9 +107,9 @@ - if [ "$(OVERWRITE)" = "y" ]; then \ + if true; then \ echo "Updating asterisk.conf" ; \ - sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ - -e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \ -@@ -790,8 +781,8 @@ define INSTALL_CONFIGS + sed -e 's|^astcachedir.*$$|astcachedir => $(ASTCACHEDIR)|' \ + -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \ +@@ -781,8 +772,8 @@ define INSTALL_CONFIGS -e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \ -e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \ -e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \ @@ -120,7 +120,7 @@ rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \ fi endef -@@ -825,7 +816,7 @@ adsi: +@@ -816,7 +807,7 @@ adsi: else \ echo "Installing $$x" ; \ fi ; \ diff --git a/net/asterisk18/pkg-plist b/net/asterisk18/pkg-plist index 73c2dc1911e7..1d084921121d 100644 --- a/net/asterisk18/pkg-plist +++ b/net/asterisk18/pkg-plist @@ -54,6 +54,7 @@ @sample %%ETCDIR%%/festival.conf.sample @sample %%ETCDIR%%/followme.conf.sample @sample %%ETCDIR%%/func_odbc.conf.sample +@sample %%ETCDIR%%/geolocation.conf.sample @sample %%ETCDIR%%/hep.conf.sample @sample %%ETCDIR%%/http.conf.sample @sample %%ETCDIR%%/iax.conf.sample @@ -262,6 +263,7 @@ include/asterisk/res_aeap.h include/asterisk/res_aeap_message.h include/asterisk/res_audiosocket.h include/asterisk/res_fax.h +include/asterisk/res_geolocation.h include/asterisk/res_hep.h include/asterisk/res_mwi_external.h include/asterisk/res_odbc.h