Update the asterisk port to 10.8.0 - This is a major update, notable changes:

- If using ConfBridge, note that the dialplan arguments have changed.

- If using the built-in HTTP server, note that a bindaddr must now be given,
previously the default was 0.0.0.0 but this must now be given explicitly.

- Internal database now uses SQLite3 not BDB, conversion tools are provided.

See share/doc/asterisk/UPGRADE.txt for more.
This commit is contained in:
sthen 2012-09-28 00:03:57 +00:00
parent e435381750
commit bb0dc52ad9
13 changed files with 103 additions and 4438 deletions

View File

@ -1,10 +1,9 @@
# $OpenBSD: Makefile,v 1.160 2012/09/25 21:58:46 sthen Exp $
# $OpenBSD: Makefile,v 1.161 2012/09/28 00:03:57 sthen Exp $
SHARED_ONLY= Yes
COMMENT-main= open source multi-protocol PBX and telephony toolkit
VER= 1.8.16.0
REVISION-main= 0
VER= 10.8.0
DISTNAME= asterisk-${VER:S/beta/-beta/:S/rc/-rc/}
PKGNAME-main= asterisk-${VER}
@ -77,11 +76,14 @@ MAKE_FLAGS+= ASTCFLAGS="${CFLAGS}" \
NOISY_BUILD="Yes" \
OPTIMIZE=
CONFIGURE_ARGS+= --localstatedir=/var
CONFIGURE_ARGS+= --with-asound=no \
--with-avcodec=no \
--with-cap=no \
--with-dahdi=no \
--with-gtk2=no \
--with-h323=no \
--with-isdnnet=no \
--with-misdn=no \
--with-nbs=no \
@ -89,6 +91,7 @@ CONFIGURE_ARGS+= --with-asound=no \
--with-osptk=no \
--with-oss=no \
--with-pri=no \
--with-pwlib=no \
--with-SDL_image=no \
--with-sdl=no \
--with-sqlite=no \
@ -101,7 +104,6 @@ CONFIGURE_ARGS+= --with-asound=no \
CONFIGURE_ARGS+= --with-jack=no \
--with-lua=no \
--with-portaudio=no \
--with-pwlib=no \
--with-radius=no \
--with-resample=no \
--with-tds=no

View File

@ -1,11 +1,11 @@
SHA256 (asterisk-1.8.16.0.tar.gz) = xFqJWbBr14nSfmFrz75QTUjj8tN5k8RbPIvJyzYk0tw=
SHA256 (asterisk-10.8.0.tar.gz) = FKqzPnKcGFFGU7LrwvspXeYMoMRnmJ5bQWzRXgx9R+o=
SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = eRdRl6ZRwlu2KYjnIQI+m7cRx+7yisouy6KR1D7j5mc=
SHA256 (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = ye/FmyBQU27CFiXULLsvWqivxjKK8NIIvq0rWJ8rRzI=
SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 1fAxzDHr6+yZzj/PRP+Ue9eye16VZaezphhcLRvaCUw=
SHA256 (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz.sha1) = a0BErk9wQ3/hT5gPUVL6uk6iqitdhAKMAhOrL2XHSR8=
SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz) = RJ+4ENFlAsMFL+3wL353s2IGrFoUXz2s9Bd4Q6L8tTg=
SHA256 (asterisk-moh-opsound-wav-2.03.tar.gz.sha1) = Y8VUFsoRQmGrGvT9EVIyLy7GnZGrw0vEzufTKByuDZc=
SIZE (asterisk-1.8.16.0.tar.gz) = 25085895
SIZE (asterisk-10.8.0.tar.gz) = 25007513
SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz) = 2042362
SIZE (asterisk-core-sounds-en-gsm-1.4.22.tar.gz.sha1) = 84
SIZE (asterisk-extra-sounds-en-gsm-1.4.11.tar.gz) = 3349898

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-Makefile,v 1.32 2012/06/07 10:39:25 sthen Exp $
--- Makefile.orig Thu Apr 12 15:26:06 2012
+++ Makefile Wed Jun 6 21:57:09 2012
@@ -121,7 +121,7 @@ ASTTOPDIR:=$(subst $(space),\$(space),$(CURDIR))
$OpenBSD: patch-Makefile,v 1.33 2012/09/28 00:03:57 sthen Exp $
--- Makefile.orig Wed Jun 13 15:30:34 2012
+++ Makefile Tue Sep 18 23:47:38 2012
@@ -123,7 +123,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.32 2012/06/07 10:39:25 sthen Exp $
# Asterisk.conf is located in ASTETCDIR or by using the -C flag
# when starting Asterisk
@@ -151,8 +151,10 @@ LINKER_SYMBOL_PREFIX=
@@ -153,8 +153,10 @@ LINKER_SYMBOL_PREFIX=
# 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.32 2012/06/07 10:39:25 sthen Exp $
MOD_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
OTHER_SUBDIR_CFLAGS="-I$(ASTTOPDIR)/include"
@@ -162,7 +164,9 @@ OPTIONS=
@@ -164,7 +166,9 @@ OPTIONS=
ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)

View File

@ -1,14 +0,0 @@
$OpenBSD: patch-addons_chan_ooh323_c,v 1.4 2012/08/04 21:53:56 sthen Exp $
--- addons/chan_ooh323.c.orig Wed Jun 20 10:15:22 2012
+++ addons/chan_ooh323.c Mon Jul 30 23:13:44 2012
@@ -2729,8 +2729,10 @@ int reload_config(int reload)
gTOS = IPTOS_THROUGHPUT;
else if (!strcasecmp(v->value, "reliability"))
gTOS = IPTOS_RELIABILITY;
+#ifdef IPTOS_MINCOST
else if (!strcasecmp(v->value, "mincost"))
gTOS = IPTOS_MINCOST;
+#endif
else if (!strcasecmp(v->value, "none"))
gTOS = 0;
else

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configs_asterisk_conf_sample,v 1.2 2011/05/11 15:07:15 sthen Exp $
--- configs/asterisk.conf.sample.orig Tue Feb 8 20:22:35 2011
+++ configs/asterisk.conf.sample Wed May 11 10:11:21 2011
@@ -57,8 +57,8 @@ astlogdir => /var/log/asterisk
$OpenBSD: patch-configs_asterisk_conf_sample,v 1.3 2012/09/28 00:03:57 sthen Exp $
--- configs/asterisk.conf.sample.orig Wed Dec 7 20:12:53 2011
+++ configs/asterisk.conf.sample Thu Jan 5 19:41:24 2012
@@ -58,8 +58,8 @@ astsbindir => /usr/sbin
; not otherwise require one.
;transcode_via_sln = yes ; Build transcode paths via SLINEAR, instead of
; directly.
@ -12,7 +12,7 @@ $OpenBSD: patch-configs_asterisk_conf_sample,v 1.2 2011/05/11 15:07:15 sthen Exp
;lightbackground = yes ; If your terminal is set for a light-colored
; background.
;forceblackbackground = yes ; Force the background of the terminal to be
@@ -75,11 +75,11 @@ documentation_language = en_US ; Set the language you
@@ -76,11 +76,11 @@ documentation_language = en_US ; Set the language you
; lock.
; Changing the following lines may compromise your security.

View File

@ -0,0 +1,13 @@
$OpenBSD: patch-configs_res_odbc_conf_sample,v 1.1 2012/09/28 00:03:57 sthen Exp $
--- configs/res_odbc.conf.sample.orig Thu Sep 20 13:29:33 2012
+++ configs/res_odbc.conf.sample Thu Sep 20 13:30:00 2012
@@ -19,8 +19,7 @@
; If not specified, it is assumed the section is enabled.
enabled => no
;
-; This value should match an entry in /etc/odbc.ini
-; (or /usr/local/etc/odbc.ini, on FreeBSD and similar systems).
+; This value should match an entry in /etc/iodbc/odbc.ini
dsn => asterisk
;
; Username for connecting to the database. The default user is "root".

View File

@ -0,0 +1,18 @@
$OpenBSD: patch-configs_sip_conf_sample,v 1.1 2012/09/28 00:03:57 sthen Exp $
--- configs/sip.conf.sample.orig Thu Sep 20 14:02:08 2012
+++ configs/sip.conf.sample Thu Sep 20 14:03:03 2012
@@ -148,11 +148,11 @@ allowoverlap=no ; Disable overlap dial
; a) Listen on a specific IPv4 address. Example: bindaddr=192.0.2.1
; b) Listen on a specific IPv6 address. Example: bindaddr=2001:db8::1
; c) Listen on the IPv4 wildcard. Example: bindaddr=0.0.0.0
-; d) Listen on the IPv4 and IPv6 wildcards. Example: bindaddr=::
+; d) Listen on the IPv6 wildcard. Example: bindaddr=::
; (You can choose independently for UDP, TCP, and TLS, by specifying different values for
; "udpbindaddr", "tcpbindaddr", and "tlsbindaddr".)
-; (Note that using bindaddr=:: will show only a single IPv6 socket in netstat.
-; IPv4 is supported at the same time using IPv4-mapped IPv6 addresses.)
+; (Note that on OpenBSD, using bindaddr=:: will only allow IPv6 connections.
+; OpenBSD does *not* permit IPv4-mapped IPv6 addresses.)
;
; You may optionally add a port number. (The default is port 5060 for UDP and TCP, 5061
; for TLS).

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-configure_ac,v 1.25 2012/06/07 10:39:25 sthen Exp $
--- configure.ac.orig Thu Apr 12 15:26:06 2012
+++ configure.ac Wed Jun 6 21:57:10 2012
@@ -55,7 +55,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
$OpenBSD: patch-configure_ac,v 1.26 2012/09/28 00:03:57 sthen Exp $
--- configure.ac.orig Thu Apr 12 16:01:13 2012
+++ configure.ac Tue Sep 18 23:44:17 2012
@@ -59,7 +59,7 @@ AC_SUBST([astvarrundir], ['${localstatedir}/run/a
case "${host_os}" in
*bsd*)
@ -10,7 +10,7 @@ $OpenBSD: patch-configure_ac,v 1.25 2012/06/07 10:39:25 sthen Exp $
astvarlibdir='${prefix}/share/asterisk'
astdbdir='${localstatedir}/db/asterisk'
fi
@@ -1605,7 +1605,7 @@ if test "${USE_IMAP_TK}" != "no"; then
@@ -1617,7 +1617,7 @@ if test "${USE_IMAP_TK}" != "no"; then
)
else #looking in imap directory didn't work, try c-client
imap_ldflags=""
@ -19,7 +19,7 @@ $OpenBSD: patch-configure_ac,v 1.25 2012/06/07 10:39:25 sthen Exp $
imap_include="-DUSE_SYSTEM_CCLIENT"
CPPFLAGS="${saved_cppflags}"
LIBS="${saved_libs}"
@@ -1791,7 +1791,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
@@ -1803,7 +1803,7 @@ AST_EXT_TOOL_CHECK([NETSNMP], [net-snmp-config], , [--
AST_EXT_LIB_CHECK([NEWT], [newt], [newtBell], [newt.h])

View File

@ -1,26 +1,26 @@
$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.13 2011/07/12 19:54:39 sthen Exp $
$OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.14 2012/09/28 00:03:57 sthen Exp $
- more useful defaults
- create /var/run/asterisk with sane ownership/perms
--- contrib/scripts/safe_asterisk.orig Thu May 5 16:04:24 2011
+++ contrib/scripts/safe_asterisk Mon Jul 11 23:45:36 2011
@@ -2,9 +2,9 @@
# vim:textwidth=80:tabstop=4:shiftwidth=4:smartindent:autoindent
--- contrib/scripts/safe_asterisk.orig Thu May 5 16:06:59 2011
+++ contrib/scripts/safe_asterisk Thu Jan 5 19:56:40 2012
@@ -6,9 +6,9 @@ ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
ASTVARLOGDIR=__ASTERISK_LOG_DIR__
CLIARGS="$*" # Grab any args passed to safe_asterisk
CLIARGS="$*" # Grab any args passed to safe_asterisk
-TTY=9 # TTY (if you want one) for Asterisk to run on
-CONSOLE=yes # Whether or not you want a console
-#NOTIFY=ben@alkaloid.net # Who to notify about crashes
+TTY="" # TTY (if you want one) for Asterisk to run on
+CONSOLE=no # Whether or not you want a console
+NOTIFY=root # Who to notify about crashes
#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)
@@ -14,10 +14,11 @@ SLEEPSECS=4
ASTSBINDIR=__ASTERISK_SBIN_DIR__
ASTVARRUNDIR=__ASTERISK_VARRUN_DIR__
-#NOTIFY=root@localhost.localdomain # Who to notify about crashes
+TTY= # TTY (if you want one) for Asterisk to run on
+CONSOLE=no # Whether or not you want a console
+NOTIFY=root # Who to notify about crashes
#EXEC=/path/to/somescript # Run this command if Asterisk crashes
#LOGFILE=${ASTVARLOGDIR}/safe_asterisk.log # Where to place the normal logfile (disabled if blank)
#SYSLOG=local0 # Which syslog facility to use (disabled if blank)
@@ -16,10 +16,11 @@ MACHINE=`hostname` # To specify which machine has c
DUMPDROP=/tmp
SLEEPSECS=4
ASTPIDFILE=${ASTVARRUNDIR}/asterisk.pid
+VARRUNOWNER="_asterisk:wheel" # chown __ASTERISK_VARRUN_DIR__ if it's created.
@ -32,7 +32,7 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.13 2011/07/12 19:54:39 sthen E
# run asterisk with this priority
PRIORITY=0
@@ -43,6 +44,19 @@ message() {
@@ -45,6 +46,19 @@ message() {
fi
}
@ -52,7 +52,7 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.13 2011/07/12 19:54:39 sthen E
# 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 -nrx 'core show version'`
@@ -71,7 +85,7 @@ else
@@ -73,7 +87,7 @@ else
fi
fi
SYSCTL_MAXFILES="fs.file-max"
@ -61,7 +61,7 @@ $OpenBSD: patch-contrib_scripts_safe_asterisk,v 1.13 2011/07/12 19:54:39 sthen E
SYSCTL_MAXFILES="kern.maxfiles"
fi
@@ -82,8 +96,10 @@ else
@@ -84,8 +98,10 @@ else
fi
fi

View File

@ -1,7 +1,7 @@
$OpenBSD: patch-pbx_pbx_spool_c,v 1.1 2012/03/17 23:08:20 sthen Exp $
--- pbx/pbx_spool.c.orig Tue Oct 25 20:08:04 2011
+++ pbx/pbx_spool.c Sat Mar 17 22:57:23 2012
@@ -716,6 +716,12 @@ static void *scan_thread(void *unused)
$OpenBSD: patch-pbx_pbx_spool_c,v 1.2 2012/09/28 00:03:57 sthen Exp $
--- pbx/pbx_spool.c.orig Mon Feb 13 22:03:33 2012
+++ pbx/pbx_spool.c Thu Mar 29 21:47:56 2012
@@ -723,6 +723,12 @@ static void *scan_thread(void *unused)
queue_created_files();
#else
struct timespec ts2 = { next - now, 0 };

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.45 2012/09/25 21:58:46 sthen Exp $
@comment $OpenBSD: PLIST-main,v 1.46 2012/09/28 00:03:57 sthen Exp $
@conflict asterisk-sounds-<=1.2.1p2
@conflict asterisk-curl-*
@conflict asterisk-fax-*
@ -48,6 +48,7 @@ include/asterisk/causes.h
include/asterisk/ccss.h
include/asterisk/cdr.h
include/asterisk/cel.h
include/asterisk/celt.h
include/asterisk/channel.h
include/asterisk/channelstate.h
include/asterisk/chanvars.h
@ -81,6 +82,9 @@ include/asterisk/event_defs.h
include/asterisk/extconf.h
include/asterisk/features.h
include/asterisk/file.h
include/asterisk/format.h
include/asterisk/format_cap.h
include/asterisk/format_pref.h
include/asterisk/frame.h
include/asterisk/frame_defs.h
include/asterisk/framehook.h
@ -103,6 +107,7 @@ include/asterisk/lock.h
include/asterisk/logger.h
include/asterisk/manager.h
include/asterisk/md5.h
include/asterisk/message.h
include/asterisk/mod_format.h
include/asterisk/module.h
include/asterisk/monitor.h
@ -128,6 +133,7 @@ include/asterisk/security_events.h
include/asterisk/security_events_defs.h
include/asterisk/select.h
include/asterisk/sha1.h
include/asterisk/silk.h
include/asterisk/slin.h
include/asterisk/slinfactory.h
include/asterisk/smdi.h
@ -198,12 +204,10 @@ lib/asterisk/modules/app_privacy.so
lib/asterisk/modules/app_queue.so
lib/asterisk/modules/app_read.so
lib/asterisk/modules/app_readexten.so
lib/asterisk/modules/app_readfile.so
lib/asterisk/modules/app_record.so
lib/asterisk/modules/app_sayunixtime.so
lib/asterisk/modules/app_senddtmf.so
lib/asterisk/modules/app_sendtext.so
lib/asterisk/modules/app_setcallerid.so
lib/asterisk/modules/app_sms.so
lib/asterisk/modules/app_softhangup.so
lib/asterisk/modules/app_speech_utils.so
@ -237,7 +241,6 @@ lib/asterisk/modules/chan_agent.so
lib/asterisk/modules/chan_bridge.so
lib/asterisk/modules/chan_gtalk.so
lib/asterisk/modules/chan_iax2.so
lib/asterisk/modules/chan_jingle.so
lib/asterisk/modules/chan_local.so
lib/asterisk/modules/chan_mgcp.so
lib/asterisk/modules/chan_multicast_rtp.so
@ -252,6 +255,7 @@ lib/asterisk/modules/codec_g726.so
lib/asterisk/modules/codec_gsm.so
lib/asterisk/modules/codec_ilbc.so
lib/asterisk/modules/codec_lpc10.so
lib/asterisk/modules/codec_resample.so
lib/asterisk/modules/codec_ulaw.so
lib/asterisk/modules/format_g719.so
lib/asterisk/modules/format_g723.so
@ -267,7 +271,6 @@ 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
@ -293,6 +296,7 @@ lib/asterisk/modules/func_frame_trace.so
lib/asterisk/modules/func_global.so
lib/asterisk/modules/func_groupcount.so
lib/asterisk/modules/func_iconv.so
lib/asterisk/modules/func_jitterbuffer.so
lib/asterisk/modules/func_lock.so
lib/asterisk/modules/func_logic.so
lib/asterisk/modules/func_math.so
@ -329,6 +333,8 @@ lib/asterisk/modules/res_crypto.so
lib/asterisk/modules/res_curl.so
lib/asterisk/modules/res_fax.so
lib/asterisk/modules/res_fax_spandsp.so
lib/asterisk/modules/res_format_attr_celt.so
lib/asterisk/modules/res_format_attr_silk.so
lib/asterisk/modules/res_jabber.so
lib/asterisk/modules/res_limit.so
lib/asterisk/modules/res_monitor.so
@ -349,6 +355,8 @@ lib/asterisk/modules/res_timing_pthread.so
@man man/man8/autosupport.8
@man man/man8/safe_asterisk.8
@bin sbin/astcanary
@bin sbin/astdb2bdb
@bin sbin/astdb2sqlite3
@bin sbin/asterisk
sbin/astgenkey
sbin/autosupport
@ -396,6 +404,7 @@ share/doc/asterisk/README.txt
share/doc/asterisk/UPGRADE-1.2.txt
share/doc/asterisk/UPGRADE-1.4.txt
share/doc/asterisk/UPGRADE-1.6.txt
share/doc/asterisk/UPGRADE-1.8.txt
share/doc/asterisk/UPGRADE.txt
share/doc/asterisk/api-1.6.0-changes.odt
share/doc/asterisk/api-1.6.2-changes.txt
@ -437,6 +446,7 @@ 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/confbridge.conf
share/examples/asterisk/default/console.conf
share/examples/asterisk/default/dbsep.conf
share/examples/asterisk/default/dnsmgr.conf
@ -551,7 +561,6 @@ share/examples/asterisk/openbsd/voicemail.conf.sample
@sample /var/log/asterisk/
@sample /var/log/asterisk/cdr-csv/
@sample /var/log/asterisk/cdr-custom/
@owner _asterisk
@sample /var/spool/asterisk/voicemail/
@sample /var/spool/asterisk/voicemail/default/
@sample /var/spool/asterisk/voicemail/default/1234/

View File

@ -1,4 +1,4 @@
$OpenBSD: README-main,v 1.2 2011/06/02 13:41:41 ajacoutot Exp $
$OpenBSD: README-main,v 1.3 2012/09/28 00:03:57 sthen Exp $
+-----------------------------------------------------------------------
| Running ${FULLPKGNAME} on OpenBSD
@ -8,7 +8,14 @@ Configuration
=============
Simplified sample configuration files have been provided
in ${SYSCONFDIR}/asterisk; the full set from the Asterisk distribution
is available in ${PREFIX}/share/examples/asterisk/default.
is available in ${PREFIX}/share/examples/asterisk/default; some or all
of these can be copied to ${SYSCONFDIR}/asterisk and edited.
Asterisk logs to /var/log/asterisk/messages by default; log rotation
can be handled by adding a line like the following to /etc/newsyslog.conf:
/var/log/asterisk/messages 640 5 1000 * Z "asterisk -rx 'logger reload'"
Documentation
=============