On 2006/01/18 11:26, Ian Darwin wrote: > 1.2.2 was just announced; can you update the port for that please?
Attached, but testing upgrade with modified /usr/local/sbin/safe_asterisk, I noticed this didn't work cleanly (the file is intended to be changed by the user). I wonder if there's a clean way to handle this. The only method that came to mind is to patch the Makefile to install this file into share/examples rather than sbin and using @sample sbin/safe_asterisk, does that seem an acceptable method?
Index: Makefile =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/Makefile,v retrieving revision 1.5 diff -u -p -r1.5 Makefile --- Makefile 15 Aug 2005 17:36:06 -0000 1.5 +++ Makefile 22 Jan 2006 17:48:10 -0000 @@ -1,10 +1,9 @@ # $OpenBSD: Makefile,v 1.5 2005/08/15 17:36:06 jolan Exp $ COMMENT= "open source PBX" -DISTNAME= asterisk-1.0.9 +DISTNAME= asterisk-1.2.2 CATEGORIES= telephony -MASTER_SITES= http://www.asterisk.org/html/downloads/ \ - ftp://ftp.asterisk.org/pub/telephony/asterisk/ +MASTER_SITES= ftp://ftp.digium.com/pub/asterisk/ HOMEPAGE= http://www.asterisk.org/ @@ -20,7 +19,7 @@ USE_GMAKE= Yes BUILD_DEPENDS= :bison-*:devel/bison -MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' +MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' MAKEFLAGS+=-DWITHOUT_ZAPTEL post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/asterisk Index: distinfo =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/distinfo,v retrieving revision 1.4 diff -u -p -r1.4 distinfo --- distinfo 15 Aug 2005 17:36:06 -0000 1.4 +++ distinfo 22 Jan 2006 17:55:01 -0000 @@ -1,4 +1,4 @@ -MD5 (asterisk-1.0.9.tar.gz) = 0d7f1c680ae53a739f26a069ef8b580a -RMD160 (asterisk-1.0.9.tar.gz) = 2e48dc00a3c290cc6b418ab0aee42feb93d9e76a -SHA1 (asterisk-1.0.9.tar.gz) = 62edb29222e4a801893d1f23b73def8555ac2c47 -SIZE (asterisk-1.0.9.tar.gz) = 9604582 +MD5 (asterisk-1.2.2.tar.gz) = 628653f76a8f062709875e93d18859c6 +RMD160 (asterisk-1.2.2.tar.gz) = c185cc28fc81b92e378133a6fe8f987dec1dbb5c +SHA1 (asterisk-1.2.2.tar.gz) = 0bd7a734da337ebc505350d48e521a5ce82fa996 +SIZE (asterisk-1.2.2.tar.gz) = 10532437 Index: patches/patch-Makefile =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/patches/patch-Makefile,v retrieving revision 1.4 diff -u -p -r1.4 patch-Makefile --- patches/patch-Makefile 15 Aug 2005 17:36:07 -0000 1.4 +++ patches/patch-Makefile 16 Jan 2006 21:43:11 -0000 @@ -1,115 +1,141 @@ -$OpenBSD: patch-Makefile,v 1.4 2005/08/15 17:36:07 jolan Exp $ ---- Makefile.orig Tue Apr 26 09:30:23 2005 -+++ Makefile Sun Aug 14 21:15:32 2005 -@@ -20,6 +20,7 @@ OSARCH=$(shell uname -s) - - ifeq (${OSARCH},Linux) - PROC=$(shell uname -m) -+ifneq (${OSARCH},OpenBSD) - ifeq ($(PROC),x86_64) - # You must have GCC 3.4 to use k8, otherwise use athlon - PROC=k8 -@@ -40,6 +41,7 @@ endif - - MPG123TARG=linux - endif -+endif - - ifeq ($(findstring BSD,${OSARCH}),BSD) - PROC=$(shell uname -m) -@@ -63,10 +65,14 @@ PWD=$(shell pwd) +--- Makefile.orig Mon Jan 16 13:48:02 2006 ++++ Makefile Mon Jan 16 13:52:25 2006 +@@ -44,8 +44,12 @@ #K6OPT = -DK6OPT - #Tell gcc to optimize the asterisk's code -+ifneq (${OSARCH},OpenBSD) + #Tell gcc to optimize the code ++ifeq (${OSARCH},OpenBSD) ++OPTIMIZE+=-O2 ++else OPTIMIZE+=-O6 + endif +endif - #Include debug symbols in the executables (-g) and profiling info (-pg) -+ifneq (${OSARCH},OpenBSD) - DEBUG=-g #-pg -+endif - - # If you are running a radio application, define RADIO_RELAX so that the DTMF - # will be received more reliably -@@ -91,7 +97,11 @@ MALLOC_DEBUG = #-include $(PWD)/include/ + #Overwite config files on "make samples" + OVERWRITE=y +@@ -83,7 +87,11 @@ # Where to install asterisk after compiling # Default -> leave empty +ifeq (${OSARCH},OpenBSD) +INSTALL_PREFIX= ${TRUEPREFIX} +else - INSTALL_PREFIX= + INSTALL_PREFIX?= +endif # Staging directory # Files are copied here temporarily during the install process -@@ -111,31 +121,35 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY +@@ -105,7 +113,7 @@ # Don't use together with -DBUSYDETECT_TONEONLY BUSYDETECT+= #-DBUSYDETECT_COMPARE_TONE_AND_SILENCE --ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk --ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk --ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk --ASTSPOOLDIR=$(INSTALL_PREFIX)/var/spool/asterisk --ASTLOGDIR=$(INSTALL_PREFIX)/var/log/asterisk --ASTHEADERDIR=$(INSTALL_PREFIX)/usr/include/asterisk -+ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk -+ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk -+ASTETCDIR=${SYSCONFDIR}/asterisk -+ASTSPOOLDIR=/var/spool/asterisk -+ASTLOGDIR=/var/log/asterisk -+ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk - ASTCONFPATH=$(ASTETCDIR)/asterisk.conf --ASTBINDIR=$(INSTALL_PREFIX)/usr/bin --ASTSBINDIR=$(INSTALL_PREFIX)/usr/sbin --ASTVARRUNDIR=$(INSTALL_PREFIX)/var/run --ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man -+ASTBINDIR=$(INSTALL_PREFIX)/bin -+ASTSBINDIR=$(INSTALL_PREFIX)/sbin -+ASTVARRUNDIR=/var/db/asterisk -+ASTMANDIR=$(INSTALL_PREFIX)/man - - MODULES_DIR=$(ASTLIBDIR)/modules --AGI_DIR=$(ASTVARLIBDIR)/agi-bin -+AGI_DIR=/var/asterisk/agi-bin - - INCLUDE=-Iinclude -I../include --CFLAGS=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY -+CFLAGS+=-pipe -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations $(DEBUG) $(INCLUDE) -D_REENTRANT -D_GNU_SOURCE #-DMAKE_VALGRIND_HAPPY - CFLAGS+=$(OPTIMIZE) - -+ifneq (${OSARCH},OpenBSD) - ifneq ($(PROC),ultrasparc) - CFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) +-ifneq ($(OSARCH),SunOS) ++ifeq ($(OSARCH),Linux) + ASTLIBDIR=$(INSTALL_PREFIX)/usr/lib/asterisk + ASTVARLIBDIR=$(INSTALL_PREFIX)/var/lib/asterisk + ASTETCDIR=$(INSTALL_PREFIX)/etc/asterisk +@@ -119,7 +127,25 @@ + ASTMANDIR=$(INSTALL_PREFIX)/usr/share/man + MODULES_DIR=$(ASTLIBDIR)/modules + AGI_DIR=$(ASTVARLIBDIR)/agi-bin +-else ++endif ++# OpenBSD has its own packaging mechanism ++ifeq ($(OSARCH),OpenBSD) ++ ASTLIBDIR=$(INSTALL_PREFIX)/lib/asterisk ++ ASTVARLIBDIR=$(INSTALL_PREFIX)/share/asterisk ++ ASTETCDIR=${SYSCONFDIR}/asterisk ++ ASTSPOOLDIR=/var/spool/asterisk ++ ASTLOGDIR=/var/log/asterisk ++ ASTHEADERDIR=$(INSTALL_PREFIX)/include/asterisk ++ ASTCONFPATH=$(ASTETCDIR)/asterisk.conf ++ ASTBINDIR=$(INSTALL_PREFIX)/bin ++ ASTSBINDIR=$(INSTALL_PREFIX)/sbin ++ ASTVARRUNDIR=/var/db/asterisk ++ ASTMANDIR=$(INSTALL_PREFIX)/man ++ ++ MODULES_DIR=$(ASTLIBDIR)/modules ++ AGI_DIR=/var/asterisk/agi-bin ++endif ++ifeq ($(OSARCH),SunOS) + ASTLIBDIR=$(INSTALL_PREFIX)/opt/asterisk/lib + ASTVARLIBDIR=$(INSTALL_PREFIX)/var/opt/asterisk/lib + ASTETCDIR=$(INSTALL_PREFIX)/etc/opt/asterisk +@@ -160,6 +186,8 @@ + # The file, /etc/asterisk.makeopts will also be included, but can be overridden + # by the file in your home directory. + ++# OpenBSD wants repeatable builds ++ifneq ($(OSARCH),OpenBSD) + ifneq ($(wildcard /etc/asterisk.makeopts),) + include /etc/asterisk.makeopts + endif +@@ -167,6 +195,7 @@ + ifneq ($(wildcard ~/.asterisk.makeopts),) + include ~/.asterisk.makeopts endif +endif - CFLAGS+=$(shell if uname -m | grep -q ppc; then echo "-fsigned-char"; fi) -+ifneq (${OSARCH},OpenBSD) - CFLAGS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "-DOSP_SUPPORT -I/usr/include/osp" ; fi) -+endif - - ifeq (${OSARCH},FreeBSD) - OSVERSION=$(shell make -V OSVERSION -f /usr/share/mk/bsd.port.subdir.mk) -@@ -159,8 +173,10 @@ endif - #Uncomment this to use the older DSP routines - #CFLAGS+=-DOLD_DSP_ROUTINES - -+ifneq (${OSARCH},OpenBSD) - CFLAGS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) - CFLAGS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "-DZAPTEL_OPTIMIZATIONS"; fi) -+endif + ifeq ($(OSARCH),Linux) + ifeq ($(CROSS_COMPILE),) +@@ -209,6 +238,43 @@ + MPG123TARG=linux + endif - LIBEDIT=editline/libedit.a ++ifeq ($(OSARCH),OpenBSD) ++ ifeq ($(CROSS_COMPILE),) ++ PROC?=$(shell uname -m) ++ else ++ PROC=$(CROSS_PROC) ++ endif ++ ++ ifeq ($(PROC),x86_64) ++ # You must have GCC 3.4 to use k8, otherwise use athlon ++ #PROC=k8 ++ PROC=athlon ++ OPTIONS+=-m64 ++ endif ++ ++ # Initially copied from Linux case above... ++ ifeq ($(PROC),sparc64) ++ PROC=ultrasparc ++ OPTIONS+=$(shell if $(CC) -mtune=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mtune=$(PROC)"; fi) ++ OPTIONS+=$(shell if $(CC) -mcpu=v8 -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-mcpu=v8"; fi) ++ OPTIONS+=-fomit-frame-pointer ++ endif ++ ++ ifeq ($(PROC),arm) ++ # The Cirrus logic is the only heavily shipping arm processor with a real floating point unit ++ ifeq ($(SUB_PROC),maverick) ++ OPTIONS+=-fsigned-char -mcpu=ep9312 ++ else ++ ifeq ($(SUB_PROC),xscale) ++ OPTIONS+=-fsigned-char -msoft-float -mcpu=xscale ++ else ++ OPTIONS+=-fsigned-char -msoft-float ++ endif ++ endif ++ endif ++ MPG123TARG=linux ++endif ++ + PWD=$(shell pwd) + GREP=grep -@@ -222,17 +238,21 @@ ASTLINK=-Wl,-E - SOLINK=-shared -Xlinker -x +@@ -227,8 +293,10 @@ + ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include -L$(CROSS_COMPILE_TARGET)/usr/local/lib endif +-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) +ifneq (${OSARCH},OpenBSD) - CC=gcc -+endif ++ 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 + endif + + ifeq ($(PROC),ppc) +@@ -410,6 +478,7 @@ INSTALL=install _all: all @@ -117,38 +143,28 @@ $OpenBSD: patch-Makefile,v 1.4 2005/08/1 @echo " +--------- Asterisk Build Complete ---------+" @echo " + Asterisk has successfully been built, but +" @echo " + cannot be run before being installed by +" - @echo " + running: +" +@@ -417,6 +486,7 @@ @echo " + +" @echo " + $(MAKE) install +" -- @echo " +-------------------------------------------+" -+ @echo " +-------------------------------------------+" + @echo " +-------------------------------------------+" +endif - all: depend asterisk subdirs + all: cleantest depend asterisk subdirs -@@ -401,7 +421,8 @@ bininstall: all - mkdir -p $(DESTDIR)$(ASTMANDIR)/man8 - install -m 644 keys/iaxtel.pub $(DESTDIR)$(ASTVARLIBDIR)/keys - install -m 644 keys/freeworlddialup.pub $(DESTDIR)$(ASTVARLIBDIR)/keys -- install -m 644 asterisk.8.gz $(DESTDIR)$(ASTMANDIR)/man8 -+ zcat asterisk.8.gz > asterisk.8 -+ install -m 644 asterisk.8 $(DESTDIR)$(ASTMANDIR)/man8 - if [ -d contrib/firmware/iax ]; then \ - install -m 644 contrib/firmware/iax/iaxy.bin $(DESTDIR)$(ASTVARLIBDIR)/firmware/iax/iaxy.bin; \ - else \ -@@ -410,6 +431,7 @@ bininstall: all - ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/vm . ) +@@ -666,6 +736,8 @@ + fi ( cd $(DESTDIR)$(ASTVARLIBDIR)/sounds ; ln -s $(ASTSPOOLDIR)/voicemail . ) if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi ++# OpenBSD packaging has own message-at-actual-install-time +ifneq (${OSARCH},OpenBSD) @echo " +---- Asterisk Installation Complete -------+" @echo " + +" @echo " + YOU MUST READ THE SECURITY DOCUMENT +" -@@ -443,6 +465,7 @@ bininstall: all - @echo " + before doing a '$(MAKE) install'. +" - @echo " + +" +@@ -687,6 +759,7 @@ + @echo " + **Note** This requires that you have +" + @echo " + doxygen installed on your local system +" @echo " +-------------------------------------------+" +endif + @$(MAKE) -s oldmodcheck - - install: all datafiles bininstall + NEWMODS=$(notdir $(wildcard */*.so)) Index: patches/patch-aesopt_h =================================================================== RCS file: patches/patch-aesopt_h diff -N patches/patch-aesopt_h --- patches/patch-aesopt_h 26 Sep 2004 00:38:24 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-aesopt_h,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $ ---- aesopt.h.orig Tue Aug 31 08:32:11 2004 -+++ aesopt.h Thu Sep 23 16:07:38 2004 -@@ -149,8 +149,7 @@ - /* PLATFORM SPECIFIC INCLUDES */ - - #if defined( __OpenBSD__ ) --# include <machine/types.h> --# include <sys/endian.h> -+# include <sys/types.h> - #elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) - # include <sys/types.h> - # include <sys/endian.h> Index: patches/patch-apps_Makefile =================================================================== RCS file: patches/patch-apps_Makefile diff -N patches/patch-apps_Makefile --- patches/patch-apps_Makefile 26 Sep 2004 00:38:24 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,26 +0,0 @@ -$OpenBSD: patch-apps_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $ ---- apps/Makefile.orig Sun Aug 29 20:43:41 2004 -+++ apps/Makefile Thu Sep 23 16:46:19 2004 -@@ -39,18 +39,22 @@ endif - #APPS+=app_sql_odbc.so - #APPS+=app_rpt.so - -+ifneq (${OSARCH},OpenBSD) - APPS+=$(shell if [ -f /usr/include/linux/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/local/include/zaptel.h ]; then echo "app_zapras.so app_meetme.so app_flash.so app_zapbarge.so app_zapscan.so" ; fi) - APPS+=$(shell if [ -f /usr/include/osp/osp.h ]; then echo "app_osplookup.so" ; fi) -+endif - - CFLAGS+=-fPIC - -+ifneq (${OSARCH},OpenBSD) - ifeq ($(USE_POSTGRES_VM_INTERFACE),1) - CFLAGS+=-DUSEPOSTGRESVM - endif - - ifeq ($(USE_MYSQL_VM_INTERFACE),1) - CFLAGS+=-DUSEMYSQLVM -+endif - endif - - all: $(APPS) Index: patches/patch-apps_app_test_c =================================================================== RCS file: patches/patch-apps_app_test_c diff -N patches/patch-apps_app_test_c --- patches/patch-apps_app_test_c 1 May 2005 02:12:47 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,11 +0,0 @@ -$OpenBSD: patch-apps_app_test_c,v 1.2 2005/05/01 02:12:47 jcs Exp $ ---- apps/app_test.c.orig Tue Jan 4 23:41:24 2005 -+++ apps/app_test.c Sun Mar 20 21:32:37 2005 -@@ -13,6 +13,7 @@ - */ - - #include <sys/types.h> -+#include <sys/stat.h> - #include <asterisk/channel.h> - #include <asterisk/options.h> - #include <asterisk/module.h> Index: patches/patch-asterisk_c =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/patches/patch-asterisk_c,v retrieving revision 1.3 diff -u -p -r1.3 patch-asterisk_c --- patches/patch-asterisk_c 15 Aug 2005 17:36:07 -0000 1.3 +++ patches/patch-asterisk_c 16 Jan 2006 21:43:11 -0000 @@ -1,25 +1,25 @@ -$OpenBSD: patch-asterisk_c,v 1.3 2005/08/15 17:36:07 jolan Exp $ ---- asterisk.c.orig Sun May 15 22:04:58 2005 -+++ asterisk.c Sun Aug 14 21:11:29 2005 -@@ -193,7 +193,7 @@ int ast_safe_system(const char *s) - for (x=STDERR_FILENO + 1; x<4096;x++) { +$OpenBSD$ +--- asterisk.c.orig Tue Nov 29 13:24:39 2005 ++++ asterisk.c Wed Dec 28 13:18:17 2005 +@@ -433,7 +433,7 @@ int ast_safe_system(const char *s) + /* Close file descriptors and launch system command */ + for (x = STDERR_FILENO + 1; x < 4096; x++) close(x); - } -- res = execl("/bin/sh", "/bin/sh", "-c", s, NULL); -+ res = execl("/bin/sh", "/bin/sh", "-c", s, (void *)NULL); +- execl("/bin/sh", "/bin/sh", "-c", s, NULL); ++ execl("/bin/sh", "/bin/sh", "-c", s, (void*)NULL); exit(1); } else if (pid > 0) { for(;;) { -@@ -1580,7 +1580,7 @@ int main(int argc, char *argv[]) - sigset_t sigs; +@@ -1927,7 +1927,7 @@ int main(int argc, char *argv[]) int num; + int is_child_of_nonroot=0; char *buf; - char *runuser=NULL, *rungroup=NULL; + char *runuser = "_asterisk", *rungroup = "_asterisk"; - struct pollfd silly_macos[1]; /* Remember original args for restart */ -@@ -1693,6 +1693,8 @@ int main(int argc, char *argv[]) + if (argc > sizeof(_argv) / sizeof(_argv[0]) - 1) { +@@ -2065,6 +2065,8 @@ int main(int argc, char *argv[]) ast_log(LOG_WARNING, "Unable to disable core size resource limit: %s\n", strerror(errno)); } } Index: patches/patch-asterisk_h =================================================================== RCS file: patches/patch-asterisk_h diff -N patches/patch-asterisk_h --- patches/patch-asterisk_h 9 May 2005 16:50:05 -0000 1.2 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-asterisk_h,v 1.2 2005/05/09 16:50:05 jcs Exp $ ---- asterisk.h.orig Tue Sep 7 10:02:53 2004 -+++ asterisk.h Thu May 5 20:54:01 2005 -@@ -26,8 +26,8 @@ - #define AST_VAR_DIR ASTVARLIBDIR - #define AST_LOG_DIR ASTLOGDIR - #define AST_AGI_DIR ASTAGIDIR --#define AST_KEY_DIR ASTVARLIBDIR "/keys" --#define AST_DB ASTVARLIBDIR "/astdb" -+#define AST_KEY_DIR "/var/asterisk/keys" -+#define AST_DB "/var/asterisk/astdb/astdb" - #define AST_TMP_DIR ASTSPOOLDIR "/tmp" - - #define AST_CONFIG_FILE ASTCONFPATH Index: patches/patch-cdr_Makefile =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/patches/patch-cdr_Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-cdr_Makefile --- patches/patch-cdr_Makefile 26 Sep 2004 00:38:24 -0000 1.1.1.1 +++ patches/patch-cdr_Makefile 16 Jan 2006 21:43:11 -0000 @@ -1,14 +1,14 @@ -$OpenBSD: patch-cdr_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $ ---- cdr/Makefile.orig Tue Aug 31 11:33:00 2004 -+++ cdr/Makefile Thu Sep 23 16:44:54 2004 -@@ -29,26 +29,33 @@ endif +$OpenBSD$ +--- cdr/Makefile.orig Tue Nov 29 13:24:39 2005 ++++ cdr/Makefile Wed Dec 28 13:30:25 2005 +@@ -30,21 +30,26 @@ endif #A ultrasparc cpu is really v9 but the stock debian stable 3.0 gcc doesn.t support it. #So we go lowest common available by gcc and go a step down, still a step up from #the default as we now have a better instruction set to work with. - Belgarath +ifneq (${OSARCH},OpenBSD) ifeq ($(PROC),sparc64) - PROC=ultrasparc - CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 + PROC=ultrasparc + CFLAGS += -mtune=$(PROC) -O3 -pipe -fomit-frame-pointer -mcpu=v8 endif +endif @@ -16,37 +16,43 @@ $OpenBSD: patch-cdr_Makefile,v 1.1.1.1 2 # unixODBC stuff... # +ifneq (${OSARCH},OpenBSD) - MODS+=$(shell if [ -f "/usr/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) - MODS+=$(shell if [ -f "/usr/local/include/odbcinst.h" ]; then echo "cdr_odbc.so"; fi) + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/odbcinst.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/odbcinst.h),) + MODS+=cdr_odbc.so + endif +endif # # FreeTDS stuff... # +ifneq (${OSARCH},OpenBSD) - MODS+=$(shell if [ -f "/usr/include/tds.h" ]; then echo "cdr_tds.so"; fi) - MODS+=$(shell if [ -f "/usr/local/include/tds.h" ]; then echo "cdr_tds.so"; fi) + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/tds.h)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/tds.h),) + ifeq ($(shell grep -s TDS_VERSION_NO $(CROSS_COMPILE_TARGET)/usr/include/tdsver.h $(CROSS_COMPILE_TARGET)/usr/local/include/tdsver.h | grep -c 0.63),1) + CFLAGS += -DFREETDS_0_63 +@@ -57,13 +62,16 @@ ifneq ($(wildcard $(CROSS_COMPILE_TARGET + endif + MODS+=cdr_tds.so + endif +endif # # PGSQL stuff... Autoconf anyone?? # +ifneq (${OSARCH},OpenBSD) - MODS+=$(shell if [ -d /usr/local/pgsql/include ] || [ -d /usr/include/pgsql ] || [ -d /usr/local/include/pgsql ] || [ -d /opt/pgsql/include ] || [ -f /usr/include/libpq-fe.h ] ; then echo "cdr_pgsql.so"; fi) - CFLAGS+=$(shell if [ -d /usr/local/pgsql/include ]; then echo "-I/usr/local/pgsql/include"; fi) - CFLAGS+=$(shell if [ -d /usr/include/pgsql ]; then echo "-I/usr/include/pgsql"; fi) -@@ -62,11 +69,14 @@ MLFLAGS+=$(shell if [ -d /usr/local/pgsq - MLFLAGS+=$(shell if [ -d /usr/local/lib/pgsql ]; then echo "-L/usr/local/lib/pgsql"; fi) - MLFLAGS+=$(shell if [ -d /opt/pgsql/lib ]; then echo "-L/opt/pgsql/lib"; fi) - MLFLAGS+=$(shell if [ -f /usr/lib/libpq.so ]; then echo "-L/usr/lib"; fi) + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/postgresql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/pgsql)$(wildcard $(CROSS_COMPILE_TARGET)/opt/pgsql/include)$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/libpq-fe.h),) + MODS+=cdr_pgsql.so + endif +endif + MLFLAGS= + +@@ -103,8 +111,10 @@ endif # - # SQLIte stuff... + # SQLite stuff... # +ifneq (${OSARCH},OpenBSD) - MODS+=$(shell if [ -f "/usr/include/sqlite.h" ]; then echo "cdr_sqlite.so"; fi) + ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/include/sqlite.h),) + MODS+=cdr_sqlite.so +endif + endif all: depend $(MODS) - Index: patches/patch-codecs_Makefile =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/patches/patch-codecs_Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-codecs_Makefile --- patches/patch-codecs_Makefile 1 May 2005 02:12:47 -0000 1.2 +++ patches/patch-codecs_Makefile 16 Jan 2006 21:43:11 -0000 @@ -1,12 +1,19 @@ ---- codecs/Makefile.orig Wed Mar 30 13:33:49 2005 -+++ codecs/Makefile Wed Mar 30 13:32:50 2005 -@@ -19,7 +19,9 @@ - #MODG723=codec_g723_1.so codec_g723_1b.so - MODG723=$(shell [ -f g723.1/coder.c ] && echo "codec_g723_1.so") - MODG723+=$(shell [ -f g723.1b/coder2.c ] && echo "codec_g723_1b.so") +$OpenBSD$ +--- codecs/Makefile.orig Tue Nov 29 13:24:39 2005 ++++ codecs/Makefile Wed Dec 28 13:31:23 2005 +@@ -28,6 +28,7 @@ ifneq ($(wildcard g723.1b/coder2.c),) + LIBG723B=g723.1b/libg723b.a + endif + +ifneq (${OSARCH},OpenBSD) - MODSPEEX=$(shell [ -f /usr/include/speex.h ] || [ -f /usr/include/speex/speex.h ] || [ -f /usr/local/include/speex.h ] || [ -f /usr/local/include/speex/speex.h ] && echo "codec_speex.so") + UI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex.h) + UIS_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/include/speex/speex.h) + ULI_SPEEX=$(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/speex.h) +@@ -52,6 +53,7 @@ ifneq (${ULIS_SPEEX},) + CFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/speex + LIBSPEEX=-L$(CROSS_COMPILE_TARGET)/usr/local/lib + LIBSPEEX+=-lspeex -lm +endif - MODILBC=$(shell [ -f ilbc/iLBC_decode.h ] && echo "codec_ilbc.so") - CFLAGS+=-fPIC - CFLAGS+=$(shell [ -f /usr/local/include/speex.h ] && echo "-I/usr/local/include") + endif + + ifneq ($(wildcard ilbc/iLBC_decode.h),) Index: patches/patch-codecs_gsm_Makefile =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/patches/patch-codecs_gsm_Makefile,v retrieving revision 1.3 diff -u -p -r1.3 patch-codecs_gsm_Makefile --- patches/patch-codecs_gsm_Makefile 15 Aug 2005 17:36:07 -0000 1.3 +++ patches/patch-codecs_gsm_Makefile 16 Jan 2006 21:43:11 -0000 @@ -1,15 +1,15 @@ -$OpenBSD: patch-codecs_gsm_Makefile,v 1.3 2005/08/15 17:36:07 jolan Exp $ ---- codecs/gsm/Makefile.orig Tue Jun 21 09:27:28 2005 -+++ codecs/gsm/Makefile Sun Aug 14 21:11:29 2005 +$OpenBSD$ +--- codecs/gsm/Makefile.orig Tue Nov 29 13:24:39 2005 ++++ codecs/gsm/Makefile Wed Dec 28 13:32:56 2005 @@ -37,6 +37,7 @@ WAV49 = -DWAV49 ######### ppro's, etc, as well as the AMD K6 and K7. The compile will ######### probably require gcc. +ifneq (${OSARCH},OpenBSD) ifneq (${OSARCH},Darwin) + ifneq (${OSARCH},SunOS) ifneq (${PROC},x86_64) - ifneq (${PROC},ultrasparc) -@@ -56,14 +57,17 @@ endif +@@ -62,6 +63,7 @@ endif endif endif endif @@ -17,12 +17,12 @@ $OpenBSD: patch-codecs_gsm_Makefile,v 1. #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. +@@ -69,7 +71,9 @@ endif #So we go lowest common available by gcc and go a step down, still a step up from #the default as we now have a better instruction set to work with. - Belgarath -+ifneq (${OSARCH},OpenBSD) ifeq (${PROC},ultrasparc) - OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 -fomit-frame-pointer ++ifneq (${OSARCH},OpenBSD) + OPTIMIZE+=-mcpu=v8 -mtune=$(PROC) -O3 +endif endif Index: patches/patch-include_asterisk_frame_h =================================================================== RCS file: patches/patch-include_asterisk_frame_h diff -N patches/patch-include_asterisk_frame_h --- patches/patch-include_asterisk_frame_h 12 Jan 2006 21:44:20 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-include_asterisk_frame_h,v 1.1 2006/01/12 21:44:20 naddy Exp $ ---- include/asterisk/frame.h.orig Thu Jan 12 22:36:59 2006 -+++ include/asterisk/frame.h Thu Jan 12 22:37:12 2006 -@@ -30,9 +30,6 @@ extern "C" { - #ifdef __linux__ - #include <endian.h> - #elif defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__APPLE__) --#if defined(__OpenBSD__) --#include <machine/types.h> --#endif /* __OpenBSD__ */ - #include <machine/endian.h> - #define __BYTE_ORDER BYTE_ORDER - #define __LITTLE_ENDIAN LITTLE_ENDIAN Index: patches/patch-md5_c =================================================================== RCS file: patches/patch-md5_c diff -N patches/patch-md5_c --- patches/patch-md5_c 12 Jan 2006 21:44:21 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-md5_c,v 1.1 2006/01/12 21:44:21 naddy Exp $ ---- md5.c.orig Thu Jan 12 22:38:57 2006 -+++ md5.c Thu Jan 12 22:39:18 2006 -@@ -1,9 +1,6 @@ - /* MD5 checksum routines used for authentication. Not covered by GPL, but - in the public domain as per the copyright below */ --#if defined( __OpenBSD__ ) --# include <machine/types.h> --# include <sys/endian.h> --#elif defined( __FreeBSD__ ) || defined( __NetBSD__ ) -+#if defined( __OpenBSD__ ) || defined( __FreeBSD__ ) || defined( __NetBSD__ ) - # include <sys/types.h> - # include <sys/endian.h> - #elif defined( BSD ) && ( BSD >= 199103 ) || defined(__APPLE__) Index: patches/patch-pbx_Makefile =================================================================== RCS file: patches/patch-pbx_Makefile diff -N patches/patch-pbx_Makefile --- patches/patch-pbx_Makefile 26 Sep 2004 00:38:24 -0000 1.1.1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,13 +0,0 @@ -$OpenBSD: patch-pbx_Makefile,v 1.1.1.1 2004/09/26 00:38:24 jolan Exp $ ---- pbx/Makefile.orig Sun Oct 26 12:50:49 2003 -+++ pbx/Makefile Thu Sep 23 21:29:34 2004 -@@ -16,7 +16,9 @@ - PBX_LIBS=pbx_config.so pbx_wilcalu.so pbx_spool.so # pbx_gtkconsole.so pbx_kdeconsole.so - - # Add GTK console if appropriate -+ifneq (${OSARCH},OpenBSD) - PBX_LIBS+=$(shell gtk-config --cflags >/dev/null 2>/dev/null && echo "pbx_gtkconsole.so") -+endif - # Add KDE Console if appropriate - #PBX_LIBS+=$(shell [ "$$QTDIR" != "" ] && echo "pbx_kdeconsole.so") - Index: pkg/PFRAG.shared =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/pkg/PFRAG.shared,v retrieving revision 1.2 diff -u -p -r1.2 PFRAG.shared --- pkg/PFRAG.shared 1 May 2005 02:12:47 -0000 1.2 +++ pkg/PFRAG.shared 16 Jan 2006 21:43:11 -0000 @@ -4,16 +4,21 @@ lib/asterisk/modules/app_alarmreceiver.s lib/asterisk/modules/app_authenticate.so lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so +lib/asterisk/modules/app_chanspy.so lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_cut.so lib/asterisk/modules/app_db.so lib/asterisk/modules/app_dial.so +lib/asterisk/modules/app_dictate.so +lib/asterisk/modules/app_directed_pickup.so lib/asterisk/modules/app_directory.so lib/asterisk/modules/app_disa.so +lib/asterisk/modules/app_dumpchan.so lib/asterisk/modules/app_echo.so lib/asterisk/modules/app_enumlookup.so lib/asterisk/modules/app_eval.so lib/asterisk/modules/app_exec.so +lib/asterisk/modules/app_externalivr.so lib/asterisk/modules/app_festival.so lib/asterisk/modules/app_forkcdr.so lib/asterisk/modules/app_getcpeid.so @@ -21,20 +26,23 @@ lib/asterisk/modules/app_groupcount.so lib/asterisk/modules/app_hasnewvoicemail.so lib/asterisk/modules/app_ices.so lib/asterisk/modules/app_image.so [EMAIL PROTECTED] lib/asterisk/modules/app_intercom.so lib/asterisk/modules/app_lookupblacklist.so lib/asterisk/modules/app_lookupcidname.so lib/asterisk/modules/app_macro.so +lib/asterisk/modules/app_math.so +lib/asterisk/modules/app_md5.so lib/asterisk/modules/app_milliwatt.so +lib/asterisk/modules/app_mixmonitor.so lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so lib/asterisk/modules/app_parkandannounce.so lib/asterisk/modules/app_playback.so lib/asterisk/modules/app_privacy.so -lib/asterisk/modules/app_qcall.so lib/asterisk/modules/app_queue.so lib/asterisk/modules/app_random.so lib/asterisk/modules/app_read.so +lib/asterisk/modules/app_readfile.so +lib/asterisk/modules/app_realtime.so lib/asterisk/modules/app_record.so lib/asterisk/modules/app_sayunixtime.so lib/asterisk/modules/app_senddtmf.so @@ -43,10 +51,11 @@ lib/asterisk/modules/app_setcallerid.so lib/asterisk/modules/app_setcdruserfield.so lib/asterisk/modules/app_setcidname.so lib/asterisk/modules/app_setcidnum.so +lib/asterisk/modules/app_setrdnis.so +lib/asterisk/modules/app_settransfercapability.so lib/asterisk/modules/app_sms.so lib/asterisk/modules/app_softhangup.so -lib/asterisk/modules/app_striplsd.so -lib/asterisk/modules/app_substring.so +lib/asterisk/modules/app_stack.so lib/asterisk/modules/app_system.so lib/asterisk/modules/app_talkdetect.so lib/asterisk/modules/app_test.so @@ -57,17 +66,17 @@ lib/asterisk/modules/app_userevent.so lib/asterisk/modules/app_verbose.so lib/asterisk/modules/app_voicemail.so lib/asterisk/modules/app_waitforring.so +lib/asterisk/modules/app_waitforsilence.so +lib/asterisk/modules/app_while.so lib/asterisk/modules/app_zapateller.so lib/asterisk/modules/cdr_csv.so +lib/asterisk/modules/cdr_custom.so lib/asterisk/modules/cdr_manager.so lib/asterisk/modules/chan_agent.so +lib/asterisk/modules/chan_features.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so lib/asterisk/modules/chan_mgcp.so [EMAIL PROTECTED] lib/asterisk/modules/chan_modem.so [EMAIL PROTECTED] lib/asterisk/modules/chan_modem_aopen.so [EMAIL PROTECTED] lib/asterisk/modules/chan_modem_bestdata.so [EMAIL PROTECTED] lib/asterisk/modules/chan_modem_i4l.so @comment lib/asterisk/modules/chan_oss.so lib/asterisk/modules/chan_sip.so lib/asterisk/modules/chan_skinny.so @@ -79,6 +88,8 @@ lib/asterisk/modules/codec_gsm.so lib/asterisk/modules/codec_ilbc.so lib/asterisk/modules/codec_lpc10.so lib/asterisk/modules/codec_ulaw.so +lib/asterisk/modules/format_au.so +lib/asterisk/modules/format_g723.so lib/asterisk/modules/format_g726.so lib/asterisk/modules/format_g729.so lib/asterisk/modules/format_gsm.so @@ -91,9 +102,16 @@ lib/asterisk/modules/format_sln.so lib/asterisk/modules/format_vox.so lib/asterisk/modules/format_wav.so lib/asterisk/modules/format_wav_gsm.so +lib/asterisk/modules/func_callerid.so +lib/asterisk/modules/func_enum.so +lib/asterisk/modules/func_uri.so +lib/asterisk/modules/pbx_ael.so lib/asterisk/modules/pbx_config.so +lib/asterisk/modules/pbx_dundi.so +lib/asterisk/modules/pbx_functions.so +lib/asterisk/modules/pbx_loopback.so +lib/asterisk/modules/pbx_realtime.so lib/asterisk/modules/pbx_spool.so -lib/asterisk/modules/pbx_wilcalu.so lib/asterisk/modules/res_adsi.so lib/asterisk/modules/res_agi.so lib/asterisk/modules/res_crypto.so Index: pkg/PLIST =================================================================== RCS file: /data/cvs/OpenBSD/ports/telephony/asterisk/pkg/PLIST,v retrieving revision 1.4 diff -u -p -r1.4 PLIST --- pkg/PLIST 15 Aug 2005 17:36:07 -0000 1.4 +++ pkg/PLIST 16 Jan 2006 21:43:11 -0000 @@ -11,21 +11,28 @@ include/asterisk/app.h include/asterisk/ast_expr.h include/asterisk/astdb.h include/asterisk/astmm.h +include/asterisk/astobj.h include/asterisk/astosp.h +include/asterisk/build.h include/asterisk/callerid.h include/asterisk/causes.h include/asterisk/cdr.h include/asterisk/channel.h -include/asterisk/channel_pvt.h +include/asterisk/chanspy.h include/asterisk/chanvars.h include/asterisk/cli.h +include/asterisk/compat.h +include/asterisk/compiler.h include/asterisk/config.h -include/asterisk/config_pvt.h include/asterisk/crypto.h -include/asterisk/cvsid.h +include/asterisk/devicestate.h include/asterisk/dlfcn-compat.h include/asterisk/dns.h +include/asterisk/dnsmgr.h +include/asterisk/doxyref.h include/asterisk/dsp.h +include/asterisk/dundi.h +include/asterisk/endian.h include/asterisk/enum.h include/asterisk/features.h include/asterisk/file.h @@ -33,6 +40,7 @@ include/asterisk/frame.h include/asterisk/fskmodem.h include/asterisk/image.h include/asterisk/indications.h +include/asterisk/inline_api.h include/asterisk/io.h include/asterisk/linkedlists.h include/asterisk/localtime.h @@ -43,28 +51,43 @@ include/asterisk/md5.h include/asterisk/module.h include/asterisk/monitor.h include/asterisk/musiconhold.h +include/asterisk/netsock.h include/asterisk/options.h include/asterisk/pbx.h +include/asterisk/plc.h include/asterisk/poll-compat.h include/asterisk/privacy.h include/asterisk/res_odbc.h include/asterisk/rtp.h include/asterisk/say.h include/asterisk/sched.h +include/asterisk/slinfactory.h include/asterisk/srv.h +include/asterisk/strings.h include/asterisk/tdd.h include/asterisk/term.h +include/asterisk/time.h +include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/ulaw.h +include/asterisk/unaligned.h include/asterisk/utils.h +include/asterisk/version.h include/asterisk/vmodem.h lib/asterisk/ lib/asterisk/modules/ @man man/man8/asterisk.8 [EMAIL PROTECTED] man/man8/astgenkey.8 [EMAIL PROTECTED] man/man8/autosupport.8 [EMAIL PROTECTED] man/man8/safe_asterisk.8 sbin/asterisk sbin/astgenkey sbin/autosupport +sbin/rasterisk sbin/safe_asterisk +sbin/smsq +sbin/stereorize +sbin/streamplayer share/asterisk/ @comment share/asterisk/firmware/ @comment share/asterisk/firmware/iax/ @@ -89,23 +112,57 @@ share/asterisk/sounds/agent-user.gsm share/asterisk/sounds/auth-incorrect.gsm share/asterisk/sounds/auth-thankyou.gsm share/asterisk/sounds/beep.gsm +share/asterisk/sounds/beeperr.gsm share/asterisk/sounds/conf-adminmenu.gsm share/asterisk/sounds/conf-enteringno.gsm share/asterisk/sounds/conf-errormenu.gsm share/asterisk/sounds/conf-getchannel.gsm share/asterisk/sounds/conf-getconfno.gsm share/asterisk/sounds/conf-getpin.gsm +share/asterisk/sounds/conf-hasjoin.gsm +share/asterisk/sounds/conf-hasleft.gsm share/asterisk/sounds/conf-invalid.gsm share/asterisk/sounds/conf-invalidpin.gsm share/asterisk/sounds/conf-kicked.gsm +share/asterisk/sounds/conf-leaderhasleft.gsm share/asterisk/sounds/conf-locked.gsm share/asterisk/sounds/conf-lockednow.gsm share/asterisk/sounds/conf-muted.gsm share/asterisk/sounds/conf-noempty.gsm +share/asterisk/sounds/conf-onlyone.gsm share/asterisk/sounds/conf-onlyperson.gsm +share/asterisk/sounds/conf-otherinparty.gsm +share/asterisk/sounds/conf-placeintoconf.gsm +share/asterisk/sounds/conf-thereare.gsm share/asterisk/sounds/conf-unlockednow.gsm share/asterisk/sounds/conf-unmuted.gsm share/asterisk/sounds/conf-usermenu.gsm +share/asterisk/sounds/conf-userswilljoin.gsm +share/asterisk/sounds/conf-userwilljoin.gsm +share/asterisk/sounds/conf-waitforleader.gsm +share/asterisk/sounds/demo-abouttotry.gsm +share/asterisk/sounds/demo-congrats.gsm +share/asterisk/sounds/demo-echodone.gsm +share/asterisk/sounds/demo-echotest.gsm +share/asterisk/sounds/demo-enterkeywords.gsm +share/asterisk/sounds/demo-instruct.gsm +share/asterisk/sounds/demo-moreinfo.gsm +share/asterisk/sounds/demo-nogo.gsm +share/asterisk/sounds/demo-nomatch.gsm +share/asterisk/sounds/demo-thanks.gsm +share/asterisk/sounds/dictate/ +share/asterisk/sounds/dictate/both_help.gsm +share/asterisk/sounds/dictate/enter_filename.gsm +share/asterisk/sounds/dictate/forhelp.gsm +share/asterisk/sounds/dictate/pause.gsm +share/asterisk/sounds/dictate/paused.gsm +share/asterisk/sounds/dictate/play_help.gsm +share/asterisk/sounds/dictate/playback.gsm +share/asterisk/sounds/dictate/playback_mode.gsm +share/asterisk/sounds/dictate/record.gsm +share/asterisk/sounds/dictate/record_help.gsm +share/asterisk/sounds/dictate/record_mode.gsm +share/asterisk/sounds/dictate/truncating_audio.gsm share/asterisk/sounds/digits/ share/asterisk/sounds/digits/0.gsm share/asterisk/sounds/digits/1.gsm @@ -195,6 +252,7 @@ share/asterisk/sounds/dir-intro-fn.gsm share/asterisk/sounds/dir-intro.gsm share/asterisk/sounds/dir-nomatch.gsm share/asterisk/sounds/dir-nomore.gsm +share/asterisk/sounds/hello-world.gsm share/asterisk/sounds/invalid.gsm share/asterisk/sounds/letters/ share/asterisk/sounds/letters/a.gsm @@ -264,6 +322,11 @@ share/asterisk/sounds/phonetic/w_p.gsm share/asterisk/sounds/phonetic/x_p.gsm share/asterisk/sounds/phonetic/y_p.gsm share/asterisk/sounds/phonetic/z_p.gsm +share/asterisk/sounds/priv-callee-options.gsm +share/asterisk/sounds/priv-callerintros/ +share/asterisk/sounds/priv-callpending.gsm +share/asterisk/sounds/priv-introsaved.gsm +share/asterisk/sounds/priv-recordintro.gsm share/asterisk/sounds/privacy-incorrect.gsm share/asterisk/sounds/privacy-prompt.gsm share/asterisk/sounds/privacy-thankyou.gsm @@ -272,10 +335,21 @@ share/asterisk/sounds/queue-callswaiting share/asterisk/sounds/queue-holdtime.gsm share/asterisk/sounds/queue-less-than.gsm share/asterisk/sounds/queue-minutes.gsm +share/asterisk/sounds/queue-periodic-announce.gsm +share/asterisk/sounds/queue-reporthold.gsm share/asterisk/sounds/queue-seconds.gsm share/asterisk/sounds/queue-thankyou.gsm share/asterisk/sounds/queue-thereare.gsm share/asterisk/sounds/queue-youarenext.gsm +share/asterisk/sounds/screen-callee-options.gsm +share/asterisk/sounds/spy-agent.gsm +share/asterisk/sounds/spy-h323.gsm +share/asterisk/sounds/spy-iax.gsm +share/asterisk/sounds/spy-iax2.gsm +share/asterisk/sounds/spy-mgcp.gsm +share/asterisk/sounds/spy-sip.gsm +share/asterisk/sounds/spy-skinny.gsm +share/asterisk/sounds/spy-zap.gsm share/asterisk/sounds/ss-noservice.gsm share/asterisk/sounds/transfer.gsm share/asterisk/sounds/tt-allbusy.gsm @@ -283,7 +357,6 @@ share/asterisk/sounds/tt-monkeys.gsm share/asterisk/sounds/tt-monkeysintro.gsm share/asterisk/sounds/tt-somethingwrong.gsm share/asterisk/sounds/tt-weasels.gsm -share/asterisk/sounds/vm share/asterisk/sounds/vm-Cust1.gsm share/asterisk/sounds/vm-Cust2.gsm share/asterisk/sounds/vm-Cust3.gsm @@ -305,6 +378,7 @@ share/asterisk/sounds/vm-enter-num-to-ca share/asterisk/sounds/vm-extension.gsm share/asterisk/sounds/vm-first.gsm share/asterisk/sounds/vm-for.gsm +share/asterisk/sounds/vm-forward.gsm share/asterisk/sounds/vm-forwardoptions.gsm share/asterisk/sounds/vm-from-extension.gsm share/asterisk/sounds/vm-from-phonenumber.gsm @@ -323,10 +397,12 @@ share/asterisk/sounds/vm-login.gsm share/asterisk/sounds/vm-mailboxfull.gsm share/asterisk/sounds/vm-message.gsm share/asterisk/sounds/vm-messages.gsm +share/asterisk/sounds/vm-minutes.gsm share/asterisk/sounds/vm-mismatch.gsm share/asterisk/sounds/vm-msginstruct.gsm share/asterisk/sounds/vm-msgsaved.gsm share/asterisk/sounds/vm-newpassword.gsm +share/asterisk/sounds/vm-newuser.gsm share/asterisk/sounds/vm-next.gsm share/asterisk/sounds/vm-no.gsm share/asterisk/sounds/vm-nobodyavail.gsm @@ -344,6 +420,7 @@ share/asterisk/sounds/vm-prev.gsm share/asterisk/sounds/vm-reachoper.gsm share/asterisk/sounds/vm-rec-busy.gsm share/asterisk/sounds/vm-rec-name.gsm +share/asterisk/sounds/vm-rec-temp.gsm share/asterisk/sounds/vm-rec-unv.gsm share/asterisk/sounds/vm-received.gsm share/asterisk/sounds/vm-reenterpassword.gsm @@ -357,6 +434,9 @@ share/asterisk/sounds/vm-saveoper.gsm share/asterisk/sounds/vm-sorry.gsm share/asterisk/sounds/vm-star-cancel.gsm share/asterisk/sounds/vm-starmain.gsm +share/asterisk/sounds/vm-tempgreeting.gsm +share/asterisk/sounds/vm-tempgreeting2.gsm +share/asterisk/sounds/vm-tempremoved.gsm share/asterisk/sounds/vm-then-pound.gsm share/asterisk/sounds/vm-theperson.gsm share/asterisk/sounds/vm-tocallback.gsm @@ -380,13 +460,28 @@ share/asterisk/sounds/voicemail share/doc/asterisk/ share/doc/asterisk/BUGS share/doc/asterisk/BUGS.OpenBSD +share/doc/asterisk/README.ael +share/doc/asterisk/README.asterisk.conf +share/doc/asterisk/README.backtrace share/doc/asterisk/README.cdr share/doc/asterisk/README.cliprompt +share/doc/asterisk/README.configuration +share/doc/asterisk/README.cygwin +share/doc/asterisk/README.dundi +share/doc/asterisk/README.enum +share/doc/asterisk/README.extconfig +share/doc/asterisk/README.externalivr share/doc/asterisk/README.h323 share/doc/asterisk/README.iax share/doc/asterisk/README.ices +share/doc/asterisk/README.jitterbuffer +share/doc/asterisk/README.math +share/doc/asterisk/README.misdn share/doc/asterisk/README.mp3 share/doc/asterisk/README.mysql +share/doc/asterisk/README.odbcstorage +share/doc/asterisk/README.privacy +share/doc/asterisk/README.realtime share/doc/asterisk/README.sms share/doc/asterisk/README.tds share/doc/asterisk/README.variables @@ -415,12 +510,18 @@ share/examples/asterisk/default/agents.c share/examples/asterisk/default/alarmreceiver.conf.sample share/examples/asterisk/default/alsa.conf.sample share/examples/asterisk/default/asterisk.adsi +share/examples/asterisk/default/cdr.conf.sample +share/examples/asterisk/default/cdr_custom.conf.sample share/examples/asterisk/default/cdr_manager.conf.sample share/examples/asterisk/default/cdr_odbc.conf.sample share/examples/asterisk/default/cdr_pgsql.conf.sample share/examples/asterisk/default/cdr_tds.conf.sample +share/examples/asterisk/default/codecs.conf.sample +share/examples/asterisk/default/dnsmgr.conf.sample +share/examples/asterisk/default/dundi.conf.sample share/examples/asterisk/default/enum.conf.sample share/examples/asterisk/default/extconfig.conf.sample +share/examples/asterisk/default/extensions.ael.sample share/examples/asterisk/default/extensions.conf.sample share/examples/asterisk/default/features.conf.sample share/examples/asterisk/default/festival.conf.sample @@ -432,6 +533,7 @@ share/examples/asterisk/default/logger.c share/examples/asterisk/default/manager.conf.sample share/examples/asterisk/default/meetme.conf.sample share/examples/asterisk/default/mgcp.conf.sample +share/examples/asterisk/default/misdn.conf.sample share/examples/asterisk/default/modem.conf.sample share/examples/asterisk/default/modules.conf.sample share/examples/asterisk/default/musiconhold.conf.sample @@ -440,11 +542,11 @@ share/examples/asterisk/default/oss.conf share/examples/asterisk/default/phone.conf.sample share/examples/asterisk/default/privacy.conf.sample share/examples/asterisk/default/queues.conf.sample -share/examples/asterisk/default/res_config_odbc.conf.sample share/examples/asterisk/default/res_odbc.conf.sample share/examples/asterisk/default/rpt.conf.sample share/examples/asterisk/default/rtp.conf.sample share/examples/asterisk/default/sip.conf.sample +share/examples/asterisk/default/sip_notify.conf.sample share/examples/asterisk/default/skinny.conf.sample share/examples/asterisk/default/telcordia-1.adsi share/examples/asterisk/default/voicemail.conf.sample
