net/asterisk16: Update to 16.28.0

4 files changed, 25 insertions, 23 deletions

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index f334a33c9dfc..c903cc3420fe 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	asterisk
-PORTVERSION=	16.27.0
+PORTVERSION=	16.28.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/asterisk16/distinfo b/net/asterisk16/distinfo
index c01c7e003982..49e99d3924a7 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1656004905
-SHA256 (asterisk/asterisk-16.27.0.tar.gz) = 050c86d983bb93d244351c479561d08c3ff0f99a885698a45d22ee97327457e6
-SIZE (asterisk/asterisk-16.27.0.tar.gz) = 28014649
+TIMESTAMP = 1660841149
+SHA256 (asterisk/asterisk-16.28.0.tar.gz) = 0386b28741fd182dd710a8d94149c606429d6af43da5073965e3d5a937f21de8
+SIZE (asterisk/asterisk-16.28.0.tar.gz) = 28083184
 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/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 04b5fd6d9894..cb32070eebc7 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,6 +1,6 @@
---- Makefile.orig	2020-11-12 12:03:45 UTC
+--- Makefile.orig	2022-07-28 15:44:36 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 \
-@@ -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
@@ -65,16 +65,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 \
@@ -98,9 +98,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)|' \
@@ -111,7 +111,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/asterisk16/pkg-plist b/net/asterisk16/pkg-plist
index a3faacf63442..8030a1fb5b9a 100644
--- a/net/asterisk16/pkg-plist
+++ b/net/asterisk16/pkg-plist
@@ -53,6 +53,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
@@ -257,6 +258,7 @@ include/asterisk/presencestate.h
 include/asterisk/privacy.h
 include/asterisk/pval.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