Update to asterisk 1.2.12

Asterisk 1.2.11 includes a number of bug fixes, along with an update
to the chan_misdn driver for mISDN devices.
Asterisk 1.2.12 includes a number of bug fixes, including fixes for
two regressions that occurred in the 1.2.11 release. Specifically,
the AGI 'GET VARIABLE' command has now gone back to its previous
behavior, and CDR records now reflect the CallerID number instead
of ANI in the situations that this was the case in earlier 1.2 releases.

4 files changed, 41 insertions, 60 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 74503238a81..0344d78a68e 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2006/08/18 11:32:51 adam Exp $
+# $NetBSD: Makefile,v 1.31 2006/09/13 09:08:55 mjl Exp $
 
-DISTNAME=	asterisk-1.2.10
+DISTNAME=	asterisk-1.2.12
 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 9b98e767a07..db9e0e8af69 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.6 2006/04/13 08:47:06 adam Exp $
+@comment $NetBSD: PLIST.common,v 1.7 2006/09/13 09:08:55 mjl Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -357,6 +357,7 @@ libdata/asterisk/sounds/dir-intro.gsm
 libdata/asterisk/sounds/dir-nomatch.gsm
 libdata/asterisk/sounds/dir-nomore.gsm
 libdata/asterisk/sounds/hello-world.gsm
+libdata/asterisk/sounds/hours.gsm
 libdata/asterisk/sounds/invalid.gsm
 libdata/asterisk/sounds/letters/a.gsm
 libdata/asterisk/sounds/letters/at.gsm
@@ -394,6 +395,7 @@ libdata/asterisk/sounds/letters/x.gsm
 libdata/asterisk/sounds/letters/y.gsm
 libdata/asterisk/sounds/letters/z.gsm
 libdata/asterisk/sounds/letters/zed.gsm
+libdata/asterisk/sounds/minutes.gsm
 libdata/asterisk/sounds/pbx-invalid.gsm
 libdata/asterisk/sounds/pbx-invalidpark.gsm
 libdata/asterisk/sounds/pbx-transfer.gsm
@@ -443,6 +445,7 @@ libdata/asterisk/sounds/queue-thankyou.gsm
 libdata/asterisk/sounds/queue-thereare.gsm
 libdata/asterisk/sounds/queue-youarenext.gsm
 libdata/asterisk/sounds/screen-callee-options.gsm
+libdata/asterisk/sounds/seconds.gsm
 libdata/asterisk/sounds/spy-agent.gsm
 libdata/asterisk/sounds/spy-h323.gsm
 libdata/asterisk/sounds/spy-iax.gsm
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index af375f691ca..0c1efc11c31 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.17 2006/08/18 11:32:51 adam Exp $
+$NetBSD: distinfo,v 1.18 2006/09/13 09:08:55 mjl Exp $
 
-SHA1 (asterisk-1.2.10.tar.gz) = e714edce1fba1296fc90d3d69e152bb32f5f5454
-RMD160 (asterisk-1.2.10.tar.gz) = 22bb39d36adb99d23eed3b213703b8155bffca31
-Size (asterisk-1.2.10.tar.gz) = 10573308 bytes
+SHA1 (asterisk-1.2.12.tar.gz) = 10ed8f3ea5d304c7c2e64bb7efc955832a21916a
+RMD160 (asterisk-1.2.12.tar.gz) = c5df15fe0cef775bb011475e053ed06ca9fd2ec1
+Size (asterisk-1.2.12.tar.gz) = 10575163 bytes
 SHA1 (patch-aa) = e457617cb3fbec6a67971258af145cc25f0ca03e
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
-SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601
+SHA1 (patch-ad) = a4f2d40f7c3e5ece4a2965f4c8f578d07184d54f
 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 7bc21647bb3..f6ccc5ddee4 100644
--- a/comms/asterisk/patches/patch-ad
+++ b/comms/asterisk/patches/patch-ad
@@ -1,7 +1,5 @@
-$NetBSD: patch-ad,v 1.3 2006/01/18 11:39:54 mjl Exp $
-
---- channels/Makefile.orig	2005-12-15 11:52:30.000000000 +0100
-+++ channels/Makefile	2006-01-18 12:13:57.000000000 +0100
+--- channels/Makefile.orig	2006-08-17 23:57:19.000000000 +0200
++++ channels/Makefile	2006-09-13 10:46:23.000000000 +0200
 @@ -22,12 +22,13 @@
  endif
  
@@ -17,77 +15,57 @@ $NetBSD: patch-ad,v 1.3 2006/01/18 11:39:54 mjl Exp $
  endif
  
  ifeq (${OSARCH},Linux)
-@@ -73,41 +74,41 @@
-   SOLINK+=-lrt
+@@ -74,39 +75,39 @@
  endif
  
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
 -  CHANNEL_LIBS+=chan_phone.so
--endif
--
--ifneq ($(wildcard h323/libchanh323.a),)
--  CHANNEL_LIBS+=chan_h323.so
--endif
--
--ifneq ($(wildcard misdn/chan_misdn_lib.a),)
--  CHANNEL_LIBS+=chan_misdn.so
--  CFLAGS+=-Imisdn 
--endif
-+# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/ixjuser.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/ixjuser.h),)
 +#   CHANNEL_LIBS+=chan_phone.so
-+# endif
-+
-+# ifneq ($(wildcard h323/libchanh323.a),)
+ endif
+ 
+ ifneq ($(wildcard h323/libchanh323.a),)
+-  CHANNEL_LIBS+=chan_h323.so
 +#   CHANNEL_LIBS+=chan_h323.so
-+# endif
-+
-+# ifneq ($(wildcard misdn/chan_misdn_lib.a),)
+ endif
+ 
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/mISDNuser/mISDNlib.h),)
+-  CHANNEL_LIBS+=chan_misdn.so
+-  CFLAGS+=-Imisdn  
 +#   CHANNEL_LIBS+=chan_misdn.so
-+#   CFLAGS+=-Imisdn 
-+# endif
++#   CFLAGS+=-Imisdn  
+ endif
  
  CFLAGS+=-Wno-missing-prototypes -Wno-missing-declarations
  
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
 -  CHANNEL_LIBS+=chan_alsa.so
--endif
--
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
++#   CHANNEL_LIBS+=chan_alsa.so
+ endif
+ 
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
 -  CFLAGS+=-DZAPATA_PRI
 -  ZAPPRI=-lpri
--endif
--
--ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
--  CFLAGS+=-DZAPATA_R2
--  ZAPR2=-lmfcr2
--endif
-+# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/alsa/asoundlib.h),)
-+#   CHANNEL_LIBS+=chan_alsa.so
-+# endif
-+
-+# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libpri.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libpri.so.1),)
 +#   CFLAGS+=-DZAPATA_PRI
 +#   ZAPPRI=-lpri
-+# endif
-+
-+# ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
+ endif
+ 
+ ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/lib/libmfcr2.so.1)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/lib/libmfcr2.so.1),)
+-  CFLAGS+=-DZAPATA_R2
+-  ZAPR2=-lmfcr2
 +#   CFLAGS+=-DZAPATA_R2
 +#   ZAPR2=-lmfcr2
-+# endif
+ endif
  
  ALSA_SRC=chan_alsa.c
  
--ifneq ($(wildcard alsa-monitor.h),)
+ ifneq ($(wildcard alsa-monitor.h),)
 -  CFLAGS+=-DALSA_MONITOR
 -  ALSA_SRC+=alsa-monitor.h
--endif
-+# ifneq ($(wildcard alsa-monitor.h),)
-+#   CFLAGS+=-DALSA_MONITOR
-+#   ALSA_SRC+=alsa-monitor.h
-+# endif
++#  CFLAGS+=-DALSA_MONITOR
++#  ALSA_SRC+=alsa-monitor.h
+ endif
  
  ifndef WITHOUT_ZAPTEL
- ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/linux/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/zaptel.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/pkg/include/zaptel.h),)
 @@ -122,10 +123,10 @@
  endif
  endif # WITHOUT_ZAPTEL