main/asterisk: cherry-pick fix for ASTERISK-21859

Picked from 11-stable branch, and is already in 11.6.0-rc1.
But I need it early for testing.

main/asterisk/APKBUILD

@@ -2,7 +2,7 @@
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
 pkgver=11.5.1
-pkgrel=2
+pkgrel=3
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
 pkggroups="asterisk"
@@ -38,6 +38,7 @@ 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"
@@ -232,6 +233,7 @@ md5sums="34ca88eeb50580823ec6e38d4c0ad0dc  asterisk-11.5.0.tar.gz
 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"
@@ -242,6 +244,7 @@ c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclib
 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"
@@ -252,6 +255,7 @@ b9a3dedc0d8b93ae252539e94249d3dcb011d2f8562fc7eef12004def396b6b0de7a19dc77574e26
 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"

main/asterisk/ASTERISK-21859.patch

+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) &&
+