main/asterisk: upgrade to 12.2.0

3 files changed, 68 insertions, 156 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 21a2fd245..b63ae548e 100644
--- a/main/asterisk/APKBUILD
+++ b/main/asterisk/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Timo Teras <timo.teras@iki.fi>
 # Maintainer: Timo Teras <timo.teras@iki.fi>
 pkgname=asterisk
-pkgver=12.1.1
+pkgver=12.2.0
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
@@ -39,7 +39,6 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	musl-glob-compat.patch
 	musl-outofmem-handling.patch
 	ASTERISK-18995.patch
-	ASTERISK-19499.patch
 	ASTERISK-19109.patch
 	ASTERISK-20527.patch
 	asterisk.initd
@@ -236,44 +235,38 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="87a7894f47d4420c4f4e1a3618a0259d  asterisk-12.1.0.tar.gz
-5b5c754b0b1137a44e8f23c43aff8cac  asterisk-12.1.1-patch.gz
+md5sums="b9ad77d83095ec7f9d7ecffaf98db62c  asterisk-12.2.0.tar.gz
 837fc3bc835699462a8d2a7a16b9b6a3  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 b4211313aae31efa8c3c1931ba47dbf9  musl-includes.patch
 9b3e6cb75464a6ef4c40d191bdfdf7ea  musl-glob-compat.patch
 10b84632764a6f05ec9973c31f5e82fb  musl-outofmem-handling.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
-823856836230ed657ed11e6d895c23ed  ASTERISK-19499.patch
-b06ae4aecf862769158b60bd6b2e9cb0  ASTERISK-19109.patch
+8499917c1476953cdc2f5c94c0581775  ASTERISK-19109.patch
 676ca42ee1859d8a7bae4345ede5eb89  ASTERISK-20527.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="879bbd2bbf68ef76eb77406ba3309b8515db0a662408af991d694fbba99c0b9e  asterisk-12.1.0.tar.gz
-378aa9795a96fd9ca8439712e1bbf0529b2d4b6f10f49da15c6b955aba204d13  asterisk-12.1.1-patch.gz
+sha256sums="1858abd9be49eabba545fe74d6730d90ac211d2d421be9ab776209f522994263  asterisk-12.2.0.tar.gz
 6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003  100-uclibc-daemon.patch
 c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclibc.patch
 e3b7128813d0452b152d3af5015da927b07849e7f33de9f80f1d10f65907d268  musl-includes.patch
 c6a5c32646b767f09ebffccc49cac6a4ff9181498499e4453300775e75284b52  musl-glob-compat.patch
 235b9c339793c02d1d80ac37d308cf14dc3e86fe8ccbe757e9855b186d9c164b  musl-outofmem-handling.patch
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
-798e550e637917d66a8fce31d85f64fd31f4255b3addf5dd46a19ca9e7ac5282  ASTERISK-19499.patch
-62c6f6f254a0ca83fb7e13d16779121b4de0ecf7a1268c14d27d4463f5631420  ASTERISK-19109.patch
+8970797d4812a751968c0db83816fe2bc05c8b01dba7f64f21c197807528d234  ASTERISK-19109.patch
 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94  ASTERISK-20527.patch
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="690b952b9685220cd53419b5fdcf7aad96f01f8d66144fe53aa4a0456c1b000d71981a446e21187c13dc68dd067f540e169e59dcb2626741ac9de7837980e50d  asterisk-12.1.0.tar.gz
-8bd7d93c319707bc5e4efc2c51b62a635f88ba94eda5dfc2911d7a846fcc9a158743c68b19eaa8c6f1ffc07574377646d631fb86a1da06556c33acdba08ed43f  asterisk-12.1.1-patch.gz
+sha512sums="fe47c29641483bbd9f8ee79342b9c7d606d1a34c2e92773732705019aa4387b1fbac70d2c688e8b372a7ac3c48038654576ad1feb3572043f5222944bbe019b5  asterisk-12.2.0.tar.gz
 24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831  100-uclibc-daemon.patch
 601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368  101-caps-uclibc.patch
 878b8cddc5af338a07658c388d42a7f9ddf3edcf302ca8b294adcf278b6ceacd463d279cb716b0b6b059f47eb287803bc15a7f36a403c66697f466ff3cd5a6e4  musl-includes.patch
 edf65eba44e8f1f0e78671aba312bcff2090134cf94e89ebb4b6beef7b2d57b24381ae9511cbf9fffe6b555e695a3dbe2cedcd04f1d237df822fa742bd5092ac  musl-glob-compat.patch
 7cbbad2c16d89b0b4ea45257a44c25ea96ca6ecb1f5bf7707656dfa3957cae34d1dca404b3d62baca8b55cea6f9fa39819bef48a1f4dad0124da95d6c80a294e  musl-outofmem-handling.patch
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch
-3bddb216c3902354f2bb41bab0a2392b01933a82736cb4ad4cecbc70739fd716fc2fa1cbd250fa669d529763cd4ad192e573283376e0c746209cc0607edc24e3  ASTERISK-19499.patch
-1dbf0f63e5e1721e90fdd5ff0956753958a2c7eb5f710afd5ebf6d871c9b894d698d0f019f8876b5427be0b4c40497edb97ba1f64f214c9a6f8ef4478764ca74  ASTERISK-19109.patch
+875dcd976b82b554157c5539df6fae0082b072c81d4db12827d1fc41c00e8dc0118b3bf7359f30e3b49051de27a85394ff30d08e62cde811a7c197b41f1f313a  ASTERISK-19109.patch
 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d  ASTERISK-20527.patch
 e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
diff --git a/main/asterisk/ASTERISK-19109.patch b/main/asterisk/ASTERISK-19109.patch
index b7b8d76e0..09491bd8b 100644
--- a/main/asterisk/ASTERISK-19109.patch
+++ b/main/asterisk/ASTERISK-19109.patch
@@ -1,20 +1,20 @@
-diff -ru asterisk-12.1.0.orig/CHANGES asterisk-12.1.0/CHANGES
---- asterisk-12.1.0.orig/CHANGES	2014-03-04 12:28:27.967573113 +0000
-+++ asterisk-12.1.0/CHANGES	2014-03-04 12:25:54.994802007 +0000
-@@ -8,6 +8,10 @@
- ===
- ==============================================================================
+diff -ru asterisk-12.2.0.orig/CHANGES asterisk-12.2.0/CHANGES
+--- asterisk-12.2.0.orig/CHANGES	2014-04-22 00:02:00.000000000 -0300
++++ asterisk-12.2.0/CHANGES	2014-05-03 11:54:02.079108226 -0300
+@@ -10,6 +10,10 @@
+ 
+ 
  
 +
 + * Added support for deaf participants with CLI commands, manager actions
 +   and ConfBridge DTMF actions to toggle the deaf state.
 +
  ------------------------------------------------------------------------------
- --- Functionality changes from Asterisk 12.0.0 to Asterisk 12.1.0 ------------
+ --- Functionality changes from Asterisk 12.1.0 to Asterisk 12.2.0 ------------
  ------------------------------------------------------------------------------
-diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_confbridge.c
---- asterisk-12.1.0.orig/apps/app_confbridge.c	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/apps/app_confbridge.c	2014-03-04 12:35:39.105383185 +0000
+diff -ru asterisk-12.2.0.orig/apps/app_confbridge.c asterisk-12.2.0/apps/app_confbridge.c
+--- asterisk-12.2.0.orig/apps/app_confbridge.c	2014-03-21 00:54:59.000000000 -0200
++++ asterisk-12.2.0/apps/app_confbridge.c	2014-05-03 11:53:14.806030993 -0300
 @@ -215,6 +215,30 @@
  		<description>
  		</description>
@@ -71,7 +71,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	case CONF_SOUND_ONLY_ONE:
  		return S_OR(custom_sounds->onlyone, "conf-onlyone");
  	case CONF_SOUND_THERE_ARE:
-@@ -493,6 +528,16 @@
+@@ -495,6 +530,16 @@
  	send_conf_stasis(conference, chan, confbridge_unmute_type(), NULL, 1);
  }
  
@@ -88,23 +88,19 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  static void set_rec_filename(struct confbridge_conference *conference, struct ast_str **filename, int is_new)
  {
  	char *rec_file = conference->b_profile.rec_file;
-@@ -1661,11 +1706,14 @@
- 	volume_adjustments[0] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_READ);
- 	volume_adjustments[1] = ast_audiohook_volume_get(chan, AST_AUDIOHOOK_DIRECTION_WRITE);
- 
--	/* If the caller should be joined already muted, make it so */
-+	/* If the caller should be joined already muted or deaf, make it so */
- 	if (ast_test_flag(&user.u_profile, USER_OPT_STARTMUTED)) {
+@@ -1657,6 +1702,11 @@
  		/* Set user level mute request. */
  		user.muted = 1;
  	}
++	/* If the caller should be joined already deafened, set the flag before we join. */
 +	if (ast_test_flag(&user.u_profile, USER_OPT_STARTDEAF)) {
++		/* Set user level deaf request */
 +		user.features.deaf = 1;
 +	}
  
- 	if (ast_test_flag(&user.u_profile, USER_OPT_DROP_SILENCE)) {
- 		user.tech_args.drop_silence = 1;
-@@ -1845,6 +1893,30 @@
+ 	/* Look for a conference bridge matching the provided name */
+ 	if (!(conference = join_conference_bridge(args.conf_name, &user))) {
+@@ -1846,6 +1896,30 @@
  	return 0;
  }
  
@@ -135,7 +131,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  static int action_playback(struct ast_bridge_channel *bridge_channel, const char *playback_file)
  {
  	char *file_copy = ast_strdupa(playback_file);
-@@ -2033,6 +2105,11 @@
+@@ -2034,6 +2108,11 @@
  		case MENU_ACTION_PARTICIPANT_COUNT:
  			announce_user_count(conference, user);
  			break;
@@ -147,7 +143,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  		case MENU_ACTION_PLAYBACK:
  			if (!stop_prompts) {
  				res |= action_playback(bridge_channel, menu_action->data.playback_file);
-@@ -2379,14 +2456,29 @@
+@@ -2380,14 +2459,29 @@
  	return res;
  }
  
@@ -179,7 +175,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  {
  	struct confbridge_conference *conference;
  	struct confbridge_user *user;
-@@ -2403,25 +2495,33 @@
+@@ -2404,25 +2498,33 @@
  		}
  	}
  	if (user) {
@@ -228,7 +224,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	}
  	ao2_unlock(conference);
  	ao2_ref(conference, -1);
-@@ -2429,9 +2529,10 @@
+@@ -2430,9 +2532,10 @@
  	return res;
  }
  
@@ -241,7 +237,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  
  	if (res == -1) {
  		ast_cli(a->fd, "No conference bridge named '%s' found!\n", a->argv[2]);
-@@ -2440,7 +2541,24 @@
+@@ -2441,7 +2544,24 @@
  		ast_cli(a->fd, "No channel named '%s' found in conference %s\n", a->argv[3], a->argv[2]);
  		return -1;
  	}
@@ -267,7 +263,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	return 0;
  }
  
-@@ -2469,7 +2587,7 @@
+@@ -2470,7 +2590,7 @@
  		return CLI_SHOWUSAGE;
  	}
  
@@ -276,7 +272,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  
  	return CLI_SUCCESS;
  }
-@@ -2499,7 +2617,53 @@
+@@ -2500,7 +2620,53 @@
  		return CLI_SHOWUSAGE;
  	}
  
@@ -331,7 +327,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  
  	return CLI_SUCCESS;
  }
-@@ -2654,6 +2818,8 @@
+@@ -2655,6 +2821,8 @@
  	AST_CLI_DEFINE(handle_cli_confbridge_kick, "Kick participants out of conference bridges."),
  	AST_CLI_DEFINE(handle_cli_confbridge_mute, "Mute a participant."),
  	AST_CLI_DEFINE(handle_cli_confbridge_unmute, "Unmute a participant."),
@@ -340,7 +336,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	AST_CLI_DEFINE(handle_cli_confbridge_lock, "Lock a conference."),
  	AST_CLI_DEFINE(handle_cli_confbridge_unlock, "Unlock a conference."),
  	AST_CLI_DEFINE(handle_cli_confbridge_start_record, "Start recording a conference"),
-@@ -2804,10 +2970,11 @@
+@@ -2805,10 +2973,11 @@
  	return 0;
  }
  
@@ -353,7 +349,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	int res = 0;
  
  	if (ast_strlen_zero(conference_name)) {
-@@ -2823,7 +2990,7 @@
+@@ -2824,7 +2993,7 @@
  		return 0;
  	}
  
@@ -362,7 +358,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  
  	if (res == -1) {
  		astman_send_error(s, m, "No Conference by that name found.");
-@@ -2833,17 +3000,41 @@
+@@ -2834,17 +3003,41 @@
  		return 0;
  	}
  
@@ -407,7 +403,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  }
  
  static int action_lock_unlock_helper(struct mansession *s, const struct message *m, int lock)
-@@ -3196,6 +3387,8 @@
+@@ -3197,6 +3390,8 @@
  	ast_manager_unregister("ConfbridgeListRooms");
  	ast_manager_unregister("ConfbridgeMute");
  	ast_manager_unregister("ConfbridgeUnmute");
@@ -416,7 +412,7 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	ast_manager_unregister("ConfbridgeKick");
  	ast_manager_unregister("ConfbridgeUnlock");
  	ast_manager_unregister("ConfbridgeLock");
-@@ -3265,6 +3458,8 @@
+@@ -3266,6 +3461,8 @@
  	res |= ast_manager_register_xml("ConfbridgeListRooms", EVENT_FLAG_REPORTING, action_confbridgelistrooms);
  	res |= ast_manager_register_xml("ConfbridgeMute", EVENT_FLAG_CALL, action_confbridgemute);
  	res |= ast_manager_register_xml("ConfbridgeUnmute", EVENT_FLAG_CALL, action_confbridgeunmute);
@@ -425,9 +421,9 @@ diff -ru asterisk-12.1.0.orig/apps/app_confbridge.c asterisk-12.1.0/apps/app_con
  	res |= ast_manager_register_xml("ConfbridgeKick", EVENT_FLAG_CALL, action_confbridgekick);
  	res |= ast_manager_register_xml("ConfbridgeUnlock", EVENT_FLAG_CALL, action_confbridgeunlock);
  	res |= ast_manager_register_xml("ConfbridgeLock", EVENT_FLAG_CALL, action_confbridgelock);
-diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1.0/apps/confbridge/conf_config_parser.c
---- asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/apps/confbridge/conf_config_parser.c	2014-03-04 12:25:54.998135400 +0000
+diff -ru asterisk-12.2.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.2.0/apps/confbridge/conf_config_parser.c
+--- asterisk-12.2.0.orig/apps/confbridge/conf_config_parser.c	2014-03-27 21:15:35.000000000 -0200
++++ asterisk-12.2.0/apps/confbridge/conf_config_parser.c	2014-05-03 11:51:44.939851173 -0300
 @@ -862,6 +862,10 @@
  		ast_string_field_set(sounds, muted, sound_file);
  	} else if (!strcasecmp(sound_name, "sound_unmuted")) {
@@ -439,7 +435,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  	} else if (!strcasecmp(sound_name, "sound_there_are")) {
  		ast_string_field_set(sounds, thereare, sound_file);
  	} else if (!strcasecmp(sound_name, "sound_other_in_party")) {
-@@ -1001,6 +1005,7 @@
+@@ -1014,6 +1018,7 @@
  	switch (id) {
  	case MENU_ACTION_NOOP:
  	case MENU_ACTION_TOGGLE_MUTE:
@@ -447,7 +443,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  	case MENU_ACTION_INCREASE_LISTENING:
  	case MENU_ACTION_DECREASE_LISTENING:
  	case MENU_ACTION_INCREASE_TALKING:
-@@ -1291,6 +1296,9 @@
+@@ -1304,6 +1309,9 @@
  	ast_cli(a->fd,"Start Muted:             %s\n",
  		u_profile.flags & USER_OPT_STARTMUTED?
  		"true" : "false");
@@ -457,7 +453,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  	ast_cli(a->fd,"MOH When Empty:          %s\n",
  		u_profile.flags & USER_OPT_MUSICONHOLD ?
  		"enabled" : "disabled");
-@@ -1494,6 +1502,8 @@
+@@ -1507,6 +1515,8 @@
  	ast_cli(a->fd,"sound_kicked:         %s\n", conf_get_sound(CONF_SOUND_KICKED, b_profile.sounds));
  	ast_cli(a->fd,"sound_muted:          %s\n", conf_get_sound(CONF_SOUND_MUTED, b_profile.sounds));
  	ast_cli(a->fd,"sound_unmuted:        %s\n", conf_get_sound(CONF_SOUND_UNMUTED, b_profile.sounds));
@@ -466,7 +462,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  	ast_cli(a->fd,"sound_there_are:      %s\n", conf_get_sound(CONF_SOUND_THERE_ARE, b_profile.sounds));
  	ast_cli(a->fd,"sound_other_in_party: %s\n", conf_get_sound(CONF_SOUND_OTHER_IN_PARTY, b_profile.sounds));
  	ast_cli(a->fd,"sound_place_into_conference: %s\n", conf_get_sound(CONF_SOUND_PLACE_IN_CONF, b_profile.sounds));
-@@ -1621,6 +1631,9 @@
+@@ -1635,6 +1645,9 @@
  			case MENU_ACTION_TOGGLE_MUTE:
  				ast_cli(a->fd, "toggle_mute");
  				break;
@@ -476,7 +472,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  			case MENU_ACTION_NOOP:
  				ast_cli(a->fd, "no_op");
  				break;
-@@ -1917,6 +1930,7 @@
+@@ -1932,6 +1945,7 @@
  	aco_option_register(&cfg_info, "admin", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_ADMIN);
  	aco_option_register(&cfg_info, "marked", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_MARKEDUSER);
  	aco_option_register(&cfg_info, "startmuted", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_STARTMUTED);
@@ -484,9 +480,9 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/conf_config_parser.c asterisk-12.1
  	aco_option_register(&cfg_info, "music_on_hold_when_empty", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_MUSICONHOLD);
  	aco_option_register(&cfg_info, "quiet", ACO_EXACT, user_types, "no", OPT_BOOLFLAG_T, 1, FLDSET(struct user_profile, flags), USER_OPT_QUIET);
  	aco_option_register_custom(&cfg_info, "announce_user_count_all", ACO_EXACT, user_types, "no", announce_user_count_all_handler, 0);
-diff -ru asterisk-12.1.0.orig/apps/confbridge/confbridge_manager.c asterisk-12.1.0/apps/confbridge/confbridge_manager.c
---- asterisk-12.1.0.orig/apps/confbridge/confbridge_manager.c	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/apps/confbridge/confbridge_manager.c	2014-03-04 12:25:54.998135400 +0000
+diff -ru asterisk-12.2.0.orig/apps/confbridge/confbridge_manager.c asterisk-12.2.0/apps/confbridge/confbridge_manager.c
+--- asterisk-12.2.0.orig/apps/confbridge/confbridge_manager.c	2013-09-30 21:48:57.000000000 -0300
++++ asterisk-12.2.0/apps/confbridge/confbridge_manager.c	2014-05-03 11:51:44.939851173 -0300
 @@ -161,6 +161,38 @@
  			</see-also>
  		</managerEventInstance>
@@ -614,9 +610,9 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/confbridge_manager.c asterisk-12.1
  	}
  	if (stasis_message_router_add(channel_state_router,
  			confbridge_talking_type(),
-diff -ru asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h asterisk-12.1.0/apps/confbridge/include/confbridge.h
---- asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/apps/confbridge/include/confbridge.h	2014-03-04 12:25:54.998135400 +0000
+diff -ru asterisk-12.2.0.orig/apps/confbridge/include/confbridge.h asterisk-12.2.0/apps/confbridge/include/confbridge.h
+--- asterisk-12.2.0.orig/apps/confbridge/include/confbridge.h	2014-02-10 17:54:45.000000000 -0200
++++ asterisk-12.2.0/apps/confbridge/include/confbridge.h	2014-05-03 11:51:44.939851173 -0300
 @@ -58,6 +58,7 @@
  	USER_OPT_DTMF_PASS    =  (1 << 13), /*!< Sets if dtmf should be passed into the conference or not */
  	USER_OPT_ANNOUNCEUSERCOUNTALL = (1 << 14), /*!< Sets if the number of users should be announced to everyone. */
@@ -642,7 +638,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h asterisk-12.1
  	CONF_SOUND_ONLY_ONE,
  	CONF_SOUND_THERE_ARE,
  	CONF_SOUND_OTHER_IN_PARTY,
-@@ -170,6 +174,8 @@
+@@ -171,6 +175,8 @@
  		AST_STRING_FIELD(kicked);
  		AST_STRING_FIELD(muted);
  		AST_STRING_FIELD(unmuted);
@@ -651,7 +647,7 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h asterisk-12.1
  		AST_STRING_FIELD(onlyone);
  		AST_STRING_FIELD(thereare);
  		AST_STRING_FIELD(otherinparty);
-@@ -344,6 +350,8 @@
+@@ -346,6 +352,8 @@
  	struct conf_menu_entry *menu_entry,
  	struct conf_menu *menu);
  
@@ -660,10 +656,10 @@ diff -ru asterisk-12.1.0.orig/apps/confbridge/include/confbridge.h asterisk-12.1
  
  /*! \brief Looks to see if sound file is stored in bridge profile sounds, if not
   *  default sound is provided.*/
-diff -ru asterisk-12.1.0.orig/bridges/bridge_softmix.c asterisk-12.1.0/bridges/bridge_softmix.c
---- asterisk-12.1.0.orig/bridges/bridge_softmix.c	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/bridges/bridge_softmix.c	2014-03-04 12:38:29.791808091 +0000
-@@ -923,16 +923,23 @@
+diff -ru asterisk-12.2.0.orig/bridges/bridge_softmix.c asterisk-12.2.0/bridges/bridge_softmix.c
+--- asterisk-12.2.0.orig/bridges/bridge_softmix.c	2014-03-17 18:52:12.000000000 -0200
++++ asterisk-12.2.0/bridges/bridge_softmix.c	2014-05-03 11:51:44.943184488 -0300
+@@ -926,16 +926,23 @@
  
  			ast_mutex_lock(&sc->lock);
  
@@ -696,9 +692,9 @@ diff -ru asterisk-12.1.0.orig/bridges/bridge_softmix.c asterisk-12.1.0/bridges/b
  
  			ast_mutex_unlock(&sc->lock);
  
-diff -ru asterisk-12.1.0.orig/configs/confbridge.conf.sample asterisk-12.1.0/configs/confbridge.conf.sample
---- asterisk-12.1.0.orig/configs/confbridge.conf.sample	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/configs/confbridge.conf.sample	2014-03-04 12:25:54.998135400 +0000
+diff -ru asterisk-12.2.0.orig/configs/confbridge.conf.sample asterisk-12.2.0/configs/confbridge.conf.sample
+--- asterisk-12.2.0.orig/configs/confbridge.conf.sample	2014-02-10 17:54:45.000000000 -0200
++++ asterisk-12.2.0/configs/confbridge.conf.sample	2014-05-03 11:51:44.943184488 -0300
 @@ -20,6 +20,7 @@
  ;admin=yes     ; Sets if the user is an admin or not. Off by default.
  ;marked=yes    ; Sets if this is a marked user or not. Off by default.
@@ -716,7 +712,7 @@ diff -ru asterisk-12.1.0.orig/configs/confbridge.conf.sample asterisk-12.1.0/con
  ;sound_only_person ; The sound played when the user is the only person in the conference.
  ;sound_only_one ; The sound played to a user when there is only one other
                  ; person is in the conference.
-@@ -275,6 +278,8 @@
+@@ -278,6 +281,8 @@
                                         ; using the '&' character as a delimiter.
  ; toggle_mute      ; Toggle turning on and off mute.  Mute will make the user silent
                     ; to everyone else, but the user will still be able to listen in.
@@ -725,9 +721,9 @@ diff -ru asterisk-12.1.0.orig/configs/confbridge.conf.sample asterisk-12.1.0/con
  
  ; no_op ; This action does nothing (No Operation). Its only real purpose exists for
          ; being able to reserve a sequence in the config as a menu exit sequence.
-diff -ru asterisk-12.1.0.orig/include/asterisk/bridge_features.h asterisk-12.1.0/include/asterisk/bridge_features.h
---- asterisk-12.1.0.orig/include/asterisk/bridge_features.h	2014-03-04 12:28:27.970906507 +0000
-+++ asterisk-12.1.0/include/asterisk/bridge_features.h	2014-03-04 12:25:54.998135400 +0000
+diff -ru asterisk-12.2.0.orig/include/asterisk/bridge_features.h asterisk-12.2.0/include/asterisk/bridge_features.h
+--- asterisk-12.2.0.orig/include/asterisk/bridge_features.h	2013-08-21 18:51:19.000000000 -0300
++++ asterisk-12.2.0/include/asterisk/bridge_features.h	2014-05-03 11:51:44.943184488 -0300
 @@ -253,6 +253,8 @@
  	unsigned int usable:1;
  	/*! TRUE if the channel/bridge is muted. */
@@ -737,10 +733,10 @@ diff -ru asterisk-12.1.0.orig/include/asterisk/bridge_features.h asterisk-12.1.0
  	/*! TRUE if DTMF should be passed into the bridge tech.  */
  	unsigned int dtmf_passthrough:1;
  };
-diff -ru asterisk-12.1.0.orig/main/bridge_channel.c asterisk-12.1.0/main/bridge_channel.c
---- asterisk-12.1.0.orig/main/bridge_channel.c	2014-03-04 12:28:27.974239900 +0000
-+++ asterisk-12.1.0/main/bridge_channel.c	2014-03-04 12:40:23.980543471 +0000
-@@ -549,7 +549,21 @@
+diff -ru asterisk-12.2.0.orig/main/bridge_channel.c asterisk-12.2.0/main/bridge_channel.c
+--- asterisk-12.2.0.orig/main/bridge_channel.c	2014-03-17 18:52:12.000000000 -0200
++++ asterisk-12.2.0/main/bridge_channel.c	2014-05-03 11:51:44.943184488 -0300
+@@ -756,7 +756,21 @@
  		return 0;
  	}
  
diff --git a/main/asterisk/ASTERISK-19499.patch b/main/asterisk/ASTERISK-19499.patch
deleted file mode 100644
index 9346b8800..000000000
--- a/main/asterisk/ASTERISK-19499.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From d025bba965381549a5411cf008b0a519a8a1937f Mon Sep 17 00:00:00 2001
-From: kharwell <kharwell@f38db490-d61c-443f-a65b-d21fe96a405b>
-Date: Fri, 21 Feb 2014 15:44:55 +0000
-Subject: [PATCH] channel.c: MOH is not working for transferee after attended
- transfer
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Updated the code to check to see if MOH is playing on the transferor and if
-so then start it on the channel that replaces it during a masquerade.
-
-Example scenario of the problem:
-Alice calls Bob and then Bob begins the attended transfer process into a queue.
-Upon going on hold Alice hears music and so does Bob once he is in the queue.
-Bob then transfers Alice into the queue and then music for Alice stops even
-though she should be hearing it since has now replaced Bob in the queue.
-
-The problem that was occurring is that once the channel was masqueraded the app
-(queues, confbridge, etc...) had no way of knowing that the channel had just
-been swapped out thus it did not start music for the present channel.
-
-Credit to Olle Johansson for pointing me in the right direction on this issue.
-
-(closes issue ASTERISK-19499)
-Reported by: Timo Teräs
-Review: https://reviewboard.asterisk.org/r/3226/
-........
-
-Merged revisions 408642 from http://svn.asterisk.org/svn/asterisk/branches/1.8
-........
-
-Merged revisions 408643 from http://svn.asterisk.org/svn/asterisk/branches/11
-
-
-git-svn-id: http://svn.digium.com/svn/asterisk/branches/12@408644 f38db490-d61c-443f-a65b-d21fe96a405b
----
- main/channel.c | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/main/channel.c b/main/channel.c
-index a9f0fbb..da4f794 100644
---- a/main/channel.c
-+++ b/main/channel.c
-@@ -6406,6 +6406,7 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
- 	unsigned int clone_disablestatecache;
- 	int visible_indication;
- 	int clone_hold_state;
-+	int moh_is_playing;
- 	struct ast_frame *current;
- 	const struct ast_channel_tech *t;
- 	void *t_pvt;
-@@ -6452,6 +6453,8 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
- 	ao2_unlink(channels, original);
- 	ao2_unlink(channels, clonechan);
- 
-+	moh_is_playing = ast_test_flag(ast_channel_flags(original), AST_FLAG_MOH);
-+
- 	/*
- 	 * Stop any visible indication on the original channel so we can
- 	 * transfer it to the clonechan taking the original's place.
-@@ -6753,6 +6756,12 @@ static void channel_do_masquerade(struct ast_channel *original, struct ast_chann
- 		}
- 	}
- 
-+	/* if moh is playing on the original channel then it needs to be
-+	   maintained on the channel that is replacing it. */
-+	if (moh_is_playing) {
-+		ast_moh_start(original, NULL, NULL);
-+	}
-+
- 	ast_channel_lock(original);
- 
- 	/* Signal any blocker */
--- 
-1.9.0
-