Update to 1.2.22

	* channels/chan_skinny.c: Properly check for the length in the
	  skinny packet to prevent an invalid memcpy. (ASA-2007-016)

	* channels/iax2-parser.h, channels/chan_iax2.c,
	  channels/iax2-parser.c: Ensure that when encoding the contents of
	  an ast_frame into an iax_frame, that the size of the destination
	  buffer is known in the iax_frame so that code won't write past
	  the end of the allocated buffer when sending outgoing frames.
	  (ASA-2007-014)

	* channels/chan_iax2.c: After parsing information elements in IAX
	  frames, set the data length to zero, so that code later on does
	  not think it has data to copy. (ASA-2007-015)

	* res/res_musiconhold.c: Fix a couple potential minor memory leaks.
	  load_moh_classes() could return without destroying the loaded
	  configuration.

	* apps/app_chanspy.c: Fixed an issue where chanspy flags were
	  uninitialized if no options were passed.

	* res/res_musiconhold.c: Ensure that adding a user to the list of
	  users of a specific music on hold class is not done at the same
	  time as any of the other operations on this list to prevent list
	  corruption.

	* channels/chan_iax2.c: The function make_trunk() can fail and
	  return -1 instead of a valid new call number. Fix the uses of
	  this function to handle this instead of treating it as the new
	  call number. This would cause a deadlock and memory corruption.

	* channels/chan_agent.c: The cli command "agent logoff Agent/x
	  soft" did not work...at all. Now it does.

	* res/res_config_odbc.c: Make sure that the ESCAPE immediately
	  follows the condition that uses LIKE. This fixes realtime
	  extensions with ODBC.

	* apps/app_queue.c: Fix an issue where it was possible to have a
	  service level of over 100% Between the time recalc_holdtime and
	  update_queue was called, it was possible that the call could have
	  been hungup.

	* dns.c: Use res_ndestroy on systems that have it. Otherwise, use
	  res_nclose. This prevents a memleak on NetBSD - and possibly
	  others.

4 files changed, 20 insertions, 15 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 815b8ab1ed0..7bfdc86ec80 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.41 2007/07/11 14:28:46 mjl Exp $
+# $NetBSD: Makefile,v 1.42 2007/07/19 09:39:57 mjl Exp $
 
-DISTNAME=	asterisk-1.2.21.1
+DISTNAME=	asterisk-1.2.22
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases/
diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common
index 81311884fc9..59f0c5399b1 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.8 2006/12/20 11:34:55 mjl Exp $
+@comment $NetBSD: PLIST.common,v 1.9 2007/07/19 09:39:57 mjl Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -208,6 +208,7 @@ libdata/asterisk/keys/iaxtel.pub
 libdata/asterisk/mohmp3/fpm-calm-river.mp3
 libdata/asterisk/mohmp3/fpm-sunshine.mp3
 libdata/asterisk/mohmp3/fpm-world-mix.mp3
+libdata/asterisk/mohmp3/LICENSE
 libdata/asterisk/sounds/silence/1.gsm
 libdata/asterisk/sounds/silence/10.gsm
 libdata/asterisk/sounds/silence/2.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index c5aa3934629..9398562e5c0 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.28 2007/07/11 14:28:47 mjl Exp $
+$NetBSD: distinfo,v 1.29 2007/07/19 09:39:57 mjl Exp $
 
-SHA1 (asterisk-1.2.21.1.tar.gz) = 63eb9cbd35a6f500bee894472c3ee758e63fecd4
-RMD160 (asterisk-1.2.21.1.tar.gz) = adb839d290a7a89189ad342f5406c5f05634de58
-Size (asterisk-1.2.21.1.tar.gz) = 10638140 bytes
+SHA1 (asterisk-1.2.22.tar.gz) = 03f858d805f825b19f51b9a09ca98ca12f713c83
+RMD160 (asterisk-1.2.22.tar.gz) = 1eb1da93ecb614c4ad40775c22fa93784edd65e8
+Size (asterisk-1.2.22.tar.gz) = 10642597 bytes
 SHA1 (patch-aa) = e457617cb3fbec6a67971258af145cc25f0ca03e
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
-SHA1 (patch-ad) = e1da4d244c03db350e1e9b4315e8e2b947f4068c
+SHA1 (patch-ad) = 93a40eebdd2049cce2a976e54fcc3ea6a0548ebb
 SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57
 SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd
 SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922
diff --git a/comms/asterisk/patches/patch-ad b/comms/asterisk/patches/patch-ad
index 84f18b7d853..d7d2f81f3d9 100644
--- a/comms/asterisk/patches/patch-ad
+++ b/comms/asterisk/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
+$NetBSD: patch-ad,v 1.7 2007/07/19 09:39:57 mjl Exp $
 
---- channels/Makefile.orig	2007-03-26 12:21:56.000000000 +0200
-+++ channels/Makefile	2007-04-26 11:23:18.000000000 +0200
+--- channels/Makefile.orig	2007-07-11 19:15:11.000000000 +0200
++++ channels/Makefile	2007-07-19 11:17:12.000000000 +0200
 @@ -24,12 +24,13 @@
  endif
  
@@ -17,7 +17,7 @@ $NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
  endif
  
  ifeq (${OSARCH},Linux)
-@@ -76,43 +77,43 @@
+@@ -76,7 +77,7 @@
  endif
  
  ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
@@ -25,6 +25,10 @@ $NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
 +#  CHANNEL_LIBS+=chan_phone.so
  endif
  
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/compiler.h),)
+@@ -84,39 +85,39 @@
+ endif
+ 
  ifneq ($(wildcard h323/libchanh323.a),)
 -  CHANNEL_LIBS+=chan_h323.so
 +#  CHANNEL_LIBS+=chan_h323.so
@@ -73,7 +77,7 @@ $NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
  endif
  
  ifndef WITHOUT_ZAPTEL
-@@ -128,10 +129,10 @@
+@@ -132,10 +133,10 @@
  endif
  endif # WITHOUT_ZAPTEL
  
@@ -88,7 +92,7 @@ $NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
  
  CFLAGS+=-DCRYPTO
  
-@@ -143,9 +144,9 @@
+@@ -147,9 +148,9 @@
  
  ZAPDIR=/usr/lib
  
@@ -101,7 +105,7 @@ $NetBSD: patch-ad,v 1.6 2007/04/26 09:43:15 mjl Exp $
  
  ifndef OPENH323DIR
    OPENH323DIR=$(HOME)/openh323
-@@ -171,13 +172,13 @@
+@@ -175,13 +176,13 @@
    include .depend
  endif