here's an update to asterisk 1.6.2.6 for anyone interested in testing. so far i've tested basic functions only; note that this has a number of significant improvements including:
- additional clocking sources including a portable pthread-based timer - new ConfBridge application (not depending on zaptel/dahdi) diff also at http://junkpile.org/asterisk-1.6.2.6.diff if you try it, please let me know how you get on. Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/Makefile,v retrieving revision 1.75 diff -u -p -r1.75 Makefile --- Makefile 25 Mar 2010 12:01:47 -0000 1.75 +++ Makefile 2 Apr 2010 01:03:12 -0000 @@ -3,7 +3,7 @@ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -VER= 1.6.0.26 +VER= 1.6.2.6 # you can set PATCHVER=p0, p1 etc to bump everything, # this takes care of the subpackage/flavor maze #PATCHVER= p0 @@ -28,10 +28,11 @@ PERMIT_DISTFILES_FTP= Yes MULTI_PACKAGES+= -main SUBST_VARS+= CORESOUNDS -WANTLIB-main= c crypto m pthread ssl stdc++ termcap z +WANTLIB-main= c crypto iconv m pthread ssl stdc++ termcap z LIB_DEPENDS-main= gsm::audio/gsm \ ogg.>=5::audio/libogg \ vorbis.>=5,vorbisenc.>=2::audio/libvorbis \ + xml2::textproc/libxml \ sqlite3.>=3::databases/sqlite3 \ execinfo::devel/libexecinfo \ popt::devel/popt @@ -43,8 +44,7 @@ USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= autoconf -# Should be 2.63(?) -AUTOCONF_VERSION= 2.62 +AUTOCONF_VERSION= 2.63 AUTOMAKE_VERSION= 1.9 BUILD_DEPENDS+= ${MODGNU_AUTOCONF_DEPENDS} \ ${MODGNU_AUTOMAKE_DEPENDS} @@ -112,8 +112,6 @@ CONFIGURE_ARGS+= --with-iodbc=no \ MULTI_PACKAGES+= -odbc COMMENT-odbc= ODBC support for Asterisk LIB_DEPENDS-odbc= iodbc.>=3::databases/iodbc -CONFIGURE_ARGS+= --with-iodbc=${LOCALBASE} \ - --with-ltdl=${LOCALBASE} .endif # snmp @@ -128,23 +126,19 @@ LIB_DEPENDS-snmp= netsnmp.>=7::net/net-s netsnmpagent.>=7::net/net-snmp \ netsnmphelpers.>=7::net/net-snmp \ netsnmpmibs.>=7::net/net-snmp -CONFIGURE_ARGS+= --with-netsnmp=${LOCALBASE} .endif # speex -# XXX crashes at startup (bus error) -#PSEUDO_FLAVORS+= no_speex -#.if ${FLAVOR:L:Mno_speex} +PSEUDO_FLAVORS+= no_speex +.if ${FLAVOR:L:Mno_speex} CONFIGURE_ARGS+= --with-speex=no -#.else -#MULTI_PACKAGES+= -speex -#COMMENT-speex= Speex codec for Asterisk -#WANTLIB-speex= m -#LIB_DEPENDS-speex= speex.>=7:speex->=1.2rc1:audio/speex \ -# speexdsp:speex->=1.2rc1:audio/speex -#CONFIGURE_ARGS+= --with-speex=${LOCALBASE} \ -# --with-speexdsp=${LOCALBASE} -#.endif +.else +MULTI_PACKAGES+= -speex +COMMENT-speex= Speex codec for Asterisk +WANTLIB-speex= m +LIB_DEPENDS-speex= speex.>=7:speex->=1.2rc1:audio/speex \ + speexdsp:speex->=1.2rc1:audio/speex +.endif # curl PSEUDO_FLAVORS+= no_curl @@ -155,7 +149,6 @@ MULTI_PACKAGES+= -curl COMMENT-curl= libCURL support for Asterisk WANTLIB-curl= crypto idn ssl z LIB_DEPENDS-curl= curl.>=6::net/curl -CONFIGURE_ARGS+= --with-curl=${LOCALBASE} .endif # postgresql @@ -167,7 +160,6 @@ MULTI_PACKAGES+= -pgsql COMMENT-pgsql= PostgreSQL support for Asterisk WANTLIB-pgsql= z LIB_DEPENDS-pgsql= pq.>=5::databases/postgresql -CONFIGURE_ARGS+= --with-postgres=${LOCALBASE} .endif # jabber @@ -178,6 +170,7 @@ CONFIGURE_ARGS+= --with-iksemel=no MULTI_PACKAGES+= -jabber COMMENT-jabber= Jabber support for Asterisk LIB_DEPENDS-jabber= iksemel::textproc/iksemel +WANTLIB-jabber= crypto ssl .endif # h323 Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/asterisk/distinfo,v retrieving revision 1.54 diff -u -p -r1.54 distinfo --- distinfo 25 Mar 2010 12:01:47 -0000 1.54 +++ distinfo 2 Apr 2010 01:03:12 -0000 @@ -1,5 +1,5 @@ -MD5 (asterisk-1.6.0.26.tar.gz) = CeuhftxTa4onMKTja7CjYQ== -RMD160 (asterisk-1.6.0.26.tar.gz) = 4QmPxfVRfsFpIzpRdHHAmqUgXvc= -SHA1 (asterisk-1.6.0.26.tar.gz) = Anyi9VvVm4uRMeuJAQR6ICgvRfU= -SHA256 (asterisk-1.6.0.26.tar.gz) = +C+l3dUpLAudWk81e2R7VY7PsQd838upFF04um9kO88= -SIZE (asterisk-1.6.0.26.tar.gz) = 23212714 +MD5 (asterisk-1.6.2.6.tar.gz) = 8GjvJDPuvcf23WNZhvNtdw== +RMD160 (asterisk-1.6.2.6.tar.gz) = NcckuWigCr3Fu7B+Y+yQBIcs3vg= +SHA1 (asterisk-1.6.2.6.tar.gz) = k8JcMPviADlVNi2c4XM2fsxuW0k= +SHA256 (asterisk-1.6.2.6.tar.gz) = LHJKU8QNEvw3EAwdqoMS/Znu4mkgkH4wlMfCt9Dn62E= +SIZE (asterisk-1.6.2.6.tar.gz) = 23265995 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v retrieving revision 1.24 diff -u -p -r1.24 patch-Makefile --- patches/patch-Makefile 25 Mar 2010 12:01:47 -0000 1.24 +++ patches/patch-Makefile 2 Apr 2010 01:03:12 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-Makefile,v 1.24 2010/03/25 12:01:47 sthen Exp $ ---- Makefile.orig Thu Feb 18 04:20:42 2010 -+++ Makefile Fri Mar 12 20:54:09 2010 -@@ -119,7 +119,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) +--- Makefile.orig Thu Feb 18 04:21:31 2010 ++++ Makefile Fri Apr 2 00:59:18 2010 +@@ -122,7 +122,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR)) OVERWRITE=y # Include debug and macro symbols in the executables (-g) and profiling info (-pg) @@ -10,7 +10,7 @@ $OpenBSD: patch-Makefile,v 1.24 2010/03/ # Define standard directories for various platforms -@@ -181,8 +181,10 @@ HTTP_CGIDIR=/var/www/cgi-bin +@@ -184,8 +184,10 @@ 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. @@ -21,7 +21,7 @@ $OpenBSD: patch-Makefile,v 1.24 2010/03/ MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include -@@ -225,7 +227,9 @@ endif +@@ -228,7 +230,9 @@ endif ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),) ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),) @@ -31,26 +31,17 @@ $OpenBSD: patch-Makefile,v 1.24 2010/03/ endif endif -@@ -250,7 +254,9 @@ ifneq ($(findstring BSD,$(OSARCH)),) - endif +@@ -254,7 +258,9 @@ endif - ifneq ($(PROC),ultrasparc) -+ ifneq ($(OSARCH),OpenBSD) - _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) -+ endif + ifeq ($(findstring -march,$(_ASTCFLAGS) $(ASTCFLAGS)),) + ifneq ($(PROC),ultrasparc) ++ ifneq ($(OSARCH),OpenBSD) + _ASTCFLAGS+=$(shell if $(CC) -march=$(PROC) -S -o /dev/null -xc /dev/null >/dev/null 2>&1; then echo "-march=$(PROC)"; fi) ++ endif + endif endif - ifeq ($(PROC),ppc) -@@ -661,7 +667,7 @@ samples: adsi - echo "astrundir => $(ASTVARRUNDIR)" ; \ - echo "astlogdir => $(ASTLOGDIR)" ; \ - echo "" ; \ -- echo ";[options]" ; \ -+ echo "[options]" ; \ - echo ";verbose = 3" ; \ - echo ";debug = 3" ; \ - echo ";alwaysfork = yes ; same as -F at startup" ; \ -@@ -692,15 +698,15 @@ samples: adsi +@@ -733,18 +739,18 @@ samples: adsi echo " ; to the device. It is for this reason that this is optional, as it may result in requiring a" ; \ echo " ; temporary codec translation path for a channel that may not otherwise require one." ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ @@ -58,6 +49,9 @@ $OpenBSD: patch-Makefile,v 1.24 2010/03/ - echo ";rungroup = asterisk ; The group to run as" ; \ + echo "runuser = _asterisk ; The user to run as" ; \ + echo "rungroup = _asterisk ; The group to run as" ; \ + echo ";lightbackground = yes ; If your terminal is set for a light-colored background" ; \ + echo "documentation_language = en_US ; Set the Language you want Documentation displayed in. Value is in the same format as locale names" ; \ + echo ";hideconnect = yes ; Hide messages displayed when a remote console connects and disconnects" ; \ echo "" ; \ echo "; Changing the following lines may compromise your security." ; \ - echo ";[files]" ; \ Index: patches/patch-build_tools_cflags_xml =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-build_tools_cflags_xml,v retrieving revision 1.3 diff -u -p -r1.3 patch-build_tools_cflags_xml --- patches/patch-build_tools_cflags_xml 13 Dec 2009 12:11:29 -0000 1.3 +++ patches/patch-build_tools_cflags_xml 2 Apr 2010 01:03:12 -0000 @@ -1,10 +1,10 @@ $OpenBSD: patch-build_tools_cflags_xml,v 1.3 2009/12/13 12:11:29 sthen Exp $ ---- build_tools/cflags.xml.orig Mon Dec 1 13:39:14 2008 -+++ build_tools/cflags.xml Mon Dec 1 13:39:38 2008 +--- build_tools/cflags.xml.orig Mon Jan 25 21:53:48 2010 ++++ build_tools/cflags.xml Thu Apr 1 02:57:26 2010 @@ -1,5 +1,6 @@ <category name="MENUSELECT_CFLAGS" displayname="Compiler Flags" positive_output="yes" remove_on_change=".lastclean"> <member name="DONT_OPTIMIZE" displayname="Disable Optimizations by the Compiler"> + <defaultenabled>yes</defaultenabled> </member> - <member name="ENABLE_UPLOADS" displayname="Enable HTTP uploads"> - <defaultenabled>yes</defaultenabled> + <member name="DEBUG_THREADS" displayname="Enable Thread Debugging"> + </member> Index: patches/patch-cdr_cdr_sqlite3_custom_c =================================================================== RCS file: patches/patch-cdr_cdr_sqlite3_custom_c diff -N patches/patch-cdr_cdr_sqlite3_custom_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-cdr_cdr_sqlite3_custom_c 2 Apr 2010 01:03:12 -0000 @@ -0,0 +1,24 @@ +$OpenBSD$ + +from r252317, new sqlite has a conflicting function name + +--- cdr/cdr_sqlite3_custom.c.orig Fri Apr 2 01:11:13 2010 ++++ cdr/cdr_sqlite3_custom.c Fri Apr 2 01:11:15 2010 +@@ -220,7 +220,7 @@ static void free_config(int reload) + } + } + +-static int sqlite3_log(struct ast_cdr *cdr) ++static int write_cdr(struct ast_cdr *cdr) + { + int res = 0; + char *error = NULL; +@@ -321,7 +321,7 @@ static int load_module(void) + } + } + +- res = ast_cdr_register(name, desc, sqlite3_log); ++ res = ast_cdr_register(name, desc, write_cdr); + if (res) { + ast_log(LOG_ERROR, "Unable to register custom SQLite3 CDR handling\n"); + free_config(0); Index: patches/patch-channels_Makefile =================================================================== RCS file: patches/patch-channels_Makefile diff -N patches/patch-channels_Makefile --- patches/patch-channels_Makefile 13 Dec 2009 12:11:29 -0000 1.8 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,14 +0,0 @@ -$OpenBSD: patch-channels_Makefile,v 1.8 2009/12/13 12:11:29 sthen Exp $ ---- channels/Makefile.orig Mon Dec 1 13:40:51 2008 -+++ channels/Makefile Mon Dec 1 13:41:05 2008 -@@ -16,8 +16,8 @@ MENUSELECT_CATEGORY=CHANNELS - MENUSELECT_DESCRIPTION=Channel Drivers - - ifeq ($(OSARCH),OpenBSD) -- PTLIB=-lpt_OpenBSD_x86_r -- H323LIB=-lh323_OpenBSD_x86_r -+ PTLIB=-lpt -+ H323LIB=-lh323 - endif - - ifeq ($(OSARCH),linux-gnu) Index: patches/patch-channels_h323_ast_h323_cxx =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-channels_h323_ast_h323_cxx,v retrieving revision 1.4 diff -u -p -r1.4 patch-channels_h323_ast_h323_cxx --- patches/patch-channels_h323_ast_h323_cxx 23 Mar 2010 21:16:53 -0000 1.4 +++ patches/patch-channels_h323_ast_h323_cxx 2 Apr 2010 01:03:12 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-channels_h323_ast_h323_cxx,v 1.4 2010/03/23 21:16:53 ajacoutot Exp $ ---- channels/h323/ast_h323.cxx.orig Thu Jan 28 12:05:04 2010 -+++ channels/h323/ast_h323.cxx Thu Jan 28 12:05:42 2010 -@@ -2364,6 +2364,7 @@ int h323_start_listener(int listenPort, struct sockadd +--- channels/h323/ast_h323.cxx.orig Thu Jun 18 17:44:37 2009 ++++ channels/h323/ast_h323.cxx Thu Apr 1 02:57:26 2010 +@@ -2365,6 +2365,7 @@ int h323_start_listener(int listenPort, struct sockadd return 0; }; @@ -9,7 +9,7 @@ $OpenBSD: patch-channels_h323_ast_h323_c /* Addition of functions just to make the channel driver compile with H323Plus */ #if VERSION(OPENH323_MAJOR, OPENH323_MINOR, OPENH323_BUILD) > VERSION(1,19,4) /* Alternate RTP port information for Same NAT */ -@@ -2389,6 +2390,7 @@ BOOL MyH323_ExternalRTPChannel::OnReceivedAckAltPDU(co +@@ -2390,6 +2391,7 @@ BOOL MyH323_ExternalRTPChannel::OnReceivedAckAltPDU(co return TRUE; } #endif Index: patches/patch-configure_ac =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure_ac,v retrieving revision 1.6 diff -u -p -r1.6 patch-configure_ac --- patches/patch-configure_ac 25 Mar 2010 12:01:47 -0000 1.6 +++ patches/patch-configure_ac 2 Apr 2010 01:03:12 -0000 @@ -1,16 +1,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/03/25 12:01:47 sthen Exp $ ---- configure.ac.orig Mon Jan 25 21:53:28 2010 -+++ configure.ac Fri Mar 12 20:54:09 2010 -@@ -298,7 +298,7 @@ AST_EXT_LIB_SETUP([NBS], [Network Broadcast Sound], [n - AST_EXT_LIB_SETUP([NCURSES], [ncurses], [ncurses]) - AST_EXT_LIB_SETUP([NETSNMP], [Net-SNMP], [netsnmp]) - AST_EXT_LIB_SETUP([NEWT], [newt], [newt]) --AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [odbc]) -+AST_EXT_LIB_SETUP([UNIXODBC], [unixODBC], [iodbc]) - AST_EXT_LIB_SETUP([OGG], [OGG], [ogg]) - AST_EXT_LIB_SETUP([OSPTK], [OSP Toolkit], [osptk]) - AST_EXT_LIB_SETUP([OSS], [Open Sound System], [oss]) -@@ -1324,7 +1324,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l +--- configure.ac.orig Wed Feb 10 19:49:18 2010 ++++ configure.ac Fri Apr 2 01:04:31 2010 +@@ -1399,7 +1399,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp], , [--agent-l AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h]) @@ -19,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/ AST_EXT_LIB_CHECK([OGG], [ogg], [ogg_sync_init], []) -@@ -1439,7 +1439,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != " +@@ -1524,7 +1524,8 @@ if test "${PBX_PWLIB}" = "1" -a "${USE_OPENH323}" != " AST_CHECK_OPENH323() AST_CHECK_PWLIB_VERSION([OpenH323], [OPENH323], [openh323buildopts.h], [1], [17], [3]) AST_CHECK_OPENH323_BUILD() @@ -29,12 +20,13 @@ $OpenBSD: patch-configure_ac,v 1.6 2010/ AST_CHECK_PWLIB_BUILD([OpenH323], [OPENH323], [Define if your system has the OpenH323 libraries.], [#include "ptlib.h" -@@ -1536,7 +1537,7 @@ AST_EXT_LIB_CHECK([TONEZONE], [tonezone], [tone_zone_f - - AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], []) - --AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc]) -+AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -logg]) - - AC_LANG_PUSH(C++) +@@ -1623,7 +1624,8 @@ AST_EXT_LIB_CHECK([USB], [usb], [usb_init], [usb.h], [ + if test "${OSARCH}" = "OpenBSD"; + then +- AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -logg]) ++dnl XXX should use pkg-config ++ AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc -lvorbis -logg]) + else + AST_EXT_LIB_CHECK([VORBIS], [vorbis], [vorbis_info_init], [vorbis/codec.h], [-lm -lvorbisenc]) + fi Index: patches/patch-contrib_scripts_safe_asterisk =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v retrieving revision 1.10 diff -u -p -r1.10 patch-contrib_scripts_safe_asterisk --- patches/patch-contrib_scripts_safe_asterisk 25 Mar 2010 12:01:47 -0000 1.10 +++ patches/patch-contrib_scripts_safe_asterisk 2 Apr 2010 01:03:12 -0000 @@ -2,11 +2,9 @@ $OpenBSD: patch-contrib_scripts_safe_ast - more useful defaults - create /var/run/asterisk with sane ownership/perms -- shell portability fix (s/function//) -- use pkill, it's slightly less unportable than killall ---- contrib/scripts/safe_asterisk.orig Tue Jan 12 03:24:05 2010 -+++ contrib/scripts/safe_asterisk Thu Mar 25 11:47:50 2010 +--- contrib/scripts/safe_asterisk.orig Tue Jan 12 03:25:20 2010 ++++ contrib/scripts/safe_asterisk Fri Apr 2 00:55:43 2010 @@ -2,9 +2,9 @@ # vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent @@ -20,11 +18,11 @@ $OpenBSD: patch-contrib_scripts_safe_ast #EXEC=/path/to/somescript # Run this command if Asterisk crashes #LOGFILE=/path/to/logfile # Where to place the normal logfile (disabled if blank) #SYSLOG=local0 # Which syslog facility to use (disabled if blank) -@@ -13,10 +13,11 @@ DUMPDROP=/tmp - SLEEPSECS=4 +@@ -14,10 +14,11 @@ SLEEPSECS=4 ASTSBINDIR=__ASTERISK_SBIN_DIR__ - ASTPIDFILE=__ASTERISK_VARRUN_DIR__/asterisk.pid -+VARRUNOWNER="_asterisk:wheel" # chown __ASTERISK_VARRUN_DIR__ if it's created. + ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__ + ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid ++VARRUNOWNER="_asterisk:wheel" # chown __ASTERISK_VARRUN_DIR__ if it's created. -# comment this line out to have this script _not_ kill all mpg123 processes when +# uncomment this line to have this script kill all mpg123 processes when @@ -34,19 +32,11 @@ $OpenBSD: patch-contrib_scripts_safe_ast # run asterisk with this priority PRIORITY=0 -@@ -32,7 +33,7 @@ PRIORITY=0 - # set to the system's maximum files open devided by two, if not set here. - # MAXFILES=32768 - --function message() { -+message() { - echo "$1" >&2 - if test "x$SYSLOG" != "x" ; then - logger -p "${SYSLOG}.warn" -t safe_asterisk[$$] "$1" -@@ -42,6 +43,19 @@ function message() { +@@ -42,6 +43,19 @@ message() { + echo "safe_asterisk[$$]: $1" >> "$LOGFILE" fi } - ++ +# Create the directory for the control socket if required. As of 1.6.0.26, +# Asterisk tries to create this itself at startup but doesn't give suitable +# ownership. This must be created before the 'check if asterisk is already @@ -59,16 +49,6 @@ $OpenBSD: patch-contrib_scripts_safe_ast + chmod 770 $varrundir + fi +fi -+ + # Check if Asterisk is already running. If it is, then bug out, because # starting safe_asterisk when Asterisk is running is very bad. - VERSION=`${ASTSBINDIR}/asterisk -rx 'core show version'` -@@ -186,7 +200,7 @@ run_asterisk() - message "Automatically restarting Asterisk." - sleep $SLEEPSECS - if test "0$KILLALLMPG123" -gt "0" ; then -- killall -9 mpg123 -+ pkill -9 mpg123 - fi - done - } Index: patches/patch-main_asterisk_c =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v retrieving revision 1.12 diff -u -p -r1.12 patch-main_asterisk_c --- patches/patch-main_asterisk_c 25 Mar 2010 12:01:47 -0000 1.12 +++ patches/patch-main_asterisk_c 2 Apr 2010 01:03:12 -0000 @@ -4,9 +4,9 @@ from upstream ticket #17076; don't chgrp unless it was automatically created ---- main/asterisk.c.orig Thu Feb 25 21:24:06 2010 -+++ main/asterisk.c Thu Mar 25 08:27:17 2010 -@@ -2929,7 +2929,7 @@ int main(int argc, char *argv[]) +--- main/asterisk.c.orig Thu Feb 25 21:25:05 2010 ++++ main/asterisk.c Thu Apr 1 02:57:26 2010 +@@ -3103,7 +3103,7 @@ int main(int argc, char *argv[]) FILE *f; sigset_t sigs; int num; @@ -15,7 +15,7 @@ unless it was automatically created char *buf; const char *runuser = NULL, *rungroup = NULL; char *remotesock = NULL; -@@ -3118,8 +3118,12 @@ int main(int argc, char *argv[]) +@@ -3303,8 +3303,12 @@ int main(int argc, char *argv[]) /* It's common on some platforms to clear /var/run at boot. Create the * socket file directory before we drop privileges. */ @@ -30,7 +30,7 @@ unless it was automatically created } #ifndef __CYGWIN__ -@@ -3135,7 +3139,7 @@ int main(int argc, char *argv[]) +@@ -3320,7 +3324,7 @@ int main(int argc, char *argv[]) ast_log(LOG_WARNING, "No such group '%s'!\n", rungroup); exit(1); } Index: patches/patch-sounds_Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-sounds_Makefile,v retrieving revision 1.1 diff -u -p -r1.1 patch-sounds_Makefile --- patches/patch-sounds_Makefile 5 Sep 2007 22:42:52 -0000 1.1 +++ patches/patch-sounds_Makefile 2 Apr 2010 01:03:12 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-sounds_Makefile,v 1.1 2007/09/05 22:42:52 sthen Exp $ ---- sounds/Makefile.orig Tue Jan 23 15:12:44 2007 -+++ sounds/Makefile Tue Jan 23 15:13:08 2007 -@@ -60,6 +60,8 @@ endif +--- sounds/Makefile.orig Thu Feb 18 04:21:31 2010 ++++ sounds/Makefile Thu Apr 1 02:57:26 2010 +@@ -68,6 +68,8 @@ endif all: $(CORE_SOUNDS) $(EXTRA_SOUNDS) $(MOH) have_download: Index: pkg/PLIST-curl =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-curl,v retrieving revision 1.3 diff -u -p -r1.3 PLIST-curl --- pkg/PLIST-curl 26 Feb 2010 12:44:14 -0000 1.3 +++ pkg/PLIST-curl 2 Apr 2010 01:03:12 -0000 @@ -2,3 +2,4 @@ @pkgpath telephony/asterisk,-curl,h323 lib/asterisk/modules/func_curl.so lib/asterisk/modules/res_config_curl.so +lib/asterisk/modules/res_curl.so Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v retrieving revision 1.26 diff -u -p -r1.26 PLIST-main --- pkg/PLIST-main 25 Mar 2010 12:01:47 -0000 1.26 +++ pkg/PLIST-main 2 Apr 2010 01:03:12 -0000 @@ -27,7 +27,11 @@ include/asterisk/astobj2.h include/asterisk/astosp.h include/asterisk/audiohook.h include/asterisk/autoconfig.h +include/asterisk/bridging.h +include/asterisk/bridging_features.h +include/asterisk/bridging_technology.h include/asterisk/build.h +include/asterisk/buildinfo.h include/asterisk/buildopts.h include/asterisk/callerid.h include/asterisk/causes.h @@ -39,8 +43,10 @@ include/asterisk/compat.h include/asterisk/compiler.h include/asterisk/config.h include/asterisk/crypto.h +include/asterisk/datastore.h include/asterisk/devicestate.h include/asterisk/dial.h +include/asterisk/dlinkedlists.h include/asterisk/dns.h include/asterisk/dnsmgr.h include/asterisk/doxyref.h @@ -59,6 +65,7 @@ include/asterisk/fskmodem_float.h include/asterisk/fskmodem_int.h include/asterisk/global_datastores.h include/asterisk/hashtab.h +include/asterisk/heap.h include/asterisk/http.h include/asterisk/image.h include/asterisk/indications.h @@ -87,17 +94,20 @@ include/asterisk/rtp.h include/asterisk/say.h include/asterisk/sched.h include/asterisk/sha1.h +include/asterisk/slin.h include/asterisk/slinfactory.h include/asterisk/smdi.h include/asterisk/speech.h include/asterisk/srv.h include/asterisk/stringfields.h include/asterisk/strings.h +include/asterisk/taskprocessor.h include/asterisk/tcptls.h include/asterisk/tdd.h include/asterisk/term.h include/asterisk/threadstorage.h include/asterisk/time.h +include/asterisk/timing.h include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/udptl.h @@ -105,6 +115,8 @@ include/asterisk/ulaw.h include/asterisk/unaligned.h include/asterisk/utils.h include/asterisk/version.h +include/asterisk/xml.h +include/asterisk/xmldoc.h lib/asterisk/ lib/asterisk/modules/ lib/asterisk/modules/app_adsiprog.so @@ -115,6 +127,7 @@ lib/asterisk/modules/app_cdr.so lib/asterisk/modules/app_chanisavail.so lib/asterisk/modules/app_channelredirect.so lib/asterisk/modules/app_chanspy.so +lib/asterisk/modules/app_confbridge.so lib/asterisk/modules/app_controlplayback.so lib/asterisk/modules/app_db.so lib/asterisk/modules/app_dial.so @@ -139,9 +152,10 @@ lib/asterisk/modules/app_mixmonitor.so lib/asterisk/modules/app_morsecode.so lib/asterisk/modules/app_mp3.so lib/asterisk/modules/app_nbscat.so +lib/asterisk/modules/app_originate.so lib/asterisk/modules/app_parkandannounce.so -lib/asterisk/modules/app_pickupchan.so lib/asterisk/modules/app_playback.so +lib/asterisk/modules/app_playtones.so lib/asterisk/modules/app_privacy.so lib/asterisk/modules/app_queue.so lib/asterisk/modules/app_read.so @@ -169,11 +183,16 @@ lib/asterisk/modules/app_waitforsilence. lib/asterisk/modules/app_waituntil.so lib/asterisk/modules/app_while.so lib/asterisk/modules/app_zapateller.so +lib/asterisk/modules/bridge_builtin_features.so +lib/asterisk/modules/bridge_multiplexed.so +lib/asterisk/modules/bridge_simple.so +lib/asterisk/modules/bridge_softmix.so lib/asterisk/modules/cdr_csv.so lib/asterisk/modules/cdr_custom.so lib/asterisk/modules/cdr_manager.so lib/asterisk/modules/cdr_sqlite3_custom.so lib/asterisk/modules/chan_agent.so +lib/asterisk/modules/chan_bridge.so lib/asterisk/modules/chan_iax2.so lib/asterisk/modules/chan_local.so lib/asterisk/modules/chan_mgcp.so @@ -198,17 +217,21 @@ lib/asterisk/modules/format_ilbc.so lib/asterisk/modules/format_jpeg.so lib/asterisk/modules/format_ogg_vorbis.so lib/asterisk/modules/format_pcm.so +lib/asterisk/modules/format_siren14.so +lib/asterisk/modules/format_siren7.so lib/asterisk/modules/format_sln.so lib/asterisk/modules/format_sln16.so lib/asterisk/modules/format_vox.so lib/asterisk/modules/format_wav.so lib/asterisk/modules/format_wav_gsm.so +lib/asterisk/modules/func_aes.so lib/asterisk/modules/func_audiohookinherit.so lib/asterisk/modules/func_base64.so lib/asterisk/modules/func_blacklist.so lib/asterisk/modules/func_callerid.so lib/asterisk/modules/func_cdr.so lib/asterisk/modules/func_channel.so +lib/asterisk/modules/func_config.so lib/asterisk/modules/func_cut.so lib/asterisk/modules/func_db.so lib/asterisk/modules/func_devstate.so @@ -228,6 +251,7 @@ lib/asterisk/modules/func_rand.so lib/asterisk/modules/func_realtime.so lib/asterisk/modules/func_sha1.so lib/asterisk/modules/func_shell.so +lib/asterisk/modules/func_sprintf.so lib/asterisk/modules/func_strings.so lib/asterisk/modules/func_sysinfo.so lib/asterisk/modules/func_timeout.so @@ -244,10 +268,10 @@ lib/asterisk/modules/pbx_spool.so lib/asterisk/modules/res_adsi.so lib/asterisk/modules/res_ael_share.so lib/asterisk/modules/res_agi.so +lib/asterisk/modules/res_clialiases.so lib/asterisk/modules/res_clioriginate.so lib/asterisk/modules/res_convert.so lib/asterisk/modules/res_crypto.so -lib/asterisk/modules/res_indications.so lib/asterisk/modules/res_limit.so lib/asterisk/modules/res_monitor.so lib/asterisk/modules/res_musiconhold.so @@ -255,6 +279,7 @@ lib/asterisk/modules/res_phoneprov.so lib/asterisk/modules/res_realtime.so lib/asterisk/modules/res_smdi.so lib/asterisk/modules/res_speech.so +lib/asterisk/modules/res_timing_pthread.so @man man/man8/asterisk.8 @man man/man8/astgenkey.8 @man man/man8/autosupport.8 @@ -268,6 +293,7 @@ sbin/autosupport @bin sbin/hashtest @bin sbin/hashtest2 sbin/rasterisk +...@bin sbin/refcounter sbin/safe_asterisk @bin sbin/smsq @bin sbin/stereorize @@ -278,6 +304,10 @@ share/asterisk/agi-bin/agi-test.agi @bin share/asterisk/agi-bin/eagi-sphinx-test @bin share/asterisk/agi-bin/eagi-test share/asterisk/agi-bin/jukebox.agi +share/asterisk/documentation/ +share/asterisk/documentation/appdocsxml.dtd +share/asterisk/documentation/core-en_US.xml +share/asterisk/documentation/thirdparty/ share/asterisk/firmware/ share/asterisk/firmware/iax/ share/asterisk/images/ @@ -301,6 +331,7 @@ share/asterisk/phoneprov/000000000000-di share/asterisk/phoneprov/000000000000-phone.cfg share/asterisk/phoneprov/000000000000.cfg share/asterisk/phoneprov/polycom.xml +share/asterisk/phoneprov/polycom_line.xml share/asterisk/sounds/ share/asterisk/sounds/.asterisk-core-sounds-en-gsm-${CORESOUNDS} share/asterisk/sounds/en/ @@ -762,10 +793,15 @@ share/asterisk/static-http/docs/images.o share/asterisk/static-http/docs/images.pl share/asterisk/static-http/docs/images.tex share/asterisk/static-http/docs/img1.png +share/asterisk/static-http/docs/img10.png share/asterisk/static-http/docs/img2.png share/asterisk/static-http/docs/img3.png share/asterisk/static-http/docs/img4.png share/asterisk/static-http/docs/img5.png +share/asterisk/static-http/docs/img6.png +share/asterisk/static-http/docs/img7.png +share/asterisk/static-http/docs/img8.png +share/asterisk/static-http/docs/img9.png share/asterisk/static-http/docs/index.html share/asterisk/static-http/docs/internals.pl share/asterisk/static-http/docs/labels.pl @@ -973,6 +1009,7 @@ share/asterisk/static-http/docs/node28.h share/asterisk/static-http/docs/node280.html share/asterisk/static-http/docs/node281.html share/asterisk/static-http/docs/node282.html +share/asterisk/static-http/docs/node283.html share/asterisk/static-http/docs/node29.html share/asterisk/static-http/docs/node3.html share/asterisk/static-http/docs/node30.html @@ -1076,7 +1113,9 @@ share/doc/asterisk/WARNINGS share/doc/asterisk/ael.tex share/doc/asterisk/ajam.tex share/doc/asterisk/api-1.6.0-changes.odt +share/doc/asterisk/api-1.6.2-changes.txt share/doc/asterisk/app-sms.tex +share/doc/asterisk/appdocsxml.dtd share/doc/asterisk/asterisk-conf.tex share/doc/asterisk/asterisk-mib.txt share/doc/asterisk/asterisk.8 @@ -1092,22 +1131,30 @@ share/doc/asterisk/asterisk.toc share/doc/asterisk/backtrace.tex share/doc/asterisk/backtrace.txt share/doc/asterisk/billing.tex +share/doc/asterisk/building_queues.txt share/doc/asterisk/callfiles.txt share/doc/asterisk/cdrdriver.tex +share/doc/asterisk/chan_sip-perf-testing.txt share/doc/asterisk/chaniax.tex share/doc/asterisk/channelvariables.tex share/doc/asterisk/cli.txt share/doc/asterisk/cliprompt.tex share/doc/asterisk/configuration.tex +share/doc/asterisk/core-en_US.xml +share/doc/asterisk/database_transactions.txt share/doc/asterisk/datastores.txt share/doc/asterisk/digium-mib.txt +share/doc/asterisk/distributed_devstate.txt share/doc/asterisk/dundi.tex share/doc/asterisk/enum.tex share/doc/asterisk/extensions.tex share/doc/asterisk/externalivr.txt +share/doc/asterisk/followme.txt share/doc/asterisk/freetds.tex +share/doc/asterisk/google-soc2009-ideas.txt share/doc/asterisk/hardware.tex share/doc/asterisk/hebrew.ods +share/doc/asterisk/hoard.txt share/doc/asterisk/ices.tex share/doc/asterisk/images.aux share/doc/asterisk/images.log @@ -1116,10 +1163,15 @@ share/doc/asterisk/images.pl share/doc/asterisk/images.tex share/doc/asterisk/imapstorage.tex share/doc/asterisk/img1.png +share/doc/asterisk/img10.png share/doc/asterisk/img2.png share/doc/asterisk/img3.png share/doc/asterisk/img4.png share/doc/asterisk/img5.png +share/doc/asterisk/img6.png +share/doc/asterisk/img7.png +share/doc/asterisk/img8.png +share/doc/asterisk/img9.png share/doc/asterisk/index.html share/doc/asterisk/internals.pl share/doc/asterisk/janitor-projects.txt @@ -1336,6 +1388,7 @@ share/doc/asterisk/node28.html share/doc/asterisk/node280.html share/doc/asterisk/node281.html share/doc/asterisk/node282.html +share/doc/asterisk/node283.html share/doc/asterisk/node29.html share/doc/asterisk/node3.html share/doc/asterisk/node30.html @@ -1433,9 +1486,11 @@ share/doc/asterisk/smdi.txt share/doc/asterisk/sms.txt share/doc/asterisk/speechrec.txt share/doc/asterisk/ss7.txt +share/doc/asterisk/timing.txt share/doc/asterisk/unistim.txt share/doc/asterisk/valgrind.txt share/doc/asterisk/video.txt +share/doc/asterisk/video_console.txt share/examples/asterisk/ @mode 750 @group _asterisk @@ -1446,6 +1501,7 @@ share/examples/asterisk/default/ share/examples/asterisk/default/adsi.conf @comment share/examples/asterisk/default/adtranvofr.conf share/examples/asterisk/default/agents.conf +share/examples/asterisk/default/ais.conf share/examples/asterisk/default/alarmreceiver.conf @comment share/examples/asterisk/default/alsa.conf share/examples/asterisk/default/amd.conf @@ -1460,9 +1516,13 @@ share/examples/asterisk/default/cdr_sqli @comment share/examples/asterisk/default/cdr_tds.conf @comment share/examples/asterisk/default/chan_dahdi.conf share/examples/asterisk/default/cli.conf +share/examples/asterisk/default/cli_aliases.conf +share/examples/asterisk/default/cli_permissions.conf share/examples/asterisk/default/codecs.conf share/examples/asterisk/default/console.conf +share/examples/asterisk/default/dbsep.conf share/examples/asterisk/default/dnsmgr.conf +share/examples/asterisk/default/dsp.conf share/examples/asterisk/default/dundi.conf share/examples/asterisk/default/enum.conf share/examples/asterisk/default/extconfig.conf @@ -1494,6 +1554,7 @@ share/examples/asterisk/default/phone.co share/examples/asterisk/default/phoneprov.conf share/examples/asterisk/default/queuerules.conf share/examples/asterisk/default/queues.conf +share/examples/asterisk/default/res_config_sqlite.conf @comment share/examples/asterisk/default/rpt.conf share/examples/asterisk/default/rtp.conf share/examples/asterisk/default/say.conf Index: pkg/PLIST-speex =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-speex,v retrieving revision 1.2 diff -u -p -r1.2 PLIST-speex --- pkg/PLIST-speex 26 Feb 2010 12:44:14 -0000 1.2 +++ pkg/PLIST-speex 2 Apr 2010 01:03:12 -0000 @@ -1,3 +1,4 @@ @comment $OpenBSD: PLIST-speex,v 1.2 2010/02/26 12:44:14 sthen Exp $ @pkgpath telephony/asterisk,-speex,h323 lib/asterisk/modules/codec_speex.so +lib/asterisk/modules/func_speex.so
