Changes 1.2.7:

* Important bug fixes
* SIP handling
* MixMonitor call recording

4 files changed, 39 insertions, 28 deletions

diff --git a/comms/asterisk/patches/patch-aa b/comms/asterisk/patches/patch-aa
index 9910e59ab13..69163f132fe 100644
--- a/comms/asterisk/patches/patch-aa
+++ b/comms/asterisk/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
+$NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
 
---- Makefile.orig	2005-12-05 06:47:51.000000000 +0000
+--- Makefile.orig	2006-04-11 23:58:47.000000000 +0200
 +++ Makefile
-@@ -106,31 +106,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
+@@ -46,7 +46,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
+ #K6OPT  = -DK6OPT
+ 
+ #Tell gcc to optimize the code
+-OPTIMIZE+=-O6
+ endif
+ 
+ #Overwite config files on "make samples"
+@@ -108,31 +107,32 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
  BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE
  
  ifneq ($(OSARCH),SunOS)
@@ -57,7 +65,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  endif
-@@ -223,7 +224,7 @@ ASTCFLAGS+=$(OPTIMIZE)
+@@ -226,7 +226,7 @@ ASTCFLAGS+=$(OPTIMIZE)
  ASTOBJ=-o asterisk
  
  ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -66,7 +74,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
    ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
  endif
  
-@@ -254,24 +255,24 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -257,24 +257,24 @@ ifeq ($(OSARCH),FreeBSD)
  
    # XXX FreeBSD paths
    PREFIX?=/usr/local
@@ -103,7 +111,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
    MPG123TARG=netbsd
  endif
  
-@@ -290,7 +291,7 @@ ifeq ($(findstring CYGWIN,$(OSARCH)),CYG
+@@ -293,7 +293,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
@@ -112,7 +120,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
    PROC=$(shell uname -m)
  endif
  
-@@ -367,7 +368,8 @@ ifeq ($(OSARCH),Darwin)
+@@ -370,7 +370,8 @@ ifeq ($(OSARCH),Darwin)
    AUDIO_LIBS=-framework CoreAudio
    ASTLINK=-Wl,-dynamic
    SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
@@ -122,7 +130,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
    ASTCFLAGS+=-DPOLLCOMPAT
  else
  #These are used for all but Darwin
-@@ -379,8 +381,12 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -382,8 +383,12 @@ ifeq ($(OSARCH),FreeBSD)
    LIBS+=-lcrypto
  endif
  
@@ -136,7 +144,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
  endif
  
  ifeq ($(OSARCH),OpenBSD)
-@@ -718,31 +724,31 @@ install: all datafiles bininstall
+@@ -719,31 +724,31 @@ install: all datafiles bininstall
  upgrade: all bininstall
  
  adsi:
@@ -177,7 +185,7 @@ $NetBSD: patch-aa,v 1.7 2006/01/29 01:21:45 rillig Exp $
  		( \
  		echo "[directories]" ; \
  		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -759,7 +765,7 @@ samples: adsi
+@@ -760,7 +765,7 @@ samples: adsi
  		echo ";astctlowner = root" ; \
  		echo ";astctlgroup = apache" ; \
  		echo ";astctl = asterisk.ctl" ; \
diff --git a/comms/asterisk/patches/patch-ae b/comms/asterisk/patches/patch-ae
index 2a218da43df..14737b35ea5 100644
--- a/comms/asterisk/patches/patch-ae
+++ b/comms/asterisk/patches/patch-ae
@@ -1,7 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2006/01/13 20:32:38 riz Exp $
---- apps/Makefile.orig	2005-11-29 18:24:39.000000000 +0000
-+++ apps/Makefile	2006-01-02 00:58:23.000000000 +0000
-@@ -45,15 +45,17 @@
+$NetBSD: patch-ae,v 1.3 2006/04/13 08:47:06 adam Exp $
+
+--- apps/Makefile.orig	2006-02-09 03:31:21.000000000 +0100
++++ apps/Makefile
+@@ -45,15 +45,17 @@ APPS=app_dial.so app_playback.so app_voi
  #APPS+=app_rpt.so
  
  ifndef WITHOUT_ZAPTEL
@@ -21,12 +22,12 @@ $NetBSD: patch-ae,v 1.2 2006/01/13 20:32:38 riz Exp $
  ifeq ($(findstring BSD,${OSARCH}),BSD)
  CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
  endif
-@@ -103,10 +105,10 @@
+@@ -103,10 +105,10 @@ app_curl.so: app_curl.o
  	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} $(CURLLIBS)
  
  app_sql_postgres.o: app_sql_postgres.c
--	$(CC) -pipe -I/usr/local/pgsql/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
-+	$(CC) -pipe -I${PREFIX}/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
+-	$(CC) -pipe -I$(CROSS_COMPILE_TARGET)/usr/local/pgsql/include -I$(CROSS_COMPILE_TARGET)/usr/include/postgresql $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
++	$(CC) -pipe -I$(CROSS_COMPILE_TARGET)/${PREFIX}/include $(CFLAGS) -c -o app_sql_postgres.o app_sql_postgres.c
  
  app_sql_postgres.so: app_sql_postgres.o
 -	$(CC) $(SOLINK) -o $@ ${CYGSOLINK} $< ${CYGSOLIB} -L/usr/local/pgsql/lib -lpq
diff --git a/comms/asterisk/patches/patch-af b/comms/asterisk/patches/patch-af
index 73339b11ae7..819601bf6c8 100644
--- a/comms/asterisk/patches/patch-af
+++ b/comms/asterisk/patches/patch-af
@@ -1,14 +1,15 @@
-$NetBSD: patch-af,v 1.3 2006/01/13 20:32:38 riz Exp $
+$NetBSD: patch-af,v 1.4 2006/04/13 08:47:06 adam Exp $
 
---- codecs/gsm/Makefile.orig	2005-11-29 19:24:39.000000000 +0100
-+++ codecs/gsm/Makefile	2005-12-25 12:55:32.000000000 +0100
-@@ -37,32 +37,6 @@ WAV49	= -DWAV49
+--- codecs/gsm/Makefile.orig	2006-03-30 23:44:03.000000000 +0200
++++ codecs/gsm/Makefile
+@@ -37,33 +37,6 @@ WAV49	= -DWAV49
  ######### ppro's, etc, as well as the AMD K6 and K7.  The compile will
  ######### probably require gcc. 
  
 -ifneq (${OSARCH},Darwin)
 -ifneq (${OSARCH},SunOS)
 -ifneq (${PROC},x86_64)
+-ifneq (${PROC},amd64)
 -ifneq (${PROC},ultrasparc)
 -ifneq ($(shell uname -m),ppc)
 -ifneq ($(shell uname -m),ppc64)
@@ -31,7 +32,7 @@ $NetBSD: patch-af,v 1.3 2006/01/13 20:32:38 riz Exp $
 -endif
 -endif
 -endif
--
+-endif
+ 
  #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.
diff --git a/comms/asterisk/patches/patch-ag b/comms/asterisk/patches/patch-ag
index 85ab027b462..8413f505878 100644
--- a/comms/asterisk/patches/patch-ag
+++ b/comms/asterisk/patches/patch-ag
@@ -1,7 +1,8 @@
-$NetBSD: patch-ag,v 1.1 2005/05/24 14:29:06 riz Exp $
---- codecs/lpc10/Makefile.orig	2005-05-23 20:31:37.000000000 -0700
-+++ codecs/lpc10/Makefile	2005-05-23 20:32:34.000000000 -0700
-@@ -29,6 +29,7 @@
+$NetBSD: patch-ag,v 1.2 2006/04/13 08:47:06 adam Exp $
+
+--- codecs/lpc10/Makefile.orig	2005-11-29 19:24:39.000000000 +0100
++++ codecs/lpc10/Makefile
+@@ -32,6 +32,7 @@ endif
  ifneq ($(OSARCH),Darwin)
  ifneq ($(findstring BSD,${OSARCH}),BSD)
  ifneq ($(PROC),ppc)
@@ -9,7 +10,7 @@ $NetBSD: patch-ag,v 1.1 2005/05/24 14:29:06 riz Exp $
  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.
-@@ -46,6 +47,7 @@
+@@ -53,6 +54,7 @@ endif
  endif
  endif
  endif