Update Asterisk to 13.7.2: this is mainly bug fixes with some minor

features and fixes for AST-2016-001, AST-2016-002, and AST-2016-003.
Also some pkglinting.

----- 13.7.2

The Asterisk Development Team has announced the release of Asterisk 13.7.2.

The release of Asterisk 13.7.2 resolves an issue reported by the
community and would have not been possible without your participation.
Thank you!

The following is the issue resolved in this release:

Bugs fixed in this release:
-----------------------------------
 * ASTERISK-25702 - PjSip realtime DB and Cache Errors since
      upgrade to asterisk-13.7.0 from asterisk-13.7.0-rc2 (Reported by
      Nic Colledge)

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13.7.2

Thank you for your continued support of Asterisk!

----- 13.7.1

The Asterisk Development Team has announced security releases for Certified
Asterisk 11.6 and 13.1 and Asterisk 11 and 13. The available security releases
are released as versions 11.6-cert12, 11.21.1, 13.1-cert3, and 13.7.1.

The release of these versions resolves the following security vulnerabilities:

* AST-2016-001: BEAST vulnerability in HTTP server

  The Asterisk HTTP server currently has a default configuration which allows
  the BEAST vulnerability to be exploited if the TLS functionality is enabled.
  This can allow a man-in-the-middle attack to decrypt data passing through it.

* AST-2016-002: File descriptor exhaustion in chan_sip

  Setting the sip.conf timert1 value to a value higher than 1245 can cause an
  integer overflow and result in large retransmit timeout times. These large
  timeout values hold system file descriptors hostage and can cause the system
  to run out of file descriptors.

* AST-2016-003: Remote crash vulnerability receiving UDPTL FAX data.

  If no UDPTL packets are lost there is no problem. However, a lost packet
  causes Asterisk to use the available error correcting redundancy packets. If
  those redundancy packets have zero length then Asterisk uses an uninitialized
  buffer pointer and length value which can cause invalid memory accesses later
  when the packet is copied.

For a full list of changes in the current releases, please see the ChangeLogs:

http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-13.7.1

The security advisories are available at:

 * http://downloads.asterisk.org/pub/security/AST-2016-001.pdf
 * http://downloads.asterisk.org/pub/security/AST-2016-002.pdf
 * http://downloads.asterisk.org/pub/security/AST-2016-003.pdf

Thank you for your continued support of Asterisk!

----- 13.7.0

The Asterisk Development Team has announced the release of Asterisk 13.7.0.

The release of Asterisk 13.7.0 resolves several issues reported by the
community and would have not been possible without your participation.
Thank you!

The following are the issues resolved in this release:

New Features made in this release:
-----------------------------------
 * ASTERISK-25419 - Dialplan Application for Integration of StatsD
      (Reported by Ashley Sanders)
 * ASTERISK-25549 - Confbridge: Add participant timeout option
      (Reported by Mark Michelson)
 * ASTERISK-24922 - ARI: Add the ability to intercept hold and
      raise an event (Reported by Matt Jordan)

Bugs fixed in this release:
-----------------------------------
 * ASTERISK-25689 - pjsip show contacts not working in Asterisk
      13.7rc2 (Reported by Marcelo Terres)
 * ASTERISK-25640 - pbx: Deadlock on features reload and state
      change hint. (Reported by Krzysztof Trempala)
 * ASTERISK-25664 - ast_format_cap_append_by_type leaks a reference
      (Reported by Corey Farrell)
 * ASTERISK-25601 - json: Audit reference usage and thread safety
      (Reported by Joshua Colp)
 * ASTERISK-25625 - res_sorcery_memory_cache: Add full backend
      caching (Reported by Joshua Colp)
 * ASTERISK-25615 - res_pjsip: Setting transport async_operations >
      1 causes segfault on tls transports (Reported by George Joseph)
 * ASTERISK-25364 - [patch]Issue a TCP connection(kernel) and
      thread of asterisk is not released (Reported by Hiroaki Komatsu)
 * ASTERISK-25619 - res_chan_stats not sending the correct
      information to StatsD (Reported by Tyler Cambron)
 * ASTERISK-25569 - app_meetme: Audio quality issues (Reported by
      Corey Farrell)
 * ASTERISK-25609 - [patch]Asterisk may crash when calling
      ast_channel_get_t38_state(c) (Reported by Filip Jenicek)
 * ASTERISK-24146 - [patch]No audio on WebRtc caller side when
      answer waiting time is more than ~7sec (Reported by Aleksei
      Kulakov)
 * ASTERISK-25599 - [patch] SLIN Resampling Codec only 80 msec
      (Reported by Alexander Traud)
 * ASTERISK-25616 - Warning with a Codec Module which supports PLC
      with FEC (Reported by Alexander Traud)
 * ASTERISK-25610 - Asterisk crash during "sip reload" (Reported by
      Dudás József)
 * ASTERISK-25608 - res_pjsip/contacts/statsd:  Lifecycle events
      aren't consistent (Reported by George Joseph)
 * ASTERISK-25584 - [patch] format-attribute module: VP8 missing
      (Reported by Alexander Traud)
 * ASTERISK-25583 - [patch] format-attribute module: RFC 7587 (Opus
      Codec) (Reported by Alexander Traud)
 * ASTERISK-25498 - Asterisk crashes when negotiating g729 without
      that module installed (Reported by Ben Langfeld)
 * ASTERISK-25595 - Unescaped : in messge sent to statsd (Reported
      by Niklas Larsson)
 * ASTERISK-25476 - chan_sip loses registrations after a while
      (Reported by Michael Keuter)
 * ASTERISK-25598 - res_pjsip:  Contact status messages are
      printing a hash instead of the uri (Reported by George Joseph)
 * ASTERISK-25600 - bridging: Inconsistency in BRIDGEPEER (Reported
      by Jonathan Rose)
 * ASTERISK-25582 - Testsuite: Reactor timeout error in
      tests/fax/pjsip/directmedia_reinvite_t38 (Reported by Matt
      Jordan)
 * ASTERISK-25593 - fastagi: record file closed after sending
      result (Reported by Kevin Harwell)
 * ASTERISK-25585 - [patch]rasterisk never hits most of main(), but
      it's assumed to (Reported by Walter Doekes)
 * ASTERISK-25590 - CLI Usage info for 'pjsip send notify'
      references incorrect config (Reported by Corey Farrell)
 * ASTERISK-25165 - Testsuite - Sorcery memory cache leaks
      (Reported by Corey Farrell)
 * ASTERISK-25575 - res_pjsip: Dynamic outbound registrations
      created via ARI are not loaded into memory on Asterisk
      start/restart (Reported by Matt Jordan)
 * ASTERISK-25545 - [patch] translation module gets cached not
      joint format (Reported by Alexander Traud)
 * ASTERISK-25573 - [patch] H.264 format attribute module: resets
      whole SDP (Reported by Alexander Traud)
 * ASTERISK-24958 - Forwarding loop detection inhibits certain
      desirable scenarios (Reported by Mark Michelson)
 * ASTERISK-25561 - app_queue.c line 6503 (try_calling): mutex
      'qe->chan' freed more times than we've locked! (Reported by Alec
      Davis)
 * ASTERISK-25552 - hashtab: Improve NULL tolerance (Reported by
      Joshua Colp)
 * ASTERISK-25160 - [patch] Opus Codec: SIP/SDP line fmtp missing
      when called internally (Reported by Alexander Traud)
 * ASTERISK-25535 - [patch] format creation on module load instead
      of cache (Reported by Alexander Traud)
 * ASTERISK-25449 - main/sched: Regression introduced by
      5c713fdf18f causes erroneous duplicate RTCP messages; other
      potential scheduling issues in chan_sip/chan_skinny (Reported by
      Matt Jordan)
 * ASTERISK-25546 - threadpool: Race condition between idle timeout
      and activation (Reported by Joshua Colp)
 * ASTERISK-25537 - [patch] format-attribute module: RFC or
      internal defaults? (Reported by Alexander Traud)
 * ASTERISK-25533 - [patch] buffer for ast_format_cap_get_names
      only 64 bytes (Reported by Alexander Traud)
 * ASTERISK-25373 -  add documentation for CALLERID(pres) and also
      the CONNECTEDLINE and REDIRECTING variants (Reported by Walter
      Doekes)
 * ASTERISK-25527 - Quirky xmldoc description wrapping (Reported by
      Walter Doekes)
 * ASTERISK-24779 - Passthrough OPUS codec not working with
      chan_pjsip (Reported by PowerPBX)
 * ASTERISK-25522 - ARI: Crash when creating channel via ARI
      originate with requesting channel (Reported by Matt Jordan)
 * ASTERISK-25434 - Compiler flags not reported in 'core show
      settings' despite usage during compilation (Reported by Rusty
      Newton)
 * ASTERISK-24106 - WebSockets Automatically decides what driver it
      will use  (Reported by Andrew Nagy)
 * ASTERISK-25513 - Crash: malloc failed with high load of
      subscriptions. (Reported by John Bigelow)
 * ASTERISK-25505 - res_pjsip_pubsub: Crash on off-nominal when UAS
      dialog can't be created (Reported by Joshua Colp)
 * ASTERISK-24543 - Asterisk 13 responds to SIP Invite with all
      possible codecs configured for peer as opposed to intersection
      of configured codecs and offered codecs (Reported by Taylor
      Hawkes)
 * ASTERISK-25494 - build:  GCC 5.1.x catches some new const, array
      bounds and missing paren issues (Reported by George Joseph)
 * ASTERISK-25485 - res_pjsip_outbound_registration: registration
      stops due to 400 response (Reported by Kevin Harwell)
 * ASTERISK-25486 - res_pjsip: Fix deadlock when validating URIs
      (Reported by Joshua Colp)
 * ASTERISK-7803 - [patch] Update the maximum packetization values
      in frame.c (Reported by dea)
 * ASTERISK-25484 - [patch] autoframing=yes has no effect (Reported
      by Alexander Traud)
 * ASTERISK-25461 - Nested dialplan #includes don't work as
      expected. (Reported by Richard Mudgett)
 * ASTERISK-25455 - Deadlock of PJSIP realtime over
      res_config_pgsql  (Reported by mdu113)
 * ASTERISK-25135 - [patch]RTP Timeout hangup cause code missing
      (Reported by Olle Johansson)
 * ASTERISK-25435 - Asterisk periodically hangs. UDP Recv-Q greatly
      exceeds zero. (Reported by Dmitriy Serov)
 * ASTERISK-25451 - Broken video - erased rtp marker bit (Reported
      by Stefan Engström)
 * ASTERISK-25400 - Hints broken when "CustomPresence" doesn't
      exist in AstDB (Reported by Andrew Nagy)
 * ASTERISK-25443 - [patch]IPv6 - Potential issue in via header
      parsing (Reported by ffs)
 * ASTERISK-25404 - segfault/crash in chan_pjsip_hangup ... at
      chan_pjsip.c (Reported by Chet Stevens)
 * ASTERISK-25391 - AMI GetConfigJSON returns invalid JSON
      (Reported by Bojan Nemčić)
 * ASTERISK-25441 - Deadlock in res_sorcery_memory_cache. (Reported
      by Richard Mudgett)
 * ASTERISK-25438 - res_rtp_asterisk: ICE role message even when
      ICE is not enabled (Reported by Joshua Colp)

Improvements made in this release:
-----------------------------------
 * ASTERISK-25618 - res_pjsip:  Check for readability of TLS files
      at startup (Reported by George Joseph)
 * ASTERISK-25572 - Endpoints: Add StatsD stats for Asterisk
      endpoints (Reported by Matt Jordan)
 * ASTERISK-25571 - PJSIP: Add StatsD stats for some common PJSIP
      objects (Reported by Matt Jordan)
 * ASTERISK-25518 - taskprocessor: Add high water mark (Reported by
      Jonathan Rose)
 * ASTERISK-25477 - pjsip show "command" like [criteria] (Reported
      by Bryant Zimmerman)
 * ASTERISK-24718 - [patch]Add inital support of "sanitize" to
      configure (Reported by Badalian Vyacheslav)

For a full list of changes in this release, please see the ChangeLog:

http://downloads.asterisk.org/pub/telephony/asterisk/ChangeLog-13.7.0

Thank you for your continued support of Asterisk!

5 files changed, 83 insertions, 63 deletions

diff --git a/comms/asterisk13/Makefile b/comms/asterisk13/Makefile
index abbba7bb96f..53b2fcad1a1 100644
--- a/comms/asterisk13/Makefile
+++ b/comms/asterisk13/Makefile
@@ -1,21 +1,23 @@
-# $NetBSD: Makefile,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+# $NetBSD: Makefile,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-13.6.0
-DIST_SUBDIR=	${PKGNAME_NOREV}
-DISTFILES=	${DEFAULT_DISTFILES}
-EXTRACT_ONLY=	${DISTNAME}.tar.gz
+DISTNAME=	asterisk-13.7.2
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://downloads.asterisk.org/pub/telephony/asterisk/ \
 		http://downloads.asterisk.org/pub/telephony/asterisk/old-releases/ \
 		http://downloads.asterisk.org/pub/telephony/sounds/releases/
+DIST_SUBDIR=	${PKGNAME_NOREV}
+DISTFILES=	${DEFAULT_DISTFILES}
 
-OWNER=		jnemeth@NetBSD.org
-HOMEPAGE=	http://www.asterisk.org/
 COMMENT=	The Asterisk Software PBX
 LICENSE=	gnu-gpl-v2
+
+EXTRACT_ONLY=	${DISTNAME}.tar.gz
+OWNER=		jnemeth@NetBSD.org
+HOMEPAGE=	http://www.asterisk.org/
+
 MAKE_JOBS_SAFE=	NO
 
 # known to have issues on i386, block the package until the bug is fixed
@@ -55,17 +57,17 @@ INSTALLATION_DIRS+=	${ASTDATADIR}/sounds/en ${ASTDATADIR}/moh
 
 BUILD_DEFS+=		VARBASE
 
-ASTERISK_USER?=		asterisk
-ASTERISK_GROUP?=	asterisk
-PKG_GROUPS=		${ASTERISK_GROUP}
-PKG_USERS=		${ASTERISK_USER}:${ASTERISK_GROUP}
+ASTERISK_USER?=			asterisk
+ASTERISK_GROUP?=		asterisk
+PKG_GROUPS=			${ASTERISK_GROUP}
+PKG_USERS=			${ASTERISK_USER}:${ASTERISK_GROUP}
 PKG_GECOS.${ASTERISK_USER}=	Asterisk PBX
-PKG_GROUPS_VARS=	ASTERISK_GROUP
-PKG_USERS_VARS=		ASTERISK_USER
-FILES_SUBST+=		ASTERISK_USER=${ASTERISK_USER}
-FILES_SUBST+=		ASTERISK_GROUP=${ASTERISK_GROUP}
-MESSAGE_SUBST+=		ASTERISK_USER=${ASTERISK_USER}
-MESSAGE_SUBST+=		ASTERISK_GROUP=${ASTERISK_GROUP}
+PKG_GROUPS_VARS=		ASTERISK_GROUP
+PKG_USERS_VARS=			ASTERISK_USER
+FILES_SUBST+=			ASTERISK_USER=${ASTERISK_USER}
+FILES_SUBST+=			ASTERISK_GROUP=${ASTERISK_GROUP}
+MESSAGE_SUBST+=			ASTERISK_USER=${ASTERISK_USER}
+MESSAGE_SUBST+=			ASTERISK_GROUP=${ASTERISK_GROUP}
 
 # Various path settings for Asterisk
 PKG_SYSCONFSUBDIR=	asterisk
@@ -117,7 +119,7 @@ PLIST_VARS+=	mgcp
 # if the grep fails
 NOSIGPIPE!=	${GREP} SO_NOSIGPIPE /usr/include/sys/socket.h || echo ""
 .if ${NOSIGPIPE} != ""
-PLIST.mgcp= yes
+PLIST.mgcp=	yes
 .endif
 
 .include "options.mk"
diff --git a/comms/asterisk13/PLIST b/comms/asterisk13/PLIST
index c54c0ac5e7b..3e85da319e2 100644
--- a/comms/asterisk13/PLIST
+++ b/comms/asterisk13/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -348,6 +348,7 @@ lib/asterisk/modules/func_frame_trace.so
 lib/asterisk/modules/func_global.so
 lib/asterisk/modules/func_groupcount.so
 lib/asterisk/modules/func_hangupcause.so
+lib/asterisk/modules/func_holdintercept.so
 lib/asterisk/modules/func_iconv.so
 lib/asterisk/modules/func_jitterbuffer.so
 lib/asterisk/modules/func_lock.so
@@ -414,6 +415,7 @@ lib/asterisk/modules/res_format_attr_h263.so
 lib/asterisk/modules/res_format_attr_h264.so
 lib/asterisk/modules/res_format_attr_opus.so
 lib/asterisk/modules/res_format_attr_silk.so
+lib/asterisk/modules/res_format_attr_vp8.so
 lib/asterisk/modules/res_hep.so
 lib/asterisk/modules/res_hep_rtcp.so
 lib/asterisk/modules/res_http_websocket.so
diff --git a/comms/asterisk13/distinfo b/comms/asterisk13/distinfo
index 9657b8f6401..756366eccd9 100644
--- a/comms/asterisk13/distinfo
+++ b/comms/asterisk13/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.2 2015/12/05 23:42:44 jnemeth Exp $
+$NetBSD: distinfo,v 1.3 2016/02/07 09:13:34 jnemeth Exp $
 
-SHA1 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = 320d3b83f6d4641db76c957738b21a7b8eec938b
-RMD160 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = c6cdb801c65f3539d16c6db1e10bd75e6807684e
-SHA512 (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = e6ba627d3bdeb8bba75d7b109012d08a8a3873cc63534bc140b5ba183bb1fe8125f6f746f6bdf046ae4751d9e9011dee4f7de91de44abfd7777a834525de178f
-Size (asterisk-13.6.0/asterisk-13.6.0.tar.gz) = 32146107 bytes
-SHA1 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
-RMD160 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
-SHA512 (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 3908fcb439fe7d08dc6cba45b7a6aeea9825299871332d30f60535957072521b2f3f60222a49689b6fe1f693f80e3605b91ce395d16e15b15c50025eb086c19b
-Size (asterisk-13.6.0/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
-SHA1 (patch-Makefile) = 27ec5836a8f07c226032d1a7e0ed3667e46b2406
+SHA1 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = a513947d71fd4c836a8a313da9e9a4f4eb813b89
+RMD160 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 9321bff9f9683adc6fd52a29e8722cba28a45512
+SHA512 (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 5a0cd2c83e8f3191105fc20f54eb7fbf2fcb015af1fcfd980221aa205fdaf288835c4b76093f15e2abff2b1672f46a383efc2a89b5ae8afdc92353d7fd91d693
+Size (asterisk-13.7.2/asterisk-13.7.2.tar.gz) = 32176731 bytes
+SHA1 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = fbb94494e31fc08eee8fdf2ce7d12eb274018050
+RMD160 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 53656a3d6771602504f220ad312093e3503e1150
+SHA512 (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 3908fcb439fe7d08dc6cba45b7a6aeea9825299871332d30f60535957072521b2f3f60222a49689b6fe1f693f80e3605b91ce395d16e15b15c50025eb086c19b
+Size (asterisk-13.7.2/asterisk-extra-sounds-en-gsm-1.4.15.tar.gz) = 4409969 bytes
+SHA1 (patch-Makefile) = 78c188c1873d70c2285cf2b7cf9e90052f51be69
 SHA1 (patch-addons_chan__ooh323.c) = 9cba619ced6a4449604faebeac33d91a23519c48
 SHA1 (patch-apps_app__dumpchan.c) = 127ac02bdc180ad2334cd095aa6e646feb6fba10
 SHA1 (patch-apps_app__followme.c) = c6a5790b5e9b34d07dbfdd66a58e2854c8c72695
@@ -43,7 +43,7 @@ SHA1 (patch-main_logger.c) = 321a52b3015af85ea13055953cec5a5d9da05ec8
 SHA1 (patch-main_manager.c) = 8cfdac2aed203573d1c426cea1131fca12b9cd9e
 SHA1 (patch-main_netsock.c) = 383952a5fd4e1cecf7d1fa304a897d72e52cdf8c
 SHA1 (patch-main_pbx.c) = a468fa724971a25c3d645d63aea6c889ebe7ede1
-SHA1 (patch-main_sched.c) = 6cb74d69cc873c2477d37e0cc72d939a78d3e6e3
+SHA1 (patch-main_sched.c) = 5fb08c75cb97398f4dd39cc2dd317190ca472f6c
 SHA1 (patch-main_stdtime_localtime.c) = 58910ae9012915d69b31db9b0b41b3f85ce34e36
 SHA1 (patch-main_test.c) = f38b370cdb5788304e02c71ef05d2130ead9de98
 SHA1 (patch-main_utils.c) = 4b4de6303e8b937fe591a64efcf4d65ef8c56b97
diff --git a/comms/asterisk13/patches/patch-Makefile b/comms/asterisk13/patches/patch-Makefile
index 92fc541e377..60c1f4be7c2 100644
--- a/comms/asterisk13/patches/patch-Makefile
+++ b/comms/asterisk13/patches/patch-Makefile
@@ -1,6 +1,6 @@
-$NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
+$NetBSD: patch-Makefile,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
 
---- Makefile.orig	2015-10-09 21:48:48.000000000 +0000
+--- Makefile.orig	2016-02-05 20:32:40.000000000 +0000
 +++ Makefile
 @@ -132,7 +132,7 @@ DEBUG=-g3
  
@@ -62,7 +62,28 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
  	"$(ASTSPOOLDIR)" "$(ASTSPOOLDIR)/dictate" "$(ASTSPOOLDIR)/meetme" \
  	"$(ASTSPOOLDIR)/monitor" "$(ASTSPOOLDIR)/system" "$(ASTSPOOLDIR)/tmp" \
  	"$(ASTSPOOLDIR)/voicemail" "$(ASTSPOOLDIR)/recording" \
-@@ -673,21 +671,21 @@ upgrade: bininstall
+@@ -682,7 +680,7 @@ upgrade: bininstall
+ #  (2) the extension to strip off
+ define INSTALL_CONFIGS
+ 	@for x in configs/$(1)/*$(2); do \
+-		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x $(2)`"; \
++		dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x $(2)`"; \
+ 		if [ -f "$${dst}" ]; then \
+ 			if [ "$(OVERWRITE)" = "y" ]; then \
+ 				if cmp -s "$${dst}" "$$x" ; then \
+@@ -711,24 +709,24 @@ define INSTALL_CONFIGS
+ 			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
+ 			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
+ 			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
+-			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
+-		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
+-		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
++			"$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
++		$(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
++		rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
+ 	fi
+ endef
+ 
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -81,27 +102,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
  	done
  
  samples: adsi
- 	@echo Installing other config files...
- 	@for x in configs/samples/*.sample; do \
--		dst="$(DESTDIR)$(ASTETCDIR)/`$(BASENAME) $$x .sample`" ;	\
-+		dst="$(DESTDIR)$(ASTEXAMPLEDIR)/`$(BASENAME) $$x .sample`" ;	\
- 		if [ -f "$${dst}" ]; then \
- 			if [ "$(OVERWRITE)" = "y" ]; then \
- 				if cmp -s "$${dst}" "$$x" ; then \
-@@ -716,9 +714,9 @@ samples: adsi
- 			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
- 			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
- 			-e 's|^astsbindir.*$$|astsbindir => $(ASTSBINDIR)|' \
--			"$(DESTDIR)$(ASTCONFPATH)" > "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
--		$(INSTALL) -m 644 "$(DESTDIR)$(ASTCONFPATH).tmp" "$(DESTDIR)$(ASTCONFPATH)" ; \
--		rm -f "$(DESTDIR)$(ASTCONFPATH).tmp" ; \
-+			"$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" > "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
-+		$(INSTALL) -m 644 "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf" ; \
-+		rm -f "$(DESTDIR)$(ASTEXAMPLEDIR)/asterisk.conf.tmp" ; \
- 	fi ; \
- 	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
- 	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -744,7 +742,7 @@ samples: adsi
+@@ -761,7 +759,7 @@ basic-pbx:
  webvmail:
  	@[ -d "$(DESTDIR)$(HTTP_DOCSDIR)/" ] || ( printf "http docs directory not found.\nUpdate assignment of variable HTTP_DOCSDIR in Makefile!\n" && exit 1 )
  	@[ -d "$(DESTDIR)$(HTTP_CGIDIR)" ] || ( printf "cgi-bin directory not found.\nUpdate assignment of variable HTTP_CGIDIR in Makefile!\n" && exit 1 )
@@ -110,7 +111,22 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -909,7 +907,7 @@ uninstall-all: _uninstall
+@@ -811,11 +809,11 @@ endif
+ endif
+ 
+ install-logrotate:
+-	if [ ! -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ]; then \
+-		$(INSTALL) -d "$(DESTDIR)$(ASTETCDIR)/../logrotate.d" ; \
++	if [ ! -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ]; then \
++		$(INSTALL) -d "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d" ; \
+ 	fi
+ 	sed 's#__LOGDIR__#$(ASTLOGDIR)#g' < contrib/scripts/asterisk.logrotate | sed 's#__SBINDIR__#$(ASTSBINDIR)#g' > contrib/scripts/asterisk.logrotate.tmp
+-	$(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTETCDIR)/../logrotate.d/asterisk"
++	$(INSTALL) -m 0644 contrib/scripts/asterisk.logrotate.tmp "$(DESTDIR)$(ASTEXAMPLEDIR)/../logrotate.d/asterisk"
+ 	rm -f contrib/scripts/asterisk.logrotate.tmp
+ 
+ config:
+@@ -926,7 +924,7 @@ uninstall-all: _uninstall
  	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
  	rm -rf "$(DESTDIR)$(ASTDATADIR)"
  	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -119,7 +135,7 @@ $NetBSD: patch-Makefile,v 1.1.1.1 2015/12/05 23:29:09 jnemeth Exp $
  	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
  
  menuconfig: menuselect
-@@ -994,6 +992,7 @@ else
+@@ -1011,6 +1009,7 @@ else
  endif
  
  .PHONY: menuselect
diff --git a/comms/asterisk13/patches/patch-main_sched.c b/comms/asterisk13/patches/patch-main_sched.c
index a763088a5a0..201fe1ad7aa 100644
--- a/comms/asterisk13/patches/patch-main_sched.c
+++ b/comms/asterisk13/patches/patch-main_sched.c
@@ -1,17 +1,17 @@
-$NetBSD: patch-main_sched.c,v 1.1.1.1 2015/12/05 23:29:10 jnemeth Exp $
+$NetBSD: patch-main_sched.c,v 1.2 2016/02/07 09:13:34 jnemeth Exp $
 
---- main/sched.c.orig	2015-10-09 21:48:48.000000000 +0000
+--- main/sched.c.orig	2016-02-05 20:32:40.000000000 +0000
 +++ main/sched.c
-@@ -450,7 +450,7 @@ static int sched_settime(struct timeval 
- {
- 	struct timeval now = ast_tvnow();
+@@ -468,7 +468,7 @@ static int sched_settime(struct timeval 
+ 		ast_assert(0);
+ 	}
  
 -	/*ast_debug(1, "TV -> %lu,%lu\n", tv->tv_sec, tv->tv_usec);*/
-+	/*ast_debug(1, "TV -> %jd,%jd\n", tv->tv_sec, tv->tv_usec);*/
++	/*ast_debug(1, "TV -> %jd,%lu\n", (intmax_t)tv->tv_sec, tv->tv_usec);*/
  	if (ast_tvzero(*t))	/* not supplied, default to now */
  		*t = now;
  	*t = ast_tvadd(*t, ast_samp2tv(when, 1000));
-@@ -678,11 +678,11 @@ void ast_sched_dump(struct ast_sched_con
+@@ -696,11 +696,11 @@ void ast_sched_dump(struct ast_sched_con
  		struct timeval delta;
  		q = ast_heap_peek(con->sched_heap, x);
  		delta = ast_tvsub(q->when, when);