[packages/asterisk] Version: 13.0.0-beta2
jajcus
jajcus at pld-linux.org
Mon Nov 3 13:46:16 CET 2014
commit 00222a6230dbc7143d27192ef04dcadff0d6016a
Author: Jacek Konieczny <j.konieczny at eggsoft.pl>
Date: Mon Nov 3 13:42:57 2014 +0100
Version: 13.0.0-beta2
13 is the new LTS line of Asterisk.
– H.323 out (the libraries in BR were not what current h323 support in
Asterisk uses… and nobody uses h.323 anyway)
– more modules enabled (including some deprecated ones – won't hurt, I
guess)
– utilities built and packaged into '-utils'
FHS-paths.patch | 122 ++++++++++++++++++++++++++--------------------------
asterisk-lib.patch | 13 ------
asterisk.spec | 105 ++++++++++++++++++++------------------------
menuselect.makedeps | 22 +++++++---
menuselect.makeopts | 29 ++++++++-----
mxml-system.patch | 71 ------------------------------
6 files changed, 142 insertions(+), 220 deletions(-)
---
diff --git a/asterisk.spec b/asterisk.spec
index 292fc6a..4a6c850 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,9 +1,7 @@
# TODO:
-# - check/fix build with our h323. Does anybody still use H.323, anyway?
# - make package for moh sound files
#
# Conditional build:
-%bcond_with h323 # without h323 support
%bcond_with corosync # res_corosync module (broken in 12.0.0)
%bcond_without sqlite2 # build without old sqlite support
%bcond_without oss # build without OSS audio support (SDL dependency)
@@ -25,12 +23,13 @@
Summary: Asterisk PBX
Summary(pl.UTF-8): Centralka (PBX) Asterisk
Name: asterisk
-Version: 12.6.0
-Release: 1
+Version: 13.0.0
+%define beta beta2
+Release: 0.%{beta}.1
License: GPL v2
Group: Applications/System
-Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: bb5a1dec86f8d9c4ee4108942adb62a6
+Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}-%{beta}.tar.gz
+# Source0-md5: ac6bbff37b3d2a3cf53209826075df66
Source1: %{name}.init
Source2: %{name}.sysconfig
Source3: %{name}.tmpfiles
@@ -39,14 +38,12 @@ Source5: %{name}.service
# menuselect.* -> make menuconfig; choose options; copy resulting files here
Source6: menuselect.makedeps
Source7: menuselect.makeopts
-Patch0: mxml-system.patch
-Patch1: lua51-path.patch
-Patch2: %{name}-lib.patch
-Patch3: %{name}-ppc.patch
-Patch4: FHS-paths.patch
-Patch5: pld-banner.patch
-Patch6: lpc10-system.patch
-Patch7: %{name}-histedit.patch
+Patch0: lua51-path.patch
+Patch1: %{name}-ppc.patch
+Patch2: FHS-paths.patch
+Patch3: pld-banner.patch
+Patch4: lpc10-system.patch
+Patch5: %{name}-histedit.patch
URL: http://www.asterisk.org/
BuildRequires: OSPToolkit-devel >= 4.0.0
%{?with_oss:BuildRequires: SDL_image-devel}
@@ -80,15 +77,11 @@ BuildRequires: libxml2-devel
BuildRequires: libxslt-devel
BuildRequires: lpc10-devel
BuildRequires: lua51-devel
-BuildRequires: mxml-devel
%{?with_mysql:BuildRequires: mysql-devel}
BuildRequires: ncurses-devel
BuildRequires: neon-devel
BuildRequires: net-snmp-devel
BuildRequires: newt-devel
-%if %{with h323}
-BuildRequires: h323plus-devel >= 1.24.0
-%endif
%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: openssl-devel >= 0.9.7d
BuildRequires: pam-devel
@@ -97,9 +90,6 @@ BuildRequires: pkgconfig
BuildRequires: popt-devel
%{?with_portaudio:BuildRequires: portaudio-devel >= 19}
%{?with_pgsql:BuildRequires: postgresql-devel}
-%if %{with h323}
-BuildRequires: ptlib-devel
-%endif
%{?with_radius:BuildRequires: radiusclient-ng-devel}
BuildRequires: rpmbuild(macros) >= 1.671
BuildRequires: sed >= 4.0
@@ -188,6 +178,13 @@ Astman is a text mode Manager for Asterisk.
Astman connects to Asterisk by TCP, so you can run Astman on a
completely different computer than your Asterisk computer.
+%package utils
+Summary: Various utilities for Asterisk
+Group: Applications/Networking
+
+%description utils
+Various utilities built with Asterisk.
+
%package bluetooth
Summary: chan_mobile – bluetooth mobile phone interface for Asterisk
Group: Applications/Networking
@@ -248,17 +245,6 @@ Requires: %{name} = %{version}-%{release}
%description gsm
Support GSM audio encoding/decoding.
-%package h323
-Summary: H.323 protocol support for Asterisk
-Group: Applications/Networking
-Requires: %{name} = %{version}-%{release}
-
-%description h323
-This channel driver (chan_h323) provides support for the H.323
-protocol for Asterisk. This is an implementation originally
-contributed by NuFone and nowdays maintained and distributed by
-Digium, Inc. Hence, it is considered the official H.323 chanel driver.
-
%package http
Summary: HTTP Server Support
Group: Applications/Networking
@@ -540,22 +526,20 @@ BuildArch: noarch
API documentation for Asterisk.
%prep
-%setup -q
+%setup -q -n %{name}-%{version}-%{beta}
%patch0 -p1
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
# Fixup makefile so sound archives aren't downloaded/installed
%{__sed} -i -e 's/^all:.*$/all:/' sounds/Makefile
%{__sed} -i -e 's/^install:.*$/install:/' sounds/Makefile
# avoid using these
-rm -rf imap menuselect/mxml main/editline codecs/gsm codecs/lpc10
+rm -rf imap main/editline codecs/gsm codecs/lpc10
%build
rm -f pbx/.depend
@@ -585,7 +569,6 @@ cd ..
--without-gtk2 \
--with-imap=system \
--with-gsm=/usr \
- %{__without h323 h323} \
%{__without oss oss} \
%{__without oss sdl} \
%{__without oss SDL_image} \
@@ -610,9 +593,6 @@ cp -f .cleancount .lastclean
cp %{SOURCE6} .
cp %{SOURCE7} .
-%if %{without h323}
-menuselect/menuselect --disable chan_ooh323 --disable chan_h323 menuselect.makeopts
-%endif
%if %{without corosync}
menuselect/menuselect --disable res_corosync menuselect.makeopts
%endif
@@ -654,6 +634,9 @@ menuselect/menuselect --disable res_pjsip --disable chan_pjsip menuselect.makeop
%endif
%{__sed} -i -e 's/^MENUSELECT_OPTS_app_voicemail=.*$/MENUSELECT_OPTS_app_voicemail=FILE_STORAGE/' menuselect.makeopts
+
+menuselect/menuselect --enable app_voicemail menuselect.makeopts
+
%{__make} DEBUG= \
OPTIMIZE= \
ASTVARRUNDIR=%{_localstatedir}/run/asterisk \
@@ -783,16 +766,12 @@ find doc/api -name '*.map' -size 0 -delete
%endif
# remove configuration files for components never built
-rm $RPM_BUILD_ROOT%{_sysconfdir}/asterisk/{app_mysql,app_skel,cdr_mysql,config_test,misdn,test_sorcery}.conf
+rm $RPM_BUILD_ROOT%{_sysconfdir}/asterisk/{app_skel,config_test,misdn,ooh323,test_sorcery}.conf
# remove configuration files for disabled optional components
%if %{without corosync}
rm $RPM_BUILD_ROOT%{_sysconfdir}/asterisk/res_corosync.conf
%endif
-%if %{without h323}
-# I don't even know which one can be fixed
-rm $RPM_BUILD_ROOT%{_sysconfdir}/asterisk/{h323,ooh323}.conf
-%endif
%if %{without sqlite2}
rm $RPM_BUILD_ROOT%{_sysconfdir}/asterisk/res_config_sqlite.conf
%endif
@@ -938,6 +917,8 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/sla.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/smdi.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/sorcery.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/ss7.timers
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/stasis.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/statsd.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/telcordia-1.adsi
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/udptl.conf
@@ -990,9 +971,11 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/app_read.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_readexten.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_record.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/app_saycounted.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_sayunixtime.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_senddtmf.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_sendtext.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/app_setcallerid.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_sms.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_softhangup.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_speech_utils.so
@@ -1075,6 +1058,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/func_math.so
%attr(755,root,root) %{_libdir}/asterisk/modules/func_md5.so
%attr(755,root,root) %{_libdir}/asterisk/modules/func_module.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/func_periodic_hook.so
%attr(755,root,root) %{_libdir}/asterisk/modules/func_pitchshift.so
%attr(755,root,root) %{_libdir}/asterisk/modules/func_presencestate.so
%attr(755,root,root) %{_libdir}/asterisk/modules/func_rand.so
@@ -1125,6 +1109,8 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/res_format_attr_silk.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_http_websocket.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_limit.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_manager_devicestate.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_manager_presencestate.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_monitor.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_mutestream.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_musiconhold.so
@@ -1206,6 +1192,15 @@ chown -R asterisk:asterisk /var/lib/asterisk
%doc doc/api/*
%endif
+%files utils
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_sbindir}/aelparse
+%attr(755,root,root) %{_sbindir}/conf2ael
+%attr(755,root,root) %{_sbindir}/muted
+%attr(755,root,root) %{_sbindir}/smsq
+%attr(755,root,root) %{_sbindir}/stereorize
+%attr(755,root,root) %{_sbindir}/streamplayer
+
%files astman
%defattr(644,root,root,755)
%attr(755,root,root) %{_sbindir}/astman
@@ -1245,6 +1240,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
%defattr(644,root,root,755)
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/meetme.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/chan_dahdi.conf
+%{_datadir}/dahdi/span_config.d/40-asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/app_dahdiras.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_flash.so
%attr(755,root,root) %{_libdir}/asterisk/modules/app_meetme.so
@@ -1271,13 +1267,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/format_gsm.so
%attr(755,root,root) %{_libdir}/asterisk/modules/format_wav_gsm.so
-%if %{with h323}
-%files h323
-%defattr(644,root,root,755)
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/chan_ooh323.conf
-%attr(755,root,root) %{_libdir}/asterisk/modules/chan_ooh323.so
-%endif
-
%files http
%defattr(644,root,root,755)
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/http.conf
@@ -1298,15 +1287,9 @@ chown -R asterisk:asterisk /var/lib/asterisk
%files jabber
%defattr(644,root,root,755)
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/gtalk.conf
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jabber.conf
-%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/jingle.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/motif.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/xmpp.conf
-%attr(755,root,root) %{_libdir}/asterisk/modules/chan_gtalk.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/chan_jingle.so
%attr(755,root,root) %{_libdir}/asterisk/modules/chan_motif.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/res_jabber.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_xmpp.so
%if %{with jack}
@@ -1346,7 +1329,11 @@ chown -R asterisk:asterisk /var/lib/asterisk
%if %{with mysql}
%files mysql
%defattr(644,root,root,755)
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/app_mysql.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/cdr_mysql.conf
%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_config_mysql.conf
+%attr(755,root,root) %{_libdir}/asterisk/modules/app_mysql.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/cdr_mysql.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_config_mysql.so
%endif
@@ -1411,11 +1398,13 @@ chown -R asterisk:asterisk /var/lib/asterisk
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_notify.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_one_touch_record_info.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_outbound_authenticator_digest.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_outbound_publish.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_outbound_registration.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_path.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_pidf_body_generator.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_pidf_digium_body_supplement.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_pidf_eyebeam_body_supplement.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_publish_asterisk.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_pubsub.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_refer.so
%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_registrar.so
diff --git a/FHS-paths.patch b/FHS-paths.patch
index be61b40..ddb6e35 100644
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -1,6 +1,6 @@
-diff -urN asterisk-10.10.1.org/agi/DialAnMp3.agi asterisk-10.10.1/agi/DialAnMp3.agi
---- asterisk-10.10.1.org/agi/DialAnMp3.agi 2006-02-14 20:14:15.000000000 +0100
-+++ asterisk-10.10.1/agi/DialAnMp3.agi 2012-12-09 17:39:23.439903079 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/DialAnMp3.agi asterisk-13.0.0-beta2/agi/DialAnMp3.agi
+--- asterisk-13.0.0-beta2.orig/agi/DialAnMp3.agi 2006-02-14 20:14:15.000000000 +0100
++++ asterisk-13.0.0-beta2/agi/DialAnMp3.agi 2014-10-31 15:15:42.000000000 +0100
@@ -17,7 +17,7 @@
print STDERR " -- $i = $AGI{$i}\n";
}
@@ -10,9 +10,9 @@ diff -urN asterisk-10.10.1.org/agi/DialAnMp3.agi asterisk-10.10.1/agi/DialAnMp3.
sub checkresult {
my ($res) = @_;
-diff -urN asterisk-10.10.1.org/agi/jukebox.agi asterisk-10.10.1/agi/jukebox.agi
---- asterisk-10.10.1.org/agi/jukebox.agi 2006-03-07 00:45:37.000000000 +0100
-+++ asterisk-10.10.1/agi/jukebox.agi 2012-12-09 17:40:10.852090269 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/jukebox.agi asterisk-13.0.0-beta2/agi/jukebox.agi
+--- asterisk-13.0.0-beta2.orig/agi/jukebox.agi 2006-03-07 00:45:37.000000000 +0100
++++ asterisk-13.0.0-beta2/agi/jukebox.agi 2014-10-31 15:15:42.000000000 +0100
@@ -17,7 +17,7 @@
#
# Uses festival to list off all your MP3 music files over a channel in
@@ -22,9 +22,9 @@ diff -urN asterisk-10.10.1.org/agi/jukebox.agi asterisk-10.10.1/agi/jukebox.agi
#
# Invocation Example:
# exten => 68742,1,Answer()
-diff -urN asterisk-10.10.1.org/agi/numeralize asterisk-10.10.1/agi/numeralize
---- asterisk-10.10.1.org/agi/numeralize 2006-02-14 20:14:15.000000000 +0100
-+++ asterisk-10.10.1/agi/numeralize 2012-12-09 17:40:44.503642846 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/numeralize asterisk-13.0.0-beta2/agi/numeralize
+--- asterisk-13.0.0-beta2.orig/agi/numeralize 2006-02-14 20:14:15.000000000 +0100
++++ asterisk-13.0.0-beta2/agi/numeralize 2014-10-31 15:15:42.000000000 +0100
@@ -6,7 +6,7 @@
$mp3dir="/usr/media/mpeg3";
@@ -34,9 +34,9 @@ diff -urN asterisk-10.10.1.org/agi/numeralize asterisk-10.10.1/agi/numeralize
sub process_dir {
my ($dir) = @_;
my $file;
-diff -urN asterisk-10.10.1.org/configs/festival.conf.sample asterisk-10.10.1/configs/festival.conf.sample
---- asterisk-10.10.1.org/configs/festival.conf.sample 2009-05-28 16:39:21.000000000 +0200
-+++ asterisk-10.10.1/configs/festival.conf.sample 2012-12-09 17:46:56.880797051 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/festival.conf.sample asterisk-13.0.0-beta2/configs/samples/festival.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/festival.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/festival.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -21,7 +21,7 @@
; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
; Defaults to /tmp/
@@ -46,9 +46,9 @@ diff -urN asterisk-10.10.1.org/configs/festival.conf.sample asterisk-10.10.1/con
;
; Festival command to send to the server.
; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-diff -urN asterisk-10.10.1.org/configs/http.conf.sample asterisk-10.10.1/configs/http.conf.sample
---- asterisk-10.10.1.org/configs/http.conf.sample 2012-02-02 19:48:05.000000000 +0100
-+++ asterisk-10.10.1/configs/http.conf.sample 2012-12-09 17:48:06.764027901 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/http.conf.sample asterisk-13.0.0-beta2/configs/samples/http.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/http.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/http.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -5,7 +5,7 @@
; Note about Asterisk documentation:
; If Asterisk was installed from a tarball, then the HTML documentation should
@@ -58,8 +58,8 @@ diff -urN asterisk-10.10.1.org/configs/http.conf.sample asterisk-10.10.1/configs
; HTTP server is enabled in this file by setting the "enabled", "bindaddr",
; and "bindport" options, then you should be able to view the documentation
; remotely by browsing to:
-@@ -75,6 +75,6 @@
- ;[post_mappings]
+@@ -91,6 +91,6 @@
+ ; config permission to POST files.
;
; In this example, if the prefix option is set to "asterisk", then using the
-; POST URL: /asterisk/uploads will put files in /var/lib/asterisk/uploads/.
@@ -67,10 +67,10 @@ diff -urN asterisk-10.10.1.org/configs/http.conf.sample asterisk-10.10.1/configs
+; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
;
-diff -urN asterisk-10.10.1.org/configs/iax.conf.sample asterisk-10.10.1/configs/iax.conf.sample
---- asterisk-10.10.1.org/configs/iax.conf.sample 2012-02-17 23:03:04.000000000 +0100
-+++ asterisk-10.10.1/configs/iax.conf.sample 2012-12-09 17:49:42.841791492 +0100
-@@ -457,8 +457,8 @@
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/iax.conf.sample asterisk-13.0.0-beta2/configs/samples/iax.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/iax.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/iax.conf.sample 2014-10-31 15:15:42.000000000 +0100
+@@ -534,8 +534,8 @@
; authentication is used, "inkeys" is a list of acceptable public keys on the
; local system that can be used to authenticate the remote peer, separated by
; the ":" character. "outkey" is a single, private key to use to authenticate
@@ -81,9 +81,9 @@ diff -urN asterisk-10.10.1.org/configs/iax.conf.sample asterisk-10.10.1/configs/
; keys should always be 3DES encrypted.
;
;
-diff -urN asterisk-10.10.1.org/configs/musiconhold.conf.sample asterisk-10.10.1/configs/musiconhold.conf.sample
---- asterisk-10.10.1.org/configs/musiconhold.conf.sample 2010-10-16 13:51:54.000000000 +0200
-+++ asterisk-10.10.1/configs/musiconhold.conf.sample 2012-12-09 17:51:00.925391957 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/musiconhold.conf.sample asterisk-13.0.0-beta2/configs/samples/musiconhold.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/musiconhold.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/musiconhold.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -32,7 +32,7 @@
; The path specified can be either an absolute path (starts with '/'),
; or a relative path; relative paths are interpreted as being relative
@@ -93,7 +93,7 @@ diff -urN asterisk-10.10.1.org/configs/musiconhold.conf.sample asterisk-10.10.1/
;
; NOTE:
; If you are not using "autoload" in modules.conf, then you
-@@ -68,7 +68,7 @@
+@@ -73,7 +73,7 @@
;mode=custom
; Note that with mode=custom, a directory is not required, such as when reading
; from a stream.
@@ -102,16 +102,16 @@ diff -urN asterisk-10.10.1.org/configs/musiconhold.conf.sample asterisk-10.10.1/
;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
;[ulawstream]
-@@ -80,5 +80,5 @@
+@@ -85,5 +85,5 @@
; choice
;[solaris]
;mode=custom
-;directory=/var/lib/asterisk/mohmp3
+;directory=/usr/share/asterisk/mohmp3
;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-diff -urN asterisk-10.10.1.org/configs/osp.conf.sample asterisk-10.10.1/configs/osp.conf.sample
---- asterisk-10.10.1.org/configs/osp.conf.sample 2010-07-12 06:16:18.000000000 +0200
-+++ asterisk-10.10.1/configs/osp.conf.sample 2012-12-09 17:52:27.669407614 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/osp.conf.sample asterisk-13.0.0-beta2/configs/samples/osp.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/osp.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/osp.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -45,8 +45,8 @@
;source=domain name or [IP address in brackets]
;
@@ -123,9 +123,9 @@ diff -urN asterisk-10.10.1.org/configs/osp.conf.sample asterisk-10.10.1/configs/
;
; Specify the private key file name.
; If this parameter is unspecified or not present, the default name will be the
-diff -urN asterisk-10.10.1.org/configs/phoneprov.conf.sample asterisk-10.10.1/configs/phoneprov.conf.sample
---- asterisk-10.10.1.org/configs/phoneprov.conf.sample 2011-02-03 17:13:40.000000000 +0100
-+++ asterisk-10.10.1/configs/phoneprov.conf.sample 2012-12-09 17:53:04.411102199 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/phoneprov.conf.sample asterisk-13.0.0-beta2/configs/samples/phoneprov.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/phoneprov.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/phoneprov.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -130,7 +130,7 @@
${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
config/${MAC} => polycom.xml ; Dynamic Filename => template file
@@ -135,9 +135,9 @@ diff -urN asterisk-10.10.1.org/configs/phoneprov.conf.sample asterisk-10.10.1/co
;snom 300, 320, 360, 370, 820, 821, 870 support
snom-${MAC}.xml => snom-mac.xml
-diff -urN asterisk-10.10.1.org/configs/res_config_sqlite.conf.sample asterisk-10.10.1/configs/res_config_sqlite.conf.sample
---- asterisk-10.10.1.org/configs/res_config_sqlite.conf.sample 2009-06-30 19:22:16.000000000 +0200
-+++ asterisk-10.10.1/configs/res_config_sqlite.conf.sample 2012-12-09 17:53:34.972511834 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/samples/res_config_sqlite.conf.sample asterisk-13.0.0-beta2/configs/samples/res_config_sqlite.conf.sample
+--- asterisk-13.0.0-beta2.orig/configs/samples/res_config_sqlite.conf.sample 2014-07-17 23:17:28.000000000 +0200
++++ asterisk-13.0.0-beta2/configs/samples/res_config_sqlite.conf.sample 2014-10-31 15:15:42.000000000 +0100
@@ -1,7 +1,7 @@
[general]
@@ -147,9 +147,9 @@ diff -urN asterisk-10.10.1.org/configs/res_config_sqlite.conf.sample asterisk-10
; Both config_table and cdr_table are optional. If config_table is omitted,
; you must specify it in extconfig.conf. If it is both provided here and in
-diff -urN asterisk-10.10.1.org/contrib/scripts/astgenkey asterisk-10.10.1/contrib/scripts/astgenkey
---- asterisk-10.10.1.org/contrib/scripts/astgenkey 2006-02-14 20:14:15.000000000 +0100
-+++ asterisk-10.10.1/contrib/scripts/astgenkey 2012-12-09 17:54:20.187930457 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/scripts/astgenkey asterisk-13.0.0-beta2/contrib/scripts/astgenkey
+--- asterisk-13.0.0-beta2.orig/contrib/scripts/astgenkey 2014-03-05 13:06:48.000000000 +0100
++++ asterisk-13.0.0-beta2/contrib/scripts/astgenkey 2014-10-31 15:15:42.000000000 +0100
@@ -29,7 +29,7 @@
echo "in PEM format for use by Asterisk. You will be asked to"
echo "enter a passcode for your key multiple times. Please"
@@ -158,10 +158,10 @@ diff -urN asterisk-10.10.1.org/contrib/scripts/astgenkey asterisk-10.10.1/contri
+ echo "need to be moved to /usr/share/asterisk/keys if you want"
echo "to use them, and any private keys (.key files) will"
echo "need to be initialized at runtime either by running"
- echo "Asterisk with the '-i' option, or with the 'init keys'"
-diff -urN asterisk-10.10.1.org/contrib/scripts/astgenkey.8 asterisk-10.10.1/contrib/scripts/astgenkey.8
---- asterisk-10.10.1.org/contrib/scripts/astgenkey.8 2010-04-10 10:33:57.000000000 +0200
-+++ asterisk-10.10.1/contrib/scripts/astgenkey.8 2012-12-09 17:55:31.921239116 +0100
+ echo "Asterisk with the '-i' option, or with the 'keys init'"
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/scripts/astgenkey.8 asterisk-13.0.0-beta2/contrib/scripts/astgenkey.8
+--- asterisk-13.0.0-beta2.orig/contrib/scripts/astgenkey.8 2014-03-05 13:06:48.000000000 +0100
++++ asterisk-13.0.0-beta2/contrib/scripts/astgenkey.8 2014-10-31 15:15:42.000000000 +0100
@@ -87,7 +87,7 @@
.RE
@@ -184,9 +184,9 @@ diff -urN asterisk-10.10.1.org/contrib/scripts/astgenkey.8 asterisk-10.10.1/cont
.RS
.RE
-diff -urN asterisk-10.10.1.org/contrib/utils/README.rawplayer asterisk-10.10.1/contrib/utils/README.rawplayer
---- asterisk-10.10.1.org/contrib/utils/README.rawplayer 2006-02-14 20:14:15.000000000 +0100
-+++ asterisk-10.10.1/contrib/utils/README.rawplayer 2012-12-09 17:56:14.356535856 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/utils/README.rawplayer asterisk-13.0.0-beta2/contrib/utils/README.rawplayer
+--- asterisk-13.0.0-beta2.orig/contrib/utils/README.rawplayer 2006-02-14 20:14:15.000000000 +0100
++++ asterisk-13.0.0-beta2/contrib/utils/README.rawplayer 2014-10-31 15:15:42.000000000 +0100
@@ -16,7 +16,7 @@
sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
@@ -196,9 +196,9 @@ diff -urN asterisk-10.10.1.org/contrib/utils/README.rawplayer asterisk-10.10.1/c
and set up a class in musiconhold.conf like so:
[classes]
-diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-10.10.1/pbx/ael/ael-test/ael-test3/extensions.ael
---- asterisk-10.10.1.org/pbx/ael/ael-test/ael-test3/extensions.ael 2007-11-27 00:15:53.000000000 +0100
-+++ asterisk-10.10.1/pbx/ael/ael-test/ael-test3/extensions.ael 2012-12-09 17:59:11.918059006 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-13.0.0-beta2/pbx/ael/ael-test/ael-test3/extensions.ael
+--- asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ael-test3/extensions.ael 2007-11-27 00:15:53.000000000 +0100
++++ asterisk-13.0.0-beta2/pbx/ael/ael-test/ael-test3/extensions.ael 2014-10-31 15:15:42.000000000 +0100
@@ -2049,7 +2049,7 @@
macro callerid-liar()
@@ -313,9 +313,9 @@ diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ael-test3/extensions.ael asteris
goto s|loopback;
}
762 => {
-diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-10.10.1/pbx/ael/ael-test/ael-vtest13/extensions.ael
---- asterisk-10.10.1.org/pbx/ael/ael-test/ael-vtest13/extensions.ael 2007-11-27 00:15:53.000000000 +0100
-+++ asterisk-10.10.1/pbx/ael/ael-test/ael-vtest13/extensions.ael 2012-12-09 18:00:16.051004293 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-13.0.0-beta2/pbx/ael/ael-test/ael-vtest13/extensions.ael
+--- asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael 2007-11-27 00:15:53.000000000 +0100
++++ asterisk-13.0.0-beta2/pbx/ael/ael-test/ael-vtest13/extensions.ael 2014-10-31 15:15:42.000000000 +0100
@@ -2048,7 +2048,7 @@
macro callerid-liar()
@@ -430,9 +430,9 @@ diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ael-vtest13/extensions.ael aster
goto s|loopback;
}
762 => {
-diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-10.10.1/pbx/ael/ael-test/ref.ael-vtest13
---- asterisk-10.10.1.org/pbx/ael/ael-test/ref.ael-vtest13 2010-12-22 21:10:34.000000000 +0100
-+++ asterisk-10.10.1/pbx/ael/ael-test/ref.ael-vtest13 2012-12-09 18:00:36.818628849 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ref.ael-vtest13 asterisk-13.0.0-beta2/pbx/ael/ael-test/ref.ael-vtest13
+--- asterisk-13.0.0-beta2.orig/pbx/ael/ael-test/ref.ael-vtest13 2010-12-22 21:10:34.000000000 +0100
++++ asterisk-13.0.0-beta2/pbx/ael/ael-test/ref.ael-vtest13 2014-10-31 15:15:42.000000000 +0100
@@ -2182,7 +2182,7 @@
@@ -526,9 +526,9 @@ diff -urN asterisk-10.10.1.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-10.10.1
exten => 761,3,Goto(s,loopback)
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
-diff -urN asterisk-10.10.1.org/UPGRADE-1.4.txt asterisk-10.10.1/UPGRADE-1.4.txt
---- asterisk-10.10.1.org/UPGRADE-1.4.txt 2009-08-18 22:29:37.000000000 +0200
-+++ asterisk-10.10.1/UPGRADE-1.4.txt 2012-12-09 17:38:45.004796317 +0100
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/UPGRADE-1.4.txt asterisk-13.0.0-beta2/UPGRADE-1.4.txt
+--- asterisk-13.0.0-beta2.orig/UPGRADE-1.4.txt 2009-08-18 22:29:37.000000000 +0200
++++ asterisk-13.0.0-beta2/UPGRADE-1.4.txt 2014-10-31 15:15:42.000000000 +0100
@@ -92,7 +92,7 @@
WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
instead of the alternate-language files being stored in subdirectories underneath
@@ -538,10 +538,10 @@ diff -urN asterisk-10.10.1.org/UPGRADE-1.4.txt asterisk-10.10.1/UPGRADE-1.4.txt
language itself, then places all the sound files for that language under that
directory and its subdirectories. This is the layout that will be created if you
select non-English languages to be installed via menuselect, HOWEVER Asterisk does
-diff -urN asterisk-10.10.1.org/utils/ael_main.c asterisk-10.10.1/utils/ael_main.c
---- asterisk-10.10.1.org/utils/ael_main.c 2012-03-13 08:48:01.000000000 +0100
-+++ asterisk-10.10.1/utils/ael_main.c 2012-12-09 18:01:28.371002034 +0100
-@@ -533,7 +533,7 @@
+diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/utils/ael_main.c asterisk-13.0.0-beta2/utils/ael_main.c
+--- asterisk-13.0.0-beta2.orig/utils/ael_main.c 2014-07-04 15:26:37.000000000 +0200
++++ asterisk-13.0.0-beta2/utils/ael_main.c 2014-10-31 15:15:42.000000000 +0100
+@@ -532,7 +532,7 @@
strcpy(config_dir, "/etc/asterisk");
localized_use_conf_dir();
}
diff --git a/asterisk-lib.patch b/asterisk-lib.patch
deleted file mode 100644
index 3a3bba8..0000000
--- a/asterisk-lib.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- asterisk-1.6.1.12/channels/Makefile~ 2009-07-21 16:48:38.000000000 +0300
-+++ asterisk-1.6.1.12/channels/Makefile 2009-12-29 20:52:01.351345246 +0200
-@@ -21,8 +21,8 @@
- endif
-
- ifeq ($(OSARCH),linux-gnu)
-- PTLIB=-lpt_linux_x86_r
-- H323LIB=-lh323_linux_x86_r
-+ PTLIB=-lpt
-+ H323LIB=-lopenh323
- CHANH323LIB=-ldl
- endif
-
diff --git a/menuselect.makedeps b/menuselect.makedeps
index 1081a0a..9ee161b 100644
--- a/menuselect.makedeps
+++ b/menuselect.makedeps
@@ -8,7 +8,6 @@ MENUSELECT_DEPENDS_app_fax=SPANDSP
MENUSELECT_DEPENDS_app_jack=JACK RESAMPLE
MENUSELECT_DEPENDS_app_meetme=DAHDI
MENUSELECT_DEPENDS_app_osplookup=OSPTK OPENSSL
-MENUSELECT_DEPENDS_app_dahdibarge=DAHDI
MENUSELECT_DEPENDS_cdr_syslog=SYSLOG
MENUSELECT_DEPENDS_cdr_pgsql=PGSQL
MENUSELECT_DEPENDS_cdr_radius=RADIUS
@@ -30,9 +29,6 @@ MENUSELECT_DEPENDS_chan_nbs=NBS
MENUSELECT_DEPENDS_chan_oss=OSS
MENUSELECT_DEPENDS_chan_phone=IXJUSER
MENUSELECT_DEPENDS_chan_vpb=VPB
-MENUSELECT_DEPENDS_chan_gtalk=IKSEMEL OPENSSL
-MENUSELECT_DEPENDS_chan_h323=OPENH323
-MENUSELECT_DEPENDS_chan_jingle=IKSEMEL OPENSSL
MENUSELECT_DEPENDS_codec_dahdi=DAHDI
MENUSELECT_DEPENDS_codec_gsm=GSM
MENUSELECT_DEPENDS_codec_ilbc=ILBC
@@ -60,6 +56,7 @@ MENUSELECT_DEPENDS_res_pjsip=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_acl=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_authenticator_digest=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_caller_id=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_dialog_info_body_generator=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_diversion=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_dtmf_info=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_endpoint_identifier_anonymous=PJPROJECT
@@ -70,22 +67,27 @@ MENUSELECT_DEPENDS_res_pjsip_header_funcs=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_log_forwarder=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_logger=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_messaging=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_multihomed=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_mwi=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_mwi_body_generator=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_nat=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_notify=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_one_touch_record_info=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_outbound_authenticator_digest=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_outbound_publish=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_outbound_registration=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_path=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_pidf_body_generator=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_pidf_digium_body_supplement=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_pidf_eyebeam_body_supplement=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_publish_asterisk=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_pubsub=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_refer=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_registrar=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_registrar_expire=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_rfc3326=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_sdp_rtp=PJPROJECT
+MENUSELECT_DEPENDS_res_pjsip_send_to_voicemail=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_session=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_t38=PJPROJECT
MENUSELECT_DEPENDS_res_pjsip_transport_websocket=PJPROJECT
@@ -101,9 +103,9 @@ MENUSELECT_DEPENDS_res_config_pgsql=PGSQL
MENUSELECT_DEPENDS_res_config_sqlite=SQLITE
MENUSELECT_DEPENDS_res_corosync=COROSYNC
MENUSELECT_DEPENDS_res_fax_spandsp=SPANDSP
+MENUSELECT_DEPENDS_res_hep_pjsip=PJPROJECT
MENUSELECT_DEPENDS_res_snmp=NETSNMP
MENUSELECT_DEPENDS_res_timing_kqueue=KQUEUE
-MENUSELECT_DEPENDS_res_jabber=IKSEMEL OPENSSL
MENUSELECT_DEPENDS_test_abstract_jb=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_acl=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_amihooks=TEST_FRAMEWORK
@@ -115,16 +117,21 @@ MENUSELECT_DEPENDS_test_ast_format_str_reduce=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_astobj2=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_astobj2_thrash=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_bucket=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_callerid=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_cdr=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_cel=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_channel_feature_hooks=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_config=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_core_codec=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_core_format=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_db=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_devicestate=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_dlinklists=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_endpoints=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_event=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_expr=TEST_FRAMEWORK
-MENUSELECT_DEPENDS_test_format_api=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_format_cache=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_format_cap=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_func_file=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_gosub=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_hashtab_thrash=TEST_FRAMEWORK
@@ -134,6 +141,7 @@ MENUSELECT_DEPENDS_test_json=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_linkedlists=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_locale=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_logger=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_message=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_netsock2=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_optional_api=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_pbx=TEST_FRAMEWORK
@@ -155,9 +163,11 @@ MENUSELECT_DEPENDS_test_substitution=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_taskprocessor=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_threadpool=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_time=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_uri=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_utils=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_uuid=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_voicemail_api=TEST_FRAMEWORK
+MENUSELECT_DEPENDS_test_websocket_client=TEST_FRAMEWORK
MENUSELECT_DEPENDS_test_xml_escape=TEST_FRAMEWORK
MENUSELECT_DEPENDS_BETTER_BACKTRACES=BFD DLADDR
MENUSELECT_DEPENDS_BUILD_NATIVE=NATIVE_ARCH
diff --git a/menuselect.makeopts b/menuselect.makeopts
index e579f0e..e68f475 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -1,24 +1,24 @@
-MENUSELECT_ADDONS=chan_ooh323 format_mp3 app_mysql app_saycountpl cdr_mysql
-MENUSELECT_APPS=app_skel app_fax app_ivrdemo app_saycounted app_dahdibarge app_readfile app_setcallerid
+MENUSELECT_ADDONS=chan_ooh323 format_mp3
+MENUSELECT_APPS=app_skel app_ivrdemo
MENUSELECT_BRIDGES=
MENUSELECT_CDR=cdr_sqlite
MENUSELECT_CEL=
-MENUSELECT_CHANNELS=chan_misdn chan_nbs chan_vpb chan_h323
+MENUSELECT_CHANNELS=chan_misdn chan_nbs chan_vpb
MENUSELECT_CODECS=
MENUSELECT_FORMATS=
MENUSELECT_FUNCS=
MENUSELECT_PBX=
-MENUSELECT_RES=res_mwi_external res_mwi_external_ami res_stasis_test res_timing_kqueue
-MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_cdr test_cel test_config test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_format_api test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_netsock2 test_optional_api test_pbx test_poll test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_utils test_uuid test_voicemail_api test_xml_escape
-MENUSELECT_CFLAGS=LOADABLE_MODULES
-MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
-MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb astman
+MENUSELECT_RES=res_stasis_mailbox res_stasis_test res_timing_kqueue
+MENUSELECT_TESTS=test_abstract_jb test_acl test_amihooks test_aoc test_app test_ari test_ari_model test_ast_format_str_reduce test_astobj2 test_astobj2_thrash test_bucket test_callerid test_cdr test_cel test_channel_feature_hooks test_config test_core_codec test_core_format test_db test_devicestate test_dlinklists test_endpoints test_event test_expr test_format_cache test_format_cap test_func_file test_gosub test_hashtab_thrash test_heap test_jitterbuf test_json test_linkedlists test_locale test_logger test_message test_netsock2 test_optional_api test_pbx test_poll test_res_stasis test_sched test_scoped_lock test_security_events test_skel test_sorcery test_sorcery_astdb test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints test_stringfields test_strings test_substitution test_taskprocessor test_threadpool test_time test_uri test_utils test_uuid test_voicemail_api test_websocket_client test_xml_escape
+MENUSELECT_CFLAGS=LOADABLE_MODULES BUILD_NATIVE OPTIONAL_API
+MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
+MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb aelparse astman conf2ael muted smsq stereorize streamplayer
MENUSELECT_AGIS=
MENUSELECT_EMBED=
MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM
MENUSELECT_MOH=MOH-OPSOUND-WAV
MENUSELECT_EXTRA_SOUNDS=
-MENUSELECT_BUILD_DEPS=bridge_holding app_voicemail app_cdr app_confbridge res_monitor res_speech res_agi res_stasis res_adsi res_smdi res_odbc res_xmpp res_pjsip res_pjsip_session res_crypto res_http_websocket res_pktccops res_jabber res_ael_share res_ari res_mwi_external res_sorcery_config res_pjsip_pubsub res_pjsip_exten_state res_stasis_recording res_statsd res_fax G711_NEW_ALGORITHM
+MENUSELECT_BUILD_DEPS=bridge_holding app_voicemail app_cdr app_confbridge res_monitor res_speech res_agi res_stasis res_adsi res_odbc res_smdi res_xmpp res_pjsip res_pjsip_session res_crypto res_http_websocket app_chanspy func_cut func_groupcount func_uri res_ael_share res_ari res_mwi_external res_sorcery_config res_pjsip_pubsub res_pjsip_exten_state res_pjsip_outbound_publish res_stasis_recording res_statsd res_fax res_hep G711_NEW_ALGORITHM
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_stasis_test
@@ -34,16 +34,21 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2_thrash
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_bucket
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_callerid
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cdr
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_cel
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_channel_feature_hooks
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_codec
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_core_format
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_endpoints
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_event
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_expr
-MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cache
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_format_cap
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_func_file
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_gosub
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_hashtab_thrash
@@ -53,6 +58,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_json
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_linkedlists
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_locale
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_logger
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_message
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_netsock2
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_optional_api
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_pbx
@@ -74,8 +80,9 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_taskprocessor
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_threadpool
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uri
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_uuid
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_voicemail_api
+MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_websocket_client
MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_xml_escape
-MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE
diff --git a/mxml-system.patch b/mxml-system.patch
deleted file mode 100644
index a7f17ca..0000000
--- a/mxml-system.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -dur asterisk-12.0.0.orig/menuselect/Makefile asterisk-12.0.0/menuselect/Makefile
---- asterisk-12.0.0.orig/menuselect/Makefile 2012-05-09 21:57:43.000000000 +0200
-+++ asterisk-12.0.0/menuselect/Makefile 2014-01-08 12:23:16.000000000 +0100
-@@ -23,6 +23,7 @@
- # Basic set of sources and flags/libraries/includes
- OBJS:=menuselect.o strcompat.o
- CFLAGS+=-g -D_GNU_SOURCE -Wall
-+MXML_LIB:=$(shell pkg-config --libs mxml)
-
- ifeq ($(MENUSELECT_DEBUG),yes)
- CFLAGS += -DMENUSELECT_DEBUG
-@@ -30,13 +31,13 @@
-
- ifdef NCURSES_LIB
- C_OBJS += menuselect_curses.o
-- C_LIBS +=$(NCURSES_LIB)
-+ C_LIBS += $(MXML_LIB) $(NCURSES_LIB)
- C_INCLUDE += $(NCURSES_INCLUDE)
- ALL_TGTS += cmenuselect
- else
- ifdef CURSES_LIB
- C_OBJS += menuselect_curses.o
-- C_LIBS +=$(CURSES_LIB)
-+ C_LIBS += $(MXML_LIB) $(CURSES_LIB)
- C_INCLUDE += $(CURSES_INCLUDE)
- ALL_TGTS += cmenuselect
- endif
-@@ -44,19 +45,20 @@
-
- ifdef GTK2_LIB
- G_OBJS += menuselect_gtk.o
-- G_LIBS += $(GTK2_LIB)
-+ G_LIBS += $(MXML_LIB) $(GTK2_LIB)
- G_INCLUDE += $(GTK2_INCLUDE)
- ALL_TGTS += gmenuselect
- endif
-
- ifdef NEWT_LIB
- N_OBJS += menuselect_newt.o
-- N_LIBS += $(NEWT_LIB)
-+ N_LIBS += $(MXML_LIB) $(NEWT_LIB)
- N_INCLUDE += $(NEWT_INCLUDE)
- ALL_TGTS += nmenuselect
- endif
-
- M_OBJS += menuselect_stub.o
-+M_LIBS += $(MXML_LIB)
- ALL_TGTS += menuselect
-
- all: $(ALL_TGTS)
-@@ -66,7 +68,7 @@
- makeopts autoconfig.h: autoconfig.h.in makeopts.in
- @./configure $(CONFIGURE_SILENT)
-
--$(ALL_TGTS): mxml/libmxml.a
-+$(ALL_TGTS):
-
- ifdef C_OBJS
- menuselect_curses.o: CFLAGS+=$(C_INCLUDE)
-diff -dur asterisk-12.0.0.orig/menuselect/menuselect.c asterisk-12.0.0/menuselect/menuselect.c
---- asterisk-12.0.0.orig/menuselect/menuselect.c 2011-11-09 23:22:13.000000000 +0100
-+++ asterisk-12.0.0/menuselect/menuselect.c 2014-01-08 12:21:41.000000000 +0100
-@@ -32,7 +32,7 @@
- #include <getopt.h>
-
- #include "autoconfig.h"
--#include "mxml/mxml.h"
-+#include "mxml.h"
- #include "linkedlists.h"
- #include "menuselect.h"
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/asterisk.git/commitdiff/00222a6230dbc7143d27192ef04dcadff0d6016a
More information about the pld-cvs-commit
mailing list