Version: 14.5.0

diff --git a/FHS-paths.patch b/FHS-paths.patch
index ddb6e354da7aabe4c732dbcfa97d524e6c6381bd..afa39a1ba1dd90d8f7dd7af1a24f7731aaae9a3e 100644 (file)
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -1,6 +1,6 @@
-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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/DialAnMp3.agi asterisk-14.5.0/agi/DialAnMp3.agi
+--- asterisk-14.5.0.orig/agi/DialAnMp3.agi     2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/agi/DialAnMp3.agi  2017-06-09 14:40:59.000000000 +0200

 @@ -17,7 +17,7 @@
        print STDERR " -- $i = $AGI{$i}\n";
  }
 @@ -17,7 +17,7 @@
        print STDERR " -- $i = $AGI{$i}\n";
  }


@@ -10,9 +10,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/DialAnM
  
  sub checkresult {
        my ($res) = @_;
  
  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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/jukebox.agi asterisk-14.5.0/agi/jukebox.agi
+--- asterisk-14.5.0.orig/agi/jukebox.agi       2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/agi/jukebox.agi    2017-06-09 14:40:59.000000000 +0200

 @@ -17,7 +17,7 @@
  #
  # Uses festival to list off all your MP3 music files over a channel in
 @@ -17,7 +17,7 @@
  #
  # Uses festival to list off all your MP3 music files over a channel in


@@ -22,9 +22,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/jukebox
  #
  # Invocation Example:
  #   exten => 68742,1,Answer()
  #
  # 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/numeralize asterisk-14.5.0/agi/numeralize
+--- asterisk-14.5.0.orig/agi/numeralize        2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/agi/numeralize     2017-06-09 14:40:59.000000000 +0200

 @@ -6,7 +6,7 @@
  
  $mp3dir="/usr/media/mpeg3";
 @@ -6,7 +6,7 @@
  
  $mp3dir="/usr/media/mpeg3";


@@ -34,9 +34,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/agi/numeral
  sub process_dir {
        my ($dir) = @_;
        my $file;
  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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/festival.conf.sample asterisk-14.5.0/configs/samples/festival.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/festival.conf.sample  2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/festival.conf.sample       2017-06-09 14:40:59.000000000 +0200

 @@ -21,7 +21,7 @@
  ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
  ; Defaults to /tmp/
 @@ -21,7 +21,7 @@
  ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
  ; Defaults to /tmp/


@@ -46,9 +46,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ;
  ; Festival command to send to the server.
  ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
  ;
  ; 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/http.conf.sample asterisk-14.5.0/configs/samples/http.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/http.conf.sample      2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/http.conf.sample   2017-06-09 14:40:59.000000000 +0200

 @@ -5,7 +5,7 @@
  ; Note about Asterisk documentation:
  ;   If Asterisk was installed from a tarball, then the HTML documentation should
 @@ -5,7 +5,7 @@
  ; Note about Asterisk documentation:
  ;   If Asterisk was installed from a tarball, then the HTML documentation should


@@ -58,7 +58,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ;   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:
  ;   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 @@
+@@ -121,6 +121,6 @@

  ; config permission to POST files.
  ;
  ; In this example, if the prefix option is set to "asterisk", then using the
  ; config permission to POST files.
  ;
  ; In this example, if the prefix option is set to "asterisk", then using the


@@ -67,10 +67,10 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
 +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
 +;uploads = /var/spool/asterisk/uploads/
  ;
 +; 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/iax.conf.sample asterisk-14.5.0/configs/samples/iax.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/iax.conf.sample       2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/iax.conf.sample    2017-06-09 14:40:59.000000000 +0200
+@@ -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
  ; authentication is used, "inkeys" is a list of acceptable public keys on the
  ; local system that can be used to authenticate the remote peer, separated by
  ; the ":" character.  "outkey" is a single, private key to use to authenticate


@@ -81,10 +81,10 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ; keys should always be 3DES encrypted.
  ;
  ;
  ; 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/musiconhold.conf.sample asterisk-14.5.0/configs/samples/musiconhold.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/musiconhold.conf.sample       2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/musiconhold.conf.sample    2017-06-09 14:40:59.000000000 +0200
+@@ -35,7 +35,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
  ; 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


@@ -93,7 +93,7 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ;
  ; NOTE:
  ; If you are not using "autoload" in modules.conf, then you
  ;
  ; NOTE:
  ; If you are not using "autoload" in modules.conf, then you

-@@ -73,7 +73,7 @@
+@@ -79,7 +79,7 @@

  ;mode=custom
  ; Note that with mode=custom, a directory is not required, such as when reading
  ; from a stream.
  ;mode=custom
  ; Note that with mode=custom, a directory is not required, such as when reading
  ; from a stream.


@@ -102,16 +102,16 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
  ;[ulawstream]
  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
  ;[ulawstream]

-@@ -85,5 +85,5 @@
+@@ -95,5 +95,5 @@

  ; choice
  ;[solaris]
  ;mode=custom
 -;directory=/var/lib/asterisk/mohmp3
 +;directory=/usr/share/asterisk/mohmp3
  ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
  ; 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
+diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/osp.conf.sample asterisk-14.5.0/configs/samples/osp.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/osp.conf.sample       2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/osp.conf.sample    2017-06-09 14:40:59.000000000 +0200

 @@ -45,8 +45,8 @@
  ;source=domain name or [IP address in brackets]
  ;
 @@ -45,8 +45,8 @@
  ;source=domain name or [IP address in brackets]
  ;


@@ -123,10 +123,10 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  ;
  ; Specify the private key file name.
  ; If this parameter is unspecified or not present, the default name will be the
  ;
  ; 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/phoneprov.conf.sample asterisk-14.5.0/configs/samples/phoneprov.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/phoneprov.conf.sample 2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/phoneprov.conf.sample      2017-06-09 14:40:59.000000000 +0200
+@@ -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
  ${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


@@ -135,9 +135,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  
  ;snom 300, 320, 360, 370, 820, 821, 870 support
  snom-${MAC}.xml => snom-mac.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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/res_config_sqlite.conf.sample asterisk-14.5.0/configs/samples/res_config_sqlite.conf.sample
+--- asterisk-14.5.0.orig/configs/samples/res_config_sqlite.conf.sample 2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/configs/samples/res_config_sqlite.conf.sample      2017-06-09 14:40:59.000000000 +0200

 @@ -1,7 +1,7 @@
  [general]
  
 @@ -1,7 +1,7 @@
  [general]
  


@@ -147,9 +147,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/configs/sam
  
  ; 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
  
  ; 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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/astgenkey asterisk-14.5.0/contrib/scripts/astgenkey
+--- asterisk-14.5.0.orig/contrib/scripts/astgenkey     2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/contrib/scripts/astgenkey  2017-06-09 14:40:59.000000000 +0200

 @@ -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"
 @@ -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"


@@ -159,9 +159,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/scr
        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'"
        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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/astgenkey.8 asterisk-14.5.0/contrib/scripts/astgenkey.8
+--- asterisk-14.5.0.orig/contrib/scripts/astgenkey.8   2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/contrib/scripts/astgenkey.8        2017-06-09 14:40:59.000000000 +0200

 @@ -87,7 +87,7 @@
  .RE
  
 @@ -87,7 +87,7 @@
  .RE
  


@@ -184,9 +184,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/scr
  .RS
  .RE
  
  .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 -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/utils/README.rawplayer asterisk-14.5.0/contrib/utils/README.rawplayer
+--- asterisk-14.5.0.orig/contrib/utils/README.rawplayer        2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/contrib/utils/README.rawplayer     2017-06-09 14:40:59.000000000 +0200

 @@ -16,7 +16,7 @@
  sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
  
 @@ -16,7 +16,7 @@
  sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
  


@@ -196,9 +196,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/contrib/uti
  and set up a class in musiconhold.conf like so:
  
  [classes]
  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 -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

 @@ -2049,7 +2049,7 @@
  
  macro callerid-liar()
 @@ -2049,7 +2049,7 @@
  
  macro callerid-liar()


@@ -313,9 +313,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael
                goto s|loopback;
        }
        762 => {
                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 -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

 @@ -2048,7 +2048,7 @@
  
  macro callerid-liar()
 @@ -2048,7 +2048,7 @@
  
  macro callerid-liar()


@@ -430,9 +430,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael
                goto s|loopback;
        }
        762 => {
                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 -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

 @@ -2182,7 +2182,7 @@
  
  
 @@ -2182,7 +2182,7 @@
  
  


@@ -526,9 +526,9 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/pbx/ael/ael
  exten => 761,3,Goto(s,loopback)
  exten => 762,1,agi(tts-riddle.agi)
  exten => 762,2,Background(gsm/what-time-it-is2)
  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
+diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/UPGRADE-1.4.txt asterisk-14.5.0/UPGRADE-1.4.txt
+--- asterisk-14.5.0.orig/UPGRADE-1.4.txt       2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/UPGRADE-1.4.txt    2017-06-09 14:40:59.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
 @@ -92,7 +92,7 @@
  WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
  instead of the alternate-language files being stored in subdirectories underneath


@@ -538,15 +538,15 @@ diff -durN -x '*~' -x '*.orig' -x '*.rej' asterisk-13.0.0-beta2.orig/UPGRADE-1.4
  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
  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
+diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/utils/ael_main.c asterisk-14.5.0/utils/ael_main.c
+--- asterisk-14.5.0.orig/utils/ael_main.c      2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/utils/ael_main.c   2017-06-09 14:41:43.000000000 +0200

 @@ -532,7 +532,7 @@
                strcpy(config_dir, "/etc/asterisk");
                localized_use_conf_dir();
        }
 -      strcpy(var_dir, "/var/lib/asterisk");
 @@ -532,7 +532,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");
        if( dump_extensions ) {
                dumpfile = fopen("extensions.conf.aeldump","w");

diff --git a/asterisk.spec b/asterisk.spec
index fb06f5f13b2788de175ab8432ab51661666fa733..4699989eebc012a22cc4fa58447185e3d340dace 100644 (file)
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -38,12 +38,12 @@
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk
 Summary:       Asterisk PBX
 Summary(pl.UTF-8):     Centralka (PBX) Asterisk
 Name:          asterisk

-Version:       13.16.0
-Release:       1
+Version:       14.5.0
+Release:       0.1

 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz

-# Source0-md5: 97e55bae49878882fc41f4b95d63f18a
+# Source0-md5: d9ac67d98a565f338d412ef678bd4c56

 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles


@@ -129,13 +129,14 @@ BuildRequires:    speexdsp-devel
 %{?with_sqlite2:BuildRequires: sqlite-devel >= 2}
 BuildRequires: sqlite3-devel
 BuildRequires: srtp-devel
 %{?with_sqlite2:BuildRequires: sqlite-devel >= 2}
 BuildRequires: sqlite3-devel
 BuildRequires: srtp-devel

-Requires(post,preun,postun):   systemd-units >= 38
-Requires:      systemd-units >= 0.38
+BuildRequires: unbound-devel

 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: uriparser-devel
 %{?with_ilbc:BuildRequires:    webrtc-libilbc-devel >= 2}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel
 %{?with_odbc:BuildRequires:    unixODBC-devel}
 BuildRequires: uriparser-devel
 %{?with_ilbc:BuildRequires:    webrtc-libilbc-devel >= 2}
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: zlib-devel

+Requires(post,preun,postun):   systemd-units >= 38
+Requires:      systemd-units >= 0.38

 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel
 Requires(post,preun):  /sbin/chkconfig
 Requires(postun):      /usr/sbin/groupdel
 Requires(postun):      /usr/sbin/userdel


@@ -814,6 +815,7 @@ cd menuselect
 cd ..
 
 %configure \
 cd ..
 
 %configure \

+       --with-unbound \

        %{__without oss SDL_image} \
        %{__without bluetooth bluetooth} \
        --without-gtk2 \
        %{__without oss SDL_image} \
        %{__without bluetooth bluetooth} \
        --without-gtk2 \


@@ -1168,6 +1170,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/phoneprov.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queuerules.conf
 %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/phoneprov.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/queuerules.conf
 %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/resolver_unbound.conf

 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_parking.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_pktccops.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/res_parking.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_pktccops.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/res_stun_monitor.conf


@@ -1195,6 +1198,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_alarmreceiver.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_amd.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_authenticate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_alarmreceiver.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_amd.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_authenticate.so

+%attr(755,root,root) %{_libdir}/asterisk/modules/app_bridgeaddchan.so

 %attr(755,root,root) %{_libdir}/asterisk/modules/app_bridgewait.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_cdr.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_celgenuserevent.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_bridgewait.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_cdr.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_celgenuserevent.so


@@ -1241,6 +1245,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_speech_utils.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_stack.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_stasis.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_speech_utils.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_stack.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_stasis.so

+%attr(755,root,root) %{_libdir}/asterisk/modules/app_statsd.so

 %attr(755,root,root) %{_libdir}/asterisk/modules/app_system.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_talkdetect.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_test.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_system.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_talkdetect.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/app_test.so


@@ -1268,7 +1273,6 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge_media.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mgcp.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_bridge_media.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_iax2.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_mgcp.so

-%attr(755,root,root) %{_libdir}/asterisk/modules/chan_multicast_rtp.so

 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_phone.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_rtp.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_sip.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_phone.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_rtp.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/chan_sip.so


@@ -1378,6 +1382,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %if %{with opus_vp8}
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_format_attr_vp8.so
 %endif
 %if %{with opus_vp8}
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_format_attr_vp8.so
 %endif

+%attr(755,root,root) %{_libdir}/asterisk/modules/res_http_media_cache.so

 %attr(755,root,root) %{_libdir}/asterisk/modules/res_http_websocket.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_limit.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_manager_devicestate.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_http_websocket.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_limit.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_manager_devicestate.so


@@ -1391,6 +1396,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %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_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_resolver_unbound.so

 # 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
 # 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


@@ -1559,6 +1565,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_ilbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_ilbc.so
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_ilbc.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/format_ilbc.so

+%attr(755,root,root) %{_libdir}/asterisk/modules/res_format_attr_ilbc.so

 %endif
 
 %files jabber
 %endif
 
 %files jabber


@@ -1757,6 +1764,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %files speex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_speex.so
 %files speex
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/asterisk/modules/codec_speex.so

+%attr(755,root,root) %{_libdir}/asterisk/modules/format_ogg_speex.so

 %attr(755,root,root) %{_libdir}/asterisk/modules/func_speex.so
 
 %if %{with sqlite2}
 %attr(755,root,root) %{_libdir}/asterisk/modules/func_speex.so
 
 %if %{with sqlite2}

diff --git a/x32.patch b/x32.patch
index bd5f8c09ebce53c185bc79b05be94af78fdc7639..bdcc5010d6a637da4abb5f903800214be5aa67de 100644 (file)
--- a/x32.patch
+++ b/x32.patch
@@ -1,19 +1,19 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/main/Makefile asterisk-13.16.0/main/Makefile
---- asterisk-13.16.0.orig/main/Makefile        2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/main/Makefile     2017-06-09 14:17:11.000000000 +0200
+diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/main/Makefile asterisk-14.5.0/main/Makefile
+--- asterisk-14.5.0.orig/main/Makefile 2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/main/Makefile      2017-06-09 14:43:16.000000000 +0200

 @@ -47,7 +47,7 @@
  AST_LIBS+=$(RT_LIB)
  AST_LIBS+=$(SYSTEMD_LIB)
  
 @@ -47,7 +47,7 @@
  AST_LIBS+=$(RT_LIB)
  AST_LIBS+=$(SYSTEMD_LIB)
  

--ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc kfreebsd-gnu),)
-+ifneq ($(findstring $(OSARCH), linux-gnu linux-gnux32 uclinux linux-uclibc kfreebsd-gnu),)
+-ifneq ($(findstring $(OSARCH), linux-gnu uclinux linux-uclibc linux-musl kfreebsd-gnu),)
++ifneq ($(findstring $(OSARCH), linux-gnu linux-gnux32 uclinux linux-uclibc linux-musl kfreebsd-gnu),)

    AST_LIBS+=-ldl
    ifneq (x$(CAP_LIB),x)
      AST_LIBS+=$(CAP_LIB)
    AST_LIBS+=-ldl
    ifneq (x$(CAP_LIB),x)
      AST_LIBS+=$(CAP_LIB)

-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/Makefile asterisk-13.16.0/Makefile
---- asterisk-13.16.0.orig/Makefile     2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/Makefile  2017-06-09 14:16:48.000000000 +0200
-@@ -183,6 +183,11 @@
+diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/Makefile asterisk-14.5.0/Makefile
+--- asterisk-14.5.0.orig/Makefile      2017-05-30 19:50:46.000000000 +0200
++++ asterisk-14.5.0/Makefile   2017-06-09 14:42:55.000000000 +0200
+@@ -182,6 +182,11 @@

  # Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
  OPTIONS=
  
  # Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
  OPTIONS=