main/asterisk: upgrade to 13.4.0

2 files changed, 6 insertions, 68 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 77a1b5602d..d70394ec6d 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=13.3.2
-pkgrel=1
+pkgver=13.4.0
+pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
@@ -17,7 +17,7 @@ makedepends="autoconf automake libtool tar wget bsd-compat-headers
 	sqlite-dev postgresql-dev unixodbc-dev freetds-dev mariadb-dev
 	alsa-lib-dev pjproject-dev dahdi-tools-dev libpri-dev libsrtp-dev
 	spandsp-dev libresample speex-dev speexdsp-dev libogg-dev
-	bluez-dev"
+	bluez-dev libxml2-dev"
 install="$pkgname.pre-install $pkgname.pre-upgrade"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-pgsql $pkgname-odbc
 	$pkgname-tds $pkgname-fax $pkgname-sample-config:sample
@@ -41,7 +41,6 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	musl-libcap.patch
 	musl-includes.patch
 	musl-glob-compat.patch
-	musl-outofmem-handling.patch
 	musl-mutex-init.patch
 	ASTERISK-18995.patch
 	ASTERISK-19109.patch
@@ -249,14 +248,11 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="95b4850668b8880e6c4bfefae4fb427c  asterisk-13.3.0.tar.gz
-608f55942e82194a742634ddfd03cd2e  asterisk-13.3.1-patch.gz
-756c24ef3b2bb638246308093ea15910  asterisk-13.3.2-patch.gz
+md5sums="8cd729d481f0b3d9aadcf5a607c25803  asterisk-13.4.0.tar.gz
 126dd4fba66f4cf9aa94dfd7034e0ec4  asterisk-addon-mp3-r201.patch.gz
 7b699961171a93d7788420f518c5931e  musl-libcap.patch
 1147c81ac5e49c36a5d264019480bec0  musl-includes.patch
 9b3e6cb75464a6ef4c40d191bdfdf7ea  musl-glob-compat.patch
-10b84632764a6f05ec9973c31f5e82fb  musl-outofmem-handling.patch
 1ca5e8326dc03c963a7ce5455d0f21ba  musl-mutex-init.patch
 5535ecf893134fd341cfbd9f8e1249d2  ASTERISK-18995.patch
 ba0944d05570a1076f826807598c5752  ASTERISK-19109.patch
@@ -264,14 +260,11 @@ ba0944d05570a1076f826807598c5752  ASTERISK-19109.patch
 4bdc82ba3d6bdfdedc71e5da2fde5ec2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="88b1eaab1b2d45722f89f51e1fa47883a8fab283bc1dc2ffd7d7c6a0e4411d57  asterisk-13.3.0.tar.gz
-5e9fbd1b1e3ee0790fee65bc01e790cdfed8b01683eff99110d0a262d97a0740  asterisk-13.3.1-patch.gz
-ee2353b1cb9b7c7fa17d8c5220ad2a7f6adbc8b3e013312ebb745ab5aea80267  asterisk-13.3.2-patch.gz
+sha256sums="2049012665e99d2967b18d1594ae752307db7e967235877f1e058e6fb5b4c045  asterisk-13.4.0.tar.gz
 d32a5a695cee1699011d0e9ad02eb43af612def06f92017627194099edf98e3f  asterisk-addon-mp3-r201.patch.gz
 f23aa2c03f9be1eb3c4c0ceac79ddcce7381aae46d6e6853ad20b1de5ac125d9  musl-libcap.patch
 354596949399ac38f245e03a0833ca4cf6aa664e28ef92d79715c654465aa5fe  musl-includes.patch
 c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52  musl-glob-compat.patch
-235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b  musl-outofmem-handling.patch
 a5205ed44b57a72934baf8cde543ddb179f277494181818905110bfdcccfe7d9  musl-mutex-init.patch
 d3f1304ddcce48f2c09cb81e924052f7eb2d36829aa1a0bf6a2e0be476333ee7  ASTERISK-18995.patch
 6e0e023b83cd197ea4ff2a536d83dcce3675c094c47d195a39d809d64199b713  ASTERISK-19109.patch
@@ -279,14 +272,11 @@ d3f1304ddcce48f2c09cb81e924052f7eb2d36829aa1a0bf6a2e0be476333ee7  ASTERISK-18995
 10454553733e6cc52c6e9db508768a638655d99c095c5b39fb043858c088f21f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="2751608b35e21f4ea8d9b053a8dcaaf532bd16d7a1105550c1d44ea121a700ee1499e1fcf864a08d8103a2de433caccfbb7ae6e666f82760b981082a1f3ce0a7  asterisk-13.3.0.tar.gz
-7591c244e9971bbc76669e19b155e983461789fed8213e27b6f085b7b95c8a6d50a07aa28cc54672c4b6d46a939070bd18d929795f7a4279f0adc4947b15adfe  asterisk-13.3.1-patch.gz
-707495ec3862b8448e6bf09d188a368e8732ae0d3de246d00943d7391da825ba91a3692d69da68e6561efcffe631340146c27cce534e6260b0f5f4f7814e2b45  asterisk-13.3.2-patch.gz
+sha512sums="5f6843d8a635e274bfae5ca5d5305f5764fa2cee3c6d83d73d681cd8a672aba6452d4deb0cbe9e3a61c657aab8563b0138b311ff6a8d42d28fce65c5dcad783a  asterisk-13.4.0.tar.gz
 aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b  asterisk-addon-mp3-r201.patch.gz
 31bdf1323155a9fbedf8c05183167903ff83bef4d408848368d3fab78e6c6265228ceece54375d68df6a99b9c1879431033d0a8cec875244c61ccc1f8e37fc5d  musl-libcap.patch
 7eb3c1f3207d8f7c58fbc3b30e7b9193e7498da09d53d7e907f3d9d79ffc86fa6f83b593dc4c1b0007d7e62565cb8618dc415d1a9ee61affa10e6a64b146967a  musl-includes.patch
 edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac  musl-glob-compat.patch
-7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e  musl-outofmem-handling.patch
 f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e638316d439c68b38ee05362c87503fca1f36343976a01af9d6eb1  musl-mutex-init.patch
 f6c1b0030225638a20e374a6f14dca23fce88e1953bec0e399e8ee2e18241f6fdebc6be0404d7ae46359f66cdb7aa9240f2a4be17d5046aedf5aa72235e9da5d  ASTERISK-18995.patch
 28b2e4cc87aa94353795d6ef1f878a32d8d881e77f683ca19891fe7932c5505347b9c6fae9ea14de05d6fe4da4cb9a72fa219e40bf8365c7a0b4c5a2294af5d0  ASTERISK-19109.patch
diff --git a/main/asterisk/musl-outofmem-handling.patch b/main/asterisk/musl-outofmem-handling.patch
deleted file mode 100644
index 24b1a9ec74..0000000000
--- a/main/asterisk/musl-outofmem-handling.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- asterisk-12.1.0.orig/include/asterisk/utils.h
-+++ asterisk-12.1.0/include/asterisk/utils.h
-@@ -25,7 +25,6 @@
- 
- #include "asterisk/network.h"
- 
--#include <execinfo.h>
- #include <time.h>	/* we want to override localtime_r */
- #include <unistd.h>
- #include <string.h>
-@@ -480,25 +479,13 @@
- #define ast_free free
- #define ast_free_ptr ast_free
- 
--/*
-- * This buffer is in static memory. We never intend to read it,
-- * nor do we care about multiple threads writing to it at the
-- * same time. We only want to know if we're recursing too deep
-- * already. 60 entries should be more than enough.  Function
-- * call depth rarely exceeds 20 or so.
-- */
--#define _AST_MEM_BACKTRACE_BUFLEN 60
--extern void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
--
--/*
-- * Ok, this sucks. But if we're already out of mem, we don't
-- * want the logger to create infinite recursion (and a crash).
-- */
- #define MALLOC_FAILURE_MSG \
- 	do { \
--		if (backtrace(_ast_mem_backtrace_buffer, _AST_MEM_BACKTRACE_BUFLEN) < _AST_MEM_BACKTRACE_BUFLEN) { \
--			ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
--		} \
-+		extern int __thread _ast_out_of_memory; \
-+		if (_ast_out_of_memory) break; \
-+		_ast_out_of_memory = 1; \
-+		ast_log(LOG_ERROR, "Memory Allocation Failure in function %s at line %d of %s\n", func, lineno, file); \
-+		_ast_out_of_memory = 0; \
- 	} while (0)
- 
- /*!
---- asterisk-12.1.0.orig/main/hashtab.c
-+++ asterisk-12.1.0/main/hashtab.c
-@@ -44,7 +44,7 @@
- 
- 
- #ifndef __AST_DEBUG_MALLOC
--void *_ast_mem_backtrace_buffer[_AST_MEM_BACKTRACE_BUFLEN];
-+int __thread _ast_out_of_memory;
- #endif
- 
- #if (defined(MALLOC_DEBUG) && !defined(STANDALONE))