-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
+diff -urN asterisk-16.15.0.org/agi/DialAnMp3.agi asterisk-16.15.0/agi/DialAnMp3.agi
+--- asterisk-16.15.0.org/agi/DialAnMp3.agi 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/DialAnMp3.agi 2020-11-27 12:44:43.374449817 +0100
@@ -17,7 +17,7 @@
print STDERR " -- $i = $AGI{$i}\n";
}
sub checkresult {
my ($res) = @_;
-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
+diff -urN asterisk-16.15.0.org/agi/jukebox.agi asterisk-16.15.0/agi/jukebox.agi
+--- asterisk-16.15.0.org/agi/jukebox.agi 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/jukebox.agi 2020-11-27 12:44:43.374449817 +0100
@@ -17,7 +17,7 @@
#
# Uses festival to list off all your MP3 music files over a channel in
#
# Invocation Example:
# exten => 68742,1,Answer()
-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
+diff -urN asterisk-16.15.0.org/agi/numeralize asterisk-16.15.0/agi/numeralize
+--- asterisk-16.15.0.org/agi/numeralize 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/numeralize 2020-11-27 12:44:43.374449817 +0100
@@ -6,7 +6,7 @@
$mp3dir="/usr/media/mpeg3";
sub process_dir {
my ($dir) = @_;
my $file;
-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
+diff -urN asterisk-16.15.0.org/configs/samples/festival.conf.sample asterisk-16.15.0/configs/samples/festival.conf.sample
+--- asterisk-16.15.0.org/configs/samples/festival.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/festival.conf.sample 2020-11-27 12:44:43.374449817 +0100
@@ -21,7 +21,7 @@
; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
; Defaults to /tmp/
;
; Festival command to send to the server.
; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-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
+diff -urN asterisk-16.15.0.org/configs/samples/http.conf.sample asterisk-16.15.0/configs/samples/http.conf.sample
+--- asterisk-16.15.0.org/configs/samples/http.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/http.conf.sample 2020-11-27 12:44:43.374449817 +0100
@@ -5,7 +5,7 @@
; Note about Asterisk documentation:
; If Asterisk was installed from a tarball, then the HTML documentation should
; 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:
-@@ -91,6 +91,6 @@
+@@ -127,6 +127,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/spool/asterisk/uploads/.
+;uploads = /var/spool/asterisk/uploads/
;
-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 @@
+diff -urN asterisk-16.15.0.org/configs/samples/iax.conf.sample asterisk-16.15.0/configs/samples/iax.conf.sample
+--- asterisk-16.15.0.org/configs/samples/iax.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/iax.conf.sample 2020-11-27 12:44:43.374449817 +0100
+@@ -531,8 +531,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
; keys should always be 3DES encrypted.
;
;
-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 @@
+diff -urN asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample asterisk-16.15.0/configs/samples/musiconhold.conf.sample
+--- asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/musiconhold.conf.sample 2020-11-27 12:44:43.377783255 +0100
+@@ -36,7 +36,7 @@
; The path specified can be either an absolute path (starts with '/'),
; or a relative path; relative paths are interpreted as being relative
; to the 'astdatalibdir' in asterisk.conf, which defaults to
;
; NOTE:
; If you are not using "autoload" in modules.conf, then you
-@@ -73,7 +73,7 @@
+@@ -102,7 +102,7 @@
;mode=custom
; Note that with mode=custom, a directory is not required, such as when reading
; from a stream.
;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
;[ulawstream]
-@@ -85,5 +85,5 @@
+@@ -118,7 +118,7 @@
; 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 -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
+
+ ; By default, when res_musiconhold reloads or unloads, it sends a HUP signal
+diff -urN asterisk-16.15.0.org/configs/samples/osp.conf.sample asterisk-16.15.0/configs/samples/osp.conf.sample
+--- asterisk-16.15.0.org/configs/samples/osp.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/osp.conf.sample 2020-11-27 12:44:43.377783255 +0100
@@ -45,8 +45,8 @@
;source=domain name or [IP address in brackets]
;
;
; Specify the private key file name.
; If this parameter is unspecified or not present, the default name will be the
-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 @@
+diff -urN asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample asterisk-16.15.0/configs/samples/phoneprov.conf.sample
+--- asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/phoneprov.conf.sample 2020-11-27 12:44:43.377783255 +0100
+@@ -136,7 +136,7 @@
${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov)
config/${MAC} => polycom.xml ; Dynamic Filename => template file
${MAC}-directory.xml => 000000000000-directory.xml
;snom 300, 320, 360, 370, 820, 821, 870 support
snom-${MAC}.xml => snom-mac.xml
-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
+diff -urN asterisk-16.15.0.org/configs/samples/res_config_sqlite.conf.sample asterisk-16.15.0/configs/samples/res_config_sqlite.conf.sample
+--- asterisk-16.15.0.org/configs/samples/res_config_sqlite.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/res_config_sqlite.conf.sample 2020-11-27 12:44:43.377783255 +0100
@@ -1,7 +1,7 @@
[general]
; 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 -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
+diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey asterisk-16.15.0/contrib/scripts/astgenkey
+--- asterisk-16.15.0.org/contrib/scripts/astgenkey 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/scripts/astgenkey 2020-11-27 12:44:43.377783255 +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"
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 '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
+diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey.8 asterisk-16.15.0/contrib/scripts/astgenkey.8
+--- asterisk-16.15.0.org/contrib/scripts/astgenkey.8 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/scripts/astgenkey.8 2020-11-27 12:44:43.377783255 +0100
@@ -87,7 +87,7 @@
.RE
- Those files should be copied to
+ Those files should be copied to
-.I /var/lib/asterisk/keys
+.I /usr/share/asterisk/keys
.RS
.RE
-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
+diff -urN asterisk-16.15.0.org/contrib/utils/README.rawplayer asterisk-16.15.0/contrib/utils/README.rawplayer
+--- asterisk-16.15.0.org/contrib/utils/README.rawplayer 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/utils/README.rawplayer 2020-11-27 12:44:43.377783255 +0100
@@ -16,7 +16,7 @@
sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
and set up a class in musiconhold.conf like so:
[classes]
-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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael 2020-11-27 12:44:43.377783255 +0100
@@ -2049,7 +2049,7 @@
macro callerid-liar()
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
- Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
+ Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
@@ -2106,7 +2106,7 @@
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
@@ -2223,7 +2223,7 @@
-
+
}
1 => { // Sonya
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
}
1 => { // SEAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
}
2 => { // ERIC
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
Voicemail(u4);
goto homeline|s|loopback;
-
+
// SetMusicOnHold(erics);
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ // TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
// goto homeline|s|loopback;
}
3 => { // RYAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
4 => { // KYLE
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
5 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
-
+
}
6 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
7 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
1 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
-
+
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2778,7 +2778,7 @@
}
761 => {
Record(announcement:gsm);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
goto s|loopback;
}
762 => {
-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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael 2020-11-27 12:44:43.377783255 +0100
@@ -2048,7 +2048,7 @@
macro callerid-liar()
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/priv-callerintros/LIAR.gsm&);
- Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&);
+ Background(priv-liar); // Script: OOOps! Sorry! I don't allow men with ski masks pulled over their
// faces to get in the front door, and unidentified callers won't fair
// any better. You entered *MY* phone number. That won't work.
@@ -2105,7 +2105,7 @@
if( "${PRIVACYMGRSTATUS}" = "FAILED" )
{
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
Hangup();
return;
Playback(greetings/direct); // Welcome to the Murphy residence. This system will automatically try to connect you to...
Playback(/var/spool/asterisk/voicemail/default/${direct}/greet);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&);
switch(${direct})
{
@@ -2222,7 +2222,7 @@
-
+
}
1 => { // Sonya
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&);
&std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket);
goto s|loopback;
}
1 => { // SEAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,3,35,mtw,telemarket,telemarket);
&std-priv-exten(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket);
}
2 => { // ERIC
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
Voicemail(u4);
goto homeline|s|loopback;
-
+
// SetMusicOnHold(erics);
- // TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ // TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ // TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
// TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&);
// &std-priv-exten(Zap/3r2&Zap/5r2,4,35,mtw,telemarket,telemarket);
// goto homeline|s|loopback;
}
3 => { // RYAN
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
4 => { // KYLE
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
5 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
-
+
}
6 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
7 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&);
&std-priv-exten(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket);
goto homeline|s|loopback;
}
1 => {
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm);
TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&);
-
+
&std-priv-exten(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket);
@@ -2777,7 +2777,7 @@
}
761 => {
Record(announcement:gsm);
- TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&);
-+ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&);
++ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&);
goto s|loopback;
}
762 => {
-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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13 2020-11-27 12:44:43.381116692 +0100
@@ -2182,7 +2182,7 @@
[callerid-liar]
-exten => ~~s~~,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/priv-callerintros/LIAR.gsm&)
-+exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/priv-callerintros/LIAR.gsm&)
++exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/priv-callerintros/LIAR.gsm&)
exten => ~~s~~,2,Background(priv-liar)
exten => ~~s~~,3,Hangup()
exten => ~~s~~,4,Return()
exten => s,5,PrivacyManager()
exten => s,6,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?7:11)
-exten => s,7,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm)
-+exten => s,7,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm)
++exten => s,7,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm)
exten => s,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => s,9,Hangup()
exten => s,10,Return()
exten => s,31,Playback(greetings/direct)
exten => s,32,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet)
-exten => s,33,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => s,33,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => s,33,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => s,34,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&)
exten => s,35,Goto(sw_92_${direct},10)
exten => s,36,NoOp(Finish switch_if_homeline_91_92)
exten => sw_92_1,10,Gosub(std-priv-exten,~~s~~,1(Zap/6r3&Sip/murf,1,25,mpA(beep)tw,telemarket,telemarket))
exten => sw_92_1,11,Goto(s,loopback)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/2/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
[homeline-kids]
exten => s,1(begin),Background(murphy-homeline-kids)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/3/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(IAX2/seaniax&Zap/5r2,3,35,mtw,telemarket,telemarket))
exten => 1,4,Goto(homeline,s,loopback)
-exten => 2,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 2,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 2,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 2,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/4/greet.wav&)
exten => 2,3,Voicemail(u4)
exten => 2,4,Goto(homeline,s,loopback)
-exten => 3,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 3,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 3,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 3,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/5/greet.wav&)
exten => 3,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,5,35,mtw,telemarket,telemarket))
exten => 3,4,Goto(homeline,s,loopback)
-exten => 4,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 4,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 4,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 4,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/6/greet.wav&)
exten => 4,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,6,35,mtw,telemarket,telemarket))
exten => 4,4,Goto(homeline,s,loopback)
-exten => 5,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 5,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 5,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 5,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/7/greet.wav&)
exten => 5,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,7,35,mtw,telemarket,telemarket))
exten => 5,4,Goto(homeline,s,loopback)
-exten => 6,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 6,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 6,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 6,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/8/greet.wav&)
exten => 6,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,8,35,mtw,telemarket,telemarket))
exten => 6,4,Goto(homeline,s,loopback)
-exten => 7,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 7,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 7,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 7,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/9/greet.wav&)
exten => 7,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket))
exten => 7,4,Goto(homeline,s,loopback)
exten => s,7(loopback),Background(greetings/greeting)
exten => s,8,Background(murphy-office-intro1)
-exten => 1,1,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm)
-+exten => 1,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm)
++exten => 1,1,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm)
exten => 1,2,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/1/greet.wav&)
exten => 1,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket))
exten => 1,4,Goto(s,loopback)
exten => 760,2,Goto(s,loopback)
exten => 761,1,Record(announcement:gsm)
-exten => 761,2,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&)
-+exten => 761,2,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&)
++exten => 761,2,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&)
exten => 761,3,Goto(s,loopback)
exten => 762,1,agi(tts-riddle.agi)
exten => 762,2,Background(gsm/what-time-it-is2)
-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
- the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
--etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
-+etc.) the new layout creates one directory under /usr/share/asterisk/sounds for the
- 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 -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 @@
+diff -urN asterisk-16.15.0.org/utils/ael_main.c asterisk-16.15.0/utils/ael_main.c
+--- asterisk-16.15.0.org/utils/ael_main.c 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/utils/ael_main.c 2020-11-27 12:44:43.381116692 +0100
+@@ -525,7 +525,7 @@
strcpy(config_dir, "/etc/asterisk");
localized_use_conf_dir();
}
- strcpy(var_dir, "/var/lib/asterisk");
-+ strcpy(var_dir, "/usr/shre/asterisk");
-
++ strcpy(var_dir, "/usr/share/asterisk");
+
if( dump_extensions ) {
dumpfile = fopen("extensions.conf.aeldump","w");
projects / packages / asterisk.git / blobdiff