From: Jacek Konieczny <j.konieczny@eggsoft.pl>
Date: Fri, 9 Jun 2017 12:35:40 +0000 (+0200)
Subject: Version: 13.16.0
X-Git-Tag: auto/th/asterisk-13.16.0-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2Fasterisk.git;a=commitdiff_plain;h=0e8251f

Version: 13.16.0
---

diff --git a/asterisk.spec b/asterisk.spec
index 27121cc..fb06f5f 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -38,12 +38,12 @@
 Summary:	Asterisk PBX
 Summary(pl.UTF-8):	Centralka (PBX) Asterisk
 Name:		asterisk
-Version:	13.15.1
+Version:	13.16.0
 Release:	1
 License:	GPL v2
 Group:		Applications/System
 Source0:	http://downloads.digium.com/pub/asterisk/releases/%{name}-%{version}.tar.gz
-# Source0-md5:	c9cbd1917702ce6db16b245e4a357332
+# Source0-md5:	97e55bae49878882fc41f4b95d63f18a
 Source1:	%{name}.init
 Source2:	%{name}.sysconfig
 Source3:	%{name}.tmpfiles
@@ -115,7 +115,7 @@ BuildRequires:	openssl-devel >= 0.9.7d
 BuildRequires:	opus-devel
 %{?with_opus_vp8:BuildRequires:	opusfile-devel}
 BuildRequires:	pam-devel
-%{?with_pjsip:BuildRequires:	pjproject-devel >= 2.6-1}
+%{?with_pjsip:BuildRequires:	pjproject-devel >= 2.6-2}
 BuildRequires:	pkgconfig
 BuildRequires:	popt-devel
 %{?with_portaudio:BuildRequires:	portaudio-devel >= 19}
diff --git a/lpc10-system.patch b/lpc10-system.patch
index 4668b9c..3d4bc06 100644
--- a/lpc10-system.patch
+++ b/lpc10-system.patch
@@ -1,6 +1,6 @@
-diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/build_tools/menuselect-deps.in asterisk-13.14.0/build_tools/menuselect-deps.in
---- asterisk-13.14.0.orig/build_tools/menuselect-deps.in	2017-02-13 20:51:51.000000000 +0100
-+++ asterisk-13.14.0/build_tools/menuselect-deps.in	2017-03-31 10:30:17.000000000 +0200
+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 @@
  GENERIC_ODBC=@PBX_GENERIC_ODBC@
  GMIME=@PBX_GMIME@
@@ -9,9 +9,9 @@ diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/build_tools/menuselect-deps.
  GSM=@PBX_GSM@
  ILBC=@PBX_ILBC@
  GTK2=@PBX_GTK2@
-diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/codecs/codec_lpc10.c asterisk-13.14.0/codecs/codec_lpc10.c
---- asterisk-13.14.0.orig/codecs/codec_lpc10.c	2017-02-13 20:51:51.000000000 +0100
-+++ asterisk-13.14.0/codecs/codec_lpc10.c	2017-03-31 10:30:17.000000000 +0200
+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
 @@ -26,6 +26,9 @@
   *
   * \ingroup codecs
@@ -31,9 +31,9 @@ diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/codecs/codec_lpc10.c asteris
  
  /* Sample frame data */
  #include "asterisk/slin.h"
-diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/codecs/Makefile asterisk-13.14.0/codecs/Makefile
---- asterisk-13.14.0.orig/codecs/Makefile	2017-02-13 20:51:51.000000000 +0100
-+++ asterisk-13.14.0/codecs/Makefile	2017-03-31 10:31:15.000000000 +0200
+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
 @@ -27,8 +27,7 @@
  
  SUB_DIRS := \
@@ -49,14 +49,14 @@ diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/codecs/Makefile asterisk-13.
  
  
 +ifneq ($(LPC10_INTERNAL),no)
- $(if $(filter codec_lpc10,$(EMBEDDED_MODS)),modules.link,codec_lpc10.so): $(LIBLPC10)
+ codec_lpc10.so: $(LIBLPC10)
 +endif
  
  # Don't run the implicit rules for this target.
  $(LIBLPC10): $(SUB_LPC10) ;
-diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/configure.ac asterisk-13.14.0/configure.ac
---- asterisk-13.14.0.orig/configure.ac	2017-03-31 10:30:01.000000000 +0200
-+++ asterisk-13.14.0/configure.ac	2017-03-31 10:30:17.000000000 +0200
+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 @@
  AST_EXT_LIB_SETUP([GSM], [External GSM], [gsm], [, use 'internal' GSM otherwise])
  AST_EXT_LIB_SETUP([ILBC], [System iLBC], [ilbc], [, use 'internal' iLBC otherwise])
@@ -65,7 +65,7 @@ diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/configure.ac asterisk-13.14.
  AST_EXT_LIB_SETUP([GMIME], [GMime], [gmime])
  AST_EXT_LIB_SETUP([OPENH323], [OpenH323], [h323])
  AST_EXT_LIB_SETUP([HOARD], [Hoard Memory Allocator], [hoard])
-@@ -1542,6 +1543,72 @@
+@@ -1530,6 +1531,72 @@
     fi
  fi
  
@@ -138,10 +138,10 @@ diff -dur -x '*~' -x '*.orig' asterisk-13.14.0.orig/configure.ac asterisk-13.14.
  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' asterisk-13.14.0.orig/makeopts.in asterisk-13.14.0/makeopts.in
---- asterisk-13.14.0.orig/makeopts.in	2017-02-13 20:51:51.000000000 +0100
-+++ asterisk-13.14.0/makeopts.in	2017-03-31 10:30:17.000000000 +0200
-@@ -163,6 +163,10 @@
+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
+@@ -160,6 +160,10 @@
  ILBC_INCLUDE=@ILBC_INCLUDE@
  ILBC_LIB=@ILBC_LIB@
  
diff --git a/x32.patch b/x32.patch
index 469a52c..bd5f8c0 100644
--- a/x32.patch
+++ b/x32.patch
@@ -1,8 +1,21 @@
---- asterisk-13.2.0/Makefile~	2014-10-31 16:50:53.000000000 +0000
-+++ asterisk-13.2.0/Makefile	2015-04-05 09:40:53.896839072 +0000
-@@ -174,6 +174,11 @@
-   LDCONFIG_FLAGS=-n
- endif
+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
+@@ -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),)
+   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 @@
+ # Create OPTIONS variable, but probably we can assign directly to ASTCFLAGS
+ OPTIONS=
  
 +ifeq ($(OSARCH),linux-gnux32)
 +  # flag to tell 'ldconfig' to only process specified directories
@@ -12,14 +25,3 @@
  ifeq ($(findstring -save-temps,$(_ASTCFLAGS) $(ASTCFLAGS)),)
    ifeq ($(findstring -pipe,$(_ASTCFLAGS) $(ASTCFLAGS)),)
      _ASTCFLAGS+=-pipe
---- asterisk-13.2.0/main/Makefile~	2014-07-04 15:26:58.000000000 +0000
-+++ asterisk-13.2.0/main/Makefile	2015-04-05 09:41:32.963507792 +0000
-@@ -41,7 +41,7 @@
- AST_LIBS+=$(UUID_LIB)
- AST_LIBS+=$(CRYPT_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 LOADABLE_MODULES,$(MENUSELECT_CFLAGS)),)
-   AST_LIBS+=-ldl
-   endif