1:45 p.m.
The package rpms/asterisk.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/asterisk.git/commit/?id=6599b2e53....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit c57e6c2437325d0217107e8fa2dad1aea2909f92
Merge: f71897b a73a75a
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Tue Oct 31 10:54:14 2017 -0400
Merge branch 'master' of ssh://pkgs.fedoraproject.org/rpms/asterisk
commit f71897b548f3c50e1e111a374dc637fea11ed2c2
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Tue Oct 31 10:52:58 2017 -0400
Update to upstream 15.1.0 release
diff --git a/asterisk.spec b/asterisk.spec
index a600ee2..86bc746 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -48,7 +48,7 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 15.0.0
+Version: 15.1.0
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -1641,6 +1641,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Tue Oct 31 2017 Jared Smith <jsmith(a)fedoraproject.org> - 15.1.0-1
+- Update to upstream 15.1.0 release
+
* Thu Oct 05 2017 Jared Smith <jsmith(a)fedoraproject.org> - 15.0.0-1
- Update to upstream 15.0.0 release
diff --git a/sources b/sources
index 0262c4b..9d2f1bb 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (asterisk-15.0.0.tar.gz) =
ff348b48ece170b19b73f2faf481ed6e1650df1d790b61d1fac3ed8be00b0eae0f7227fbb5ce6ee36b9f10bea67276f1a0797bd183dc11d9c831594b84f34624
-SHA512 (asterisk-15.0.0.tar.gz.asc) =
1e77a5e1595ad2f1c53c77f3f83290dc4aa69833fd73b7321848c85da2234b1b8e70aff1c1deae7da576c0d57f2b926426364e65a15b63a037231f47e0584650
+SHA512 (asterisk-15.1.0.tar.gz) =
031d28e4f4d65f84c911d0cbc83858650878b7908ce6d5f4e3dbff84e6d1648fe39cebc327206cab403b4aaa0e892828b91a46d36cb73a284f0a5d61f24da9fd
+SHA512 (asterisk-15.1.0.tar.gz.asc) =
1dab082fa10cc307f87d9a9fc4adf1742e67f9f93da0628df69d99b5eeedee11ea61f32ec0b86d559cf6a2a01a581c18688fa36baf4f732f7bedc8936c856079
commit a73a75aa0ab888e30734b5cd6c15832de4455c47
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Tue Oct 31 10:52:58 2017 -0400
Update to upstream 15.1.0 release
diff --git a/asterisk.spec b/asterisk.spec
index a600ee2..86bc746 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -48,7 +48,7 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 15.0.0
+Version: 15.1.0
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -1641,6 +1641,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Tue Oct 31 2017 Jared Smith <jsmith(a)fedoraproject.org> - 15.1.0-1
+- Update to upstream 15.1.0 release
+
* Thu Oct 05 2017 Jared Smith <jsmith(a)fedoraproject.org> - 15.0.0-1
- Update to upstream 15.0.0 release
commit 51d021083935b8c17071acac736938fadb27e5af
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Thu Oct 5 14:17:01 2017 -0400
Update to upstream 15.0.0 release
diff --git a/asterisk.spec b/asterisk.spec
index 4e3fc11..a600ee2 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -48,7 +48,7 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 14.6.2
+Version: 15.0.0
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -736,9 +736,9 @@ popd
./bootstrap.sh
%if 0%{?fedora} > 0 || 0%{?rhel} >= 7
-%configure --with-imap=system --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes
--with-srtp --with-pjproject=/usr LDFLAGS="%{ldflags}"
+%configure --with-imap=system --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes
--with-srtp --with-pjproject=/usr --without-pjproject-bundled
LDFLAGS="%{ldflags}"
%else
-%configure --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes --with-gmime=no
--with-srtp --with-pjproject=/usr LDFLAGS="%{ldflags}"
+%configure --with-gsm=/usr --with-ilbc=/usr --with-libedit=yes --with-gmime=no
--with-srtp --with-pjproject=/usr --without-pjproject-bundled
LDFLAGS="%{ldflags}"
%endif
make %{?_smp_mflags} menuselect-tree NOISY_BUILD=1
@@ -1029,6 +1029,8 @@ fi
%{_libdir}/asterisk/modules/app_stack.so
%{_libdir}/asterisk/modules/app_stasis.so
%{_libdir}/asterisk/modules/app_statsd.so
+%{_libdir}/asterisk/modules/app_statsd.so
+%{_libdir}/asterisk/modules/app_stream_echo.so
%{_libdir}/asterisk/modules/app_system.so
%{_libdir}/asterisk/modules/app_talkdetect.so
%{_libdir}/asterisk/modules/app_test.so
@@ -1185,6 +1187,7 @@ fi
%{_libdir}/asterisk/modules/res_resolver_unbound.so
%{_libdir}/asterisk/modules/res_rtp_asterisk.so
%{_libdir}/asterisk/modules/res_rtp_multicast.so
+%{_libdir}/asterisk/modules/res_sdp_translator_pjmedia.so
%{_libdir}/asterisk/modules/res_security_log.so
%{_libdir}/asterisk/modules/res_smdi.so
%{_libdir}/asterisk/modules/res_sorcery_astdb.so
@@ -1638,6 +1641,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Thu Oct 05 2017 Jared Smith <jsmith(a)fedoraproject.org> - 15.0.0-1
+- Update to upstream 15.0.0 release
+
* Thu Sep 21 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.2-1
- Update to upstream 14.6.2 release
diff --git a/menuselect.makeopts b/menuselect.makeopts
index 845ad2b..c1104d2 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -5,7 +5,7 @@ MENUSELECT_CDR=cdr_sqlite
MENUSELECT_CEL=cel_radius
MENUSELECT_CFLAGS=LOADABLE_MODULES
MENUSELECT_CHANNELS=chan_nbs chan_vpb
-MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a
+MENUSELECT_CODECS=codec_opus codec_silk codec_siren7 codec_siren14 codec_g729a
codec_codec2
MENUSELECT_CORE_SOUNDS=
MENUSELECT_EMBED=
MENUSELECT_EXTRA_SOUNDS=
@@ -15,7 +15,7 @@ MENUSELECT_MOH=
MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
MENUSELECT_PBX=
MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external
res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone
-MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl
test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file
test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution
test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll
test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api
test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape
test_callerid test_ari test_ari_model test_bucket test_cdr test_cel
test_channel_feature_hooks test_core_codec test_core_format test_endpoints
test_format_cache test_format_cap test_json test_message test_optional_api
test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb
test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints
test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector
test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr
test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache
test_media_cache test_bridging
+MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl
test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file
test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution
test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll
test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api
test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape
test_callerid test_ari test_ari_model test_bucket test_cdr test_cel
test_channel_feature_hooks test_core_codec test_core_format test_endpoints
test_format_cache test_format_cap test_json test_message test_optional_api
test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb
test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints
test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector
test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr
test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache
test_media_cache test_bridging test_channel test_conversions test_sdp test_stream
MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael
muted smsq stereorize streamplayer
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs
diff --git a/sources b/sources
index a7a72d9..0262c4b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (asterisk-14.6.2.tar.gz) =
31889a31779ffd9d7d30568ecb824f2f091b022c7e0e6229921acf7aa84efd80f3d9aaba7faff521064a1fce7509de0c3e149f04cc69941b2f68f62c0e9e8f9a
-SHA512 (asterisk-14.6.2.tar.gz.asc) =
d93e3514f16d00baa150614e4e4fb6136216659f251baf762723e69f7be50c2ae6cf1ba2189553697822d9b14701543d683a6271fa736878088e9b2178d1b8ed
+SHA512 (asterisk-15.0.0.tar.gz) =
ff348b48ece170b19b73f2faf481ed6e1650df1d790b61d1fac3ed8be00b0eae0f7227fbb5ce6ee36b9f10bea67276f1a0797bd183dc11d9c831594b84f34624
+SHA512 (asterisk-15.0.0.tar.gz.asc) =
1e77a5e1595ad2f1c53c77f3f83290dc4aa69833fd73b7321848c85da2234b1b8e70aff1c1deae7da576c0d57f2b926426364e65a15b63a037231f47e0584650
commit 2d2ab1700aef2b6b0914b29f84770021068da2e9
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Thu Sep 21 17:49:52 2017 -0400
Update to upstream 14.6.2 release for CVE-2017-14603
diff --git a/asterisk.spec b/asterisk.spec
index 25128bd..4e3fc11 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -48,8 +48,8 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 14.6.1
-Release: 6%{?dist}
+Version: 14.6.2
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -1638,6 +1638,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Thu Sep 21 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.2-1
+- Update to upstream 14.6.2 release
+
* Wed Sep 13 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-6
- Re-enable corosync, see RHBZ#1478089
diff --git a/sources b/sources
index 87ffd3a..a7a72d9 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (asterisk-14.6.1.tar.gz) =
8f503dba1b97eb4c9777a7d1a21cf3bd6771bf2334ea6dd55e718a30f0570f661d682556b1121960f8f8bcf988092ddeee05665161e97a904f414cbf3f4a3492
-SHA512 (asterisk-14.6.1.tar.gz.asc) =
ab8206f661fa2f7bfaaf1cc55cd9b8fe3cee2c07731846337956efb15a91e7288165229ab2ca501bd30dd585d95897b7e7efa1921ca51595b723e46c6bada875
+SHA512 (asterisk-14.6.2.tar.gz) =
31889a31779ffd9d7d30568ecb824f2f091b022c7e0e6229921acf7aa84efd80f3d9aaba7faff521064a1fce7509de0c3e149f04cc69941b2f68f62c0e9e8f9a
+SHA512 (asterisk-14.6.2.tar.gz.asc) =
d93e3514f16d00baa150614e4e4fb6136216659f251baf762723e69f7be50c2ae6cf1ba2189553697822d9b14701543d683a6271fa736878088e9b2178d1b8ed
commit a268de8d518656cf54385220c2721046c7787944
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Wed Sep 13 19:18:08 2017 -0400
Re-enable corosync module
diff --git a/asterisk.spec b/asterisk.spec
index 927c0ac..25128bd 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -37,7 +37,7 @@
%endif
%global ldap 1
%global gmime 1
-%global corosync 0
+%global corosync 1
%if 0%{?fedora} >= 21
%global jack 0
%else
@@ -49,7 +49,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 14.6.1
-Release: 5%{?dist}
+Release: 6%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -1638,6 +1638,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Wed Sep 13 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-6
+- Re-enable corosync, see RHBZ#1478089
+
* Sun Sep 03 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-5
- Add dependency on unbound-devel for res_resolver_unbound
commit eb2040b16c3a3e30c62e391e4701a3322381059f
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Sun Sep 3 02:18:14 2017 -0400
Remove the entry for res_resolver_unbound
diff --git a/menuselect.makeopts b/menuselect.makeopts
index 8824c9f..845ad2b 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -14,7 +14,7 @@ MENUSELECT_FUNCS=
MENUSELECT_MOH=
MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
MENUSELECT_PBX=
-MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external
res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone
res_resolver_unbound
+MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external
res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone
MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl
test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file
test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution
test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll
test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api
test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape
test_callerid test_ari test_ari_model test_bucket test_cdr test_cel
test_channel_feature_hooks test_core_codec test_core_format test_endpoints
test_format_cache test_format_cap test_json test_message test_optional_api
test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb
test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints
test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector
test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr
test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache
test_media_cache test_bridging
MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael
muted smsq stereorize streamplayer
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
commit c959d1c00e513fac265d682352ce3b2f779d27f9
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Sun Sep 3 02:11:58 2017 -0400
Add dependency on unbound-devel for res_resolver_unbound
diff --git a/asterisk.spec b/asterisk.spec
index cb6efe1..927c0ac 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -49,7 +49,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 14.6.1
-Release: 4%{?dist}
+Release: 5%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -134,6 +134,9 @@ BuildRequires: ilbc-devel
# res_rtp_asterisk
BuildRequires: libuuid-devel
+# res_resolver_unbound
+BuildRequires: unbound-devel
+
%if 0%{?corosync}
BuildRequires: corosynclib-devel
%endif
@@ -1179,6 +1182,7 @@ fi
%{_libdir}/asterisk/modules/res_parking.so
%{_libdir}/asterisk/modules/res_phoneprov.so
%{_libdir}/asterisk/modules/res_realtime.so
+%{_libdir}/asterisk/modules/res_resolver_unbound.so
%{_libdir}/asterisk/modules/res_rtp_asterisk.so
%{_libdir}/asterisk/modules/res_rtp_multicast.so
%{_libdir}/asterisk/modules/res_security_log.so
@@ -1634,6 +1638,9 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Sun Sep 03 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-5
+- Add dependency on unbound-devel for res_resolver_unbound
+
* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-4
- Disable corosync modules until corosync works in ppc64le again
commit 6599b2e535acdb4a95652608e80c8e18c008fdf8
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Sun Sep 3 01:57:20 2017 -0400
Fix MariaDB patch, disable corosync
diff --git a/asterisk-mariadb.patch b/asterisk-mariadb.patch
new file mode 100644
index 0000000..50161f4
--- /dev/null
+++ b/asterisk-mariadb.patch
@@ -0,0 +1,19 @@
+commit 7e0d36fd61c244f292a5cf646fff1daf6963278c
+Author: Tom Hughes <tom(a)compton.nu>
+Date: Fri Sep 1 21:47:55 2017 +0100
+
+ Include mariadb_version.h instead of mysql_version.h
+
+diff --git a/addons/res_config_mysql.c b/addons/res_config_mysql.c
+index 259650d4f3..a7e433ff52 100644
+--- a/addons/res_config_mysql.c
++++ b/addons/res_config_mysql.c
+@@ -35,7 +35,7 @@ ASTERISK_REGISTER_FILE()
+ #include <sys/stat.h>
+
+ #include <mysql/mysql.h>
+-#include <mysql/mysql_version.h>
++#include <mysql/mariadb_version.h>
+ #include <mysql/errmsg.h>
+
+ #include "asterisk/channel.h"
diff --git a/asterisk-openssl.patch b/asterisk-openssl.patch
deleted file mode 100644
index 494bf8a..0000000
--- a/asterisk-openssl.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-commit b9b82f067dd2372dda3ecd83411c7b58800b80a2
-Author: Tom Hughes <tom(a)compton.nu>
-Date: Fri Mar 10 22:46:33 2017 +0000
-
- Fixes for OpenSSL 1.1.x support
-
-diff --git a/main/libasteriskssl.c b/main/libasteriskssl.c
-index 4e6ea1a..9f6b98c 100644
---- a/main/libasteriskssl.c
-+++ b/main/libasteriskssl.c
-@@ -74,7 +74,7 @@ static void ssl_lock(int mode, int n, const char *file, int line)
- }
- }
-
--#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
-+#if OPENSSL_VERSION_NUMBER < 0x10100000L
- int SSL_library_init(void)
- {
- #if defined(AST_DEVMODE)
-@@ -116,7 +116,7 @@ void ERR_free_strings(void)
- {
- /* we can't allow this to be called, ever */
- }
--#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
-+#endif /* OPENSSL_VERSION_NUMBER < 0x10100000L */
-
- #endif /* HAVE_OPENSSL */
-
-diff --git a/main/tcptls.c b/main/tcptls.c
-index 513676c..4e131f2 100644
---- a/main/tcptls.c
-+++ b/main/tcptls.c
-@@ -40,6 +40,8 @@ ASTERISK_REGISTER_FILE()
- #include <signal.h>
- #include <sys/stat.h>
-
-+#include <openssl/dh.h>
-+
- #include "asterisk/compat.h"
- #include "asterisk/tcptls.h"
- #include "asterisk/http.h"
-@@ -399,19 +401,17 @@ static int tcptls_stream_close(void *cookie)
- SSL_get_error(stream->ssl, res));
- }
-
--#if defined(OPENSSL_API_COMPAT) && OPENSSL_API_COMPAT >= 0x10100000L
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L
- if (!SSL_is_server(stream->ssl)) {
- #else
- if (!stream->ssl->server) {
- #endif
- /* For client threads, ensure that the error stack is cleared */
--#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
--#if OPENSSL_VERSION_NUMBER >= 0x10000000L
-- ERR_remove_thread_state(NULL);
--#else
-+#if OPENSSL_VERSION_NUMBER < 0x10000000L
- ERR_remove_state(0);
--#endif /* OPENSSL_VERSION_NUMBER >= 0x10000000L */
--#endif /* !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L */
-+#elif OPENSSL_VERSION_NUMBER < 0x10100000L
-+ ERR_remove_thread_state(NULL);
-+#endif
- }
-
- SSL_free(stream->ssl);
-@@ -850,12 +850,16 @@ static int __ssl_setup(struct ast_tls_config *cfg, int client)
- cfg->ssl_ctx = SSL_CTX_new(SSLv3_client_method());
- } else
- #endif
-+#if defined(OPENSSL_VERSION_NUMBER) && (OPENSSL_VERSION_NUMBER >=
0x10100000L)
-+ cfg->ssl_ctx = SSL_CTX_new(TLS_client_method());
-+#else
- if (ast_test_flag(&cfg->flags, AST_SSL_TLSV1_CLIENT)) {
- cfg->ssl_ctx = SSL_CTX_new(TLSv1_client_method());
- } else {
- disable_ssl = 1;
- cfg->ssl_ctx = SSL_CTX_new(SSLv23_client_method());
- }
-+#endif
- } else {
- disable_ssl = 1;
- cfg->ssl_ctx = SSL_CTX_new(SSLv23_server_method());
diff --git a/asterisk.spec b/asterisk.spec
index 3fdb699..cb6efe1 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -37,7 +37,7 @@
%endif
%global ldap 1
%global gmime 1
-%global corosync 1
+%global corosync 0
%if 0%{?fedora} >= 21
%global jack 0
%else
@@ -49,7 +49,7 @@
Summary: The Open Source PBX
Name: asterisk
Version: 14.6.1
-Release: 1%{?dist}
+Release: 4%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -62,11 +62,11 @@ Source4: menuselect.makeopts
Source5: asterisk.service
Source6: asterisk-tmpfiles
-Patch0: asterisk-openssl.patch
+Patch0: asterisk-mariadb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-root-%(%{__id_u} -n)
# Does not build on s390x: https://bugzilla.redhat.com/show_bug.cgi?id=1465162
-ExcludeArch: s390x
+#ExcludeArch: s390x
BuildRequires: autoconf
BuildRequires: automake
@@ -639,7 +639,7 @@ Jabber/XMPP resources for Asterisk.
%prep
%setup -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}
-#%patch0 -p1
+%patch0 -p1
cp %{S:3} menuselect.makedeps
cp %{S:4} menuselect.makeopts
@@ -893,6 +893,10 @@ rm -f %{buildroot}%{_sysconfdir}/asterisk/res_snmp.conf
rm -f %{buildroot}%{_sysconfdir}/asterisk/res_ldap.conf
%endif
+%if ! 0%{?corosync}
+rm -f %{buildroot}%{_sysconfdir}/asterisk/res_corosync.conf
+%endif
+
%clean
rm -rf %{buildroot}
@@ -1630,6 +1634,12 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-4
+- Disable corosync modules until corosync works in ppc64le again
+
+* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-3
+- Fix MySQL header path (due to change in mariadb-devel patckage)
+
* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-1
- Update to upstream 14.6.1 release
- Solves AST-2017-005, AST-2017-006, and AST-2017-007 security issues
diff --git a/gcc5.rc2.patch b/gcc5.rc2.patch
deleted file mode 100644
index 8152337..0000000
--- a/gcc5.rc2.patch
+++ /dev/null
@@ -1,125 +0,0 @@
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index bd694ec..4c25ec2 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -9595,7 +9595,8 @@ static int parse_request(struct sip_request *req)
- {
- char *c = ast_str_buffer(req->data);
- ptrdiff_t *dst = req->header;
-- int i = 0, lim = SIP_MAX_HEADERS - 1;
-+ int i = 0;
-+ unsigned int lim = SIP_MAX_HEADERS - 1;
- unsigned int skipping_headers = 0;
- ptrdiff_t current_header_offset = 0;
- char *previous_header = "";
-diff --git a/include/asterisk/inline_api.h b/include/asterisk/inline_api.h
-index d76dfa0..291a838 100644
---- a/include/asterisk/inline_api.h
-+++ b/include/asterisk/inline_api.h
-@@ -48,7 +48,7 @@
- #if !defined(LOW_MEMORY) && !defined(DISABLE_INLINE)
-
- #if !defined(AST_API_MODULE)
--#if defined(__clang__)
-+#if defined(__clang__) || defined(__GNUC_STDC_INLINE__)
- #define AST_INLINE_API(hdr, body) static hdr; static inline hdr body
- #else /* if defined(__clang__) */
- #define AST_INLINE_API(hdr, body) hdr; extern inline hdr body
-diff --git a/main/ccss.c b/main/ccss.c
-index 7f63690..ff5739a 100644
---- a/main/ccss.c
-+++ b/main/ccss.c
-@@ -825,7 +825,7 @@ int ast_cc_set_param(struct ast_cc_config_params *params, const char
* const nam
- return 0;
- }
-
-- if (!sscanf(value, "%30u", &value_as_uint) == 1) {
-+ if (sscanf(value, "%30u", &value_as_uint) != 1) {
- return -1;
- }
-
-diff --git a/main/dsp.c b/main/dsp.c
-index a329dbb..335fb3d 100644
---- a/main/dsp.c
-+++ b/main/dsp.c
-@@ -112,9 +112,11 @@ static struct progalias {
- { "uk", PROG_MODE_UK },
- };
-
-+#define FREQ_ARRAY_SIZE 7
-+
- static struct progress {
- enum gsamp_size size;
-- int freqs[7];
-+ int freqs[FREQ_ARRAY_SIZE];
- } modes[] = {
- { GSAMP_SIZE_NA, { 350, 440, 480, 620, 950, 1400, 1800 } }, /*!< North America */
- { GSAMP_SIZE_CR, { 425 } }, /*!< Costa Rica, Brazil */
-@@ -389,7 +391,7 @@ struct ast_dsp {
- struct ast_dsp_busy_pattern busy_cadence;
- int historicnoise[DSP_HISTORY];
- int historicsilence[DSP_HISTORY];
-- goertzel_state_t freqs[7];
-+ goertzel_state_t freqs[FREQ_ARRAY_SIZE];
- int freqcount;
- int gsamps;
- enum gsamp_size gsamp_size;
-@@ -1036,6 +1038,8 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s,
int len)
- int pass;
- int newstate = DSP_TONE_STATE_SILENCE;
- int res = 0;
-+ int freqcount = dsp->freqcount > FREQ_ARRAY_SIZE ? FREQ_ARRAY_SIZE :
dsp->freqcount;
-+
- while (len) {
- /* Take the lesser of the number of samples we need and what we have */
- pass = len;
-@@ -1045,7 +1049,7 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s,
int len)
- for (x = 0; x < pass; x++) {
- samp = s[x];
- dsp->genergy += (int32_t) samp * (int32_t) samp;
-- for (y = 0; y < dsp->freqcount; y++) {
-+ for (y = 0; y < freqcount; y++) {
- goertzel_sample(&dsp->freqs[y], samp);
- }
- }
-@@ -1053,8 +1057,8 @@ static int __ast_dsp_call_progress(struct ast_dsp *dsp, short *s,
int len)
- dsp->gsamps += pass;
- len -= pass;
- if (dsp->gsamps == dsp->gsamp_size) {
-- float hz[7];
-- for (y = 0; y < 7; y++) {
-+ float hz[FREQ_ARRAY_SIZE];
-+ for (y = 0; y < FREQ_ARRAY_SIZE; y++) {
- hz[y] = goertzel_result(&dsp->freqs[y]);
- }
- switch (dsp->progmode) {
-@@ -1642,7 +1646,7 @@ static void ast_dsp_prog_reset(struct ast_dsp *dsp)
-
- dsp->gsamp_size = modes[dsp->progmode].size;
- dsp->gsamps = 0;
-- for (x = 0; x < ARRAY_LEN(modes[dsp->progmode].freqs); x++) {
-+ for (x = 0; x < FREQ_ARRAY_SIZE; x++) {
- if (modes[dsp->progmode].freqs[x]) {
- goertzel_init(&dsp->freqs[x], (float)modes[dsp->progmode].freqs[x],
dsp->sample_rate);
- max = x + 1;
-@@ -1668,6 +1672,7 @@ static struct ast_dsp *__ast_dsp_new(unsigned int sample_rate)
- dsp->digitmode = DSP_DIGITMODE_DTMF;
- dsp->faxmode = DSP_FAXMODE_DETECT_CNG;
- dsp->sample_rate = sample_rate;
-+ dsp->freqcount = 0;
- /* Initialize digit detector */
- ast_digit_detect_init(&dsp->digit_state, dsp->digitmode &
DSP_DIGITMODE_MF, dsp->sample_rate);
- dsp->display_inband_dtmf_warning = 1;
-diff --git a/main/manager.c b/main/manager.c
-index 8fa1942..be780e7 100644
---- a/main/manager.c
-+++ b/main/manager.c
-@@ -4785,7 +4785,7 @@ static int action_atxfer(struct mansession *s, const struct message
*m)
- static int check_blacklist(const char *cmd)
- {
- char *cmd_copy, *cur_cmd;
-- char *cmd_words[MAX_BLACKLIST_CMD_LEN] = { NULL, };
-+ char *cmd_words[AST_MAX_CMD_LEN] = { NULL, };
- int i;
-
- cmd_copy = ast_strdupa(cmd);
commit 7abad25351ba1c2f37f4beb7f813cdb8ec7f119e
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Fri Sep 1 14:22:15 2017 -0400
Update to upstream 14.6.1 release for security updates
diff --git a/asterisk.spec b/asterisk.spec
index 8c59acd..3fdb699 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -48,7 +48,7 @@
Summary: The Open Source PBX
Name: asterisk
-Version: 14.6.0
+Version: 14.6.1
Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
@@ -70,6 +70,7 @@ ExcludeArch: s390x
BuildRequires: autoconf
BuildRequires: automake
+BuildRequires: perl
# core build requirements
BuildRequires: openssl-devel
@@ -1629,6 +1630,13 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.1-1
+- Update to upstream 14.6.1 release
+- Solves AST-2017-005, AST-2017-006, and AST-2017-007 security issues
+
+* Fri Sep 01 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.0-2
+- Add perl to BuildRequires
+
* Thu Aug 31 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.0-1
- Update to upstream 14.6.0 release
- Re-enable radius sub-packages
diff --git a/sources b/sources
index 2558e0d..87ffd3a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (asterisk-14.6.0.tar.gz) =
4193cf85c4dd3258c5c561567674faa8698520afe4ae733824cd7c7e8265b0c70456fd260dee283228e6381ab9a72ba1968d1b5b209b3a82438fbb468a22afe4
-SHA512 (asterisk-14.6.0.tar.gz.asc) =
2bfd23c541d0456597d1240c3d19b93a90ef5661ec2008dcf267e3c9b1a20693a2ee62e721dc914786fddd79beda48d6fceae83db7200031895df913cea8730c
+SHA512 (asterisk-14.6.1.tar.gz) =
8f503dba1b97eb4c9777a7d1a21cf3bd6771bf2334ea6dd55e718a30f0570f661d682556b1121960f8f8bcf988092ddeee05665161e97a904f414cbf3f4a3492
+SHA512 (asterisk-14.6.1.tar.gz.asc) =
ab8206f661fa2f7bfaaf1cc55cd9b8fe3cee2c07731846337956efb15a91e7288165229ab2ca501bd30dd585d95897b7e7efa1921ca51595b723e46c6bada875
commit 3376ed6c591b30c98af18744b414b5f02d42e118
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Thu Aug 31 23:50:29 2017 -0400
Upload sources for 14.6.0
diff --git a/sources b/sources
index ab4bc86..2558e0d 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (asterisk-14.5.0.tar.gz) =
04dbea932900ecd3218629b2f19d20ad544cd7c02014fb4bd659e638e4a068ba179e6a4400bed788316fd337102ed8290c95823304567f378f9626361fd18c5e
-SHA512 (asterisk-14.5.0.tar.gz.asc) =
11b124a8f9c565d85503efb0304ddf7e06e6697cbcb417272d6eab6ce4fb27af39d1627c1b78dad680843c97e6bba7dedeafb053047bd915098ae3ea03bba924
+SHA512 (asterisk-14.6.0.tar.gz) =
4193cf85c4dd3258c5c561567674faa8698520afe4ae733824cd7c7e8265b0c70456fd260dee283228e6381ab9a72ba1968d1b5b209b3a82438fbb468a22afe4
+SHA512 (asterisk-14.6.0.tar.gz.asc) =
2bfd23c541d0456597d1240c3d19b93a90ef5661ec2008dcf267e3c9b1a20693a2ee62e721dc914786fddd79beda48d6fceae83db7200031895df913cea8730c
commit 401483e79cfc88d81ec21c425a227b94be8acfa3
Author: Jared K. Smith <jaredsmith(a)jaredsmith.net>
Date: Thu Aug 31 17:19:53 2017 -0400
Update to upstream 14.6.0 release
diff --git a/asterisk.spec b/asterisk.spec
index c8c08ca..8c59acd 100644
--- a/asterisk.spec
+++ b/asterisk.spec
@@ -43,16 +43,13 @@
%else
%global jack 1
%endif
-%if 0%{?fedora} >= 25
-%global radius 0
-%endif
%global makeargs DEBUG= OPTIMIZE= DESTDIR=%{buildroot}
ASTVARRUNDIR=%{astvarrundir} ASTDATADIR=%{_datadir}/asterisk
ASTVARLIBDIR=%{_datadir}/asterisk ASTDBDIR=%{_localstatedir}/spool/asterisk NOISY_BUILD=1
Summary: The Open Source PBX
Name: asterisk
-Version: 14.5.0
-Release: 4%{?dist}
+Version: 14.6.0
+Release: 1%{?dist}
License: GPLv2
Group: Applications/Internet
URL: http://www.asterisk.org/
@@ -1632,6 +1629,10 @@ fi
%{_libdir}/asterisk/modules/res_xmpp.so
%changelog
+* Thu Aug 31 2017 Jared Smith <jsmith(a)fedoraproject.org> - 14.6.0-1
+- Update to upstream 14.6.0 release
+- Re-enable radius sub-packages
+
* Wed Aug 02 2017 Fedora Release Engineering <releng(a)fedoraproject.org> - 14.5.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
diff --git a/menuselect.makeopts b/menuselect.makeopts
index fe632d8..8824c9f 100644
--- a/menuselect.makeopts
+++ b/menuselect.makeopts
@@ -15,7 +15,7 @@ MENUSELECT_MOH=
MENUSELECT_OPTS_app_voicemail=FILE_STORAGE
MENUSELECT_PBX=
MENUSELECT_RES=res_config_sqlite res_timing_kqueue res_stasis_test res_mwi_external
res_mwi_external_ami res_stasis_mailbox res_ari_mailboxes res_digium_phone
res_resolver_unbound
-MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl
test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file
test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution
test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll
test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api
test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape
test_callerid test_ari test_ari_model test_bucket test_cdr test_cel
test_channel_feature_hooks test_core_codec test_core_format test_endpoints
test_format_cache test_format_cap test_json test_message test_optional_api
test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb
test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints
test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector
test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr
test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache
test_media_cache
+MENUSELECT_TESTS=test_skel test_heap test_sched test_astobj2 test_dlinklists test_acl
test_aoc test_app test_ast_format_str_reduce test_devicestate test_event test_func_file
test_gosub test_named_lock test_pbx test_stringfields test_strings test_substitution
test_time test_utils test_amihooks test_locale test_logger test_security_events test_poll
test_expr test_netsock2 test_db test_linkedlists test_config test_voicemail_api
test_jitterbuf test_abstract_jb test_astobj2_thrash test_hashtab_thrash test_xml_escape
test_callerid test_ari test_ari_model test_bucket test_cdr test_cel
test_channel_feature_hooks test_core_codec test_core_format test_endpoints
test_format_cache test_format_cap test_json test_message test_optional_api
test_res_pjsip_scheduler test_res_stasis test_scoped_lock test_sorcery test_sorcery_astdb
test_sorcery_realtime test_stasis test_stasis_channels test_stasis_endpoints
test_taskprocessor test_threadpool test_uri test_uuid test_websocket_client test_vector
test_sorcery_memory_cache_thrash test_astobj2_weaken test_dns test_dns_naptr
test_dns_query_set test_dns_recurring test_dns_srv test_file test_http_media_cache
test_media_cache test_bridging
MENUSELECT_UTILS=aelparse astcanary astdb2sqlite3 astman check_expr check_expr2 conf2ael
muted smsq stereorize streamplayer
MENUSELECT_DEPSFAILED=MENUSELECT_APPS=app_osplookup
MENUSELECT_DEPSFAILED=MENUSELECT_CHANNELS=chan_nbs