Changes 1.2.8:

* Number of bug fixes, including IAX2 channel driver fixes.

4 files changed, 17 insertions, 56 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 4b7c3bb533c..de4a6ec7371 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.25 2006/04/23 00:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2006/05/31 18:43:15 adam Exp $
 
-DISTNAME=	asterisk-1.2.7.1
+DISTNAME=	asterisk-1.2.8
 CATEGORIES=	comms net audio
 MASTER_SITES=	http://ftp.digium.com/pub/asterisk/ \
 		http://ftp.digium.com/pub/asterisk/old-releases
@@ -23,7 +23,7 @@ INSTALL_TARGET=		install samples
 #PKG_USERS= 		${ASTERISK_USER}:${ASTERISK_GROUP}
 
 # Various path settings for Asterisk
-PKG_SYSCONFSUBDIR?=	asterisk
+PKG_SYSCONFSUBDIR=	asterisk
 ASTLIBDIR?=		${PREFIX}/lib/asterisk
 ASTVARLIBDIR?=		${PREFIX}/libdata/asterisk
 ASTETCDIR?=		${PKG_SYSCONFDIR}
diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo
index 6a83d416741..919fde458c4 100644
--- a/comms/asterisk/distinfo
+++ b/comms/asterisk/distinfo
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.13 2006/04/13 18:36:58 mjl Exp $
+$NetBSD: distinfo,v 1.14 2006/05/31 18:43:15 adam Exp $
 
-SHA1 (asterisk-1.2.7.1.tar.gz) = 070a5ca9aaac5fd11544955e4261d5f38b765911
-RMD160 (asterisk-1.2.7.1.tar.gz) = 28c1d5c3ac6db52d7d315f59d391a655b77338fd
-Size (asterisk-1.2.7.1.tar.gz) = 10554037 bytes
-SHA1 (patch-aa) = eacc0ecee06ab79f6fb1e6dfed009a0b514c8c5a
+SHA1 (asterisk-1.2.8.tar.gz) = 438d39803f092d827ef957651e5cc3e3a2253814
+RMD160 (asterisk-1.2.8.tar.gz) = 28040ff0f0a74cce577996e8f075e20dafc4bb31
+Size (asterisk-1.2.8.tar.gz) = 10567488 bytes
+SHA1 (patch-aa) = c422fa7784de14af8be30bafa8c2c9b60b0fc2ec
 SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79
 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127
 SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601
 SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57
-SHA1 (patch-af) = 1ece9dd83cdb68f2daa1dfd3bf53014f873def81
 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 69163f132fe..e0adf24db47 100644
--- a/comms/asterisk/patches/patch-aa
+++ b/comms/asterisk/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
+$NetBSD: patch-aa,v 1.9 2006/05/31 18:43:15 adam Exp $
 
---- Makefile.orig	2006-04-11 23:58:47.000000000 +0200
+--- Makefile.orig	2006-04-30 16:27:56.000000000 +0200
 +++ Makefile
 @@ -46,7 +46,6 @@ ifneq ($(findstring dont-optimize,$(MAKE
  #K6OPT  = -DK6OPT
@@ -65,7 +65,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
    MODULES_DIR=$(ASTLIBDIR)/modules
    AGI_DIR=$(ASTVARLIBDIR)/agi-bin
  endif
-@@ -226,7 +226,7 @@ ASTCFLAGS+=$(OPTIMIZE)
+@@ -225,7 +225,7 @@ ASTCFLAGS+=$(OPTIMIZE)
  ASTOBJ=-o asterisk
  
  ifeq ($(findstring BSD,$(OSARCH)),BSD)
@@ -74,7 +74,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
    ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib
  endif
  
-@@ -257,24 +257,24 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -256,24 +256,24 @@ ifeq ($(OSARCH),FreeBSD)
  
    # XXX FreeBSD paths
    PREFIX?=/usr/local
@@ -111,7 +111,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
    MPG123TARG=netbsd
  endif
  
-@@ -293,7 +293,7 @@ ifeq ($(findstring CYGWIN,$(OSARCH)),CYG
+@@ -292,7 +292,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
@@ -120,7 +120,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
    PROC=$(shell uname -m)
  endif
  
-@@ -370,7 +370,8 @@ ifeq ($(OSARCH),Darwin)
+@@ -369,7 +369,8 @@ ifeq ($(OSARCH),Darwin)
    AUDIO_LIBS=-framework CoreAudio
    ASTLINK=-Wl,-dynamic
    SOLINK=-dynamic -bundle -undefined suppress -force_flat_namespace
@@ -130,7 +130,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
    ASTCFLAGS+=-DPOLLCOMPAT
  else
  #These are used for all but Darwin
-@@ -382,8 +383,12 @@ ifeq ($(OSARCH),FreeBSD)
+@@ -381,8 +382,12 @@ ifeq ($(OSARCH),FreeBSD)
    LIBS+=-lcrypto
  endif
  
@@ -144,7 +144,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
  endif
  
  ifeq ($(OSARCH),OpenBSD)
-@@ -719,31 +724,31 @@ install: all datafiles bininstall
+@@ -720,31 +725,31 @@ install: all datafiles bininstall instal
  upgrade: all bininstall
  
  adsi:
@@ -185,7 +185,7 @@ $NetBSD: patch-aa,v 1.8 2006/04/13 08:47:06 adam Exp $
  		( \
  		echo "[directories]" ; \
  		echo "astetcdir => $(ASTETCDIR)" ; \
-@@ -760,7 +765,7 @@ samples: adsi
+@@ -761,7 +766,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
deleted file mode 100644
index 819601bf6c8..00000000000
--- a/comms/asterisk/patches/patch-af
+++ /dev/null
@@ -1,38 +0,0 @@
-$NetBSD: patch-af,v 1.4 2006/04/13 08:47:06 adam Exp $
-
---- 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)
--ifneq ($(shell uname -m),alpha)
--ifneq ($(shell uname -m),armv4l)
--ifneq (${PROC},sparc64)
--ifneq (${PROC},arm)
--ifneq (${PROC},ppc)
--ifneq (${PROC},ppc64)
--OPTIMIZE+=-march=$(PROC)
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--endif
--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.