From 313d7fe1fd1308c075abbdd9b8b5a72d20cc9f19 Mon Sep 17 00:00:00 2001 From: areq Date: Sun, 17 Apr 2011 18:45:49 +0000 Subject: [PATCH] - 1.8.3.2 Changed files: FHS-paths.patch -> 1.5 asterisk.spec -> 1.192 --- FHS-paths.patch | 77 +++++++++++++++++++++++++------------------------ asterisk.spec | 4 +-- 2 files changed, 41 insertions(+), 40 deletions(-) diff --git a/FHS-paths.patch b/FHS-paths.patch index b9ef9b3..9d249f6 100644 --- a/FHS-paths.patch +++ b/FHS-paths.patch @@ -1,51 +1,51 @@ Index: pbx/ael/ael-test/ref.ael-vtest13 =================================================================== ---- pbx/ael/ael-test/ref.ael-vtest13.orig 2010-10-05 02:23:11.000000000 +0300 -+++ pbx/ael/ael-test/ref.ael-vtest13 2010-10-23 12:56:19.047483668 +0300 +--- pbx/ael/ael-test/ref.ael-vtest13.orig 2010-12-22 20:05:02.000000000 +0000 ++++ pbx/ael/ael-test/ref.ael-vtest13 2011-04-17 18:23:22.190000784 +0000 @@ -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,2,Background(priv-liar) - exten => s,3,Hangup() - exten => s,4,Return() -@@ -2218,7 +2218,7 @@ - exten => s,5,Zapateller(nocallerid) - exten => s,6,PrivacyManager() - exten => s,7,GotoIf($["${PRIVACYMGRSTATUS}" = "FAILED" ]?8:12) --exten => s,8,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/privmanfailed.gsm) -+exten => s,8,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/privmanfailed.gsm) - exten => s,9,Gosub(std-priv-exten,s,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) - exten => s,10,Hangup() - exten => s,11,Return() -@@ -2244,7 +2244,7 @@ - exten => s,31,verbose(direct is XXX#${direct}XXXX) - exten => s,32,Playback(greetings/direct) - exten => s,33,Playback(/var/spool/asterisk/voicemail/default/${direct}/greet) --exten => s,34,TrySystem(/usr/bin/play /var/lib/asterisk/sounds/call-for.gsm) -+exten => s,34,TrySystem(/usr/bin/play /usr/share/asterisk/sounds/call-for.gsm) - exten => s,35,TrySystem(/usr/bin/play /var/spool/asterisk/voicemail/default/${direct}/greet.wav&) - exten => s,36,Goto(sw_92_${direct},10) - exten => s,37,NoOp(Finish switch_if_homeline_91_92) -@@ -2323,7 +2323,7 @@ +-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~~,2,Background(priv-liar) + exten => ~~s~~,3,Hangup() + exten => ~~s~~,4,Return() +@@ -2217,7 +2217,7 @@ + exten => s,4,Zapateller(nocallerid) + 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,8,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) + exten => s,9,Hangup() + exten => s,10,Return() +@@ -2243,7 +2243,7 @@ + exten => s,30,verbose(direct is XXX#${direct}XXXX) + 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,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) +@@ -2322,7 +2322,7 @@ exten => sw_92_2,11,Goto(s,loopback) - 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,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,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r1&Zap/5r1,2,25,mtw,telemarket,telemarket)) exten => 1,4,Goto(s,loopback) -@@ -2400,31 +2400,31 @@ +@@ -2399,31 +2399,31 @@ [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,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,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) @@ -55,38 +55,38 @@ Index: pbx/ael/ael-test/ref.ael-vtest13 -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,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,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,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,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,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,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,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,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,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/3r2&Zap/5r2,9,35,mtw,telemarket,telemarket)) exten => 7,4,Goto(homeline,s,loopback) -@@ -2452,7 +2452,7 @@ +@@ -2451,7 +2451,7 @@ exten => s,6,TrySystem(/usr/local/bin/who-is-it ${CALLERID(num)} "${CALLERID(name)}"&) 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,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,3,Gosub(std-priv-exten,~~s~~,1(Zap/6&Sip/murf,1,30,mtw,telemarket,telemarket)) exten => 1,4,Goto(s,loopback) -@@ -2578,7 +2578,7 @@ +@@ -2577,7 +2577,7 @@ exten => 760,1,DateTime() exten => 760,2,Goto(s,loopback) exten => 761,1,Record(announcement:gsm) @@ -95,6 +95,7 @@ Index: pbx/ael/ael-test/ref.ael-vtest13 exten => 761,3,Goto(s,loopback) exten => 762,1,agi(tts-riddle.agi) exten => 762,2,Background(gsm/what-time-it-is2) + Index: pbx/ael/ael-test/ael-test3/extensions.ael =================================================================== --- pbx/ael/ael-test/ael-test3/extensions.ael (revision 222649) diff --git a/asterisk.spec b/asterisk.spec index 0e67e3e..0a8bbaa 100644 --- a/asterisk.spec +++ b/asterisk.spec @@ -38,12 +38,12 @@ Summary: Asterisk PBX Summary(pl.UTF-8): Centralka (PBX) Asterisk Name: asterisk -Version: 1.8.2.4 +Version: 1.8.3.2 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: b3cd5866ce73632a44c0ddb2f3b1ad1f +# Source0-md5: 0bee03f4498a6081146a579b51130633 Source1: %{name}.init Source2: %{name}.sysconfig Source5: %{name}.logrotate -- 2.44.0