From 4dea8b204239f7ef8e13a44b18831b22d08850ec Mon Sep 17 00:00:00 2001
From: Jared Smith <jsmith@fedoraproject.org>
Date: Oct 09 2019 11:43:24 +0000
Subject: Update to upstream 16.6.0 release, with bundled pjproject 2.9


---

diff --git a/asterisk.spec b/asterisk.spec
index abd0d4b..5d11b16 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -1,7 +1,7 @@
 #global _rc 2
 #global _beta 3
 
-%global           pjsip_version   2.8
+%global           pjsip_version   2.9
 
 %global           optflags        %{optflags} -Werror-implicit-function-declaration -DLUA_COMPAT_MODULE
 %ifarch s390 %{arm} aarch64 %{mips}
@@ -40,7 +40,7 @@
 
 Summary:          The Open Source PBX
 Name:             asterisk
-Version:          16.5.1
+Version:          16.6.0
 Release:          1%{?dist}
 License:          GPLv2
 URL:              http://www.asterisk.org/
@@ -586,7 +586,6 @@ gpgv2 --keyring %{SOURCE7} %{SOURCE1} %{SOURCE0}
 # copy the pjproject tarball to the cache/ directory
 mkdir cache
 cp %{SOURCE8} cache/
-ls -altr cache/
 
 %if 0%{?fedora}
 %patch0 -p1
@@ -671,7 +670,7 @@ pushd menuselect
 %configure
 popd
 
-%configure --with-imap=system --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes --with-srtp --with-pjproject=/usr --without-pjproject-bundled LDFLAGS="%{ldflags}"
+%configure --with-imap=system --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes --with-srtp --with-pjproject-bundled --with-externals-cache=%{_builddir}/asterisk-%{version}/cache LDFLAGS="%{ldflags}"
 
 %make_build menuselect-tree NOISY_BUILD=1
 %{__perl} -n -i -e 'print unless /openr2/i' menuselect-tree
@@ -880,9 +879,10 @@ fi
 
 %{_libdir}/libasteriskssl.so.1
 
+%{_libdir}/libasteriskpj.so
+%{_libdir}/libasteriskpj.so.2
 %dir %{_libdir}/asterisk
 %dir %{_libdir}/asterisk/modules
-
 %{_libdir}/asterisk/modules/app_agent_pool.so
 %{_libdir}/asterisk/modules/app_adsiprog.so
 %{_libdir}/asterisk/modules/app_alarmreceiver.so
@@ -1549,6 +1549,10 @@ fi
 %endif
 
 %changelog
+* Wed Oct 09 2019 Jared K. Smith <jsmith@fedoraproject.org> - 16.6.0-1
+- Update to upstream 16.6.0 for security and bug fixes
+- Update to using bundled pjproject release 2.9
+
 * Fri Sep 06 2019 Jared K. Smith <jsmith@fedoraproject.org> - 16.5.1-1
 - Update for upstream security release 16.5.1, with AST-2019-004 and
   AST-2019-005
diff --git a/sources b/sources
index b2844b1..bf7f0e5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (asterisk-16.5.1.tar.gz) = 9e9e6aae2267d5be53dd6e9fd2979ce00f4be4b057f414103e22f8e3cac1eae20e48edbb6e9e3fd261c53f8075f5d3a40c2af67614438ffd920a1bf65cfe59c5
-SHA512 (asterisk-16.5.1.tar.gz.asc) = 4e8bf8e9d27b0a7d08b582ddb15dc2cd2922635c310a3808ff39afbf20dbab463ec1696d098c2edd22cc71586bf919aa52ef27c993c55d251c265dba438517fb
-SHA512 (pjproject-2.8.tar.bz2) = 0a0ee66932959710f806cb1d88a3b946b214d2caecd54ecc9eabdbdb17f7f4fa0b7d27567dc3796d845a25b850c974536e7c7538d51f93771d13dd2fd309eaf5
+SHA512 (asterisk-16.6.0.tar.gz) = 24845115dff0e8fb67e413d2d9705640835b7a74a9cc1c9d1d65ca3a504dd45cd6594d543f737c47687e80f57eb8e30114641362aea600ddfd47c3908fd65d22
+SHA512 (asterisk-16.6.0.tar.gz.asc) = 8fedf1ebbf62ccecaa17d5b07d7d165265586d3194b3ad944dab21903f28aae2a3a4b49b510b8f111452950b364f21d64498ff421dc3dd21abc93d8b68f0e75c
+SHA512 (pjproject-2.9.tar.bz2) = a65823a86ad0cd76890cf7dd2485f7547fd90aea2ef631c5420c009b35f39eda3b78551a42fc2816c2470de9eb728c26497774a8494824472ecaa1d2889cc20b