From 0f0650bc1e30873f72dfdf2e1cafea2f02711a81 Mon Sep 17 00:00:00 2001 From: Grzegorz Pycia / PLD Date: Sun, 9 Dec 2012 19:33:25 +0100 Subject: [PATCH] up to 10.10.1 builds for 686 removed usbradio, rpt --- FHS-paths.patch | 239 ++++++++++++++++++++------------------------ asterisk.spec | 27 ++--- menuselect.makedeps | 6 +- menuselect.makeopts | 18 ++-- mxml-system.patch | 14 +-- 5 files changed, 140 insertions(+), 164 deletions(-) diff --git a/FHS-paths.patch b/FHS-paths.patch index 6b72b8e..be61b40 100644 --- a/FHS-paths.patch +++ b/FHS-paths.patch @@ -1,18 +1,6 @@ -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/UPGRADE-1.4.txt asterisk-1.8.6.0/UPGRADE-1.4.txt ---- asterisk-1.8.6.0.orig/UPGRADE-1.4.txt 2009-08-18 22:29:37.000000000 +0200 -+++ asterisk-1.8.6.0/UPGRADE-1.4.txt 2011-09-07 14:09:30.000000000 +0200 -@@ -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 -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/DialAnMp3.agi asterisk-1.8.6.0/agi/DialAnMp3.agi ---- asterisk-1.8.6.0.orig/agi/DialAnMp3.agi 2006-02-14 20:14:15.000000000 +0100 -+++ asterisk-1.8.6.0/agi/DialAnMp3.agi 2011-09-07 14:09:30.000000000 +0200 +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 @@ -17,7 +17,7 @@ print STDERR " -- $i = $AGI{$i}\n"; } @@ -22,9 +10,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/DialAnMp3.agi asteris sub checkresult { my ($res) = @_; -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/jukebox.agi asterisk-1.8.6.0/agi/jukebox.agi ---- asterisk-1.8.6.0.orig/agi/jukebox.agi 2006-03-07 00:45:37.000000000 +0100 -+++ asterisk-1.8.6.0/agi/jukebox.agi 2011-09-07 14:09:30.000000000 +0200 +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 @@ -17,7 +17,7 @@ # # Uses festival to list off all your MP3 music files over a channel in @@ -34,9 +22,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/jukebox.agi asterisk- # # Invocation Example: # exten => 68742,1,Answer() -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/numeralize asterisk-1.8.6.0/agi/numeralize ---- asterisk-1.8.6.0.orig/agi/numeralize 2006-02-14 20:14:15.000000000 +0100 -+++ asterisk-1.8.6.0/agi/numeralize 2011-09-07 14:09:30.000000000 +0200 +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 @@ -6,7 +6,7 @@ $mp3dir="/usr/media/mpeg3"; @@ -46,33 +34,21 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/agi/numeralize asterisk-1 sub process_dir { my ($dir) = @_; my $file; -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/apps/app_rpt.c asterisk-1.8.6.0/apps/app_rpt.c ---- asterisk-1.8.6.0.orig/apps/app_rpt.c 2011-07-14 22:13:06.000000000 +0200 -+++ asterisk-1.8.6.0/apps/app_rpt.c 2011-09-07 14:09:30.000000000 +0200 -@@ -242,7 +242,7 @@ - #define TONEMACRO "tonemacro" - #define FUNCCHAR '*' - #define ENDCHAR '#' --#define EXTNODEFILE "/var/lib/asterisk/rpt_extnodes" -+#define EXTNODEFILE "/usr/share/asterisk/rpt_extnodes" - #define NODENAMES "rpt/nodenames" - #define PARROTFILE "/tmp/parrot_%s_%u" - -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/festival.conf.sample asterisk-1.8.6.0/configs/festival.conf.sample ---- asterisk-1.8.6.0.orig/configs/festival.conf.sample 2009-05-28 16:39:21.000000000 +0200 -+++ asterisk-1.8.6.0/configs/festival.conf.sample 2011-09-07 14:09:30.000000000 +0200 +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 @@ -21,7 +21,7 @@ ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process. ; Defaults to /tmp/ ; -;cachedir=/var/lib/asterisk/festivalcache/ -+;cachedir=/var/spool/asterisk/festival/ ++;cachedir=/var/spool/asterisk/festivalcache/ ; ; Festival command to send to the server. ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/http.conf.sample asterisk-1.8.6.0/configs/http.conf.sample ---- asterisk-1.8.6.0.orig/configs/http.conf.sample 2011-04-21 20:24:05.000000000 +0200 -+++ asterisk-1.8.6.0/configs/http.conf.sample 2011-09-07 14:09:30.000000000 +0200 +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 @@ -5,7 +5,7 @@ ; Note about Asterisk documentation: ; If Asterisk was installed from a tarball, then the HTML documentation should @@ -82,7 +58,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/http.conf.sample ; 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: -@@ -74,6 +74,6 @@ +@@ -75,6 +75,6 @@ ;[post_mappings] ; ; In this example, if the prefix option is set to "asterisk", then using the @@ -91,10 +67,10 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/http.conf.sample +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/. +;uploads = /var/spool/asterisk/uploads/ ; -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/iax.conf.sample asterisk-1.8.6.0/configs/iax.conf.sample ---- asterisk-1.8.6.0.orig/configs/iax.conf.sample 2011-02-02 20:27:19.000000000 +0100 -+++ asterisk-1.8.6.0/configs/iax.conf.sample 2011-09-07 14:09:30.000000000 +0200 -@@ -456,8 +456,8 @@ +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 @@ ; 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 @@ -105,9 +81,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/iax.conf.sample a ; keys should always be 3DES encrypted. ; ; -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/musiconhold.conf.sample asterisk-1.8.6.0/configs/musiconhold.conf.sample ---- asterisk-1.8.6.0.orig/configs/musiconhold.conf.sample 2010-10-16 12:47:00.000000000 +0200 -+++ asterisk-1.8.6.0/configs/musiconhold.conf.sample 2011-09-07 14:09:30.000000000 +0200 +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 @@ -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 @@ -133,23 +109,23 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/musiconhold.conf. -;directory=/var/lib/asterisk/mohmp3 +;directory=/usr/share/asterisk/mohmp3 ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12 -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/osp.conf.sample asterisk-1.8.6.0/configs/osp.conf.sample ---- asterisk-1.8.6.0.orig/configs/osp.conf.sample 2010-07-12 06:16:18.000000000 +0200 -+++ asterisk-1.8.6.0/configs/osp.conf.sample 2011-09-07 14:09:30.000000000 +0200 +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 @@ -45,8 +45,8 @@ ;source=domain name or [IP address in brackets] ; ; Define path and file name of crypto files. -; The default path for crypto file is /var/lib/asterisk/keys. If no path is -; defined, crypto files will in /var/lib/asterisk/keys directory. -+; The default path for crypto file is /user/share/asterisk/keys. If no path is -+; defined, crypto files will in /user/share/asterisk/keys directory. ++; The default path for crypto file is /usr/share/asterisk/keys. If no path is ++; defined, crypto files will in /usr/share/asterisk/keys directory. ; ; Specify the private key file name. ; If this parameter is unspecified or not present, the default name will be the -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/phoneprov.conf.sample asterisk-1.8.6.0/configs/phoneprov.conf.sample ---- asterisk-1.8.6.0.orig/configs/phoneprov.conf.sample 2011-02-03 16:50:35.000000000 +0100 -+++ asterisk-1.8.6.0/configs/phoneprov.conf.sample 2011-09-07 14:10:47.000000000 +0200 +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 @@ -130,7 +130,7 @@ ${MAC}-phone.cfg => 000000000000-phone.cfg ; (relative to AST_DATA_DIR/phoneprov) config/${MAC} => polycom.xml ; Dynamic Filename => template file @@ -159,9 +135,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/phoneprov.conf.sa ;snom 300, 320, 360, 370, 820, 821, 870 support snom-${MAC}.xml => snom-mac.xml -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/res_config_sqlite.conf.sample asterisk-1.8.6.0/configs/res_config_sqlite.conf.sample ---- asterisk-1.8.6.0.orig/configs/res_config_sqlite.conf.sample 2009-06-30 19:22:16.000000000 +0200 -+++ asterisk-1.8.6.0/configs/res_config_sqlite.conf.sample 2011-09-07 14:09:30.000000000 +0200 +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 @@ -1,7 +1,7 @@ [general] @@ -171,9 +147,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/configs/res_config_sqlite ; 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 -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey asterisk-1.8.6.0/contrib/scripts/astgenkey ---- asterisk-1.8.6.0.orig/contrib/scripts/astgenkey 2006-02-14 20:14:15.000000000 +0100 -+++ asterisk-1.8.6.0/contrib/scripts/astgenkey 2011-09-07 14:09:30.000000000 +0200 +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 @@ -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" @@ -183,9 +159,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey 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 -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey.8 asterisk-1.8.6.0/contrib/scripts/astgenkey.8 ---- asterisk-1.8.6.0.orig/contrib/scripts/astgenkey.8 2010-04-10 10:33:57.000000000 +0200 -+++ asterisk-1.8.6.0/contrib/scripts/astgenkey.8 2011-09-07 14:09:30.000000000 +0200 +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 @@ -87,7 +87,7 @@ .RE @@ -208,10 +184,10 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/scripts/astgenkey .RS .RE -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/utils/README.rawplayer asterisk-1.8.6.0/contrib/utils/README.rawplayer ---- asterisk-1.8.6.0.orig/contrib/utils/README.rawplayer 2006-02-14 20:14:15.000000000 +0100 -+++ asterisk-1.8.6.0/contrib/utils/README.rawplayer 2011-09-07 14:09:30.000000000 +0200 -@@ -16,11 +16,11 @@ +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 +@@ -16,7 +16,7 @@ sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw @@ -220,14 +196,9 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/contrib/utils/README.rawp and set up a class in musiconhold.conf like so: [classes] --default => custom:/var/lib/asterisk/holdmusic_raw,/usr/bin/rawplayer -+default => custom:/usr/share/asterisk/holdmusic_raw,/usr/bin/rawplayer - - - This is the most efficient way to implement moh because no cpu usage is required to -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-1.8.6.0/pbx/ael/ael-test/ael-test3/extensions.ael ---- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael 2007-11-27 00:15:53.000000000 +0100 -+++ asterisk-1.8.6.0/pbx/ael/ael-test/ael-test3/extensions.ael 2011-09-07 14:09:30.000000000 +0200 +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 @@ -2049,7 +2049,7 @@ macro callerid-liar() @@ -242,7 +213,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test if( "${PRIVACYMGRSTATUS}" = "FAILED" ) { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm); &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); Hangup(); return; @@ -251,7 +222,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test 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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm); TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&); switch(${direct}) { @@ -260,7 +231,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test } 1 => { // Sonya - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -269,7 +240,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test } 1 => { // SEAN - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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); @@ -277,35 +248,35 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test } 2 => { // ERIC - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ // TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -313,14 +284,14 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test } 6 => { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -329,7 +300,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test } 1 => { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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); @@ -338,19 +309,19 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-test 761 => { Record(announcement:gsm); - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&); goto s|loopback; } 762 => { -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-1.8.6.0/pbx/ael/ael-test/ael-vtest13/extensions.ael ---- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael 2007-11-27 00:15:53.000000000 +0100 -+++ asterisk-1.8.6.0/pbx/ael/ael-test/ael-vtest13/extensions.ael 2011-09-07 14:09:30.000000000 +0200 +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 @@ -2048,7 +2048,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&); ++ 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 // faces to get in the front door, and unidentified callers won't fair // any better. You entered *MY* phone number. That won't work. @@ -359,7 +330,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes if( "${PRIVACYMGRSTATUS}" = "FAILED" ) { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/privmanfailed.gsm); &std-priv-exten(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket); Hangup(); return; @@ -368,7 +339,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes 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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/call-for.gsm); TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&); switch(${direct}) { @@ -377,7 +348,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes } 1 => { // Sonya - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -386,7 +357,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes } 1 => { // SEAN - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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); @@ -394,35 +365,35 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes } 2 => { // ERIC - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ // TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -430,14 +401,14 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes } 6 => { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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; @@ -446,7 +417,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes } 1 => { - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm); ++ TrySystem(/usr/bin/play /usr/shre/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); @@ -455,19 +426,19 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ael-vtes 761 => { Record(announcement:gsm); - TrySystem(/usr/bin/play /var/lib/asterisk/sounds/announcement.gsm&); -+ TrySystem(/usr/bin/play /usr/share/asterisk/sounds/announcement.gsm&); ++ TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/announcement.gsm&); goto s|loopback; } 762 => { -diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael-vtest13 asterisk-1.8.6.0/pbx/ael/ael-test/ref.ael-vtest13 ---- asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael-vtest13 2010-12-22 21:05:02.000000000 +0100 -+++ asterisk-1.8.6.0/pbx/ael/ael-test/ref.ael-vtest13 2011-09-07 14:09:30.000000000 +0200 +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 @@ -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/share/asterisk/sounds/priv-callerintros/LIAR.gsm&) ++exten => ~~s~~,1,TrySystem(/usr/bin/play /usr/shre/asterisk/sounds/priv-callerintros/LIAR.gsm&) exten => ~~s~~,2,Background(priv-liar) exten => ~~s~~,3,Hangup() exten => ~~s~~,4,Return() @@ -476,7 +447,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- 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/share/asterisk/sounds/privmanfailed.gsm) ++exten => s,7,TrySystem(/usr/bin/play /usr/shre/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() @@ -485,7 +456,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- 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/share/asterisk/sounds/call-for.gsm) ++exten => s,33,TrySystem(/usr/bin/play /usr/shre/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) @@ -494,7 +465,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- 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/share/asterisk/sounds/call-for.gsm) ++exten => 1,1,TrySystem(/usr/bin/play /usr/shre/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) @@ -503,37 +474,37 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- [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/share/asterisk/sounds/call-for.gsm) ++exten => 1,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 2,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 3,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 4,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 5,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 6,1,TrySystem(/usr/bin/play /usr/shre/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/share/asterisk/sounds/call-for.gsm) ++exten => 7,1,TrySystem(/usr/bin/play /usr/shre/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) @@ -542,7 +513,7 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- 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/share/asterisk/sounds/call-for.gsm) ++exten => 1,1,TrySystem(/usr/bin/play /usr/shre/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) @@ -551,19 +522,31 @@ diff -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/pbx/ael/ael-test/ref.ael- 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/share/asterisk/sounds/announcement.gsm&) ++exten => 761,2,TrySystem(/usr/bin/play /usr/shre/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 -dur -x '*.orig' -x '*.rej' asterisk-1.8.6.0.orig/utils/ael_main.c asterisk-1.8.6.0/utils/ael_main.c ---- asterisk-1.8.6.0.orig/utils/ael_main.c 2011-07-14 22:13:06.000000000 +0200 -+++ asterisk-1.8.6.0/utils/ael_main.c 2011-09-07 14:09:30.000000000 +0200 -@@ -503,7 +503,7 @@ +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 +@@ -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 -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 @@ strcpy(config_dir, "/etc/asterisk"); localized_use_conf_dir(); } - strcpy(var_dir, "/var/lib/asterisk"); -+ strcpy(var_dir, "/usr/share/asterisk"); ++ strcpy(var_dir, "/usr/shre/asterisk"); if( dump_extensions ) { dumpfile = fopen("extensions.conf.aeldump","w"); diff --git a/asterisk.spec b/asterisk.spec index d2d18ae..0d26650 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -34,16 +34,16 @@ %bcond_without verbose # verbose build %define spandsp_version 0.0.2pre26 -%define rel 6 +%define rel 1 Summary: Asterisk PBX Summary(pl.UTF-8): Centralka (PBX) Asterisk Name: asterisk -Version: 10.0.1 +Version: 10.10.1 Release: %{rel}%{?with_bristuff:.bristuff} License: GPL v2 Group: Applications/System Source0: http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz -# Source0-md5: b8eaff7832fe46fc764030ed46df617c +# Source0-md5: 6ce8e2c9f6a5589e8b77059e3e70031f Source1: %{name}.init Source2: %{name}.sysconfig Source3: %{name}.tmpfiles @@ -55,7 +55,7 @@ Source12: menuselect.makedeps Source13: menuselect.makeopts Patch0: mxml-system.patch Patch1: lua51-path.patch -Patch2: %{name}-no_k6_on_sparc.patch +#atch2: %{name}-no_k6_on_sparc.patch Patch3: %{name}-lib.patch Patch4: %{name}-ppc.patch Patch5: external-libedit.patch @@ -472,14 +472,6 @@ Requires: %{name} = %{version}-%{release} %description unistim Unistim channel for Asterisk -%package usbradio -Summary: USB radio channel for Asterisk -Group: Applications/Networking -Requires: %{name} = %{version}-%{release} - -%description usbradio -Unistim channel for Asterisk - %package voicemail Summary: Common Voicemail Modules for Asterisk Group: Applications/Networking @@ -544,7 +536,7 @@ API documentation for Asterisk. %setup -q %patch0 -p1 %patch1 -p1 -%patch2 -p1 +#patch2 -p1 %patch3 -p1 %patch4 -p1 %patch5 -p0 @@ -568,7 +560,7 @@ cp %{SOURCE11} . %patch15 -p1 %endif %patch16 -p1 -%patch17 -p1 +#%patch17 -p1 %patch18 -p1 %patch19 -p1 @@ -862,7 +854,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queues.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_config_mysql.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_stun_monitor.conf -%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rpt.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/rtp.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/say.conf %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/sip*.conf @@ -958,6 +949,7 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(755,root,root) %{_libdir}/asterisk/modules/codec_alaw.so %attr(755,root,root) %{_libdir}/asterisk/modules/codec_g722.so %attr(755,root,root) %{_libdir}/asterisk/modules/codec_g726.so +%attr(755,root,root) %{_libdir}/asterisk/modules/codec_ilbc.so %attr(755,root,root) %{_libdir}/asterisk/modules/codec_ulaw.so %attr(755,root,root) %{_libdir}/asterisk/modules/format_g719.so %attr(755,root,root) %{_libdir}/asterisk/modules/format_g723.so @@ -1039,6 +1031,7 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(755,root,root) %{_libdir}/asterisk/modules/res_mutestream.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_musiconhold.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_phoneprov.so +%attr(755,root,root) %{_libdir}/asterisk/modules/res_pktccops.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_realtime.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_asterisk.so %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_multicast.so @@ -1305,10 +1298,6 @@ chown -R asterisk:asterisk /var/lib/asterisk %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/unistim.conf %attr(755,root,root) %{_libdir}/asterisk/modules/chan_unistim.so -%files usbradio -%defattr(644,root,root,755) -%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/usbradio.conf -%attr(755,root,root) %{_libdir}/asterisk/modules/chan_usbradio.so %files voicemail %defattr(644,root,root,755) diff --git a/menuselect.makedeps b/menuselect.makedeps index c8dfc89..63bc3f0 100644 --- a/menuselect.makedeps +++ b/menuselect.makedeps @@ -7,10 +7,9 @@ MENUSELECT_DEPENDS_app_page=DAHDI MENUSELECT_DEPENDS_app_dahdiras=DAHDI 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_rpt=DAHDI TONEZONE MENUSELECT_DEPENDS_app_dahdibarge=DAHDI -MENUSELECT_DEPENDS_app_meetme=DAHDI MENUSELECT_DEPENDS_cdr_syslog=SYSLOG MENUSELECT_DEPENDS_cdr_pgsql=PGSQL MENUSELECT_DEPENDS_cdr_radius=RADIUS @@ -31,7 +30,6 @@ MENUSELECT_DEPENDS_chan_misdn=ISDNNET MISDN SUPPSERV MENUSELECT_DEPENDS_chan_nbs=NBS MENUSELECT_DEPENDS_chan_oss=OSS MENUSELECT_DEPENDS_chan_phone=IXJUSER -MENUSELECT_DEPENDS_chan_usbradio=OSS ALSA USB MENUSELECT_DEPENDS_chan_vpb=VPB MENUSELECT_DEPENDS_chan_h323=OPENH323 MENUSELECT_DEPENDS_codec_dahdi=DAHDI @@ -71,6 +69,7 @@ MENUSELECT_DEPENDS_test_aoc=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_app=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_ast_format_str_reduce=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_astobj2=TEST_FRAMEWORK +MENUSELECT_DEPENDS_test_config=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_db=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_devicestate=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_dlinklists=TEST_FRAMEWORK @@ -94,6 +93,7 @@ MENUSELECT_DEPENDS_test_strings=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_substitution=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_time=TEST_FRAMEWORK MENUSELECT_DEPENDS_test_utils=TEST_FRAMEWORK +MENUSELECT_DEPENDS_BUILD_NATIVE=NATIVE_ARCH MENUSELECT_DEPENDS_REBUILD_PARSERS=BISON FLEX MENUSELECT_DEPENDS_BETTER_BACKTRACES=BFD DLADDR MENUSELECT_DEPENDS_USE_HOARD_ALLOCATOR=HOARD diff --git a/menuselect.makeopts b/menuselect.makeopts index 2d48f18..ef683e2 100644 --- a/menuselect.makeopts +++ b/menuselect.makeopts @@ -1,26 +1,26 @@ MENUSELECT_ADDONS=format_mp3 app_mysql app_saycountpl cdr_mysql -MENUSELECT_APPS=app_skel app_fax app_ivrdemo app_rpt app_saycounted app_dahdibarge app_readfile app_setcallerid +MENUSELECT_APPS=app_skel app_fax app_ivrdemo app_saycounted app_dahdibarge app_readfile app_setcallerid MENUSELECT_BRIDGES= MENUSELECT_CDR=cdr_sqlite MENUSELECT_CEL= -MENUSELECT_CHANNELS=chan_misdn chan_nbs chan_vpb chan_h323 -MENUSELECT_CODECS=codec_ilbc +MENUSELECT_CHANNELS=chan_nbs chan_vpb chan_h323 +MENUSELECT_CODECS= MENUSELECT_FORMATS= MENUSELECT_FUNCS= MENUSELECT_PBX= -MENUSELECT_RES=res_ais res_pktccops res_timing_kqueue -MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils +MENUSELECT_RES=res_ais res_timing_kqueue +MENUSELECT_TESTS=test_acl test_amihooks test_aoc test_app test_ast_format_str_reduce test_astobj2 test_config test_db test_devicestate test_dlinklists test_event test_expr test_format_api test_func_file test_gosub test_heap test_linkedlists test_locale test_logger test_netsock2 test_pbx test_poll test_sched test_security_events test_skel test_stringfields test_strings test_substitution test_time test_utils MENUSELECT_CFLAGS=LOADABLE_MODULES -MENUSELECT_OPTS_app_voicemail=FILE_STORAGE +MENUSELECT_OPTS_app_voicemail=ODBC_STORAGE MENUSELECT_UTILS=astcanary astdb2sqlite3 astdb2bdb MENUSELECT_AGIS= MENUSELECT_EMBED= MENUSELECT_CORE_SOUNDS=CORE-SOUNDS-EN-GSM MENUSELECT_MOH=MOH-OPSOUND-WAV MENUSELECT_EXTRA_SOUNDS= -MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_meetme res_monitor res_agi res_adsi res_smdi res_odbc res_crypto res_jabber res_ael_share res_fax G711_NEW_ALGORITHM chan_usbradio -MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_misdn +MENUSELECT_BUILD_DEPS=chan_local app_voicemail app_meetme res_monitor res_agi res_adsi res_smdi res_odbc res_crypto res_jabber res_pktccops res_ael_share res_fax G711_NEW_ALGORITHM MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs +MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_ais MENUSELECT_DEPSFAILED=MENUSELECT_RES=res_timing_kqueue MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_acl MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_amihooks @@ -28,6 +28,7 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_aoc MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_app MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_ast_format_str_reduce MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_astobj2 +MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_config MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_db MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_devicestate MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_dlinklists @@ -51,3 +52,4 @@ MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_strings MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_substitution MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_time MENUSELECT_DEPSFAILED=MENUSELECT_TESTS=test_utils +MENUSELECT_DEPSFAILED=MENUSELECT_CFLAGS=BUILD_NATIVE diff --git a/mxml-system.patch b/mxml-system.patch index 41abc5e..6c832cc 100644 --- a/mxml-system.patch +++ b/mxml-system.patch @@ -1,9 +1,10 @@ ---- asterisk-1.6.1.12/menuselect/Makefile~ 2008-12-11 00:00:19.000000000 +0200 -+++ asterisk-1.6.1.12/menuselect/Makefile 2009-12-30 23:14:47.201686543 +0200 +diff -urN asterisk-10.10.1.org/menuselect/Makefile asterisk-10.10.1/menuselect/Makefile +--- asterisk-10.10.1.org/menuselect/Makefile 2012-05-09 21:57:43.000000000 +0200 ++++ asterisk-10.10.1/menuselect/Makefile 2012-12-09 16:21:44.578265277 +0100 @@ -23,6 +23,7 @@ # Basic set of sources and flags/libraries/includes OBJS:=menuselect.o strcompat.o - CFLAGS:=-g -c -D_GNU_SOURCE -Wall + CFLAGS+=-g -D_GNU_SOURCE -Wall +MXML_LIB:=$(shell pkg-config --libs mxml) ifeq ($(MENUSELECT_DEBUG),yes) @@ -33,15 +34,16 @@ all: $(ALL_TGTS) @@ -66,7 +68,7 @@ makeopts autoconfig.h: autoconfig.h.in makeopts.in - @./configure $(CONFIGURE_SILENT) CC= LD= AR= CFLAGS= + @./configure $(CONFIGURE_SILENT) -$(ALL_TGTS): mxml/libmxml.a +$(ALL_TGTS): ifdef C_OBJS menuselect_curses.o: CFLAGS+=$(C_INCLUDE) ---- asterisk-1.8.0/menuselect/menuselect.c.orig 2010-08-25 04:42:41.000000000 +0300 -+++ asterisk-1.8.0/menuselect/menuselect.c 2010-10-23 12:10:31.077483673 +0300 +diff -urN asterisk-10.10.1.org/menuselect/menuselect.c asterisk-10.10.1/menuselect/menuselect.c +--- asterisk-10.10.1.org/menuselect/menuselect.c 2011-11-09 23:22:13.000000000 +0100 ++++ asterisk-10.10.1/menuselect/menuselect.c 2012-12-09 16:22:51.341349575 +0100 @@ -32,7 +32,7 @@ #include -- 2.44.0