From ec07907292ca4e7d94c2b767665905cbfc2c883d Mon Sep 17 00:00:00 2001
From: Guido Falsi <madpilot@FreeBSD.org>
Date: Wed, 23 Dec 2020 11:33:12 +0000
Subject: MFH: r555764 r558976

Update asterisk16 to 16.15.0

- Update asterisk16 to 16.15.1

Security:	6adf6ce0-44a6-11eb-95b7-001999f8d30b
---
 net/asterisk16/Makefile             | 2 +-
 net/asterisk16/distinfo             | 6 +++---
 net/asterisk16/files/patch-Makefile | 8 ++++----
 net/asterisk16/pkg-plist            | 4 ++++
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index 70f4eab57692..4e479f748496 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	16.14.1
+PORTVERSION=	16.15.1
 CATEGORIES=	net
 MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index 039ea643af21..bacc30bd1c3e 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1604616089
-SHA256 (asterisk/asterisk-16.14.1.tar.gz) = da6d201a742e18655ac091c486c5852a6ce9babdea492e93f01b22efaf1d10d2
-SIZE (asterisk/asterisk-16.14.1.tar.gz) = 27741354
+TIMESTAMP = 1608677902
+SHA256 (asterisk/asterisk-16.15.1.tar.gz) = c14db1a4935c61f240ebf28cd30cb48f1b988d15680edf95287925e6be56c326
+SIZE (asterisk/asterisk-16.15.1.tar.gz) = 27796648
 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
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 88ca3f660cc2..04b5fd6d9894 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2020-07-09 15:39:17 UTC
+--- Makefile.orig	2020-11-12 12:03:45 UTC
 +++ Makefile
 @@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
  OVERWRITE=y
@@ -45,8 +45,8 @@
  	"$(ASTDATADIR)/firmware/iax" "$(ASTDATADIR)/images" "$(ASTDATADIR)/keys" \
  	"$(ASTDATADIR)/phoneprov" "$(ASTDATADIR)/rest-api" "$(ASTDATADIR)/static-http" \
  	"$(ASTDATADIR)/sounds" "$(ASTDATADIR)/moh" "$(ASTMANDIR)/man8" "$(AGI_DIR)" "$(ASTDBDIR)" \
--	"$(ASTDATADIR)/third-party"
-+	"$(ASTDATADIR)/third-party" "$(ASTSPOOLDIR)/outgoing"
+-	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken"
++	"$(ASTDATADIR)/third-party" "${ASTDATADIR}/keys/stir_shaken" "$(ASTSPOOLDIR)/outgoing"
  
  installdirs:
  	@for i in $(INSTALLDIRS); do \
@@ -93,7 +93,7 @@
 -		fi ; \
  		echo "Installing file $$x"; \
 -		$(INSTALL) -m 644 "$$x" "$${dst}" ;\
-+		 $(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
++		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`.sample ; \
  	done ; \
 -	if [ "$(OVERWRITE)" = "y" ]; then \
 +	if true; then \
diff --git a/net/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index 2eb5a5c1c075..fa42df92bd67 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -104,6 +104,7 @@
 @sample %%ETCDIR%%/ss7.timers.sample
 @sample %%ETCDIR%%/stasis.conf.sample
 @sample %%ETCDIR%%/statsd.conf.sample
+@sample %%ETCDIR%%/stir_shaken.conf.sample
 @sample %%ETCDIR%%/telcordia-1.adsi.sample
 @sample %%ETCDIR%%/test_sorcery.conf.sample
 @sample %%ETCDIR%%/udptl.conf.sample
@@ -224,6 +225,7 @@ include/asterisk/linkedlists.h
 include/asterisk/localtime.h
 include/asterisk/lock.h
 include/asterisk/logger.h
+include/asterisk/logger_category.h
 include/asterisk/manager.h
 include/asterisk/max_forwards.h
 include/asterisk/md5.h
@@ -268,6 +270,7 @@ include/asterisk/res_pjsip_presence_xml.h
 include/asterisk/res_pjsip_pubsub.h
 include/asterisk/res_pjsip_session.h
 include/asterisk/res_srtp.h
+include/asterisk/res_stir_shaken.h
 include/asterisk/rtp_engine.h
 include/asterisk/say.h
 include/asterisk/sched.h
@@ -394,6 +397,7 @@ sbin/safe_asterisk
 @dir %%DATADIR%%/documentation/thirdparty
 @dir %%DATADIR%%/firmware/iax
 @dir %%DATADIR%%/images
+@dir %%DATADIR%%/keys/stir_shaken
 @dir %%DATADIR%%/keys
 @dir %%DATADIR%%/moh
 @dir %%DATADIR%%/sounds
-- 
cgit v1.2.3