Update to 1.8.13.0:

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

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

The following is a sample of the issues resolved in this release:

* --- Turn off warning message when bind address is set to any.

* --- Prevent overflow in calculation in ast_tvdiff_ms on 32-bit
      machines

* --- Make DAHDISendCallreroutingFacility wait 5 seconds for a reply
      before disconnecting the call.

* --- Fix recalled party B feature flags for a failed DTMF atxfer.

* --- Fix DTMF atxfer running h exten after the wrong bridge ends.

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

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

Thank you for your continued support of Asterisk!

7 files changed, 59 insertions, 79 deletions

diff --git a/comms/asterisk18/Makefile b/comms/asterisk18/Makefile
index 3ff594a48a8..1c96d802b21 100644
--- a/comms/asterisk18/Makefile
+++ b/comms/asterisk18/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2012/06/03 22:58:50 jnemeth Exp $
+# $NetBSD: Makefile,v 1.36 2012/06/05 00:15:34 jnemeth Exp $
 #
 # NOTE: when updating this package, there are two places that sound
 #       tarballs need to be checked
 
-DISTNAME=	asterisk-1.8.12.2
+DISTNAME=	asterisk-1.8.13.0
 DIST_SUBDIR=	${PKGNAME_NOREV}
 DISTFILES=	${DEFAULT_DISTFILES}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
@@ -175,10 +175,8 @@ CONF_FILES_PERMS+=	${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_U
 	queues.conf res_config_mysql.conf res_config_sqlite.conf	\
 	res_curl.conf res_fax.conf res_ldap.conf res_odbc.conf		\
 	res_pgsql.conf res_pktccops.conf res_snmp.conf			\
-	res_stun_monitor.conf rpt.conf rtp.conf say.conf sip.conf	\
-	sip_notify.conf skinny.conf sla.conf smdi.conf telcordia-1.adsi	\
-	udptl.conf unistim.conf usbradio.conf users.conf voicemail.conf	\
-	vpb.conf
+	res_stun_monitor.conf rtp.conf say.conf sip.conf udptl.conf	\
+	unistim.conf users.conf voicemail.conf vpb.conf
 CONF_FILES_PERMS+=		${ASTEXAMPLEDIR}/${f:Q} ${PKG_SYSCONFDIR}/${f:Q} ${ASTERISK_USER} ${ASTERISK_GROUP} 0644
 .endfor
 
diff --git a/comms/asterisk18/PLIST b/comms/asterisk18/PLIST
index 520562aac5f..7102f01aa31 100644
--- a/comms/asterisk18/PLIST
+++ b/comms/asterisk18/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2012/04/07 20:10:45 jnemeth Exp $
+@comment $NetBSD: PLIST,v 1.16 2012/06/05 00:15:34 jnemeth Exp $
 include/asterisk.h
 include/asterisk/_private.h
 include/asterisk/abstract_jb.h
@@ -2772,7 +2772,6 @@ share/examples/asterisk/res_pgsql.conf
 share/examples/asterisk/res_pktccops.conf
 share/examples/asterisk/res_snmp.conf
 share/examples/asterisk/res_stun_monitor.conf
-share/examples/asterisk/rpt.conf
 share/examples/asterisk/rtp.conf
 share/examples/asterisk/say.conf
 share/examples/asterisk/sip.conf
@@ -2783,7 +2782,6 @@ share/examples/asterisk/smdi.conf
 share/examples/asterisk/telcordia-1.adsi
 share/examples/asterisk/udptl.conf
 share/examples/asterisk/unistim.conf
-share/examples/asterisk/usbradio.conf
 share/examples/asterisk/users.conf
 share/examples/asterisk/voicemail.conf
 share/examples/asterisk/vpb.conf
diff --git a/comms/asterisk18/distinfo b/comms/asterisk18/distinfo
index 218fac53ead..e508c42c992 100644
--- a/comms/asterisk18/distinfo
+++ b/comms/asterisk18/distinfo
@@ -1,22 +1,21 @@
-$NetBSD: distinfo,v 1.30 2012/06/03 22:58:51 jnemeth Exp $
+$NetBSD: distinfo,v 1.31 2012/06/05 00:15:34 jnemeth Exp $
 
-SHA1 (asterisk-1.8.12.2/asterisk-1.8.12.2.tar.gz) = 90e43dcd7e8543e56cad03e8020f4df825c51f32
-RMD160 (asterisk-1.8.12.2/asterisk-1.8.12.2.tar.gz) = 346b67918bcc27199044168d683028cb8f81ff3b
-Size (asterisk-1.8.12.2/asterisk-1.8.12.2.tar.gz) = 25089098 bytes
-SHA1 (asterisk-1.8.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
-RMD160 (asterisk-1.8.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
-Size (asterisk-1.8.12.2/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
-SHA1 (patch-aa) = 496565e1e567c42ab6ba8f996c506f52cb9c8cfe
+SHA1 (asterisk-1.8.13.0/asterisk-1.8.13.0.tar.gz) = 9c45a16d99a5ea1d73e88b3556d9ee5b2afa594b
+RMD160 (asterisk-1.8.13.0/asterisk-1.8.13.0.tar.gz) = f1ce05e56a61e3b4215dd7b9fc3f8331bf70486b
+Size (asterisk-1.8.13.0/asterisk-1.8.13.0.tar.gz) = 25059587 bytes
+SHA1 (asterisk-1.8.13.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 8692fa61423b4769dc8bfa78faf9ed5ef7a259b9
+RMD160 (asterisk-1.8.13.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 68170c769d739d6b5b35b00f999ad6bbf876f9f6
+Size (asterisk-1.8.13.0/asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898 bytes
+SHA1 (patch-aa) = d8a67b0fd3781bb2d38b08563c69e490ab42a3e8
 SHA1 (patch-af) = 19786616bb606c38f769ec85f2e4d118573659ab
-SHA1 (patch-ag) = c71c61350cefbbe53eefa99245ca7712753f22d5
 SHA1 (patch-ai) = e92edab5c1ff323478f41d0b0783102ed527fe39
 SHA1 (patch-ak) = f8d5de733807bc6c0701886a3095901d6815a8bd
 SHA1 (patch-al) = b2a1134786d7c3b118ee8c47892f91dd2a4c783a
 SHA1 (patch-am) = 5f9cbf47ec1cb66758492a5ed1bf843006eae9b7
 SHA1 (patch-an) = 93a5df66fd6459fb76e9191dc3bf37b9ee5483b5
 SHA1 (patch-ao) = aa95464a8bd4a417f313541b465142d2e4c3ee47
-SHA1 (patch-ap) = ed22f6483191f429389c0d3198d30c63b96d4df6
-SHA1 (patch-aq) = 4b7a13e605fc5933d5d87b797a40479e206f42d3
+SHA1 (patch-ap) = 0e2015f6765ca1672d3335a5aba94cdff57136f5
+SHA1 (patch-aq) = 866706ae195a70020679e549c7304c1bcd1fa1b2
 SHA1 (patch-ar) = da8e614e68e476ce32c66fed5ee9dcb8c5f9a060
 SHA1 (patch-as) = b2e1aadf49f20506243ab40796f15aab12d95bad
 SHA1 (patch-at) = df318d7b492121ff6f766b0e6ea73415293e96f0
diff --git a/comms/asterisk18/patches/patch-aa b/comms/asterisk18/patches/patch-aa
index 8c2b0ce6513..ad89b11dc41 100644
--- a/comms/asterisk18/patches/patch-aa
+++ b/comms/asterisk18/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
+$NetBSD: patch-aa,v 1.5 2012/06/05 00:15:35 jnemeth Exp $
 
---- Makefile.orig	2011-08-25 19:00:55.000000000 +0000
+--- Makefile.orig	2012-04-12 14:26:06.000000000 +0000
 +++ Makefile
-@@ -126,7 +126,7 @@ DEBUG=-g3
+@@ -125,7 +125,7 @@ DEBUG=-g3
  
  # Asterisk.conf is located in ASTETCDIR or by using the -C flag
  # when starting Asterisk
@@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTDATADIR)/agi-bin
  
-@@ -216,10 +216,6 @@ ifeq ($(AST_DEVMODE),yes)
+@@ -182,10 +182,6 @@ ifeq ($(AST_DEVMODE),yes)
    _ASTCFLAGS+=-Wformat=2
  endif
  
@@ -19,10 +19,10 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
 -  _ASTCFLAGS+=-isystem /usr/local/include
 -endif
 -
- ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),)
-   ifneq ($(PROC),ultrasparc)
-     _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi)
-@@ -442,7 +438,6 @@ dist-clean: distclean
+ ifeq ($(OSARCH),FreeBSD)
+   # -V is understood by BSD Make, not by GNU make.
+   BSDVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk)
+@@ -395,7 +391,6 @@ dist-clean: distclean
  
  distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	@$(MAKE) -C menuselect dist-clean
@@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	rm -f menuselect.makeopts makeopts menuselect-tree menuselect.makedeps
  	rm -f makeopts.embed_rules
  	rm -f config.log config.status config.cache
-@@ -452,7 +447,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
+@@ -405,7 +400,7 @@ distclean: $(SUBDIRS_DIST_CLEAN) _clean
  	rm -rf doc/api
  	rm -f build_tools/menuselect-deps
  
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	CFLAGS="$(_ASTCFLAGS) $(ASTCFLAGS)" build_tools/mkpkgconfig "$(DESTDIR)$(libdir)/pkgconfig";
  # Should static HTTP be installed during make samples or even with its own target ala
  # webvoicemail?  There are portions here that *could* be customized but might also be
-@@ -517,7 +512,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $(
+@@ -470,7 +465,7 @@ OLDHEADERS=$(filter-out $(NEWHEADERS) $(
  installdirs:
  	$(INSTALL) -d "$(DESTDIR)$(MODULES_DIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSBINDIR)"
@@ -48,7 +48,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(ASTVARRUNDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/dictate"
-@@ -546,7 +541,7 @@ installdirs:
+@@ -500,7 +495,7 @@ installdirs:
  	$(INSTALL) -d "$(DESTDIR)$(AGI_DIR)"
  	$(INSTALL) -d "$(DESTDIR)$(ASTDBDIR)"
  
@@ -57,7 +57,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	$(INSTALL) -m 755 main/asterisk "$(DESTDIR)$(ASTSBINDIR)/"
  	$(LN) -sf asterisk "$(DESTDIR)$(ASTSBINDIR)/rasterisk"
  	$(INSTALL) -m 755 contrib/scripts/astgenkey "$(DESTDIR)$(ASTSBINDIR)/"
-@@ -638,21 +633,21 @@ upgrade: bininstall
+@@ -592,21 +587,21 @@ upgrade: bininstall
  # XXX why *.adsi is installed first ?
  adsi:
  	@echo Installing adsi config files...
@@ -83,7 +83,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  		if [ -f "$${dst}" ]; then \
  			if [ "$(OVERWRITE)" = "y" ]; then \
  				if cmp -s "$${dst}" "$$x" ; then \
-@@ -680,9 +675,9 @@ samples: adsi
+@@ -634,9 +629,9 @@ samples: adsi
  			-e 's|^astspooldir.*$$|astspooldir => $(ASTSPOOLDIR)|' \
  			-e 's|^astrundir.*$$|astrundir => $(ASTVARRUNDIR)|' \
  			-e 's|^astlogdir.*$$|astlogdir => $(ASTLOGDIR)|' \
@@ -96,7 +96,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	fi ; \
  	$(INSTALL) -d "$(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX"
  	build_tools/make_sample_voicemail "$(DESTDIR)/$(ASTDATADIR)" "$(DESTDIR)/$(ASTSPOOLDIR)"
-@@ -708,7 +703,7 @@ samples: adsi
+@@ -662,7 +657,7 @@ samples: adsi
  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 )
@@ -105,7 +105,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	$(INSTALL) -d "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk"
  	for x in images/*.gif; do \
  		$(INSTALL) -m 644 $$x "$(DESTDIR)$(HTTP_DOCSDIR)/_asterisk/"; \
-@@ -861,7 +856,7 @@ uninstall-all: _uninstall
+@@ -815,7 +810,7 @@ uninstall-all: _uninstall
  	rm -rf "$(DESTDIR)$(ASTVARLIBDIR)"
  	rm -rf "$(DESTDIR)$(ASTDATADIR)"
  	rm -rf "$(DESTDIR)$(ASTSPOOLDIR)"
@@ -114,7 +114,7 @@ $NetBSD: patch-aa,v 1.4 2011/10/11 03:12:55 jnemeth Exp $
  	rm -rf "$(DESTDIR)$(ASTLOGDIR)"
  
  menuconfig: menuselect
-@@ -930,6 +925,7 @@ menuselect-tree: $(foreach dir,$(filter-
+@@ -884,6 +879,7 @@ menuselect-tree: $(foreach dir,$(filter-
  	@echo "</menu>" >> $@
  
  .PHONY: menuselect
diff --git a/comms/asterisk18/patches/patch-ag b/comms/asterisk18/patches/patch-ag
deleted file mode 100644
index 74944cc7dec..00000000000
--- a/comms/asterisk18/patches/patch-ag
+++ /dev/null
@@ -1,34 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2010/12/15 03:22:45 jnemeth Exp $
-
---- codecs/lpc10/Makefile.orig	2007-10-29 15:24:44.000000000 -0700
-+++ codecs/lpc10/Makefile
-@@ -31,19 +31,21 @@ ASTCFLAGS:= $(ASTCFLAGS:-Werror=)
- ifneq ($(OSARCH),Darwin)
-  ifneq ($(findstring BSD,${OSARCH}),BSD)
-   ifneq ($(PROC),ppc)
--   ifneq ($(PROC),x86_64)
--    ifneq ($(PROC),alpha)
-+   ifneq ($(PROC),powerpc)
-+    ifneq ($(PROC),x86_64)
-+     ifneq ($(PROC),alpha)
- #The problem with sparc is the best stuff is in newer versions of gcc (post 3.0) only.
- #This works for even old (2.96) versions of gcc and provides a small boost either way.
- #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it.
- #So we go lowest common available by gcc and go a step down, still a step up from
- #the default as we now have a better instruction set to work with. - Belgarath
--     ifeq ($(PROC),ultrasparc)
--        CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
--     else
--      ifneq ($(OSARCH),SunOS)
--       ifneq  ($(OSARCH),arm)
--#        CFLAGS+= -march=$(PROC)
-+      ifeq ($(PROC),ultrasparc)
-+         CFLAGS+= -mtune=$(PROC) -mcpu=v8 -O3 -fomit-frame-pointer
-+      else
-+       ifneq ($(OSARCH),SunOS)
-+        ifneq  ($(OSARCH),arm)
-+#         CFLAGS+= -march=$(PROC)
-+        endif
-        endif
-       endif
-      endif
diff --git a/comms/asterisk18/patches/patch-ap b/comms/asterisk18/patches/patch-ap
index 857fd82c30b..9b20156509b 100644
--- a/comms/asterisk18/patches/patch-ap
+++ b/comms/asterisk18/patches/patch-ap
@@ -1,10 +1,20 @@
-$NetBSD: patch-ap,v 1.2 2011/01/29 22:50:32 jnemeth Exp $
+$NetBSD: patch-ap,v 1.3 2012/06/05 00:15:35 jnemeth Exp $
 
-# Reported upstream as https://issues.asterisk.org/view.php?id=18705
+# sys/atomic.h reported upstream as
+#     https://issues.asterisk.org/view.php?id=18705
 
---- configure.ac.orig	2010-11-09 20:33:05.000000000 +0000
+--- configure.ac.orig	2012-04-12 14:26:06.000000000 +0000
 +++ configure.ac
-@@ -981,6 +981,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
+@@ -992,7 +992,7 @@ if $(${CC} -march=native -S -o /dev/null
+ 	fi
+ else
+ 	AC_MSG_RESULT(no)
+-	AST_NATIVE_ARCH=
++	AST_NATIVE_ARCH=0
+ fi
+ AC_SUBST(AST_NATIVE_ARCH)
+ 
+@@ -1072,6 +1072,9 @@ AST_C_DEFINE_CHECK([IP_MTU_DISCOVER], [I
  AC_CHECK_HEADER([libkern/OSAtomic.h],
                  [AC_DEFINE_UNQUOTED([HAVE_OSX_ATOMICS], 1, [Define to 1 if OSX atomic operations are supported.])])
  
diff --git a/comms/asterisk18/patches/patch-aq b/comms/asterisk18/patches/patch-aq
index 85ab599e8cd..446bd4c46ab 100644
--- a/comms/asterisk18/patches/patch-aq
+++ b/comms/asterisk18/patches/patch-aq
@@ -1,8 +1,17 @@
-$NetBSD: patch-aq,v 1.10 2012/05/06 05:40:50 jnemeth Exp $
+$NetBSD: patch-aq,v 1.11 2012/06/05 00:15:35 jnemeth Exp $
 
---- configure.orig	2012-03-27 14:32:40.000000000 +0000
+--- configure.orig	2012-04-12 14:26:06.000000000 +0000
 +++ configure
-@@ -17094,6 +17094,146 @@ fi
+@@ -16652,7 +16652,7 @@ $as_echo "user CFLAGS present" >&6; }
+ else
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+-	AST_NATIVE_ARCH=
++	AST_NATIVE_ARCH=0
+ fi
+ 
+ 
+@@ -17112,6 +17112,146 @@ fi
  
  
  
@@ -149,7 +158,7 @@ $NetBSD: patch-aq,v 1.10 2012/05/06 05:40:50 jnemeth Exp $
  # The cast to long int works around a bug in the HP C Compiler
  # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
  # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'.
-@@ -18219,6 +18359,8 @@ $as_echo_n "checking if \"struct ifaddrs
+@@ -18226,6 +18366,8 @@ $as_echo_n "checking if \"struct ifaddrs
  
  	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
@@ -158,7 +167,7 @@ $NetBSD: patch-aq,v 1.10 2012/05/06 05:40:50 jnemeth Exp $
   #include <ifaddrs.h>
  int
  main ()
-@@ -29288,10 +29430,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
+@@ -29216,10 +29358,10 @@ if test "x$ac_cv_file__sbin_launchd" = x
  
  $as_echo "#define HAVE_SBIN_LAUNCHD 1" >>confdefs.h