Up to 15.3.0

Fixed typo in FHS-paths.patch
Removed asterisk-ilbc.patch, applied upstream.

diff --git a/FHS-paths.patch b/FHS-paths.patch
index afa39a1ba1dd90d8f7dd7af1a24f7731aaae9a3e..2612cc12942022d2aa57a74f9f3668c9cc79e5c5 100644 (file)
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -165,7 +165,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/as
 @@ -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
  
@@ -196,16 +196,16 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/utils/READ
  and set up a class in musiconhold.conf like so:
  
  [classes]
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-14.5.0/pbx/ael/ael-test/ael-test3/extensions.ael
---- asterisk-14.5.0.orig/pbx/ael/ael-test/ael-test3/extensions.ael     2017-05-30 19:50:46.000000000 +0200
-+++ asterisk-14.5.0/pbx/ael/ael-test/ael-test3/extensions.ael  2017-06-09 14:40:59.000000000 +0200
+diff -urN asterisk-15.3.0-orig/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-15.3.0/pbx/ael/ael-test/ael-test3/extensions.ael
+--- asterisk-15.3.0-orig/pbx/ael/ael-test/ael-test3/extensions.ael     2018-03-15 17:31:26.000000000 +0100
++++ asterisk-15.3.0/pbx/ael/ael-test/ael-test3/extensions.ael  2018-03-25 10:02:28.491840053 +0200
 @@ -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 @@
@@ -213,7 +213,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
                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;
@@ -222,16 +222,16 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
                        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;
@@ -240,7 +240,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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);
@@ -248,50 +248,50 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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;
@@ -300,29 +300,29 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-14.5.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
---- asterisk-14.5.0.orig/pbx/ael/ael-test/ael-vtest13/extensions.ael   2017-05-30 19:50:46.000000000 +0200
-+++ asterisk-14.5.0/pbx/ael/ael-test/ael-vtest13/extensions.ael        2017-06-09 14:40:59.000000000 +0200
+diff -urN asterisk-15.3.0-orig/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-15.3.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
+--- asterisk-15.3.0-orig/pbx/ael/ael-test/ael-vtest13/extensions.ael   2018-03-15 17:31:26.000000000 +0100
++++ asterisk-15.3.0/pbx/ael/ael-test/ael-vtest13/extensions.ael        2018-03-25 10:01:53.053291285 +0200
 @@ -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 @@
@@ -330,7 +330,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
                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;
@@ -339,16 +339,16 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
                        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;
@@ -357,7 +357,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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);
@@ -365,50 +365,50 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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;
@@ -417,19 +417,20 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/a
        }
        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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/ref.ael-vtest13 asterisk-14.5.0/pbx/ael/ael-test/ref.ael-vtest13
 --- asterisk-14.5.0.orig/pbx/ael/ael-test/ref.ael-vtest13      2017-05-30 19:50:46.000000000 +0200
 +++ asterisk-14.5.0/pbx/ael/ael-test/ref.ael-vtest13   2017-06-09 14:40:59.000000000 +0200
@@ -438,7 +439,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  
  [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()
@@ -447,7 +448,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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()
@@ -456,7 +457,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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)
@@ -465,7 +466,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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)
@@ -474,37 +475,37 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  [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)
@@ -513,7 +514,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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)
@@ -522,7 +523,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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 --git a/asterisk-ilbc.patch b/asterisk-ilbc.patch
deleted file mode 100644 (file)
index 8407fa7..0000000
--- a/asterisk-ilbc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- asterisk-13.4.0/codecs/codec_ilbc.c.orig   2015-06-04 15:20:51.000000000 +0200
-+++ asterisk-13.4.0/codecs/codec_ilbc.c        2015-08-01 21:55:41.236727967 +0200
-@@ -40,8 +40,8 @@
- 
- #ifdef ILBC_WEBRTC
- #include <ilbc.h>
--typedef WebRtc_UWord16 ilbc_bytes;
--typedef WebRtc_Word16  ilbc_block;
-+typedef uint16_t ilbc_bytes;
-+typedef int16_t  ilbc_block;
- #define BUF_TYPE i16
- #else
- #include "ilbc/iLBC_encode.h"

diff --git a/asterisk.spec b/asterisk.spec
index 2fea7de6b530ffdaf78f18946eff75da6bc4dde8..78e0d7570cdff954d8274a863679cc67c0ad3f4a 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -51,12 +51,12 @@
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
-Version:       15.2.2
+Version:       15.3.0
 Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: aadc45419967e71b652f4a8ba75e12e7
+# Source0-md5: 18c9d26355225c0499a499ef5869156a
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
@@ -77,7 +77,7 @@ Patch3:               pld-banner.patch
 Patch4:                lpc10-system.patch
 Patch5:                %{name}-histedit.patch
 Patch6:                x32.patch
-Patch7:                %{name}-ilbc.patch
+#Patch7:               %{name}-ilbc.patch
 URL:           http://www.asterisk.org/
 BuildRequires: OSPToolkit-devel >= 4.0.0
 %{?with_oss:BuildRequires:     SDL-devel}
@@ -791,7 +791,6 @@ Dokumentacja API Asteriska.
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
-%patch7 -p1
 
 %if %{with opus_vp8}
 
@@ -1432,7 +1431,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 # res_rtp_asterisk.so pulls some pjproject libs, but it still looks like a core module
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_asterisk.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_rtp_multicast.so
-%attr(755,root,root) %{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
+#%attr(755,root,root) %{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_security_log.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_smdi.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_sorcery_astdb.so