From 42697baf6a4711434e4e84fa37faf6a53d42b8a8 Mon Sep 17 00:00:00 2001 From: adam Date: Thu, 13 Apr 2006 08:47:06 +0000 Subject: Changes 1.2.7: * Important bug fixes * SIP handling * MixMonitor call recording --- comms/asterisk/Makefile | 35 +++++++++++++++-------------------- comms/asterisk/PLIST.common | 3 +-- comms/asterisk/distinfo | 16 ++++++++-------- comms/asterisk/patches/patch-aa | 28 ++++++++++++++++++---------- comms/asterisk/patches/patch-ae | 15 ++++++++------- comms/asterisk/patches/patch-af | 13 +++++++------ comms/asterisk/patches/patch-ag | 11 ++++++----- 7 files changed, 63 insertions(+), 58 deletions(-) (limited to 'comms') diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile index 849714485d2..e5a06293d5d 100644 --- a/comms/asterisk/Makefile +++ b/comms/asterisk/Makefile @@ -1,8 +1,6 @@ -# $NetBSD: Makefile,v 1.22 2006/03/14 20:43:23 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2006/04/13 08:47:06 adam Exp $ -DISTNAME= asterisk-1.2.4 -# PKGREVISION= 1 -PKGREVISION= 1 +DISTNAME= asterisk-1.2.7 CATEGORIES= comms net audio MASTER_SITES= http://ftp.digium.com/pub/asterisk/ \ http://ftp.digium.com/pub/asterisk/old-releases @@ -16,8 +14,6 @@ COMMENT= The Asterisk Software PBX USE_TOOLS+= bison gmake perl:run REPLACE_PERL+= agi/agi-test.agi -# MANCOMPRESSED= yes - INSTALL_TARGET= install samples # Running as non-root will come later @@ -45,20 +41,19 @@ ASTEXAMPLEDIR?= ${PREFIX}/share/examples/asterisk SUBST_CLASSES+= asterisk SUBST_STAGE.asterisk= pre-configure SUBST_FILES.asterisk= Makefile configs/musiconhold.conf.sample -SUBST_SED.asterisk= \ - -e 's|/var/lib/asterisk|${ASTVARLIBDIR}|' \ - -e 's|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|' \ - -e 's|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|' \ - -e 's|^ *\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|' \ - -e 's|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|' \ - -e 's|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|' \ - -e 's|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|' \ - -e 's|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|' \ - -e 's|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|' \ - -e 's|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|' \ - -e 's|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|' \ - -e 's|^ *\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|' \ - -e 's|^ *\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|' +SUBST_SED.asterisk+= -e 's|/var/lib/asterisk|${ASTVARLIBDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTLIBDIR\)=.*|\1 = ${ASTLIBDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTVARLIBDIR\)=.*|\1 = ${ASTVARLIBDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTETCDIR\)=.*|\1 = ${ASTETCDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTSPOOLDIR\)=.*|\1 = ${ASTSPOOLDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTLOGDIR\)=.*|\1 = ${ASTLOGDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTHEADERDIR\)=.*|\1 = ${ASTHEADERDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTCONFPATH\)=.*|\1 = ${ASTCONFPATH}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTBINDIR\)=.*|\1 = ${ASTBINDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTSBINDIR\)=.*|\1 = ${ASTSBINDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTVARRUNDIR\)=.*|\1 = ${ASTVARRUNDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTMANDIR\)=.*|\1 = ${ASTMANDIR}|' +SUBST_SED.asterisk+= -e 's|^ *\(ASTEXAMPLEDIR\)=.*|\1 = ${ASTEXAMPLEDIR}|' .include "options.mk" diff --git a/comms/asterisk/PLIST.common b/comms/asterisk/PLIST.common index b227eed1369..9b98e767a07 100644 --- a/comms/asterisk/PLIST.common +++ b/comms/asterisk/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.5 2006/01/29 01:30:20 rillig Exp $ +@comment $NetBSD: PLIST.common,v 1.6 2006/04/13 08:47:06 adam Exp $ include/asterisk/acl.h include/asterisk/adsi.h include/asterisk/aes.h @@ -556,7 +556,6 @@ libdata/asterisk/sounds/vm-undeleted.gsm libdata/asterisk/sounds/vm-unknown-caller.gsm libdata/asterisk/sounds/vm-whichbox.gsm libdata/asterisk/sounds/vm-youhave.gsm -libdata/asterisk/sounds/voicemail man/man8/asterisk.8 man/man8/astgenkey.8 man/man8/autosupport.8 diff --git a/comms/asterisk/distinfo b/comms/asterisk/distinfo index 254c6e31ff6..a9e897d86db 100644 --- a/comms/asterisk/distinfo +++ b/comms/asterisk/distinfo @@ -1,15 +1,15 @@ -$NetBSD: distinfo,v 1.11 2006/02/01 01:45:29 mjl Exp $ +$NetBSD: distinfo,v 1.12 2006/04/13 08:47:06 adam Exp $ -SHA1 (asterisk-1.2.4.tar.gz) = 557528a0a3d2c05245d1ef3d280ed441635f1958 -RMD160 (asterisk-1.2.4.tar.gz) = 826351d12a9ffb13f81d4605d80bbc07d678f5b2 -Size (asterisk-1.2.4.tar.gz) = 10536366 bytes -SHA1 (patch-aa) = 8951b74a18d83863d728f2a6f0884087d24d6697 +SHA1 (asterisk-1.2.7.tar.gz) = 66af7ebfc55ae8cc7ff13bb94b5d99e34e02d4ca +RMD160 (asterisk-1.2.7.tar.gz) = 07944addac8a6867489d510fbd49513f319de0c9 +Size (asterisk-1.2.7.tar.gz) = 10553806 bytes +SHA1 (patch-aa) = eacc0ecee06ab79f6fb1e6dfed009a0b514c8c5a SHA1 (patch-ab) = 1bdae0ff206b63fe63373a307ecd23859c10cb79 SHA1 (patch-ac) = 4f783699c7d701030788646f8b961fa9245dc127 SHA1 (patch-ad) = bfc898732884063c6c300b15674e462793588601 -SHA1 (patch-ae) = 9b7b2ed60d79aab3e2653d97409067c17cd342b4 -SHA1 (patch-af) = 33c03a4ae531296b2b4e60713e33d7491fff504d -SHA1 (patch-ag) = 3e6ce8f463df94fe9cba8fa8dbe03eda408aa581 +SHA1 (patch-ae) = d3ff3a6e2340c53814d2e7ac97b798e9905a4c57 +SHA1 (patch-af) = 1ece9dd83cdb68f2daa1dfd3bf53014f873def81 +SHA1 (patch-ag) = 7adec0d05371f6ffa56e067770c04c8acec2d922 SHA1 (patch-ai) = 81c0ff8f8a273562a64ab7cfb301d578e18808e3 SHA1 (patch-aj) = 9111528ac9702040233308c655e5233120ee9bcf SHA1 (patch-ak) = 3027134258138ca9163d9569548c7d4faffb874f 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 -- cgit v1.2.3