- Update asterisk16 to 16.12.0

- Asterisk project now embeds pjsip 2.10, get it's distribution
  from github and adapt port
- Remove patch merged upstream
- Refresh patches and rename to current naming scheme
- Reorder some variables to silnce portlint warning

14 files changed, 51 insertions, 57 deletions

diff --git a/net/asterisk16/Makefile b/net/asterisk16/Makefile
index c7b7053db7bd..3dab2ffd94fb 100644
--- a/net/asterisk16/Makefile
+++ b/net/asterisk16/Makefile
@@ -1,17 +1,14 @@
 # $FreeBSD$
 
 PORTNAME=	asterisk
-PORTVERSION=	16.11.1
-PORTREVISION=	1
+PORTVERSION=	16.12.0
 CATEGORIES=	net
-MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729 \
-		http://www.pjsip.org/release/${PJSIP_VERSION}/:PJSIP
+MASTER_SITES=	https://downloads.asterisk.org/pub/telephony/%SUBDIR%/:DEFAULT,g729
 MASTER_SITE_SUBDIR=	asterisk/ \
 			asterisk/old-releases/ \
 			sounds/releases/:g729
 PKGNAMESUFFIX=	16
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		pjproject-${PJSIP_VERSION}.tar.bz2:PJSIP
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	madpilot@FreeBSD.org
@@ -20,12 +17,10 @@ COMMENT=	Open Source PBX and telephony toolkit
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
-		libjansson.so:devel/jansson
-
 ONLY_FOR_ARCHS=	amd64 armv6 armv7 i386 powerpc powerpc64 sparc64
 
-EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
+LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
+		libjansson.so:devel/jansson
 
 USES=		bison compiler:c11 cpe gmake gnome iconv libedit localbase \
 		shebangfix sqlite ssl ncurses
@@ -34,7 +29,9 @@ USE_LDCONFIG=	yes
 USE_RC_SUBR=	asterisk
 USE_GITHUB=	nodefault
 
-PJSIP_VERSION=	2.9
+EXTRACT_ONLY:=	${DISTNAME}${EXTRACT_SUFX}
+
+PJSIP_VERSION=	2.10
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datarootdir=${DATADIR} \
 		--with-ilbc=internal \
@@ -171,6 +168,7 @@ PJSIP_USES=		pkgconfig
 PJSIP_LIB_DEPENDS=	libsrtp2.so:net/libsrtp2 \
 			libspeex.so:audio/speex \
 			libspeexdsp.so:audio/speexdsp
+PJSIP_GH_TUPLE=		pjsip:pjproject:${PJSIP_VERSION}:pjsip
 
 PORTAUDIO_CONFIGURE_WITH=	portaudio
 PORTAUDIO_LIB_DEPENDS=	libportaudio.so:audio/portaudio
diff --git a/net/asterisk16/distinfo b/net/asterisk16/distinfo
index ef7cc9e0dec8..f00864c1cd60 100644
--- a/net/asterisk16/distinfo
+++ b/net/asterisk16/distinfo
@@ -1,11 +1,11 @@
-TIMESTAMP = 1592336962
-SHA256 (asterisk/asterisk-16.11.1.tar.gz) = f1be317774066c825ae872b2382903ae7ba1e765b3b567bd814b82cb66bfced9
-SIZE (asterisk/asterisk-16.11.1.tar.gz) = 27703143
-SHA256 (asterisk/pjproject-2.9.tar.bz2) = d185ef7855c8ec07191dde92f54b65a7a4b7a6f7bf8c46f7af35ceeb1da2a636
-SIZE (asterisk/pjproject-2.9.tar.bz2) = 5009546
+TIMESTAMP = 1594922513
+SHA256 (asterisk/asterisk-16.12.0.tar.gz) = b576a6f151115257f3d8200a97f53612a30dcbeb1a907e1f54d34b0027325dea
+SIZE (asterisk/asterisk-16.12.0.tar.gz) = 27727347
 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
diff --git a/net/asterisk16/files/patch-Makefile b/net/asterisk16/files/patch-Makefile
index 9f4abb6de701..88ca3f660cc2 100644
--- a/net/asterisk16/files/patch-Makefile
+++ b/net/asterisk16/files/patch-Makefile
@@ -1,4 +1,4 @@
---- Makefile.orig	2018-12-04 00:03:56 UTC
+--- Makefile.orig	2020-07-09 15:39:17 UTC
 +++ Makefile
 @@ -138,7 +138,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
  OVERWRITE=y
@@ -27,7 +27,7 @@
    _ASTCFLAGS+=$(shell if test $(BSDVERSION) -lt 500016 ; then echo "-D_THREAD_SAFE"; fi)
  endif
  
-@@ -462,8 +462,12 @@ endif
+@@ -466,8 +466,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 \
-@@ -562,7 +566,7 @@ INSTALLDIRS="$(ASTLIBDIR)" "$(ASTMODDIR)" "$(ASTSBINDI
+@@ -565,7 +569,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 \
-@@ -601,10 +605,10 @@ endif
+@@ -598,10 +602,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,7 +65,7 @@
  
  $(SUBDIRS_INSTALL):
  	+@DESTDIR="$(DESTDIR)" ASTSBINDIR="$(ASTSBINDIR)" ASTDATADIR="$(ASTDATADIR)" $(SUBMAKE) -C $(@:-install=) install
-@@ -719,7 +723,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
+@@ -716,7 +720,7 @@ ifneq ($(filter ~%,$(DESTDIR)),)
  	@exit 1
  endif
  
@@ -74,7 +74,7 @@
  	@if [ -x /usr/sbin/asterisk-post-install ]; then \
  		/usr/sbin/asterisk-post-install "$(DESTDIR)" . ; \
  	fi
-@@ -764,23 +768,10 @@ upgrade: bininstall
+@@ -761,23 +765,10 @@ upgrade: bininstall
  #  (2) the extension to strip off
  define INSTALL_CONFIGS
  	@for x in $(1)/*$(2); do \
@@ -100,7 +100,7 @@
  		echo "Updating asterisk.conf" ; \
  		sed -e 's|^astetcdir.*$$|astetcdir => $(ASTETCDIR)|' \
  			-e 's|^astmoddir.*$$|astmoddir => $(ASTMODDIR)|' \
-@@ -793,8 +784,8 @@ define INSTALL_CONFIGS
+@@ -790,8 +781,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
-@@ -818,7 +809,7 @@ adsi:
+@@ -825,7 +816,7 @@ adsi:
  		else \
  			echo "Installing $$x" ; \
  		fi ; \
diff --git a/net/asterisk16/files/patch-agi__Makefile b/net/asterisk16/files/patch-agi_Makefile
index 59d928b697b3..019ad10e1ef9 100644
--- a/net/asterisk16/files/patch-agi__Makefile
+++ b/net/asterisk16/files/patch-agi_Makefile
@@ -1,4 +1,4 @@
---- agi/Makefile.orig	2012-10-14 21:56:13 UTC
+--- agi/Makefile.orig	2020-07-09 15:39:17 UTC
 +++ agi/Makefile
 @@ -16,7 +16,9 @@ ASTTOPDIR?=..
  
diff --git a/net/asterisk16/files/patch-channels-chan_dahdi.c b/net/asterisk16/files/patch-channels_chan__dahdi.c
index 654fcdd47701..cc294c5ba840 100644
--- a/net/asterisk16/files/patch-channels-chan_dahdi.c
+++ b/net/asterisk16/files/patch-channels_chan__dahdi.c
@@ -1,4 +1,4 @@
---- channels/chan_dahdi.c.orig	2020-06-16 14:39:16 UTC
+--- channels/chan_dahdi.c.orig	2020-07-09 15:39:17 UTC
 +++ channels/chan_dahdi.c
 @@ -4649,6 +4649,8 @@ void dahdi_ec_enable(struct dahdi_pvt *p)
  		return;
@@ -31,16 +31,3 @@
  
  		if (res)
  			ast_log(LOG_WARNING, "Unable to disable echo cancellation on channel %d: %s\n", p->channel, strerror(errno));
-@@ -18147,8 +18152,10 @@ static int process_dahdi(struct dahdi_chan_conf *confp
- 				if ((varval = strchr(varname, '='))) {
- 					*varval++ = '\0';
- 					if ((tmpvar = ast_variable_new(varname, varval, ""))) {
--						tmpvar->next = confp->chan.vars;
--						confp->chan.vars = tmpvar;
-+						if (ast_variable_list_replace(&confp->chan.vars, tmpvar)) {
-+							tmpvar->next = confp->chan.vars;
-+							confp->chan.vars = tmpvar;
-+						}
- 					}
- 				}
- 			}
diff --git a/net/asterisk16/files/patch-channels__sip__include__sip.h b/net/asterisk16/files/patch-channels_sip_include_sip.h
index a5ed190fc7c5..d1668bf70598 100644
--- a/net/asterisk16/files/patch-channels__sip__include__sip.h
+++ b/net/asterisk16/files/patch-channels_sip_include_sip.h
@@ -1,4 +1,4 @@
---- channels/sip/include/sip.h.orig	2014-07-24 17:47:29 UTC
+--- channels/sip/include/sip.h.orig	2020-07-09 15:39:17 UTC
 +++ channels/sip/include/sip.h
 @@ -192,7 +192,7 @@
  #define DEFAULT_MOHINTERPRET   "default"  /*!< The default music class */
diff --git a/net/asterisk16/files/patch-configure b/net/asterisk16/files/patch-configure
index dcc4fd037873..423e14aad59a 100644
--- a/net/asterisk16/files/patch-configure
+++ b/net/asterisk16/files/patch-configure
@@ -1,4 +1,4 @@
---- configure.orig	2020-04-30 14:11:40 UTC
+--- configure.orig	2020-07-09 15:39:17 UTC
 +++ configure
 @@ -4687,8 +4687,6 @@ case "${host_os}" in
       ;;
@@ -9,7 +9,7 @@
       ;;
       openbsd*)
       ac_default_prefix=/usr/local
-@@ -20351,6 +20349,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
+@@ -20355,6 +20353,8 @@ $as_echo_n "checking for getifaddrs() support... " >&6
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -18,7 +18,7 @@
   #include <ifaddrs.h>
  int
  main ()
-@@ -29510,6 +29510,8 @@ fi
+@@ -29514,6 +29514,8 @@ fi
  
  for ver in 5.3 5.2 5.1; do
  
@@ -27,7 +27,7 @@
  if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no"; then
     pbxlibdir=""
     # if --with-LUA=DIR has been specified, use it.
-@@ -29524,13 +29526,13 @@ if test "x${PBX_LUA}" != "x1" -a "${USE_LUA}" != "no";
+@@ -29528,13 +29530,13 @@ 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`
@@ -44,7 +44,7 @@
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -29572,7 +29574,7 @@ fi
+@@ -29576,7 +29578,7 @@ fi
  
     # now check for the header.
     if test "${AST_LUA_FOUND}" = "yes"; then
@@ -53,7 +53,7 @@
        # if --with-LUA=DIR has been specified, use it.
        if test "x${LUA_DIR}" != "x"; then
           LUA_INCLUDE="-I${LUA_DIR}/include"
-@@ -29582,8 +29584,8 @@ fi
+@@ -29586,8 +29588,8 @@ fi
           # check for the header
           ast_ext_lib_check_saved_CPPFLAGS="${CPPFLAGS}"
           CPPFLAGS="${CPPFLAGS} ${LUA_INCLUDE}"
@@ -64,7 +64,7 @@
  if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
    LUA_HEADER_FOUND=1
  else
-@@ -29610,9 +29612,9 @@ fi
+@@ -29614,9 +29616,9 @@ fi
  
  	if test "x${PBX_LUA}" = "x1" ; then
  		if test x"${LUA_DIR}" = x; then
diff --git a/net/asterisk16/files/patch-contrib_Makefile b/net/asterisk16/files/patch-contrib_Makefile
index a0f23c3eef2e..dc38a639baad 100644
--- a/net/asterisk16/files/patch-contrib_Makefile
+++ b/net/asterisk16/files/patch-contrib_Makefile
@@ -1,4 +1,4 @@
---- contrib/Makefile.orig	2018-12-04 00:03:56 UTC
+--- contrib/Makefile.orig	2020-07-09 15:39:17 UTC
 +++ contrib/Makefile
 @@ -24,14 +24,14 @@ install:
  	$(INSTALL) -m 755 scripts/ast_logescalator "$(DESTDIR)$(ASTDATADIR)/scripts/ast_logescalator"
diff --git a/net/asterisk16/files/patch-main__Makefile b/net/asterisk16/files/patch-main_Makefile
index 21f82c0fa065..dd0dcda5ce7f 100644
--- a/net/asterisk16/files/patch-main__Makefile
+++ b/net/asterisk16/files/patch-main_Makefile
@@ -1,4 +1,4 @@
---- main/Makefile.orig	2018-08-08 16:02:31 UTC
+--- main/Makefile.orig	2020-07-09 15:39:17 UTC
 +++ main/Makefile
 @@ -80,9 +80,12 @@ endif
  
diff --git a/net/asterisk16/files/patch-main__asterisk.exports.in b/net/asterisk16/files/patch-main_asterisk.exports.in
index c2fe031398e2..23b2fde0de7a 100644
--- a/net/asterisk16/files/patch-main__asterisk.exports.in
+++ b/net/asterisk16/files/patch-main_asterisk.exports.in
@@ -1,6 +1,6 @@
---- main/asterisk.exports.in.orig	2018-08-08 16:02:31 UTC
+--- main/asterisk.exports.in.orig	2020-07-09 15:39:17 UTC
 +++ main/asterisk.exports.in
-@@ -63,6 +63,8 @@
+@@ -65,6 +65,8 @@
  
  		*/
  		LINKER_SYMBOL_PREFIX_IO_stdin_used;
diff --git a/net/asterisk16/files/patch-main__http.c b/net/asterisk16/files/patch-main_http.c
index db0d1afd44ef..555f3bb34887 100644
--- a/net/asterisk16/files/patch-main__http.c
+++ b/net/asterisk16/files/patch-main_http.c
@@ -1,6 +1,6 @@
---- main/http.c.orig	2017-12-20 20:39:39 UTC
+--- main/http.c.orig	2020-07-09 15:39:17 UTC
 +++ main/http.c
-@@ -2044,7 +2044,7 @@ static int __ast_http_load(int reload)
+@@ -2086,7 +2086,7 @@ static int __ast_http_load(int reload)
  	struct http_uri_redirect *redirect;
  	struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 };
  	uint32_t bindport = DEFAULT_PORT;
diff --git a/net/asterisk16/files/patch-main__lock.c b/net/asterisk16/files/patch-main_lock.c
index c1111fa8bbac..019735f7079f 100644
--- a/net/asterisk16/files/patch-main__lock.c
+++ b/net/asterisk16/files/patch-main_lock.c
@@ -1,6 +1,6 @@
---- main/lock.c.orig	2018-08-08 16:02:31 UTC
+--- main/lock.c.orig	2020-07-09 15:39:17 UTC
 +++ main/lock.c
-@@ -692,9 +692,6 @@ int __ast_rwlock_init(int tracking, const char *filena
+@@ -689,9 +689,6 @@ int __ast_rwlock_init(int tracking, const char *filena
  #endif /* DEBUG_THREADS */
  
  	pthread_rwlockattr_init(&attr);
diff --git a/net/asterisk16/files/patch-third-party_pjproject_Makefile b/net/asterisk16/files/patch-third-party_pjproject_Makefile
index 78c494326047..fc1b47d6e802 100644
--- a/net/asterisk16/files/patch-third-party_pjproject_Makefile
+++ b/net/asterisk16/files/patch-third-party_pjproject_Makefile
@@ -1,4 +1,4 @@
---- third-party/pjproject/Makefile.orig	2020-04-30 14:11:40 UTC
+--- third-party/pjproject/Makefile.orig	2020-07-09 15:39:17 UTC
 +++ third-party/pjproject/Makefile
 @@ -88,14 +88,10 @@ _all: $(TARGETS)
  
diff --git a/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules b/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules
index 0be34a5dce36..424b4f4a3740 100644
--- a/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules
+++ b/net/asterisk16/files/patch-third-party_pjproject_Makefile.rules
@@ -1,5 +1,14 @@
---- third-party/pjproject/Makefile.rules.orig	2020-03-12 14:44:05 UTC
+--- third-party/pjproject/Makefile.rules.orig	2020-07-09 15:39:17 UTC
 +++ third-party/pjproject/Makefile.rules
+@@ -7,7 +7,7 @@
+ # PACKAGE_URL ?= http://www.pjsip.org/release/$(PJPROJECT_VERSION)
+ 
+ PACKAGE_URL ?= https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/$(PJPROJECT_VERSION)
+-TARBALL_FILE = pjproject-$(PJPROJECT_VERSION).tar.bz2
++TARBALL_FILE = pjsip-pjproject-$(PJPROJECT_VERSION)_GH0.tar.gz
+ 
+ # PJPROJECT_CONFIGURE_OPTS could come from the command line or could be
+ # set/modified by configure.m4 if the build or host tuples aren't the same
 @@ -37,7 +37,7 @@ PJPROJECT_CONFIG_OPTS = $(PJPROJECT_CONFIGURE_OPTS) --
  	--disable-ipp \
  	--disable-libwebrtc \