main/asterisk: upgrade to 11.6.0

remove upstreamed patches

2 files changed, 5 insertions, 36 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index fc1d49d5f..22127bba1 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=11.5.1
-pkgrel=3
+pkgver=11.6.0
+pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
@@ -38,7 +38,6 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	ASTERISK-18995.patch
 	ASTERISK-19109.patch
 	ASTERISK-20527.patch
-	ASTERISK-21859.patch
 	asterisk.initd
 	asterisk.confd
 	asterisk.logrotate"
@@ -226,36 +225,30 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="34ca88eeb50580823ec6e38d4c0ad0dc  asterisk-11.5.0.tar.gz
-58a724b620c5a9d9e92029e229b189e6  asterisk-11.5.1-patch.gz
+md5sums="698acb491e20990e87bbbcf1462c8538  asterisk-11.6.0.tar.gz
 837fc3bc835699462a8d2a7a16b9b6a3  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
 146befabe95798a67c58d8ac00d397a6  ASTERISK-19109.patch
 676ca42ee1859d8a7bae4345ede5eb89  ASTERISK-20527.patch
-18dd00996eb40097daaf0052f369d537  ASTERISK-21859.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="a82c1ddd9fb1d98f0dab6e0255a127fb7c7eaa687b3d515182458244062b4194  asterisk-11.5.0.tar.gz
-e742cc28cd160ba2bf8af6733ff0940316b0dc8e2b1163edbd404d8178522579  asterisk-11.5.1-patch.gz
+sha256sums="80aa523bdaab71ce419022d8c851aaeda718dc5bbf5fe8cb99786da546dd8cee  asterisk-11.6.0.tar.gz
 6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003  100-uclibc-daemon.patch
 c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclibc.patch
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
 d657634d4c96f42ac1a8b7103104185e8cd9d5a59e5214cc1658e01805975ce8  ASTERISK-19109.patch
 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94  ASTERISK-20527.patch
-31fd177928457dd05dc61601ce9020986ff7c7a1ce78fb4bb486e7390f7ce3e2  ASTERISK-21859.patch
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="595d6c2ecbbc9a057ff601c4337fff276eae089d58d97036f9a676686dfe3b2cbaf8739f2f788416bb947a97465100cbf261030c3d17175025eec25761f0cd58  asterisk-11.5.0.tar.gz
-b9a3dedc0d8b93ae252539e94249d3dcb011d2f8562fc7eef12004def396b6b0de7a19dc77574e26cf2231e38d4758242b27d0ea4efe5c4a14de7d35610f4659  asterisk-11.5.1-patch.gz
+sha512sums="8f7bc0428f45ab32ba03a3e047fa95da2ab04eb701b0262c393aef1ce618df45b360a59f5d84939309ab3f68284ceb8a59eef94901e897cd688d8a3296b27886  asterisk-11.6.0.tar.gz
 24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831  100-uclibc-daemon.patch
 601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368  101-caps-uclibc.patch
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch
 a9a0a4199291a6ef5ebdf07daee07293d96a16a38116f6afdea61d68b167235d63b5a54e3ae45b7e11be0b9dc82863fdced1ad45110dcac29b353ddcc1d6337a  ASTERISK-19109.patch
 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d  ASTERISK-20527.patch
-2409ab13f09d4d2865e34e5332ee6b0110f4198c87af5ce1dbc61376b612909a3e40c97ffeb4a16fde73a71493d298edd449aa32a99506c1ab032fbb30ec8fea  ASTERISK-21859.patch
 e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
 7591d2faf539d05d9ee4e431c78a5e20686721fd79221ad94dffeeaff9282220b09cb9aec214bd7a8d12affaec0276c9c91e6e21af8b6712c0a9502b60b02f2b  asterisk.logrotate"
diff --git a/main/asterisk/ASTERISK-21859.patch b/main/asterisk/ASTERISK-21859.patch
deleted file mode 100644
index 93437f527..000000000
--- a/main/asterisk/ASTERISK-21859.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://issues.asterisk.org/jira/browse/ASTERISK-21859
-https://issues.asterisk.org/jira/browse/ASTERISK-22454
-https://issues.asterisk.org/jira/browse/ASTERISK-22581
-
-Index: asterisk/apps/confbridge/conf_state_multi_marked.c
-===================================================================
-diff -u -N -r380892 -r399222
---- asterisk/apps/confbridge/conf_state_multi_marked.c	(.../conf_state_multi_marked.c)	(revision 380892)
-+++ asterisk/apps/confbridge/conf_state_multi_marked.c	(.../conf_state_multi_marked.c)	(revision 399222)
-@@ -95,6 +95,13 @@
- 		AST_LIST_TRAVERSE_SAFE_BEGIN(&cbu->conference_bridge->active_list, cbu_iter, list) {
- 			/* Kick ENDMARKED cbu_iters */
- 			if (ast_test_flag(&cbu_iter->u_profile, USER_OPT_ENDMARKED)) {
-+				if (ast_test_flag(&cbu_iter->u_profile, USER_OPT_WAITMARKED) &&
-+						  !ast_test_flag(&cbu_iter->u_profile, USER_OPT_MARKEDUSER)) {
-+					AST_LIST_REMOVE_CURRENT(list);
-+					cbu_iter->conference_bridge->activeusers--;
-+					AST_LIST_INSERT_TAIL(&cbu_iter->conference_bridge->waiting_list, cbu_iter, list);
-+					cbu_iter->conference_bridge->waitingusers++;
-+				}
- 				cbu_iter->kicked = 1;
- 				ast_bridge_remove(cbu_iter->conference_bridge->bridge, cbu_iter->chan);
- 			} else if (ast_test_flag(&cbu_iter->u_profile, USER_OPT_WAITMARKED) &&
-