Changes 1.0.9:

 -- fix bug in callerid matching in the dialplan that was introduced in 1.0.8

Changes 1.0.8:
 -- chan_zap
    -- Asterisk will now also look in the regular context for the fax extension
       while executing a macro.  Previously, for this to work, the fax extension
       would have to be included in the macro definition.
    -- On some systems, ALERTING will be sent after PROCEEDING, so code has been
       added to account for this case.
    -- If no extension is specified on an overlap call, the 's' extension will
       be used.
 -- chan_sip
    -- We no longer send a "to" tag on "100 Trying" messages, as it is
       inappropriate to do so.
    -- We now respond correctly to an invite for T.38 with a "488 Not acceptable
       here"
    -- We now discard saved tags on 401/407 responses in case the provider we're
       talking to tries to pull a dirty trick on us and change it.
    -- rtptimeout options will now be correctly set on a peer basis rather than
       only global
 -- chan_mgcp
    -- Fixed setting of accountcode
    -- Fixed where *67 to block callerid only worked for first call
 -- chan_agent
    -- We now will not pass audio until the agent has acked the call if the
       configuration
       is set up for the agent to do so.
 -- chan_alsa
    -- Fixed problems with the unloading of this module
 -- res_agi
    -- A fix has been added to prevent calls from being hung up when more than
       one call is executing an AGI script calling the GET DATA command.
    -- AGI scripts will now continue to run even if a file was not found with
       the GET DATA command.
    -- When calling SAY NUMBER with a number like 09, we will now say "nine"
       instead of "zero"
 -- app_dial
    -- There was a problem where text frames would not be forwarded before the
       channel has been answered.
 -- app_disa
    -- Fixed the timeout used when no password is set
 -- app_queue
    -- Distinctive ring has been fixed to work for queue members
  -- rtp
    -- Fixed a logic error when setting the "rtpchecksums" option
 -- say.c
    -- A problem has been fixed with saying the date in Spanish.
 -- Makefile
    -- A line was missing for the autosupport script that caused "make rpm" to
       fail
 -- format_wav_gsm
    -- Fixed a problem with wav formatting that prevented files from being
       played in some media players
 -- pbx_spool
    -- Fixed if the last line of text in a file for the call spool did not
       contain a new line, it would not be processed
 -- logger
    -- Fixed the logger so that color escape sequences wouldn't be sent to the
       logs
 -- format_sln
    -- A lot of changes were made to correctly handle signed linear format on
       big endian machines

6 files changed, 48 insertions, 48 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 2e4b866e84b..3c9f54d6240 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,15 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2005/08/19 18:12:37 jlam Exp $
-#
+# $NetBSD: Makefile,v 1.6 2005/09/02 12:58:34 adam Exp $
 
-DISTNAME=		asterisk-1.0.7
-PKGREVISION=		1
-CATEGORIES=		comms net audio
-MASTER_SITES=		ftp://ftp.asterisk.org/pub/asterisk/ \
-			ftp://ftp.asterisk.org/pub/asterisk/old-releases/
+DISTNAME=	asterisk-1.0.9
+CATEGORIES=	comms net audio
+MASTER_SITES=	http://ftp.digium.com/pub/asterisk/
 
-MAINTAINER=		riz@NetBSD.org
-HOMEPAGE=		http://www.asterisk.org/
-COMMENT=		The Asterisk Software PBX
+MAINTAINER=	riz@NetBSD.org
+HOMEPAGE=	http://www.asterisk.org/
+COMMENT=	The Asterisk Software PBX
 
 USE_TOOLS+= 		bison gmake
 
diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common
index 9a688bb6606..54f7bfa6d2c 100644
--- a/comms/asterisk/PLIST.common
+++ b/comms/asterisk/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.2 2005/05/02 20:33:58 reed Exp $
+@comment $NetBSD: PLIST.common,v 1.3 2005/09/02 12:58:34 adam Exp $
 include/asterisk/acl.h
 include/asterisk/adsi.h
 include/asterisk/aes.h
@@ -270,6 +270,7 @@ libdata/asterisk/sounds/digits/h-8.gsm
 libdata/asterisk/sounds/digits/h-9.gsm
 libdata/asterisk/sounds/digits/hundred.gsm
 libdata/asterisk/sounds/digits/million.gsm
+libdata/asterisk/sounds/digits/minus.gsm
 libdata/asterisk/sounds/digits/mon-0.gsm
 libdata/asterisk/sounds/digits/mon-1.gsm
 libdata/asterisk/sounds/digits/mon-10.gsm
@@ -478,6 +479,7 @@ libdata/asterisk/sounds/voicemail
 man/man8/asterisk.8
 sbin/asterisk
 sbin/astgenkey
+sbin/autosupport
 sbin/safe_asterisk
 share/examples/asterisk/adsi.conf
 share/examples/asterisk/adtranvofr.conf
@@ -521,16 +523,3 @@ share/examples/asterisk/voicemail.conf
 share/examples/asterisk/vpb.conf
 share/examples/asterisk/zapata.conf
 share/examples/rc.d/asterisk
-@dirrm share/examples/asterisk
-@dirrm libdata/asterisk/sounds/phonetic
-@dirrm libdata/asterisk/sounds/letters
-@dirrm libdata/asterisk/sounds/digits
-@dirrm libdata/asterisk/sounds
-@dirrm libdata/asterisk/mohmp3
-@dirrm libdata/asterisk/keys
-@dirrm libdata/asterisk/images
-@dirrm libdata/asterisk/firmware/iax
-@dirrm libdata/asterisk/firmware
-@dirrm libdata/asterisk/agi-bin
-@dirrm libdata/asterisk
-@dirrm include/asterisk
diff --git a/comms/asterisk/PLIST.common_end b/comms/asterisk/PLIST.common_end
index 63a7ceed76d..98157931b26 100644
--- a/comms/asterisk/PLIST.common_end
+++ b/comms/asterisk/PLIST.common_end
@@ -1,4 +1,16 @@
-@comment $NetBSD: PLIST.common_end,v 1.1.1.1 2005/04/08 03:10:52 riz Exp $
+@comment $NetBSD: PLIST.common_end,v 1.2 2005/09/02 12:58:34 adam Exp $
+@dirrm share/examples/asterisk
+@dirrm libdata/asterisk/sounds/phonetic
+@dirrm libdata/asterisk/sounds/letters
+@dirrm libdata/asterisk/sounds/digits
+@dirrm libdata/asterisk/sounds
+@dirrm libdata/asterisk/mohmp3
+@dirrm libdata/asterisk/keys
+@dirrm libdata/asterisk/images
+@dirrm libdata/asterisk/firmware/iax
+@dirrm libdata/asterisk/firmware
+@dirrm libdata/asterisk/agi-bin
+@dirrm libdata/asterisk
 @dirrm lib/asterisk/modules
 @dirrm lib/asterisk
 @dirrm include/asterisk
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index d2b631b6ebe..2b20769fd19 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.3 2005/05/24 14:29:06 riz Exp $
+$NetBSD: distinfo,v 1.4 2005/09/02 12:58:34 adam Exp $
 
-SHA1 (asterisk-1.0.7.tar.gz) = 7e91d6771901c34f6bbd8e0bbc3ca15173654c87
-RMD160 (asterisk-1.0.7.tar.gz) = bb738f0e3d100314fa7497c9ee81f8a022e536bb
-Size (asterisk-1.0.7.tar.gz) = 9591705 bytes
-SHA1 (patch-aa) = 69800b21948b85386ea99fc2b421584d386d11fb
+SHA1 (asterisk-1.0.9.tar.gz) = 62edb29222e4a801893d1f23b73def8555ac2c47
+RMD160 (asterisk-1.0.9.tar.gz) = 2e48dc00a3c290cc6b418ab0aee42feb93d9e76a
+Size (asterisk-1.0.9.tar.gz) = 9604582 bytes
+SHA1 (patch-aa) = 6e5c979fd905da86d17f079d84183759efcca520
 SHA1 (patch-ab) = 435a76cd7bad98b0809fa47b5b79530767027aa9
 SHA1 (patch-ac) = e6aad8435be3c616112afec59b968c29721d98e3
 SHA1 (patch-ad) = c19da2acb25c8fe68882d222d4f5dcb1be75cf63
 SHA1 (patch-ae) = 9069d535ac150b1715694e45658540624d512583
-SHA1 (patch-af) = 1af2fb1140002745cf1f5540a7ffef8c054e8996
+SHA1 (patch-af) = 658aba06be8869403f37e5cb41b44934be585c7d
 SHA1 (patch-ag) = 3e6ce8f463df94fe9cba8fa8dbe03eda408aa581
diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa
index e0e389a44e0..abc016a6855 100644
--- a/comms/asterisk/patches/patch-aa
+++ b/comms/asterisk/patches/patch-aa
@@ -1,7 +1,8 @@
-$NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
---- Makefile.orig	2005-03-10 09:15:05.000000000 +0100
-+++ Makefile	2005-04-13 19:32:56.000000000 +0200
-@@ -42,7 +42,7 @@
+$NetBSD: patch-aa,v 1.3 2005/09/02 12:58:34 adam Exp $
+
+--- Makefile.orig	2005-04-26 14:30:23.000000000 +0000
++++ Makefile
+@@ -42,7 +42,7 @@ MPG123TARG=linux
  endif
  
  ifeq ($(findstring BSD,${OSARCH}),BSD)
@@ -10,7 +11,7 @@ $NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
  endif
  
  # Pentium Pro Optimize
-@@ -122,6 +122,7 @@
+@@ -122,6 +122,7 @@ ASTBINDIR=$(INSTALL_PREFIX)/usr/bin
  ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin
  ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run
  ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man
@@ -18,7 +19,7 @@ $NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
  
  MODULES_DIR=$(ASTLIBDIR)/modules
  AGI_DIR=$(ASTVARLIBDIR)/agi-bin
-@@ -148,7 +149,7 @@
+@@ -148,7 +149,7 @@ endif # FreeBSD
  
  ifeq (${OSARCH},NetBSD)
  CFLAGS+=-pthread
@@ -27,7 +28,7 @@ $NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
  MPG123TARG=netbsd
  endif
  
-@@ -159,8 +160,11 @@
+@@ -159,8 +160,11 @@ endif
  #Uncomment this to use the older DSP routines
  #CFLAGS+=-DOLD_DSP_ROUTINES
  
@@ -41,7 +42,7 @@ $NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
  
  LIBEDIT=editline/libedit.a
  
-@@ -200,7 +204,7 @@
+@@ -200,7 +204,7 @@ ifeq (${OSARCH},FreeBSD)
  LIBS+=-lcrypto
  endif
  ifeq (${OSARCH},NetBSD)
@@ -50,7 +51,7 @@ $NetBSD: patch-aa,v 1.2 2005/04/13 19:23:56 riz Exp $
  endif
  ifeq (${OSARCH},OpenBSD)
  LIBS=-lcrypto -lpthread -lm -lncurses
-@@ -448,29 +452,29 @@
+@@ -450,29 +454,29 @@ install: all datafiles bininstall
  upgrade: all bininstall
  
  adsi: all
diff --git a/comms/asterisk/patches/patch-af b/comms/asterisk/patches/patch-af
index e9d825b5bf5..d3845613ffc 100644
--- a/comms/asterisk/patches/patch-af
+++ b/comms/asterisk/patches/patch-af
@@ -1,15 +1,16 @@
-$NetBSD: patch-af,v 1.1 2005/05/24 14:29:06 riz Exp $
---- codecs/gsm/Makefile.orig	2005-05-23 20:29:10.000000000 -0700
-+++ codecs/gsm/Makefile	2005-05-23 20:29:48.000000000 -0700
-@@ -43,6 +43,7 @@
- ifneq ($(shell uname -m),ppc)
+$NetBSD: patch-af,v 1.2 2005/09/02 12:58:34 adam Exp $
+
+--- codecs/gsm/Makefile.orig	2005-06-21 14:27:28.000000000 +0000
++++ codecs/gsm/Makefile
+@@ -44,6 +44,7 @@ ifneq ($(shell uname -m),ppc)
  ifneq ($(shell uname -m),alpha)
+ ifneq ($(shell uname -m),armv4l)
  ifneq (${PROC},sparc64)
 +ifneq (${PROC},powerpc)
+ ifneq (${PROC},ppc)
+ ifneq (${PROC},ppc64)
  OPTIMIZE+=-march=$(PROC)
- endif
- endif
-@@ -50,6 +51,7 @@
+@@ -56,6 +57,7 @@ endif
  endif
  endif
  endif