telephony/asterisk 1.0.9 => 1.2.1

classic Classic list List threaded Threaded
31 messages Options
12
Reply | Threaded
Open this post in threaded view
|

telephony/asterisk 1.0.9 => 1.2.1

Ian Darwin
No MAINTAINER, no response to previous inquiry.

Tested lightly on i386 only; my PAP-2 connects locally and sends a voice reply.

Patch is relative to OpenBSD /usr/ports/telephony/asterisk

# Manually REMOVE these old patches (mostly incorporated upstream):
patches/patch-pbx_Makefile
patches/patch-asterisk_h
patches/patch-aesopt_h
patches/patch-apps_Makefile
patches/patch-apps_app_test_c

--- /dev/null Wed Dec 28 15:04:09 2005
+++ patches/patch-build_tools_make_defaults_h Wed Dec 28 14:42:03 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- build_tools/make_defaults_h.orig Wed Dec 28 14:41:44 2005
++++ build_tools/make_defaults_h Wed Dec 28 14:41:56 2005
+@@ -14,7 +14,7 @@ cat << END
+ #define AST_LOG_DIR    "${INSTALL_PATH}${ASTLOGDIR}"
+ #define AST_AGI_DIR    "${INSTALL_PATH}${AGI_DIR}"
+ #define AST_KEY_DIR    "${INSTALL_PATH}${ASTVARLIBDIR}/keys"
+-#define AST_DB         "${INSTALL_PATH}${ASTVARLIBDIR}/astdb"
++#define AST_DB         "${INSTALL_PATH}${ASTSPOOLDIR}/astdb"
+ #define AST_TMP_DIR    "${INSTALL_PATH}${ASTSPOOLDIR}/tmp"
+
+ #define AST_CONFIG_FILE "${INSTALL_PATH}${ASTCONFPATH}"
--- /dev/null Wed Dec 28 15:04:14 2005
+++ patches/patch-db_c Wed Dec 28 14:17:00 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- db.c.orig Wed Dec 28 14:16:55 2005
++++ db.c Wed Dec 28 14:10:59 2005
+@@ -64,7 +64,7 @@ static int dbinit(void)
+ {
+ if (!astdb) {
+ if (!(astdb = dbopen((char *)ast_config_AST_DB, O_CREAT | O_RDWR, 0664, DB_BTREE, NULL))) {
+- ast_log(LOG_WARNING, "Unable to open Asterisk database\n");
++ ast_log(LOG_WARNING, "Unable to open Asterisk database %s\n", ast_config_AST_DB);
+ }
+ }
+ if (astdb)
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile 15 Aug 2005 17:36:06 -0000 1.5
+++ Makefile 28 Dec 2005 20:02:54 -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.1
 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 @@
 
 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: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo 15 Aug 2005 17:36:06 -0000 1.4
+++ distinfo 28 Dec 2005 20:02:54 -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.1.tar.gz) = 04657086791e80f319c0d728af705001
+RMD160 (asterisk-1.2.1.tar.gz) = 68c96a098b4c52a096daad45ed19431c75fe1894
+SHA1 (asterisk-1.2.1.tar.gz) = aab351702d85a37ef9aefb8272f5f5d62fd791a3
+SIZE (asterisk-1.2.1.tar.gz) = 10517194
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.4
diff -u -r1.4 patch-Makefile
--- patches/patch-Makefile 15 Aug 2005 17:36:07 -0000 1.4
+++ patches/patch-Makefile 28 Dec 2005 20:02:54 -0000
@@ -1,115 +1,129 @@
-$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)
+$OpenBSD$
+--- Makefile.orig Mon Dec  5 01:47:51 2005
++++ Makefile Wed Dec 28 14:40:27 2005
+@@ -44,8 +44,12 @@ ifneq ($(findstring dont-optimize,$(MAKE
  #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 @@ MALLOC_DEBUG = #-include $(PWD)/include/
 
  # 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 @@ BUSYDETECT+= #-DBUSYDETECT_TONEONLY
  # 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 @@ ifneq ($(OSARCH),SunOS)
+   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 @@ HTTP_CGIDIR=/var/www/cgi-bin
+ # 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 @@ endif
+ 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
-
- LIBEDIT=editline/libedit.a
-
-@@ -222,17 +238,21 @@ ASTLINK=-Wl,-E
- SOLINK=-shared -Xlinker -x
+ ifeq ($(OSARCH),Linux)
+   ifeq ($(CROSS_COMPILE),)
+@@ -209,6 +238,43 @@ ifeq ($(OSARCH),Linux)
+   MPG123TARG=linux
  endif
 
-+ifneq (${OSARCH},OpenBSD)
- CC=gcc
-+endif
++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
+
+@@ -410,6 +476,7 @@ LIBS+=-lssl
  INSTALL=install
 
  _all: all
@@ -117,38 +131,28 @@
  @echo " +--------- Asterisk Build Complete ---------+"  
  @echo " + Asterisk has successfully been built, but +"  
  @echo " + cannot be run before being installed by   +"  
- @echo " + running:                                  +"  
+@@ -417,6 +484,7 @@ _all: all
  @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 +734,8 @@ bininstall: all
+ 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 +757,7 @@ bininstall: all
+ @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-asterisk_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-asterisk_c,v
retrieving revision 1.3
diff -u -r1.3 patch-asterisk_c
--- patches/patch-asterisk_c 15 Aug 2005 17:36:07 -0000 1.3
+++ patches/patch-asterisk_c 28 Dec 2005 20:02:54 -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-cdr_Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-cdr_Makefile,v
retrieving revision 1.1.1.1
diff -u -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 28 Dec 2005 20:02:54 -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 @@
  # 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: /cvs/ports/telephony/asterisk/patches/patch-codecs_Makefile,v
retrieving revision 1.2
diff -u -r1.2 patch-codecs_Makefile
--- patches/patch-codecs_Makefile 1 May 2005 02:12:47 -0000 1.2
+++ patches/patch-codecs_Makefile 28 Dec 2005 20:02:54 -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: /cvs/ports/telephony/asterisk/patches/patch-codecs_gsm_Makefile,v
retrieving revision 1.3
diff -u -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 28 Dec 2005 20:02:54 -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 @@
 
  #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: pkg/PFRAG.shared
===================================================================
RCS file: /cvs/ports/telephony/asterisk/pkg/PFRAG.shared,v
retrieving revision 1.2
diff -u -r1.2 PFRAG.shared
--- pkg/PFRAG.shared 1 May 2005 02:12:47 -0000 1.2
+++ pkg/PFRAG.shared 28 Dec 2005 20:03:01 -0000
@@ -4,16 +4,21 @@
 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_hasnewvoicemail.so
 lib/asterisk/modules/app_ices.so
 lib/asterisk/modules/app_image.so
-@comment 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_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_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
-@comment lib/asterisk/modules/chan_modem.so
-@comment lib/asterisk/modules/chan_modem_aopen.so
-@comment lib/asterisk/modules/chan_modem_bestdata.so
-@comment 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_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_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: /cvs/ports/telephony/asterisk/pkg/PLIST,v
retrieving revision 1.4
diff -u -r1.4 PLIST
--- pkg/PLIST 15 Aug 2005 17:36:07 -0000 1.4
+++ pkg/PLIST 28 Dec 2005 20:03:04 -0000
@@ -11,21 +11,28 @@
 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/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/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
+@man man/man8/astgenkey.8
+@man man/man8/autosupport.8
+@man 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/
@@ -74,9 +97,7 @@
 share/asterisk/keys/
 @sample /var/asterisk/keys/
 share/asterisk/keys/freeworlddialup.pub
-@sample /var/asterisk/keys/freeworlddialup.pub
 share/asterisk/keys/iaxtel.pub
-@sample /var/asterisk/keys/iaxtel.pub
 @comment share/asterisk/mohmp3/
 share/asterisk/sounds/
 share/asterisk/sounds/agent-alreadyon.gsm
@@ -89,23 +110,57 @@
 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 +250,7 @@
 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 +320,11 @@
 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 +333,21 @@
 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 +355,6 @@
 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 +376,7 @@
 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 +395,12 @@
 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 +418,7 @@
 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 +432,9 @@
 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 +458,28 @@
 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 +508,18 @@
 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 +531,7 @@
 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 +540,11 @@
 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

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.1

Stuart Henderson
On 2005/12/28 15:12, Ian Darwin wrote:
> Tested lightly on i386 only; my PAP-2 connects locally and sends a voice reply.
> Patch is relative to OpenBSD /usr/ports/telephony/asterisk

This patch no longer applies to -current after naddy's updates for
types.h (Jan 13). The attached patch, based on yours, fixes that and:

- s/#else/else/ in Makefile patch to build with -O2 not -O2 -O6 -march

- put astdb and keys back to /var/asterisk/astdb/astdb as with previous
port (I'm not sure it's the best place, maybe it should really go into
/var/db, but it causes less trouble for upgraders, and I don't think
/usr/local/share as your patch uses is correct for these either).

- fix big-endian arch's (building channels/chan_skinny.c was broken)

> # Manually REMOVE these old patches (mostly incorporated upstream):

> patches/patch-pbx_Makefile
> patches/patch-asterisk_h
> patches/patch-aesopt_h
> patches/patch-apps_Makefile
> patches/patch-apps_app_test_c

and now also:

patches/patch-include_asterisk_frame_h
patches/patch-md5_c

- or, for ease of use:
patches/patch-{pbx_Makefile,asterisk_h,aesopt_h,apps_Makefile,apps_app_test_c,include_asterisk_frame_h,md5_c}

- tested on i386: (reg, make a few SIP calls, test IVR and voicemail)
- builds and starts ok on sparc64, but haven't tested further there yet

I also wonder if the files in share/asterisk/sounds should use the
@SAMPLE mechanism...I guess it's unlikely most people will change them,
and those that do will probably be quite careful of taking a backup,
but it would be more friendly if an upgrade didn't blow away custom
recordings. I think fixing this would involve a move from /usr/local
to /var for some more files, though.


ast-1.2.1-patch-take5 (39K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.1

Ian Darwin
1.2.2 was just announced; can you update the port for that please?

Stuart Henderson wrote:

> This patch no longer applies to -current after naddy's updates for
>
>types.h (Jan 13). The attached patch, based on yours, fixes that and:
>
>- s/#else/else/ in Makefile patch to build with -O2 not -O2 -O6 -march
>
>- put astdb and keys back to /var/asterisk/astdb/astdb as with previous
>  
>
Why two directory levels called astdb?

>port (I'm not sure it's the best place, maybe it should really go into
>/var/db, but it causes less trouble for upgraders, and I don't think
>/usr/local/share as your patch uses is correct for these either).
>
>- fix big-endian arch's (building channels/chan_skinny.c was broken)
>
>  
>
>># Manually REMOVE these old patches (mostly incorporated upstream):
>>    
>>
>
>  
>
msf pointed out that:

You can create diffs that remove the patches by cvs rm'ing the files
from your checked out copy and the using cvs diff -Nup to make the
diffs.


>
>- tested on i386: (reg, make a few SIP calls, test IVR and voicemail)
>- builds and starts ok on sparc64, but haven't tested further there yet
>
>I also wonder if the files in share/asterisk/sounds should use the
>@SAMPLE mechanism...I guess it's unlikely most people will change them,
>and those that do will probably be quite careful of taking a backup,
>but it would be more friendly if an upgrade didn't blow away custom
>recordings. I think fixing this would involve a move from /usr/local
>to /var for some more files, though.
>
>  
>
Thanks
Ian

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Stuart Henderson
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?


asterisk-1.2.2-diff (43K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Nikolay Sturm-2
* Stuart Henderson [2006-01-22]:
> 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).

@comment no checksum

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Stuart Henderson
In reply to this post by Ian Darwin
On 2006/01/18 11:26, Ian Darwin wrote:
> >- put astdb and keys back to /var/asterisk/astdb/astdb as with previous
> >
> Why two directory levels called astdb?

Sorry, I didn't make it very clear - the second 'astdb' is the
filename.

> msf pointed out that:
>
> You can create diffs that remove the patches by cvs rm'ing the files
> from your checked out copy and the using cvs diff -Nup to make the
> diffs.

thanks. ditto 'cvs add' to make sure I include newly added files in the
patchset and don't have to add them manually, then... (new diff
attached because of this).

i386 has had regular use of SIP (no transcoding, though) and been ok.
sparc64, zaurus: I have reg'd, made a few calls and tested voicemail.


asterisk-1.2.2-diff (46K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Jolan Luff
On Tue, Jan 24, 2006 at 10:49:07PM +0000, Stuart Henderson wrote:

> On 2006/01/18 11:26, Ian Darwin wrote:
> > >- put astdb and keys back to /var/asterisk/astdb/astdb as with previous
> > >
> > Why two directory levels called astdb?
>
> Sorry, I didn't make it very clear - the second 'astdb' is the
> filename.
>
> > msf pointed out that:
> >
> > You can create diffs that remove the patches by cvs rm'ing the files
> > from your checked out copy and the using cvs diff -Nup to make the
> > diffs.
>
> thanks. ditto 'cvs add' to make sure I include newly added files in the
> patchset and don't have to add them manually, then... (new diff
> attached because of this).
>
> i386 has had regular use of SIP (no transcoding, though) and been ok.
> sparc64, zaurus: I have reg'd, made a few calls and tested voicemail.

in typical asterisk fashion, 1.2.2 is fundamentally broken and 1.2.3 has
been released.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Ian Darwin
In reply to this post by Stuart Henderson

>
>i386 has had regular use of SIP (no transcoding, though) and been ok.
>sparc64, zaurus: I have reg'd, made a few calls and tested voicemail.
>  
>
Tested on i386 only, but have e.g., received voice mail through IAX
via a DID, and picked it up over SIP.

I think this should go in; it is way more up to date
than what is in ports now... Any OK so I can commit it?

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Ian Darwin
In reply to this post by Jolan Luff

>
>in typical asterisk fashion, 1.2.2 is fundamentally broken and 1.2.3 has
>been released.
>
>
>  
>
Arggh, I can't believe you said that at the same time I said it should
go in! :-(

Err, let me rephrase that - thanks for catching this (just) before it
went in.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Ian Darwin
Ian Darwin wrote:

>
>>
>> in typical asterisk fashion, 1.2.2 is fundamentally broken and 1.2.3 has
>> been released.
>>
>>
>>  
>>

Good news, the patches seem to apply OK, I'm building it now and will
test later today.
Should we commit quickly before they have a chance to regroup and issue
a new release,
or wait two weeks and see how many critical bugs they find this time?

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Stuart Henderson
In reply to this post by Ian Darwin
On 2006/01/26 12:01, Ian Darwin wrote:
> >in typical asterisk fashion, 1.2.2 is fundamentally broken and 1.2.3 has
> >been released.

and what a great bug... no audio on SIP calls after Jan 25 00:18:52 EST

> Arggh, I can't believe you said that at the same time I said it should
> go in! :-(
>
> Err, let me rephrase that - thanks for catching this (just) before it
> went in.

Updated, builds, test make and receive SIP calls (alaw<>gsm) and ivr
on i386. I'm building it on my netra now, if it doesn't work there I'll
post back this evening.


asterisk-1.2.3-diff (46K) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Morris, Roy
In reply to this post by Stuart Henderson
Does the obsd port support the zaptel hardware? I think the
last time I built this I had to use Linux for this reason.



> -----Original Message-----
> From: [hidden email]
> [mailto:[hidden email]]On Behalf
> Of Ian Darwin
> Sent: Thursday, January 26, 2006 12:37 PM
> To: Ian Darwin
> Cc: Jolan Luff; [hidden email]
> Subject: Re: telephony/asterisk 1.0.9 => 1.2.2
>
>
> Ian Darwin wrote:
>
> >
> >>
> >> in typical asterisk fashion, 1.2.2 is fundamentally broken
> and 1.2.3 has
> >> been released.
> >>
> >>
> >>  
> >>
>
> Good news, the patches seem to apply OK, I'm building it now and will
> test later today.
> Should we commit quickly before they have a chance to regroup
> and issue
> a new release,
> or wait two weeks and see how many critical bugs they find this time?
>
>

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Jasper Lievisse Adriaanse
On Thu, 26 Jan 2006 13:01:37 -0500
"Roy Morris" <[hidden email]> wrote:

> Does the obsd port support the zaptel hardware? I think the
> last time I built this I had to use Linux for this reason.

From the diff:

+MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' MAKEFLAGS+=-DWITHOUT_ZAPTEL

So that says enough I guess.

Cheers,
Jasper

>
>
>
> > -----Original Message-----
> > From: [hidden email]
> > [mailto:[hidden email]]On Behalf
> > Of Ian Darwin
> > Sent: Thursday, January 26, 2006 12:37 PM
> > To: Ian Darwin
> > Cc: Jolan Luff; [hidden email]
> > Subject: Re: telephony/asterisk 1.0.9 => 1.2.2
> >
> >
> > Ian Darwin wrote:
> >
> > >
> > >>
> > >> in typical asterisk fashion, 1.2.2 is fundamentally broken
> > and 1.2.3 has
> > >> been released.
> > >>
> > >>
> > >>  
> > >>
> >
> > Good news, the patches seem to apply OK, I'm building it now and will
> > test later today.
> > Should we commit quickly before they have a chance to regroup
> > and issue
> > a new release,
> > or wait two weeks and see how many critical bugs they find this time?
> >
> >
>

--
"Security is decided by quality" -- Theo de Raadt

attachment0 (194 bytes) Download Attachment
Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Morris, Roy
In reply to this post by Stuart Henderson
> On Thu, 26 Jan 2006 13:01:37 -0500
> "Roy Morris" <[hidden email]> wrote:
>
> > Does the obsd port support the zaptel hardware? I think the
> > last time I built this I had to use Linux for this reason.
>
> From the diff:
>
> +MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' MAKEFLAGS+=-DWITHOUT_ZAPTEL
>
> So that says enough I guess.
>
> Cheers,
> Jasper
> >
well that blows ... I was looking forward to formatting the Linux box,
but alas not yet.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Stuart Henderson
In reply to this post by Stuart Henderson
On 2006/01/26 17:49, Stuart Henderson wrote:
> Updated, builds, test make and receive SIP calls (alaw<>gsm) and ivr
> on i386. I'm building it on my netra now, if it doesn't work there I'll
> post back this evening.

Sorry for the extra noise: I just spotted some -O3 for sparc64 in the
Makefiles which I've now fixed. Should -mcpu=v8 also go or is that less
likely to be a problem?

ime from a linux asterisk box I admin, 1.2 has been a lot less trouble
than 1.0 - I'm planning to look at sipx when I have time though.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Claudio Jeker
In reply to this post by Morris, Roy
On Thu, Jan 26, 2006 at 01:13:15PM -0500, Roy Morris wrote:

> > On Thu, 26 Jan 2006 13:01:37 -0500
> > "Roy Morris" <[hidden email]> wrote:
> >
> > > Does the obsd port support the zaptel hardware? I think the
> > > last time I built this I had to use Linux for this reason.
> >
> > From the diff:
> >
> > +MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' MAKEFLAGS+=-DWITHOUT_ZAPTEL
> >
> > So that says enough I guess.
> >
> > Cheers,
> > Jasper
> > >
> well that blows ... I was looking forward to formatting the Linux box,
> but alas not yet.
>

The zaptel interface is nicely said a nightmare. It was designed for a
specific ISA device full of quirks and evil code.
I have an idea about a replacement but not the time to implement it right
now.

--
:wq Claudio

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Jolan Luff
In reply to this post by Stuart Henderson
On Thu, Jan 26, 2006 at 06:36:17PM +0000, Stuart Henderson wrote:
> On 2006/01/26 17:49, Stuart Henderson wrote:
> > Updated, builds, test make and receive SIP calls (alaw<>gsm) and ivr
> > on i386. I'm building it on my netra now, if it doesn't work there I'll
> > post back this evening.
>
> Sorry for the extra noise: I just spotted some -O3 for sparc64 in the
> Makefiles which I've now fixed. Should -mcpu=v8 also go or is that less
> likely to be a problem?

Please remove that too.

> ime from a linux asterisk box I admin, 1.2 has been a lot less trouble
> than 1.0 - I'm planning to look at sipx when I have time though.

Good to hear, I haven't played with 1.2 at all yet.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Jolan Luff
In reply to this post by Morris, Roy
On Thu, Jan 26, 2006 at 01:13:15PM -0500, Roy Morris wrote:

> > On Thu, 26 Jan 2006 13:01:37 -0500
> > "Roy Morris" <[hidden email]> wrote:
> >
> > > Does the obsd port support the zaptel hardware? I think the
> > > last time I built this I had to use Linux for this reason.
> >
> > From the diff:
> >
> > +MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}' MAKEFLAGS+=-DWITHOUT_ZAPTEL
> >
> > So that says enough I guess.
> >
> > Cheers,
> > Jasper
> > >
> well that blows ... I was looking forward to formatting the Linux box,
> but alas not yet.

As claudio said, zaptel is what blows.  Use a Sipura 3000 or something
instead if you want to connect your home phone line to an asterisk
machine.

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Morris, Roy
In reply to this post by Stuart Henderson
> On Thu, Jan 26, 2006 at 01:13:15PM -0500, Roy Morris wrote:
> > > On Thu, 26 Jan 2006 13:01:37 -0500
> > > "Roy Morris" <[hidden email]> wrote:
> > >
> > > > Does the obsd port support the zaptel hardware? I think the
> > > > last time I built this I had to use Linux for this reason.
> > >
> > > From the diff:
> > >
> > > +MAKE_ENV+= SYSCONFDIR='${SYSCONFDIR}'
> MAKEFLAGS+=-DWITHOUT_ZAPTEL
> > >
> > > So that says enough I guess.
> > >
> > > Cheers,
> > > Jasper
> > > >
> > well that blows ... I was looking forward to formatting the
> Linux box,
> > but alas not yet.
>
> As claudio said, zaptel is what blows.  Use a Sipura 3000 or something
> instead if you want to connect your home phone line to an asterisk
> machine.
>

That's an excellent solution, and it appears to be pretty cheap too. I guess you
just set up the 3000 as SIP and go .. voipdepot.ca sells them cheap too. Think
I'll get me one and a phone while I am there .. Anyone want to buy a zaptel card? lol


Cheers
 

Reply | Threaded
Open this post in threaded view
|

Re: telephony/asterisk 1.0.9 => 1.2.2

Ian Darwin

>That's an excellent solution, and it appears to be pretty cheap too. I guess you
>just set up the 3000 as SIP and go .. voipdepot.ca sells them cheap too. Think
>I'll get me one and a phone while I am there .. Anyone want to buy a zaptel card? lol
>
>  
>
Is it PCI or ISA? :-)

12