I'll make this diff for the rc available for testing before the
actual release so we can get the update in promptly when it happens
(seemed to work well last time round) - lots of bugs fixed in this
version again. Nothing marked as security-related, but a fairly
major race that could result in memory corruption was fixed,
lots of locking cleanup, a few assorted crashes fixed, bit of
log despamming and more.
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile 15 Mar 2008 17:41:12 -0000 1.33
+++ Makefile 18 Mar 2008 09:45:24 -0000
@@ -3,9 +3,9 @@
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
-V= 1.4.18
+V= 1.4.19-rc2
DISTNAME= asterisk-$V
-FULLPKGNAME-main= ${DISTNAME}
+FULLPKGNAME-main= ${DISTNAME:S/-rc/rc/}
CATEGORIES= telephony
@@ -27,8 +27,7 @@ WANTLIB-main= c crypto m pthread ssl st
LIB_DEPENDS-main= popt::devel/popt
-MASTER_SITES= http://downloads.digium.com/pub/telephony/asterisk/ \
-
http://downloads.digium.com/pub/telephony/asterisk/old-releases/
+MASTER_SITES=
http://downloads.digium.com/pub/telephony/asterisk/releases/
USE_GMAKE= Yes
USE_LIBTOOL= Yes
@@ -173,7 +172,7 @@ LIB_DEPENDS-main+= h323::net/openh323 \
CONFIGURE_ARGS+= --with-pwlib=${LOCALBASE}/lib \
--with-h323=${LOCALBASE}/lib
WANTLIB-main+= expat ossaudio avutil
-FULLPKGNAME-main= ${DISTNAME}p0-h323
+FULLPKGNAME-main= asterisk-$V-h323
pre-build:
cd ${WRKSRC} && ${MAKE_PROGRAM} include/asterisk/buildopts.h
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo 7 Feb 2008 22:08:30 -0000 1.26
+++ distinfo 18 Mar 2008 09:44:49 -0000
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.18.tar.gz) = PYsrLvTyApAXcWY7QPGcPQ==
-RMD160 (asterisk-1.4.18.tar.gz) = ZRzyMoNWKLGE9HnbTA6AC0vtyA8=
-SHA1 (asterisk-1.4.18.tar.gz) = OgJ0iDlVELbr5KCgw3LbM7IESwo=
-SHA256 (asterisk-1.4.18.tar.gz) = QgnjzaW+JbWpg0WZCQxKK6R4rLZnChFYF2a0gNhWEI8=
-SIZE (asterisk-1.4.18.tar.gz) = 11496828
+MD5 (asterisk-1.4.19-rc2.tar.gz) = G1FWxyn2r3wvB4Rritd42A==
+RMD160 (asterisk-1.4.19-rc2.tar.gz) = NX+gq0IrstqksRHLgyfhYxdKN1o=
+SHA1 (asterisk-1.4.19-rc2.tar.gz) = EXS/FAB35wj/OGZR9NeXWCKGEHs=
+SHA256 (asterisk-1.4.19-rc2.tar.gz) =
AawrwSeo9J9jPfZbD7qEaAeL6W1HVGxQxgWuIVu01po=
+SIZE (asterisk-1.4.19-rc2.tar.gz) = 11527156
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 patch-Makefile
--- patches/patch-Makefile 7 Feb 2008 22:08:30 -0000 1.15
+++ patches/patch-Makefile 18 Mar 2008 09:45:50 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.15 2008/02/07 22:08:30 sthen Exp $
---- Makefile.orig Tue Jan 29 17:21:33 2008
-+++ Makefile Wed Jan 30 22:22:58 2008
+--- Makefile.orig Tue Feb 26 18:26:12 2008
++++ Makefile Tue Mar 18 09:45:42 2008
@@ -35,6 +35,7 @@ export ASTVARRUNDIR
export MODULES_DIR
export ASTSPOOLDIR
@@ -69,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.15 2008/02/
ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char
-@@ -566,13 +574,14 @@ samples: adsi
+@@ -573,13 +581,14 @@ samples: adsi
echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@@ -85,7 +85,7 @@ $OpenBSD: patch-Makefile,v 1.15 2008/02/
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
-@@ -595,15 +604,15 @@ samples: adsi
+@@ -602,15 +611,15 @@ samples: adsi
echo ";record_cache_dir = /tmp ; Specify cache directory (used
in cnjunction with cache_record_files)" ; \
echo ";transmit_silence_during_record = yes ; Transmit SLINEAR
silence while a channel is being recorded" ; \
echo ";transcode_via_sln = yes ; Build transcode paths via
SLINEAR, instead of directly" ; \
Index: patches/patch-channels_h323_ast_h323_cxx
===================================================================
RCS file: patches/patch-channels_h323_ast_h323_cxx
diff -N patches/patch-channels_h323_ast_h323_cxx
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-channels_h323_ast_h323_cxx 12 Mar 2008 12:01:39 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- channels/h323/ast_h323.cxx.orig Thu Mar 6 09:33:18 2008
++++ channels/h323/ast_h323.cxx Thu Mar 6 09:33:45 2008
+@@ -81,6 +81,7 @@ static MyH323EndPoint *endPoint = NULL;
+ /** PWLib entry point */
+ static MyProcess *localProcess = NULL;
+
++int timerChangePipe[2];
+ static int _timerChangePipe[2];
+
+ static unsigned traceOptions = PTrace::Timestamp | PTrace::Thread |
PTrace::FileAndLine;
Index: patches/patch-configure
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure,v
retrieving revision 1.5
diff -u -p -r1.5 patch-configure
--- patches/patch-configure 7 Feb 2008 22:08:30 -0000 1.5
+++ patches/patch-configure 18 Mar 2008 09:45:42 -0000
@@ -1,20 +1,7 @@
$OpenBSD: patch-configure,v 1.5 2008/02/07 22:08:30 sthen Exp $
---- configure.orig Wed Jan 16 01:13:27 2008
-+++ configure Wed Jan 30 22:22:58 2008
-@@ -19221,7 +19221,11 @@ echo $ECHO_N "checking for UW IMAP Toolkit c-client li
- imap_ldflags=`cat ${IMAP_TK_DIR}/c-client/LDFLAGS`
- fi
- CPPFLAGS="${CPPFLAGS} -I${IMAP_TK_DIR}/c-client"
-- LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
-+ if test -f ${IMAP_TK_DIR}/c-client/c-client.a ; then
-+ LIBS="${LIBS} ${IMAP_TK_DIR}/c-client/c-client.a "`echo ${imap_ldflags}`
-+ elif test -f ${IMAP_TK_DIR}/../lib/c-client.a ; then
-+ LIBS="${LIBS} ${IMAP_TK_DIR}/../lib/c-client.a "`echo ${imap_ldflags}`
-+ fi
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -23001,13 +23005,13 @@ if test "${USE_UNIXODBC}" != "no"; then
+--- configure.orig Tue Mar 11 14:33:45 2008
++++ configure Tue Mar 18 09:45:42 2008
+@@ -23314,13 +23314,13 @@ if test "${USE_UNIXODBC}" != "no"; then
pbxlibdir="-L${UNIXODBC_DIR}"
fi
fi
@@ -31,7 +18,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -23070,7 +23074,7 @@ fi
+@@ -23383,7 +23383,7 @@ fi
if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@@ -40,7 +27,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
UNIXODBC_HEADER_FOUND="1"
if test "x${UNIXODBC_DIR}" != "x"; then
UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
-@@ -26586,7 +26590,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -26899,7 +26899,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.`
@@ -49,7 +36,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
let
PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
let PWLIB_REQ=1*10000+9*100+2
-@@ -26688,6 +26692,9 @@ esac
+@@ -27001,6 +27001,9 @@ esac
PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
@@ -59,7 +46,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
-@@ -27546,7 +27553,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -27859,7 +27862,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.`
@@ -68,7 +55,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
let
OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
let OPENH323_REQ=1*10000+17*100+3
-@@ -27567,7 +27574,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -27880,7 +27883,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=
@@ -77,7 +64,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
for pfx in $prefixes; do
files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so*
2>/dev/null`
libfile=
-@@ -27595,7 +27602,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
+@@ -27908,7 +27911,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
d)
OPENH323_BUILD="debug";;
*)
@@ -87,7 +74,7 @@ $OpenBSD: patch-configure,v 1.5 2008/02/
notrace=`eval "grep NOTRACE
${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[
]*//'"`
if test "x$notrace" = "x"; then
notrace="0"
-@@ -32274,7 +32282,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
+@@ -32587,7 +32591,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-contrib_scripts_safe_asterisk
===================================================================
RCS file:
/cvs/ports/telephony/asterisk/patches/patch-contrib_scripts_safe_asterisk,v
retrieving revision 1.5
diff -u -p -r1.5 patch-contrib_scripts_safe_asterisk
--- patches/patch-contrib_scripts_safe_asterisk 4 Oct 2007 11:25:44 -0000
1.5
+++ patches/patch-contrib_scripts_safe_asterisk 18 Mar 2008 09:45:47 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.5 2007/10/04 11:25:44 sthen
Exp $
---- contrib/scripts/safe_asterisk.orig Thu Sep 20 22:01:20 2007
-+++ contrib/scripts/safe_asterisk Wed Oct 3 21:15:26 2007
+--- contrib/scripts/safe_asterisk.orig Tue Feb 12 22:22:54 2008
++++ contrib/scripts/safe_asterisk Tue Mar 18 09:45:42 2008
@@ -1,20 +1,21 @@
-#!/bin/bash
+#!/bin/sh
@@ -42,7 +42,7 @@ $OpenBSD: patch-contrib_scripts_safe_ast
fi
#
-@@ -167,7 +174,7 @@ run_asterisk()
+@@ -162,7 +169,7 @@ run_asterisk()
sleep $SLEEPSECS
if [ $KILLALLMPG123 ]
then
Index: patches/patch-main_asterisk_c
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-main_asterisk_c,v
retrieving revision 1.4
diff -u -p -r1.4 patch-main_asterisk_c
--- patches/patch-main_asterisk_c 7 Feb 2008 22:08:30 -0000 1.4
+++ patches/patch-main_asterisk_c 18 Mar 2008 09:45:49 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-main_asterisk_c,v 1.4 2008/02/07 22:08:30 sthen Exp $
---- main/asterisk.c.orig Thu Jan 24 17:22:09 2008
-+++ main/asterisk.c Wed Jan 30 22:22:58 2008
-@@ -2410,6 +2410,7 @@ static void ast_readconfig(void)
+--- main/asterisk.c.orig Fri Mar 7 06:36:33 2008
++++ main/asterisk.c Tue Mar 18 09:45:42 2008
+@@ -2412,6 +2412,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.4 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));
-@@ -2707,6 +2708,7 @@ int main(int argc, char *argv[])
+@@ -2709,6 +2710,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.6
diff -u -p -r1.6 PLIST-main
--- pkg/PLIST-main 7 Feb 2008 22:08:30 -0000 1.6
+++ pkg/PLIST-main 18 Mar 2008 09:57:16 -0000
@@ -260,8 +260,9 @@ share/asterisk/moh/fpm-calm-river.wav
share/asterisk/moh/fpm-sunshine.wav
share/asterisk/moh/fpm-world-mix.wav
share/asterisk/sounds/
-share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.8
-share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.8
+share/asterisk/sounds/.asterisk-core-sounds-en-gsm-1.4.9
+share/asterisk/sounds/CHANGES-asterisk-core-en-1.4.9
+share/asterisk/sounds/CREDITS-asterisk-core-en-1.4.9
share/asterisk/sounds/agent-alreadyon.gsm
share/asterisk/sounds/agent-incorrect.gsm
share/asterisk/sounds/agent-loggedoff.gsm
@@ -408,15 +409,19 @@ share/asterisk/sounds/digits/thousand.gs
share/asterisk/sounds/digits/today.gsm
share/asterisk/sounds/digits/tomorrow.gsm
share/asterisk/sounds/digits/yesterday.gsm
+share/asterisk/sounds/dir-first.gsm
+share/asterisk/sounds/dir-firstlast.gsm
share/asterisk/sounds/dir-instr.gsm
share/asterisk/sounds/dir-intro-fn.gsm
share/asterisk/sounds/dir-intro.gsm
+share/asterisk/sounds/dir-last.gsm
share/asterisk/sounds/dir-multi1.gsm
share/asterisk/sounds/dir-multi2.gsm
share/asterisk/sounds/dir-multi3.gsm
share/asterisk/sounds/dir-multi9.gsm
share/asterisk/sounds/dir-nomatch.gsm
share/asterisk/sounds/dir-nomore.gsm
+share/asterisk/sounds/dir-pls-enter.gsm
share/asterisk/sounds/es/
share/asterisk/sounds/followme/
share/asterisk/sounds/followme/call-from.gsm
@@ -557,12 +562,20 @@ share/asterisk/sounds/silence/7.gsm
share/asterisk/sounds/silence/8.gsm
share/asterisk/sounds/silence/9.gsm
share/asterisk/sounds/spy-agent.gsm
+share/asterisk/sounds/spy-console.gsm
share/asterisk/sounds/spy-h323.gsm
share/asterisk/sounds/spy-iax.gsm
share/asterisk/sounds/spy-iax2.gsm
+share/asterisk/sounds/spy-jingle.gsm
+share/asterisk/sounds/spy-local.gsm
share/asterisk/sounds/spy-mgcp.gsm
+share/asterisk/sounds/spy-misdn.gsm
+share/asterisk/sounds/spy-mobile.gsm
+share/asterisk/sounds/spy-nbs.gsm
share/asterisk/sounds/spy-sip.gsm
share/asterisk/sounds/spy-skinny.gsm
+share/asterisk/sounds/spy-unistim.gsm
+share/asterisk/sounds/spy-usbradio.gsm
share/asterisk/sounds/spy-zap.gsm
share/asterisk/sounds/ss-noservice.gsm
share/asterisk/sounds/transfer.gsm
@@ -604,6 +617,7 @@ share/asterisk/sounds/vm-incorrect-mailb
share/asterisk/sounds/vm-incorrect.gsm
share/asterisk/sounds/vm-instructions.gsm
share/asterisk/sounds/vm-intro.gsm
+share/asterisk/sounds/vm-invalidpassword.gsm
share/asterisk/sounds/vm-isonphone.gsm
share/asterisk/sounds/vm-isunavail.gsm
share/asterisk/sounds/vm-last.gsm
@@ -625,8 +639,10 @@ share/asterisk/sounds/vm-nobox.gsm
share/asterisk/sounds/vm-nomore.gsm
share/asterisk/sounds/vm-nonumber.gsm
share/asterisk/sounds/vm-num-i-have.gsm
+share/asterisk/sounds/vm-onefor-full.gsm
share/asterisk/sounds/vm-onefor.gsm
share/asterisk/sounds/vm-options.gsm
+share/asterisk/sounds/vm-opts-full.gsm
share/asterisk/sounds/vm-opts.gsm
share/asterisk/sounds/vm-passchanged.gsm
share/asterisk/sounds/vm-password.gsm
@@ -655,6 +671,7 @@ share/asterisk/sounds/vm-tempgreeting2.g
share/asterisk/sounds/vm-tempremoved.gsm
share/asterisk/sounds/vm-then-pound.gsm
share/asterisk/sounds/vm-theperson.gsm
+share/asterisk/sounds/vm-tmpexists.gsm
share/asterisk/sounds/vm-tocallback.gsm
share/asterisk/sounds/vm-tocallnum.gsm
share/asterisk/sounds/vm-tocancel.gsm
