Changes 1.2.10:

* Number of bug fixes
* New option to help to avoid a potential denial of service in IAX2 channel driver
* Support for TE407P and TE412P quad T1/E1 interface cards

4 files changed, 41 insertions, 18 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 7910a1d13db..74503238a81 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.29 2006/07/01 13:26:50 riz Exp $
+# $NetBSD: Makefile,v 1.30 2006/08/18 11:32:51 adam Exp $
 
-DISTNAME=	asterisk-1.2.9.1
+DISTNAME=	asterisk-1.2.10
 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/distinfo b/comms/asterisk/distinfo
index 881df8e3212..af375f691ca 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,13 +1,14 @@
-$NetBSD: distinfo,v 1.16 2006/07/01 13:26:50 riz Exp $
+$NetBSD: distinfo,v 1.17 2006/08/18 11:32:51 adam Exp $
 
-SHA1 (asterisk-1.2.9.1.tar.gz) = dbb3f84aa33856654bfc937dce853f524a5aa6d6
-RMD160 (asterisk-1.2.9.1.tar.gz) = d512d3560812bc267a4d372cc96f989e26d7042a
-Size (asterisk-1.2.9.1.tar.gz) = 10568287 bytes
-SHA1 (patch-aa) = 8bd803623f6bef2723c5a3ea670be1b5f8aa1077
+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 (patch-aa) = e457617cb3fbec6a67971258af145cc25f0ca03e
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
 SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601
 SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57
+SHA1 (patch-af) = 393bfbe218e843039fc9f4bc59a42ba1b9e896bd
 SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922
 SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3
 SHA1 (patch-aj) = 9111528ac9702040233308c655e5233120ee9bcf
diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa
index 6c3d8acda04..8ae58145191 100644
--- a/comms/asterisk/patches/patch-aa
+++ b/comms/asterisk/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
+$NetBSD: patch-aa,v 1.11 2006/08/18 11:32:51 adam Exp $
 
---- Makefile.orig	2006-04-30 14:27:56.000000000 +0000
+--- Makefile.orig	2006-06-29 21:23:18.000000000 +0200
 +++ Makefile
-@@ -46,7 +46,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
+@@ -47,7 +47,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
  #K6OPT  = -DK6OPT
  
  #Tell gcc to optimize the code
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
  endif
  
  #Overwite config files on "make samples"
-@@ -108,31 +107,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
+@@ -111,31 +110,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
  ifneq ($(OSARCH),SunOS)
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  endif
-@@ -225,10 +225,14 @@ ASTCFLAGS+=$(OPTIMIZE)
+@@ -231,10 +231,14 @@ ASTCFLAGS+=$(OPTIMIZE)
  ASTOBJ=-o asterisk
  
  ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -81,7 +81,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
  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)
  endif
-@@ -256,24 +260,24 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -262,24 +266,24 @@ ifeq ($(OSARCH),FreeBSD)
  
    # XXX FreeBSD paths
    PREFIX?=/usr/local
@@ -118,7 +118,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
    MPG123TARG=netbsd
  endif
  
-@@ -292,7 +296,7 @@ ifeq ($(findstring CYGWIN,$(OSARCH)),CYG
+@@ -301,7 +305,7 @@ ifeq ($(findstring CYGWIN,$(OSARCH)),CYG
    ASTOBJ=-shared -o asterisk.dll -Wl,--out-implib=libasterisk.dll.a -Wl,--export-all-symbols
    ASTLINK=
    LIBS+=-lpthread -lncurses -lm -lresolv
@@ -127,7 +127,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
    PROC=$(shell uname -m)
  endif
  
-@@ -369,7 +373,8 @@ ifeq ($(OSARCH),Darwin)
+@@ -382,7 +386,8 @@ ifeq ($(OSARCH),Darwin)
    AUDIO_LIBS=-framework CoreAudio
    ASTLINK=-Wl,-dynamic
    SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
@@ -137,7 +137,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
    ASTCFLAGS+=-DPOLLCOMPAT
  else
  #These are used for all but Darwin
-@@ -381,8 +386,12 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -394,8 +399,12 @@ ifeq ($(OSARCH),FreeBSD)
    LIBS+=-lcrypto
  endif
  
@@ -151,7 +151,16 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
  endif
  
  ifeq ($(OSARCH),OpenBSD)
-@@ -720,31 +729,31 @@ install: all datafiles bininstall instal
+@@ -642,7 +651,7 @@ bininstall: all
+ 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/tmp
+ 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/meetme
+ 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/monitor
+-	if [ -f asterisk ]; then $(INSTALL) -m 755 asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
++	if [ -f asterisk ]; then $(BSD_INSTALL_PROGRAM) asterisk $(DESTDIR)$(ASTSBINDIR)/; fi
+ 	if [ -f cygwin/asterisk.exe ]; then $(INSTALL) -m 755 cygwin/asterisk.exe $(DESTDIR)$(ASTSBINDIR)/; fi
+ 	if [ -f asterisk.dll ]; then $(INSTALL) -m 755 asterisk.dll $(DESTDIR)$(ASTSBINDIR)/; fi
+ 	$(LN) -sf asterisk $(DESTDIR)$(ASTSBINDIR)/rasterisk
+@@ -731,31 +740,31 @@ install: all datafiles bininstall instal
  upgrade: all bininstall
  
  adsi:
@@ -192,7 +201,7 @@ $NetBSD: patch-aa,v 1.10 2006/06/12 14:35:35 joerg Exp $
  		( \
  		echo "[directories]" ; \
  		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -761,7 +770,7 @@ samples: adsi
+@@ -772,7 +781,7 @@ samples: adsi
  		echo ";astctlowner = root" ; \
  		echo ";astctlgroup = apache" ; \
  		echo ";astctl = asterisk.ctl" ; \
diff --git a/comms/asterisk/patches/patch-af b/comms/asterisk/patches/patch-af
new file mode 100644
index 00000000000..835dee6e73f
--- /dev/null
+++ b/comms/asterisk/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.6 2006/08/18 11:32:51 adam Exp $
+
+--- utils/Makefile.orig	2006-08-18 11:45:54.000000000 +0200
++++ utils/Makefile
+@@ -40,7 +40,7 @@ all: depend $(TARGET)
+ install:
+ 	for x in $(TARGET); do \
+ 		if [ "$$x" != "none" ]; then \
+-			$(INSTALL) -m 755 $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
++			$(BSD_INSTALL_PROGRAM) $$x $(DESTDIR)$(ASTSBINDIR)/$$x; \
+ 		fi; \
+ 	done 
+