I'm not looking to update in-tree until 1.4.18 is released,
but I need some mixmonitor crash fixes that are in rc3, and
thought I'd throw it out here in case anyone else wants to
try the release candidate. Works on sparc64.
Index: Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile 3 Jan 2008 02:23:30 -0000 1.31
+++ Makefile 31 Jan 2008 09:54:38 -0000
@@ -3,7 +3,7 @@
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
-V= 1.4.17
+V= 1.4.18rc3
DISTNAME= asterisk-$V
FULLPKGNAME-main= ${DISTNAME}
@@ -25,8 +25,9 @@ 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/ \
+#
http://downloads.digium.com/pub/telephony/asterisk/old-releases/
+MASTER_SITES= ftp://pyxis.spacehopper.org/pub/
USE_GMAKE= Yes
USE_LIBTOOL= Yes
Index: distinfo
===================================================================
RCS file: /cvs/ports/telephony/asterisk/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- distinfo 3 Jan 2008 02:23:30 -0000 1.25
+++ distinfo 31 Jan 2008 09:56:18 -0000
@@ -1,5 +1,5 @@
-MD5 (asterisk-1.4.17.tar.gz) = /yX1bXdYWMTeYZ8vWaVQmQ==
-RMD160 (asterisk-1.4.17.tar.gz) = UMBE7gr1OhEBimHvwAi5t0ZTkZ4=
-SHA1 (asterisk-1.4.17.tar.gz) = vJCeNKXTx5AJuQ2sRb6MPAUeVzw=
-SHA256 (asterisk-1.4.17.tar.gz) = hTMeY8kDcMMFEh8TQ1jnbLsGhGoSwEp4JdWGnzMe4A0=
-SIZE (asterisk-1.4.17.tar.gz) = 11463021
+MD5 (asterisk-1.4.18rc3.tar.gz) = 1kUmUtqslrdT33Dg/Jb/mQ==
+RMD160 (asterisk-1.4.18rc3.tar.gz) = nqktISJDhjgfvwjcysxPRw0/o74=
+SHA1 (asterisk-1.4.18rc3.tar.gz) = jhzfB5mXOBUXSWagCxzFydXiQ9o=
+SHA256 (asterisk-1.4.18rc3.tar.gz) =
l//1b2to9mx6PIzaAplPF3Krrf4D7d6m8Ussl7EIkG8=
+SIZE (asterisk-1.4.18rc3.tar.gz) = 11447099
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 patch-Makefile
--- patches/patch-Makefile 19 Dec 2007 21:07:27 -0000 1.14
+++ patches/patch-Makefile 30 Jan 2008 22:22:59 -0000
@@ -1,6 +1,6 @@
$OpenBSD: patch-Makefile,v 1.14 2007/12/19 21:07:27 sthen Exp $
---- Makefile.orig Mon Dec 17 06:44:51 2007
-+++ Makefile Tue Dec 18 22:20:14 2007
+--- Makefile.orig Tue Jan 29 17:21:33 2008
++++ Makefile Wed Jan 30 22:22:58 2008
@@ -35,6 +35,7 @@ export ASTVARRUNDIR
export MODULES_DIR
export ASTSPOOLDIR
@@ -18,7 +18,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
# Create OPTIONS variable
OPTIONS=
-@@ -93,7 +94,7 @@ ASTTOPDIR:=$(shell pwd)
+@@ -95,7 +96,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
OVERWRITE=y
# Include debug and macro symbols in the executables (-g) and profiling info
(-pg)
@@ -27,7 +27,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
# Staging directory
# Files are copied here temporarily during the install process
-@@ -128,6 +129,7 @@ else
+@@ -130,6 +131,7 @@ else
ifneq ($(findstring BSD,$(OSARCH)),)
ASTVARLIBDIR=$(prefix)/share/asterisk
ASTVARRUNDIR=$(localstatedir)/run/asterisk
@@ -35,7 +35,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
else
ASTVARLIBDIR=$(localstatedir)/lib/asterisk
endif
-@@ -156,8 +158,10 @@ HTTP_CGIDIR=/var/www/cgi-bin
+@@ -158,8 +160,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.
@@ -46,7 +46,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
MOD_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
OTHER_SUBDIR_CFLAGS=-I$(ASTTOPDIR)/include
-@@ -196,8 +200,10 @@ ifeq ($(OSARCH),linux-gnu)
+@@ -198,8 +202,10 @@ ifeq ($(OSARCH),linux-gnu)
endif
ifeq ($(findstring -save-temps,$(ASTCFLAGS)),)
@@ -57,7 +57,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
ASTCFLAGS+=-Wall -Wstrict-prototypes -Wmissing-prototypes
-Wmissing-declarations $(DEBUG)
-@@ -212,9 +218,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
+@@ -214,9 +220,11 @@ ifneq ($(findstring BSD,$(OSARCH)),)
ASTLDFLAGS+=-L/usr/local/lib
endif
@@ -69,7 +69,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
ifeq ($(PROC),ppc)
ASTCFLAGS+=-fsigned-char
-@@ -564,13 +572,14 @@ samples: adsi
+@@ -566,13 +574,14 @@ samples: adsi
echo "astetcdir => $(ASTETCDIR)" ; \
echo "astmoddir => $(MODULES_DIR)" ; \
echo "astvarlibdir => $(ASTVARLIBDIR)" ; \
@@ -85,7 +85,7 @@ $OpenBSD: patch-Makefile,v 1.14 2007/12/
echo ";verbose = 3" ; \
echo ";debug = 3" ; \
echo ";alwaysfork = yes ; same as -F at startup" ; \
-@@ -593,15 +602,15 @@ samples: adsi
+@@ -595,15 +604,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-configure
===================================================================
RCS file: /cvs/ports/telephony/asterisk/patches/patch-configure,v
retrieving revision 1.4
diff -u -p -r1.4 patch-configure
--- patches/patch-configure 21 Dec 2007 10:22:19 -0000 1.4
+++ patches/patch-configure 30 Jan 2008 22:22:59 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-configure,v 1.4 2007/12/21 10:22:19 sthen Exp $
---- configure.orig Wed Dec 19 22:48:48 2007
-+++ configure Fri Dec 21 01:10:46 2007
-@@ -18778,7 +18778,11 @@ echo $ECHO_N "checking for UW IMAP Toolkit c-client li
+--- 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"
@@ -14,7 +14,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22558,13 +22562,13 @@ if test "${USE_UNIXODBC}" != "no"; then
+@@ -23001,13 +23005,13 @@ if test "${USE_UNIXODBC}" != "no"; then
pbxlibdir="-L${UNIXODBC_DIR}"
fi
fi
@@ -31,7 +31,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
-@@ -22627,7 +22631,7 @@ fi
+@@ -23070,7 +23074,7 @@ fi
if test "${AST_UNIXODBC_FOUND}" = "yes"; then
@@ -40,7 +40,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
UNIXODBC_HEADER_FOUND="1"
if test "x${UNIXODBC_DIR}" != "x"; then
UNIXODBC_LIB="${pbxlibdir} ${UNIXODBC_LIB}"
-@@ -26143,7 +26147,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -26586,7 +26590,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 +49,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
let
PWLIB_VER=${PWLIB_MAJOR_VERSION}*10000+${PWLIB_MINOR_VERSION}*100+${PWLIB_BUILD_NUMBER}
let PWLIB_REQ=1*10000+9*100+2
-@@ -26245,6 +26249,9 @@ esac
+@@ -26688,6 +26692,9 @@ esac
PWLIB_PLATFORM="${PWLIB_OSTYPE}_${PWLIB_MACHTYPE}"
@@ -59,7 +59,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
-@@ -27103,7 +27110,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -27546,7 +27553,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 +68,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
let
OPENH323_VER=${OPENH323_MAJOR_VERSION}*10000+${OPENH323_MINOR_VERSION}*100+${OPENH323_BUILD_NUMBER}
let OPENH323_REQ=1*10000+17*100+3
-@@ -27124,7 +27131,7 @@ echo "${ECHO_T}yes" >&6; }
+@@ -27567,7 +27574,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 +77,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
for pfx in $prefixes; do
files=`ls -l ${OPENH323_LIBDIR}/lib${pfx}*.so*
2>/dev/null`
libfile=
-@@ -27152,7 +27159,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
+@@ -27595,7 +27602,8 @@ echo $ECHO_N "checking OpenH323 build option... $ECHO_
d)
OPENH323_BUILD="debug";;
*)
@@ -87,7 +87,7 @@ $OpenBSD: patch-configure,v 1.4 2007/12/
notrace=`eval "grep NOTRACE
${OPENH323DIR}/openh323u.mak | grep = | sed -e 's/[A-Z0-9_]*[ ]*=[
]*//'"`
if test "x$notrace" = "x"; then
notrace="0"
-@@ -31690,7 +31698,7 @@ if test "${ac_cv_lib_vorbis_vorbis_info_init+set}" = s
+@@ -32274,7 +32282,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.3
diff -u -p -r1.3 patch-main_asterisk_c
--- patches/patch-main_asterisk_c 27 Nov 2007 10:41:04 -0000 1.3
+++ patches/patch-main_asterisk_c 30 Jan 2008 22:24:29 -0000
@@ -1,7 +1,7 @@
$OpenBSD: patch-main_asterisk_c,v 1.3 2007/11/27 10:41:04 sthen Exp $
---- main/asterisk.c.orig Wed Oct 17 16:23:51 2007
-+++ main/asterisk.c Sat Nov 17 00:45:45 2007
-@@ -2411,6 +2411,7 @@ static void ast_readconfig(void)
+--- 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)
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.3 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));
-@@ -2708,6 +2709,7 @@ int main(int argc, char *argv[])
+@@ -2707,6 +2708,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.5
diff -u -p -r1.5 PLIST-main
--- pkg/PLIST-main 19 Dec 2007 21:07:27 -0000 1.5
+++ pkg/PLIST-main 30 Jan 2008 22:51:52 -0000
@@ -20,6 +20,7 @@ include/asterisk/astmm.h
include/asterisk/astobj.h
include/asterisk/astobj2.h
include/asterisk/astosp.h
+include/asterisk/audiohook.h
include/asterisk/autoconfig.h
include/asterisk/build.h
include/asterisk/buildopts.h
@@ -27,7 +28,6 @@ include/asterisk/callerid.h
include/asterisk/causes.h
include/asterisk/cdr.h
include/asterisk/channel.h
-include/asterisk/chanspy.h
include/asterisk/chanvars.h
include/asterisk/cli.h
include/asterisk/compat.h
