main/asterisk: upgrade to 12.5.0

2 files changed, 5 insertions, 37 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 95f7ee657..18a6ad1ec 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,8 +1,8 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=12.4.0
-pkgrel=7
+pkgver=12.5.0
+pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
@@ -43,7 +43,6 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	ASTERISK-18995.patch
 	ASTERISK-19109.patch
 	ASTERISK-20527.patch
-	ASTERISK-23818.patch
 	asterisk.initd
 	asterisk.confd
 	asterisk.logrotate"
@@ -247,7 +246,7 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="96af38f9d11a1ba794cd520cef842d9c  asterisk-12.4.0.tar.gz
+md5sums="7d39837d7498abebfca9a8b3ec618362  asterisk-12.5.0.tar.gz
 126dd4fba66f4cf9aa94dfd7034e0ec4  asterisk-addon-mp3-r201.patch.gz
 a66f192623276530eeb6d722ee35bee9  musl-libcap.patch
 b4211313aae31efa8c3c1931ba47dbf9  musl-includes.patch
@@ -257,11 +256,10 @@ b4211313aae31efa8c3c1931ba47dbf9  musl-includes.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
 8499917c1476953cdc2f5c94c0581775  ASTERISK-19109.patch
 676ca42ee1859d8a7bae4345ede5eb89  ASTERISK-20527.patch
-829518608463847cb5ff00a945e45aed  ASTERISK-23818.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="6c72d0060d1ce7a7d09f510d91d588f269aac0032de6a4464d5449b0d5600a72  asterisk-12.4.0.tar.gz
+sha256sums="8355ccd815f2715ff49bf70c2480b5ea895e0a75250d0f111b1cae5af5acf06f  asterisk-12.5.0.tar.gz
 d32a5a695cee1699011d0e9ad02eb43af612def06f92017627194099edf98e3f  asterisk-addon-mp3-r201.patch.gz
 ba8334d855191af3fa662931244b6fea4ffc9eec84e40e1a52d6b3c0186d2005  musl-libcap.patch
 e3b7128813d0452b152d3af5015da927b07849e7f33de9f80f1d10f65907d268  musl-includes.patch
@@ -271,11 +269,10 @@ a5205ed44b57a72934baf8cde543ddb179f277494181818905110bfdcccfe7d9  musl-mutex-ini
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
 8970797d4812a751968c0db83816fe2bc05c8b01dba7f64f21c197807528d234  ASTERISK-19109.patch
 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94  ASTERISK-20527.patch
-491cab5d61880603a4e2324d475f017d32abf78e3fe2225780a093b189aaa0d9  ASTERISK-23818.patch
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="f1a58b42422efe7bca5bf39f400309d062b1f10c2918029e9b7db84dbffe38cef1712ce87537a22e4d7dcd32b3b768f057b6903d937d68593baeb5a56390f649  asterisk-12.4.0.tar.gz
+sha512sums="b94379038f102afec656a6c0097e094bd68c18e3ccd0d88cf541f40fafe1d209c0fb4c4bd0dfcf741c4f6b4021e41e2708ffc9b3b5e17d268c76dd6ea8e8e95a  asterisk-12.5.0.tar.gz
 aacef3f4796fb1abd33266998b53909cb4b36e7cc5ad2f7bac68bdc43e9a9072d9a4e2e7e681bddfa31f3d04575eb248afe6ea95da780c67e4829c1e22adfe1b  asterisk-addon-mp3-r201.patch.gz
 d30d1be03cbc637f1d05e6897efa2e1fae560ac2c48124a9636c5ff390c81b8c07cf9cef6d930e71eb59cb932f234284a0390487ec257e0fa45ec11d294c106c  musl-libcap.patch
 878b8cddc5af338a07658c388d42a7f9ddf3edcf302ca8b294adcf278b6ceacd463d279cb716b0b6b059f47eb287803bc15a7f36a403c66697f466ff3cd5a6e4  musl-includes.patch
@@ -285,7 +282,6 @@ f72c2e04de80d3ed9ce841308101383a1655e6da7a3c888ad31fffe63d1280993e08aefcf8e63831
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch
 875dcd976b82b554157c5539df6fae0082b072c81d4db12827d1fc41c00e8dc0118b3bf7359f30e3b49051de27a85394ff30d08e62cde811a7c197b41f1f313a  ASTERISK-19109.patch
 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d  ASTERISK-20527.patch
-214479320e713e851fc26f730c076e2d7296a385c9abe573e0acfb277d657834d48d57ffb4a2b437fc42b9d004f867a0a1cc50aa1d39e1905b5baa6c05876056  ASTERISK-23818.patch
 e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
 7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b  asterisk.logrotate"
diff --git a/main/asterisk/ASTERISK-23818.patch b/main/asterisk/ASTERISK-23818.patch
deleted file mode 100644
index 0360f4c84..000000000
--- a/main/asterisk/ASTERISK-23818.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-https://issues.asterisk.org/jira/browse/ASTERISK-23818
-https://reviewboard.asterisk.org/r/3891
-
---- a/pbx/pbx_lua.c	(revision 420123)
-+++ b/pbx/pbx_lua.c	(working copy)
-@@ -1562,7 +1562,7 @@
- 	return AST_MODULE_LOAD_SUCCESS;
- }
- 
--AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Lua PBX Switch",
-+AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Lua PBX Switch",
- 		.load = load_module,
- 		.unload = unload_module,
- 		.reload = reload,
---- a/main/pbx.c	(revision 420123)
-+++ b/main/pbx.c	(working copy)
-@@ -7868,6 +7868,11 @@
- 			ast_hashtab_end_traversal(prio_iter);
- 		}
- 		ast_hashtab_end_traversal(exten_iter);
-+	} else if (new) {
-+		/* If the context existed but had no extensions, we still want to merge
-+		 * the includes, switches and ignore patterns.
-+		 */
-+		context_merge_incls_swits_igps_other_registrars(new, context, registrar);
- 	}
- 
- 	if (!insert_count && !new && (strcmp(context->registrar, registrar) != 0 ||