- up to 16.15.0

diff --git a/FHS-paths.patch b/FHS-paths.patch
index 61b7e69596980bc0db99682a47771598438efbd4..ee880ea838b52603716b641e6b452e4c7e0e2f6a 100644 (file)
--- a/FHS-paths.patch
+++ b/FHS-paths.patch
@@ -1,6 +1,6 @@
-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
+diff -urN asterisk-16.15.0.org/agi/DialAnMp3.agi asterisk-16.15.0/agi/DialAnMp3.agi
+--- asterisk-16.15.0.org/agi/DialAnMp3.agi     2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/DialAnMp3.agi 2020-11-27 12:44:43.374449817 +0100
 @@ -17,7 +17,7 @@
        print STDERR " -- $i = $AGI{$i}\n";
  }
@@ -10,9 +10,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/DialAnMp3.agi
  
  sub checkresult {
        my ($res) = @_;
-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
+diff -urN asterisk-16.15.0.org/agi/jukebox.agi asterisk-16.15.0/agi/jukebox.agi
+--- asterisk-16.15.0.org/agi/jukebox.agi       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/jukebox.agi   2020-11-27 12:44:43.374449817 +0100
 @@ -17,7 +17,7 @@
  #
  # Uses festival to list off all your MP3 music files over a channel in
@@ -22,9 +22,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/jukebox.agi as
  #
  # Invocation Example:
  #   exten => 68742,1,Answer()
-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
+diff -urN asterisk-16.15.0.org/agi/numeralize asterisk-16.15.0/agi/numeralize
+--- asterisk-16.15.0.org/agi/numeralize        2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/agi/numeralize    2020-11-27 12:44:43.374449817 +0100
 @@ -6,7 +6,7 @@
  
  $mp3dir="/usr/media/mpeg3";
@@ -34,9 +34,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/agi/numeralize ast
  sub process_dir {
        my ($dir) = @_;
        my $file;
-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
+diff -urN asterisk-16.15.0.org/configs/samples/festival.conf.sample asterisk-16.15.0/configs/samples/festival.conf.sample
+--- asterisk-16.15.0.org/configs/samples/festival.conf.sample  2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/festival.conf.sample      2020-11-27 12:44:43.374449817 +0100
 @@ -21,7 +21,7 @@
  ; THIS DIRECTORY *MUST* EXIST and must be writable from the asterisk process.
  ; Defaults to /tmp/
@@ -46,9 +46,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/fe
  ;
  ; Festival command to send to the server.
  ; Defaults to: (tts_textasterisk "%s" 'file)(quit)\n
-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
+diff -urN asterisk-16.15.0.org/configs/samples/http.conf.sample asterisk-16.15.0/configs/samples/http.conf.sample
+--- asterisk-16.15.0.org/configs/samples/http.conf.sample      2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/http.conf.sample  2020-11-27 12:44:43.374449817 +0100
 @@ -5,7 +5,7 @@
  ; Note about Asterisk documentation:
  ;   If Asterisk was installed from a tarball, then the HTML documentation should
@@ -58,7 +58,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/ht
  ;   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:
-@@ -121,6 +121,6 @@
+@@ -127,6 +127,6 @@
  ; config permission to POST files.
  ;
  ; In this example, if the prefix option is set to "asterisk", then using the
@@ -67,9 +67,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/ht
 +; POST URL: /asterisk/uploads will put files in /var/spool/asterisk/uploads/.
 +;uploads = /var/spool/asterisk/uploads/
  ;
-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
+diff -urN asterisk-16.15.0.org/configs/samples/iax.conf.sample asterisk-16.15.0/configs/samples/iax.conf.sample
+--- asterisk-16.15.0.org/configs/samples/iax.conf.sample       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/iax.conf.sample   2020-11-27 12:44:43.374449817 +0100
 @@ -531,8 +531,8 @@
  ; authentication is used, "inkeys" is a list of acceptable public keys on the
  ; local system that can be used to authenticate the remote peer, separated by
@@ -81,10 +81,10 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/ia
  ; keys should always be 3DES encrypted.
  ;
  ;
-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 @@
+diff -urN asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample asterisk-16.15.0/configs/samples/musiconhold.conf.sample
+--- asterisk-16.15.0.org/configs/samples/musiconhold.conf.sample       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/musiconhold.conf.sample   2020-11-27 12:44:43.377783255 +0100
+@@ -36,7 +36,7 @@
  ; The path specified can be either an absolute path (starts with '/'),
  ; or a relative path; relative paths are interpreted as being relative
  ; to the 'astdatalibdir' in asterisk.conf, which defaults to
@@ -93,7 +93,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/mu
  ;
  ; NOTE:
  ; If you are not using "autoload" in modules.conf, then you
-@@ -79,7 +79,7 @@
+@@ -102,7 +102,7 @@
  ;mode=custom
  ; Note that with mode=custom, a directory is not required, such as when reading
  ; from a stream.
@@ -102,16 +102,18 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/mu
  ;application=/usr/bin/mpg123 -q -r 8000 -f 8192 -b 2048 --mono -s
  
  ;[ulawstream]
-@@ -95,5 +95,5 @@
+@@ -118,7 +118,7 @@
  ; choice
  ;[solaris]
  ;mode=custom
 -;directory=/var/lib/asterisk/mohmp3
 +;directory=/usr/share/asterisk/mohmp3
  ;application=/site/sw/bin/madplay -Q -o raw:- --mono -R 8000 -a -12
-diff -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
+ 
+ ; By default, when res_musiconhold reloads or unloads, it sends a HUP signal
+diff -urN asterisk-16.15.0.org/configs/samples/osp.conf.sample asterisk-16.15.0/configs/samples/osp.conf.sample
+--- asterisk-16.15.0.org/configs/samples/osp.conf.sample       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/osp.conf.sample   2020-11-27 12:44:43.377783255 +0100
 @@ -45,8 +45,8 @@
  ;source=domain name or [IP address in brackets]
  ;
@@ -123,9 +125,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/os
  ;
  ; Specify the private key file name.
  ; If this parameter is unspecified or not present, the default name will be the
-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
+diff -urN asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample asterisk-16.15.0/configs/samples/phoneprov.conf.sample
+--- asterisk-16.15.0.org/configs/samples/phoneprov.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/phoneprov.conf.sample     2020-11-27 12:44:43.377783255 +0100
 @@ -136,7 +136,7 @@
  ${MAC}-phone.cfg => 000000000000-phone.cfg   ; (relative to AST_DATA_DIR/phoneprov)
  config/${MAC} => polycom.xml                 ; Dynamic Filename => template file
@@ -135,9 +137,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/ph
  
  ;snom 300, 320, 360, 370, 820, 821, 870 support
  snom-${MAC}.xml => snom-mac.xml
-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
+diff -urN asterisk-16.15.0.org/configs/samples/res_config_sqlite.conf.sample asterisk-16.15.0/configs/samples/res_config_sqlite.conf.sample
+--- asterisk-16.15.0.org/configs/samples/res_config_sqlite.conf.sample 2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configs/samples/res_config_sqlite.conf.sample     2020-11-27 12:44:43.377783255 +0100
 @@ -1,7 +1,7 @@
  [general]
  
@@ -147,9 +149,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/configs/samples/re
  
  ; 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 '*~' -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
+diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey asterisk-16.15.0/contrib/scripts/astgenkey
+--- asterisk-16.15.0.org/contrib/scripts/astgenkey     2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/scripts/astgenkey 2020-11-27 12:44:43.377783255 +0100
 @@ -29,7 +29,7 @@
        echo "in PEM format for use by Asterisk.  You will be asked to"
        echo "enter a passcode for your key multiple times.  Please"
@@ -159,9 +161,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/as
        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 -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
+diff -urN asterisk-16.15.0.org/contrib/scripts/astgenkey.8 asterisk-16.15.0/contrib/scripts/astgenkey.8
+--- asterisk-16.15.0.org/contrib/scripts/astgenkey.8   2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/scripts/astgenkey.8       2020-11-27 12:44:43.377783255 +0100
 @@ -87,7 +87,7 @@
  .RE
  
@@ -184,9 +186,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/contrib/scripts/as
  .RS
  .RE
  
-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
+diff -urN asterisk-16.15.0.org/contrib/utils/README.rawplayer asterisk-16.15.0/contrib/utils/README.rawplayer
+--- asterisk-16.15.0.org/contrib/utils/README.rawplayer        2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/contrib/utils/README.rawplayer    2020-11-27 12:44:43.377783255 +0100
 @@ -16,7 +16,7 @@
  sox -c 1 track01.wav -t raw -r 8000 -c 1 -s -w track01.raw
  
@@ -196,9 +198,9 @@ 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 -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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-test3/extensions.ael     2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ael-test3/extensions.ael 2020-11-27 12:44:43.377783255 +0100
 @@ -2049,7 +2049,7 @@
  
  macro callerid-liar()
@@ -313,9 +315,9 @@ diff -urN asterisk-15.3.0-orig/pbx/ael/ael-test/ael-test3/extensions.ael asteris
                goto s|loopback;
        }
        762 => {
-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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ael-vtest13/extensions.ael   2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ael-vtest13/extensions.ael       2020-11-27 12:44:43.377783255 +0100
 @@ -2048,7 +2048,7 @@
  
  macro callerid-liar()
@@ -430,10 +432,9 @@ diff -urN asterisk-15.3.0-orig/pbx/ael/ael-test/ael-vtest13/extensions.ael aster
                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
+diff -urN asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13 asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13
+--- asterisk-16.15.0.org/pbx/ael/ael-test/ref.ael-vtest13      2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/pbx/ael/ael-test/ref.ael-vtest13  2020-11-27 12:44:43.381116692 +0100
 @@ -2182,7 +2182,7 @@
  
  
@@ -527,10 +528,10 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-14.5.0.orig/pbx/ael/ael-test/r
  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 '*~' -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 @@
+diff -urN asterisk-16.15.0.org/utils/ael_main.c asterisk-16.15.0/utils/ael_main.c
+--- asterisk-16.15.0.org/utils/ael_main.c      2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/utils/ael_main.c  2020-11-27 12:44:43.381116692 +0100
+@@ -525,7 +525,7 @@
                strcpy(config_dir, "/etc/asterisk");
                localized_use_conf_dir();
        }

diff --git a/asterisk-ppc.patch b/asterisk-ppc.patch
deleted file mode 100644 (file)
index c3ae52c..0000000
--- a/asterisk-ppc.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- asterisk-1.6.1.1/apps/app_festival.c~      2008-12-09 21:48:02.000000000 +0100
-+++ asterisk-1.6.1.1/apps/app_festival.c       2009-07-06 14:01:31.868268176 +0200
-@@ -120,6 +120,7 @@
-       int res;
- #ifdef __PPC__ 
-       char c;
-+      int x;
- #endif
- 
-       res = ast_safe_fork(0);

diff --git a/asterisk.spec b/asterisk.spec
index baec5ce91df4357b987ae1e06816ee7cac99df47..d1d7d5fbd48a773459138eb70d98691ec7f178d2 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:       16.13.0
-Release:       2
+Version:       16.15.0
+Release:       1
 License:       GPL v2
 Group:         Applications/System
 Source0:       http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5: e084339d4d3ce1efce415150d7447c0a
+# Source0-md5: 2f03204a38e8ed49e58474961d43f363
 Source1:       %{name}.init
 Source2:       %{name}.sysconfig
 Source3:       %{name}.tmpfiles
@@ -71,7 +71,7 @@ Source8:      https://github.com/traud/asterisk-opus/archive/%{opus_commit}/asterisk-
 Source9:       https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/%{pjproject_version}/pjproject-%{pjproject_version}.tar.bz2
 # Source9-md5: 4fffc49b461133f0a4143b05a22fb30e
 Patch0:                lua_versions.patch
-Patch1:                %{name}-ppc.patch
+
 Patch2:                FHS-paths.patch
 Patch3:                pld-banner.patch
 Patch4:                lpc10-system.patch
@@ -769,7 +769,7 @@ Dokumentacja API Asteriska.
 %prep
 %setup -q -a 8
 %patch0 -p1
-%patch1 -p1
+
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
@@ -1198,6 +1198,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/ss7.timers
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/stasis.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/statsd.conf
+%attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/stir_shaken.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/telcordia-1.adsi
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/udptl.conf
 %attr(640,root,asterisk) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/asterisk/users.conf
@@ -1461,6 +1462,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_send_to_voicemail.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_session.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_sips_contact.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_stir_shaken.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_t38.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_pjsip_transport_websocket.so
@@ -1488,6 +1490,7 @@ chown -R asterisk:asterisk /var/lib/asterisk
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_stasis_playback.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_stasis_recording.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_stasis_snoop.so
+%attr(755,root,root) %{_libdir}/asterisk/modules/res_stir_shaken.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_stun_monitor.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_pthread.so
 %attr(755,root,root) %{_libdir}/asterisk/modules/res_timing_timerfd.so

diff --git a/lpc10-system.patch b/lpc10-system.patch
index 3d4bc062fc2465faaa8ce2d13e86bf1721270529..57d26c42fd7095f33b673a530a06e34e23bd7962 100644 (file)
--- a/lpc10-system.patch
+++ b/lpc10-system.patch
@@ -1,7 +1,7 @@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/build_tools/menuselect-deps.in asterisk-13.16.0/build_tools/menuselect-deps.in
---- asterisk-13.16.0.orig/build_tools/menuselect-deps.in       2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/build_tools/menuselect-deps.in    2017-06-09 14:11:13.000000000 +0200
-@@ -12,6 +12,7 @@
+diff -urN asterisk-16.15.0.org/build_tools/menuselect-deps.in asterisk-16.15.0/build_tools/menuselect-deps.in
+--- asterisk-16.15.0.org/build_tools/menuselect-deps.in        2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/build_tools/menuselect-deps.in    2020-11-27 12:46:51.858456198 +0100
+@@ -14,6 +14,7 @@
  GENERIC_ODBC=@PBX_GENERIC_ODBC@
  GMIME=@PBX_GMIME@
  GNU_LD=@GNU_LD@
@@ -9,9 +9,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/build_tools/menus
  GSM=@PBX_GSM@
  ILBC=@PBX_ILBC@
  GTK2=@PBX_GTK2@
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/codec_lpc10.c asterisk-13.16.0/codecs/codec_lpc10.c
---- asterisk-13.16.0.orig/codecs/codec_lpc10.c 2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/codecs/codec_lpc10.c      2017-06-09 14:11:13.000000000 +0200
+diff -urN asterisk-16.15.0.org/codecs/codec_lpc10.c asterisk-16.15.0/codecs/codec_lpc10.c
+--- asterisk-16.15.0.org/codecs/codec_lpc10.c  2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/codecs/codec_lpc10.c      2020-11-27 12:46:51.858456198 +0100
 @@ -26,6 +26,9 @@
   *
   * \ingroup codecs
@@ -22,7 +22,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/codec_lpc1
  
  /*** MODULEINFO
        <support_level>core</support_level>
-@@ -41,7 +44,7 @@
+@@ -39,7 +42,7 @@
  #include "asterisk/utils.h"
  #include "asterisk/linkedlists.h"
  
@@ -31,9 +31,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/codec_lpc1
  
  /* Sample frame data */
  #include "asterisk/slin.h"
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/Makefile asterisk-13.16.0/codecs/Makefile
---- asterisk-13.16.0.orig/codecs/Makefile      2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/codecs/Makefile   2017-06-09 14:14:38.000000000 +0200
+diff -urN asterisk-16.15.0.org/codecs/Makefile asterisk-16.15.0/codecs/Makefile
+--- asterisk-16.15.0.org/codecs/Makefile       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/codecs/Makefile   2020-11-27 12:46:51.858456198 +0100
 @@ -27,8 +27,7 @@
  
  SUB_DIRS := \
@@ -44,7 +44,7 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/Makefile a
  
  all: _all
  
-@@ -59,7 +58,9 @@
+@@ -57,7 +56,9 @@
  .PHONY: $(SUB_DIRS)
  
  
@@ -54,18 +54,18 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/codecs/Makefile a
  
  # Don't run the implicit rules for this target.
  $(LIBLPC10): $(SUB_LPC10) ;
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/configure.ac asterisk-13.16.0/configure.ac
---- asterisk-13.16.0.orig/configure.ac 2017-06-09 14:10:32.000000000 +0200
-+++ asterisk-13.16.0/configure.ac      2017-06-09 14:11:14.000000000 +0200
-@@ -468,6 +468,7 @@
+diff -urN asterisk-16.15.0.org/configure.ac asterisk-16.15.0/configure.ac
+--- asterisk-16.15.0.org/configure.ac  2020-11-27 12:46:42.094818363 +0100
++++ asterisk-16.15.0/configure.ac      2020-11-27 12:46:51.858456198 +0100
+@@ -488,6 +488,7 @@
  AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
  AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
  AST_EXT_LIB_SETUP([GTK2], [gtk2], [gtk2])
 +AST_EXT_LIB_SETUP([LPC10], [External lpc10 library], [lpc10], [, use 'internal' lpc10 otherwise])
  AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
- AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
  AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])
-@@ -1530,6 +1531,72 @@
+ AST_EXT_LIB_SETUP([ICAL], [iCal], [ical])
+@@ -1661,6 +1662,72 @@
     fi
  fi
  
@@ -138,9 +138,9 @@ diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/configure.ac aste
  AST_EXT_LIB_CHECK([ICONV], [iconv], [iconv_open], [iconv.h])
  # GNU libiconv #define's iconv_open to libiconv_open, so we need to search for that symbol
  AST_EXT_LIB_CHECK([ICONV], [iconv], [libiconv_open], [iconv.h])
-diff -dur -x '*~' -x '*.orig' -x '*.rej' asterisk-13.16.0.orig/makeopts.in asterisk-13.16.0/makeopts.in
---- asterisk-13.16.0.orig/makeopts.in  2017-05-30 19:44:16.000000000 +0200
-+++ asterisk-13.16.0/makeopts.in       2017-06-09 14:11:14.000000000 +0200
+diff -urN asterisk-16.15.0.org/makeopts.in asterisk-16.15.0/makeopts.in
+--- asterisk-16.15.0.org/makeopts.in   2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/makeopts.in       2020-11-27 12:46:51.858456198 +0100
 @@ -160,6 +160,10 @@
  ILBC_INCLUDE=@ILBC_INCLUDE@
  ILBC_LIB=@ILBC_LIB@

diff --git a/lua_versions.patch b/lua_versions.patch
index 59c6fb4741e41aa87c69f063742fb03afdf549cd..36c7536cd1529dac6d6f70f2404aa9c45c148dc2 100644 (file)
--- a/lua_versions.patch
+++ b/lua_versions.patch
@@ -1,12 +1,11 @@
-diff -dur asterisk-15.4.1.orig/configure.ac asterisk-15.4.1/configure.ac
---- asterisk-15.4.1.orig/configure.ac  2018-06-11 23:21:37.000000000 +0200
-+++ asterisk-15.4.1/configure.ac       2018-06-12 10:34:15.000000000 +0200
-@@ -2388,7 +2388,7 @@
+--- asterisk-16.15.0.org/configure.ac  2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/configure.ac      2020-11-27 12:43:01.444606104 +0100
+@@ -2553,7 +2553,7 @@ if test -z "$__opus_include" -o x"$__opu
  fi
  AST_EXT_LIB_CHECK([OPUSFILE], [opusfile], [op_open_callbacks], [opus/opusfile.h], [], [$__opus_include])
  
--for ver in 5.3 5.2 5.1; do
-+for ver in 53 52 51 5.3 5.2 5.1; do
+-for ver in 5.4 5.3 5.2 5.1; do
++for ver in 54 53 52 51 5.4 5.3 5.2 5.1; do
        AST_EXT_LIB_CHECK([LUA], lua${ver}, [luaL_newstate], lua${ver}/lua.h, [-lm])
        if test "x${PBX_LUA}" = "x1" ; then
                if test x"${LUA_DIR}" = x; then

diff --git a/pld-banner.patch b/pld-banner.patch
index 3e317d2e6b3d33397be39dd862b3d39b23f9f9d5..1466adf74e5edf4c78dd49dba1350a55d124187f 100644 (file)
--- a/pld-banner.patch
+++ b/pld-banner.patch
@@ -1,6 +1,6 @@
---- asterisk-1.6.1.12/main/asterisk.c~ 2009-12-31 00:57:41.000000000 +0200
-+++ asterisk-1.6.1.12/main/asterisk.c  2009-12-31 00:59:34.041012391 +0200
-@@ -139,6 +139,9 @@
+--- asterisk-16.15.0.org/main/asterisk.c       2020-11-19 13:34:40.000000000 +0100
++++ asterisk-16.15.0/main/asterisk.c   2020-11-27 12:45:55.346693848 +0100
+@@ -304,6 +304,9 @@ int daemon(int, int);  /* defined in lib
                  "This is free software, with components licensed under the GNU General Public\n" \
                  "License version 2 and other licenses; you are welcome to redistribute it under\n" \
                  "certain conditions. Type 'core show license' for details.\n" \
@@ -9,4 +9,4 @@
 +                "Please report all bugs to http://bugs.pld-linux.org/\n" \
                  "=========================================================================\n", ast_get_version()) \
  
- /*! \defgroup main_options Main Configuration Options
+ static int ast_socket = -1;           /*!< UNIX Socket for allowing remote control */