Loads of fixes (5 release candidates this time round!). Anyone like to test?
In the absence of negative feedback I'll probably put this in in a couple of days. Index: Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/Makefile,v retrieving revision 1.44 diff -u -p -r1.44 Makefile --- Makefile 23 Jul 2008 08:57:10 -0000 1.44 +++ Makefile 3 Oct 2008 15:08:14 -0000 @@ -3,7 +3,7 @@ SHARED_ONLY= Yes COMMENT-main= open source multi-protocol PBX and telephony toolkit -V= 1.4.21.2 +V= 1.4.22 DISTNAME= asterisk-$V FULLPKGNAME-main= asterisk-$V @@ -205,7 +205,8 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/{BUGS,CHANGES,COPYING,CREDITS} \ ${WRKSRC}/{ChangeLog,LICENSE,README,UPGRADE.txt} \ ${PREFIX}/share/doc/asterisk - ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/asterisk + ${INSTALL_DATA} `find ${WRKSRC}/doc -type f` \ + ${PREFIX}/share/doc/asterisk ${INSTALL_DATA_DIR} ${EXAMPLEDIR} ${INSTALL_DATA_DIR} ${EXAMPLEDIR}/openbsd ${INSTALL_DATA} ${FILESDIR}/*.sample ${EXAMPLEDIR}/openbsd Index: distinfo =================================================================== RCS file: /cvs/ports/telephony/asterisk/distinfo,v retrieving revision 1.34 diff -u -p -r1.34 distinfo --- distinfo 23 Jul 2008 08:57:10 -0000 1.34 +++ distinfo 3 Oct 2008 15:08:14 -0000 @@ -1,5 +1,5 @@ -MD5 (asterisk-1.4.21.2.tar.gz) = RogeE0Xsoh6hOn1bEDb6bg== -RMD160 (asterisk-1.4.21.2.tar.gz) = k4xhjReu70WhfS++UpP7wTxO/g0= -SHA1 (asterisk-1.4.21.2.tar.gz) = jA3PV/ac4nkp94NggTFqJpXrdvo= -SHA256 (asterisk-1.4.21.2.tar.gz) = J8O7DkfG92LAznAc2XtfI/00JJhFI781NZO3emluqLU= -SIZE (asterisk-1.4.21.2.tar.gz) = 11528693 +MD5 (asterisk-1.4.22.tar.gz) = dib+vEoB4W4BLfzLnkq50g== +RMD160 (asterisk-1.4.22.tar.gz) = RpnGljCJ/RloNvf4b5gn7cE8Q5c= +SHA1 (asterisk-1.4.22.tar.gz) = WY1/3wdaTmFUvIkQ0+05lfOcnyM= +SHA256 (asterisk-1.4.22.tar.gz) = em2A7Y3job/X8sNELsXrHaPur/as4aPARXiEgYHu55o= +SIZE (asterisk-1.4.22.tar.gz) = 11598693 Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v retrieving revision 1.17 diff -u -p -r1.17 patch-Makefile --- patches/patch-Makefile 27 May 2008 22:14:34 -0000 1.17 +++ patches/patch-Makefile 3 Oct 2008 15:08:14 -0000 @@ -1,6 +1,6 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/27 22:14:34 sthen Exp $ ---- Makefile.orig Mon May 5 21:17:55 2008 -+++ Makefile Wed May 21 01:24:30 2008 +--- Makefile.orig Mon Sep 8 21:15:42 2008 ++++ Makefile Thu Oct 2 22:54:53 2008 @@ -35,6 +35,7 @@ export ASTVARRUNDIR export MODULES_DIR export ASTSPOOLDIR @@ -69,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/ ifeq ($(PROC),ppc) ASTCFLAGS+=-fsigned-char -@@ -575,13 +583,14 @@ samples: adsi +@@ -574,6 +582,7 @@ samples: adsi echo "astetcdir => $(ASTETCDIR)" ; \ echo "astmoddir => $(MODULES_DIR)" ; \ echo "astvarlibdir => $(ASTVARLIBDIR)" ; \ @@ -77,15 +77,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/ echo "astdatadir => $(ASTDATADIR)" ; \ echo "astagidir => $(AGI_DIR)" ; \ echo "astspooldir => $(ASTSPOOLDIR)" ; \ - 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" ; \ -@@ -605,15 +614,15 @@ samples: adsi +@@ -604,16 +613,16 @@ samples: adsi echo ";transmit_silence_during_record = yes ; Transmit SLINEAR silence while a channel is being recorded" ; \ echo ";transmit_silence = yes ; Transmit SLINEAR silence while a channel is being recorded or DTMF is being generated" ; \ echo ";transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of directly" ; \ @@ -93,6 +85,7 @@ $OpenBSD: patch-Makefile,v 1.17 2008/05/ - 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 ";dahdichanname = yes ; Channels created by chan_dahdi will be called 'DAHDI', otherwise 'Zap'" ; \ echo "" ; \ echo "; Changing the following lines may compromise your security." ; \ - echo ";[files]" ; \ Index: patches/patch-configure =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure,v retrieving revision 1.7 diff -u -p -r1.7 patch-configure --- patches/patch-configure 27 May 2008 22:14:34 -0000 1.7 +++ patches/patch-configure 3 Oct 2008 15:08:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/27 22:14:34 sthen Exp $ ---- configure.orig Fri May 9 17:34:08 2008 -+++ configure Wed May 21 01:24:30 2008 -@@ -23526,13 +23526,13 @@ if test "${USE_UNIXODBC}" != "no"; then +--- configure.orig Mon Sep 8 17:26:00 2008 ++++ configure Thu Oct 2 22:51:06 2008 +@@ -21945,13 +21945,13 @@ if test "${USE_UNIXODBC}" != "no"; then pbxlibdir="-L${UNIXODBC_DIR}" fi fi @@ -18,7 +18,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -23595,7 +23595,7 @@ fi +@@ -22014,7 +22014,7 @@ fi if test "${AST_UNIXODBC_FOUND}" = "yes"; then @@ -27,7 +27,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ UNIXODBC_HEADER_FOUND="1" if test "x${UNIXODBC_DIR}" != "x"; then UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}" -@@ -27520,7 +27520,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -25354,7 +25354,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu PWLIB_VERSION=`grep "PWLIB_VERSION" ${PWLIB_INCDIR}/ptbuildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` PWLIB_MAJOR_VERSION=`echo ${PWLIB_VERSION} | cut -f1 -d.` PWLIB_MINOR_VERSION=`echo ${PWLIB_VERSION} | cut -f2 -d.` @@ -36,7 +36,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ let PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER} let PWLIB_REQ=1*10000+9*100+2 -@@ -27622,6 +27622,9 @@ esac +@@ -25456,6 +25456,9 @@ esac PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}" @@ -46,7 +46,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ -@@ -28480,7 +28483,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu +@@ -26314,7 +26317,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu OPENH323_VERSION=`grep "OPENH323_VERSION" ${OPENH323_INCDIR}/openh323buildopts.h | cut -f2 -d ' ' | sed -e 's/"//g'` OPENH323_MAJOR_VERSION=`echo ${OPENH323_VERSION} | cut -f1 -d.` OPENH323_MINOR_VERSION=`echo ${OPENH323_VERSION} | cut -f2 -d.` @@ -55,7 +55,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ let OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER} let OPENH323_REQ=1*10000+17*100+3 -@@ -28501,7 +28504,7 @@ echo "${ECHO_T}yes" >&6; } +@@ -26335,7 +26338,7 @@ echo "${ECHO_T}yes" >&6; } { echo "$as_me:$LINENO: checking OpenH323 build option" >&5 echo $ECHO_N "checking OpenH323 build option... $ECHO_C" >&6; } OPENH323_SUFFIX= @@ -64,7 +64,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ for pfx in $prefixes; do files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so* 2>/dev/null` libfile= -@@ -28529,7 +28532,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_ +@@ -26363,7 +26366,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_ d) OPENH323_BUILD="debug";; *) @@ -74,7 +74,7 @@ $OpenBSD: patch-configure,v 1.7 2008/05/ notrace=`eval "grep NOTRACE ${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[ ]*//'"` if test "x$notrace" = "x"; then notrace="0" -@@ -33636,7 +33640,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s +@@ -29781,7 +29785,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS Index: patches/patch-main_asterisk_c =================================================================== RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v retrieving revision 1.7 diff -u -p -r1.7 patch-main_asterisk_c --- patches/patch-main_asterisk_c 14 Jun 2008 16:00:10 -0000 1.7 +++ patches/patch-main_asterisk_c 3 Oct 2008 15:08:14 -0000 @@ -1,7 +1,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.7 2008/06/14 16:00:10 sthen Exp $ ---- main/asterisk.c.orig Tue May 27 19:58:09 2008 -+++ main/asterisk.c Thu Jun 12 19:49:36 2008 -@@ -2478,6 +2478,7 @@ static void ast_readconfig(void) +--- main/asterisk.c.orig Sat Jul 26 16:31:21 2008 ++++ main/asterisk.c Thu Oct 2 22:51:06 2008 +@@ -2486,6 +2486,7 @@ static void ast_readconfig(void) snprintf(ast_config_AST_MONITOR_DIR, sizeof(ast_config_AST_MONITOR_DIR) - 1, "%s/monitor", v->value); } else if (!strcasecmp(v->name, "astvarlibdir")) { ast_copy_string(ast_config_AST_VAR_DIR, v->value, sizeof(ast_config_AST_VAR_DIR)); @@ -9,7 +9,7 @@ $OpenBSD: patch-main_asterisk_c,v 1.7 20 snprintf(ast_config_AST_DB, sizeof(ast_config_AST_DB), "%s/astdb", v->value); } else if (!strcasecmp(v->name, "astdatadir")) { ast_copy_string(ast_config_AST_DATA_DIR, v->value, sizeof(ast_config_AST_DATA_DIR)); -@@ -2775,6 +2776,7 @@ int main(int argc, char *argv[]) +@@ -2797,6 +2798,7 @@ int main(int argc, char *argv[]) rungroup = ast_config_AST_RUN_GROUP; if ((!runuser) && !ast_strlen_zero(ast_config_AST_RUN_USER)) runuser = ast_config_AST_RUN_USER; Index: pkg/PLIST-main =================================================================== RCS file: /cvs/ports/telephony/asterisk/pkg/PLIST-main,v retrieving revision 1.9 diff -u -p -r1.9 PLIST-main --- pkg/PLIST-main 30 Jun 2008 20:03:49 -0000 1.9 +++ pkg/PLIST-main 3 Oct 2008 15:08:14 -0000 @@ -34,9 +34,9 @@ include/asterisk/compat.h include/asterisk/compiler.h include/asterisk/config.h include/asterisk/crypto.h +include/asterisk/dahdi_compat.h include/asterisk/devicestate.h include/asterisk/dial.h -include/asterisk/dlfcn-compat.h include/asterisk/dns.h include/asterisk/dnsmgr.h include/asterisk/doxyref.h @@ -84,6 +84,7 @@ include/asterisk/tdd.h include/asterisk/term.h include/asterisk/threadstorage.h include/asterisk/time.h +include/asterisk/tonezone_compat.h include/asterisk/transcap.h include/asterisk/translate.h include/asterisk/udptl.h @@ -735,6 +736,7 @@ share/doc/asterisk/extensions.txt share/doc/asterisk/externalivr.txt share/doc/asterisk/freetds.txt share/doc/asterisk/hardware.txt +share/doc/asterisk/hebrew.ods share/doc/asterisk/iax.txt share/doc/asterisk/ices.txt share/doc/asterisk/imapstorage.txt @@ -759,6 +761,7 @@ share/doc/asterisk/radius.txt share/doc/asterisk/realtime.txt share/doc/asterisk/rtp-packetization.txt share/doc/asterisk/security.txt +share/doc/asterisk/sip-retransmit.txt share/doc/asterisk/sla.pdf share/doc/asterisk/sla.tex share/doc/asterisk/smdi.txt @@ -783,6 +786,7 @@ share/examples/asterisk/default/cdr.conf share/examples/asterisk/default/cdr_custom.conf share/examples/asterisk/default/cdr_manager.conf @comment share/examples/asterisk/default/cdr_tds.conf [EMAIL PROTECTED] share/examples/asterisk/default/chan_dahdi.conf share/examples/asterisk/default/codecs.conf share/examples/asterisk/default/dnsmgr.conf share/examples/asterisk/default/dundi.conf @@ -825,7 +829,6 @@ share/examples/asterisk/default/udptl.co share/examples/asterisk/default/users.conf share/examples/asterisk/default/voicemail.conf @comment share/examples/asterisk/default/vpb.conf [EMAIL PROTECTED] share/examples/asterisk/default/zapata.conf share/examples/asterisk/openbsd/ share/examples/asterisk/openbsd/extensions.conf.sample @mode 640