main/asterisk: upgrade to 11.9.0

2 files changed, 4 insertions, 109 deletions

diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD
index 1b78b193ff..920a6c5259 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=11.8.1
+pkgver=11.9.0
 pkgrel=0
 pkgdesc="Asterisk: A Module Open Source PBX System"
 pkgusers="asterisk"
@@ -37,7 +37,6 @@ source="$_download/asterisk-$_xy.0.tar.gz
 	101-caps-uclibc.patch
 	ASTERISK-18995.patch
 	ASTERISK-19109.patch
-	ASTERISK-19499.patch
 	ASTERISK-20527.patch
 	asterisk.initd
 	asterisk.confd
@@ -232,35 +231,29 @@ sound_en() {
 	chown -R asterisk:asterisk "$subpkgdir"/var/*/asterisk
 }
 
-md5sums="9906fd460f6138829a44d030e8167735  asterisk-11.8.0.tar.gz
-718e4ce749631de1d129bcdee802a40e  asterisk-11.8.1-patch.gz
+md5sums="743e7dc0112e24f794453443b17ce42b  asterisk-11.9.0.tar.gz
 837fc3bc835699462a8d2a7a16b9b6a3  100-uclibc-daemon.patch
 6e1129e30c4fd2c25c86c81685a485a9  101-caps-uclibc.patch
 bc6713f5434e07b79d3afdd155461d72  ASTERISK-18995.patch
 ea6ed4f9129b8c49a69b6a74a898511a  ASTERISK-19109.patch
-79ccccfc9101fc14390c76823ef4a770  ASTERISK-19499.patch
 676ca42ee1859d8a7bae4345ede5eb89  ASTERISK-20527.patch
 74cd25a5638a94ef51e9f4ede2fd28f2  asterisk.initd
 ed31d7ba37bcf8b0346dcf8593c395f0  asterisk.confd
 3e65172275684373e1a25c8a11224411  asterisk.logrotate"
-sha256sums="daa299cd682ef1bc53b601cfdc244b903ccc9fbc52c2acfa15458e3dab6ffa47  asterisk-11.8.0.tar.gz
-e50500f54eaba2480b5daa2a865b873732a2a0b5aba5003e0a1abdd3aba55d56  asterisk-11.8.1-patch.gz
+sha256sums="1627c9d48db2dab2763c65feb7b6e576b03d09e38b6b05c36d300de7d0eca1d6  asterisk-11.9.0.tar.gz
 6f56ea997513c10fa39835e8dd11fbfb4ec0bb23f4b771963e56691b15a5c003  100-uclibc-daemon.patch
 c2ef786e9a8082fe8ba7b4eb2f130925cb823d100ec567909ad465c279e335bf  101-caps-uclibc.patch
 7a7140156ae7fc7e833035db1e428db8d90159579cd2678c4b5cc829ded47485  ASTERISK-18995.patch
 3de0b38f9700d5d00fc397b8951263ed5ecfb80bf6b699c67032bbf0526e7d80  ASTERISK-19109.patch
-4f3e6a974b178792c623a2b8e91fc9921372a3e9bddcc5f8694b550c27ea4913  ASTERISK-19499.patch
 1f822e618554e9962fe4599975bdcc24413e087dbd7ea4ce0305ecb7ea9bef94  ASTERISK-20527.patch
 13bcc98f2a78d4dd41e810232979eb83044e9166302bfb5b971315f2a82af36f  asterisk.initd
 d221148583b57f9c37d7160f2493f0d204ad11f7abb17e3a3534e108ad5452d7  asterisk.confd
 77b253b6db71460acf9a51e87ad4c8582027a46db01a4c50fb048bada58c19d1  asterisk.logrotate"
-sha512sums="2f29375cd31436457b12d2a88b2357c958436bd3ae5978397fdfebe003d77db36d5e14b8cf46e801966871ece1099ebfd395c777ab0bfa1115b24612f7557236  asterisk-11.8.0.tar.gz
-2e669e50b55df204617785e9444b3a6b8c0c9c1a0d91750d0b2243cee1efec7472aefcb60e3c6eb9ccb107fb73078a3cdb7e90e869159e91b86954957078eec6  asterisk-11.8.1-patch.gz
+sha512sums="ac249e5d9889722e1e00fda325a8d04967e80ded110b05f2066cbd62a56601a325da200e8f1d92c3b8af9ef33fba733cf6767646afa05a937bbeaeb8f58b542a  asterisk-11.9.0.tar.gz
 24a0d3c0ae86117ead8d2e35fc9a5945e04b9f80f3baf122337c8361c015e5ad904c206579962aefe3eb35a1fbf269515228ae5f34a801d7725d73dc235cf831  100-uclibc-daemon.patch
 601681b9a33e77b33a0393a494c4140aa6c1f174c514093242a4081661bb7f78b6af867100996c97f3bf12e8dd10873dd3e116b61e2a0e04832f4ee470664368  101-caps-uclibc.patch
 42b2385d88e72473fe34c63e1be8cdf7f37688649fe5bf033b5ba17627008b771aec8f0a583e9ad483a20f9e1f7c33922cb42bf5b73adc68aa43fd46c5da1daa  ASTERISK-18995.patch
 19a372c3fc5a5a79dee274051106c4a9f9c27da8b7979613f9cf3f6e4d67d60f67f764f59950722ffa194c501ebb1a23d8ad3b981e57ede46f9f67a2d3e12cec  ASTERISK-19109.patch
-d44242edaf33c02eb03e1819d47632d0eafe3341723e9d6629789d6dfc4838c85f410c5ce8c008c61cd5ee8c27e62ecc050447b0ea32f831b9cc8b1e871ece9d  ASTERISK-19499.patch
 6edd8e0a1dce326aadf659c8bf8ed34083e8247b6c0f032d097c77df25feb93107375ba505e9076c084fe80676336d6c863e04c3c6808a850e24257fd7a7702d  ASTERISK-20527.patch
 e29477aa57d88fedc96d13751f68f302d3892c70b5ea5b5a8cc85d0439335fc1a6847648447b443a074c0877718f23295e3752056a108301d340d1e2919465b1  asterisk.initd
 ab6b6f08ff43268cbb1abb7ed7d678949991ba495682a644bbaeb017d6adbff0a43297905fd73ae8db1786a28d5b5904f1bc253209a0e388c8a27f26c6ce14ed  asterisk.confd
diff --git a/main/asterisk/ASTERISK-19499.patch b/main/asterisk/ASTERISK-19499.patch
deleted file mode 100644
index 704bb19ae3..0000000000
--- a/main/asterisk/ASTERISK-19499.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-From 6edcc6b28494ca4f23f42cf6c8d0fe76bbd1ce14 Mon Sep 17 00:00:00 2001
-From: kharwell <kharwell@f38db490-d61c-443f-a65b-d21fe96a405b>
-Date: Fri, 21 Feb 2014 15:27:53 +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
-
-
-git-svn-id: http://svn.digium.com/svn/asterisk/branches/11@408643 f38db490-d61c-443f-a65b-d21fe96a405b
----
- channels/chan_sip.c | 5 +++--
- main/channel.c      | 9 +++++++++
- 2 files changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index 32439d9..0c61fcd 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -24446,7 +24446,9 @@ static int attempt_transfer(struct sip_dual *transferer, struct sip_dual *target
- 
- 	if (peera && peerb && peerc && (peerb != peerc)) {
- 		ast_quiet_chan(peera);		/* Stop generators */
--		ast_quiet_chan(peerb);
-+		/* no need to quiet peerb since it should be hungup after the
-+		   transfer and the masquerade needs to be able to see if MOH is
-+		   playing on it */
- 		ast_quiet_chan(peerc);
- 		if (peerd)
- 			ast_quiet_chan(peerd);
-@@ -26103,7 +26105,6 @@ static int local_attended_transfer(struct sip_pvt *transferer, struct sip_dual *
- 
- 		ast_do_masquerade(target.chan1);
- 
--		ast_indicate(target.chan1, AST_CONTROL_UNHOLD);
- 		if (target.chan2) {
- 			ast_indicate(target.chan2, AST_CONTROL_UNHOLD);
- 		}
-diff --git a/main/channel.c b/main/channel.c
-index de0affd..a100aea 100644
---- a/main/channel.c
-+++ b/main/channel.c
-@@ -6821,6 +6821,7 @@ int ast_do_masquerade(struct ast_channel *original)
- 	unsigned int orig_disablestatecache;
- 	unsigned int clone_disablestatecache;
- 	int visible_indication;
-+	int moh_is_playing;
- 	int clone_was_zombie = 0;/*!< TRUE if the clonechan was a zombie before the masquerade. */
- 	struct ast_frame *current;
- 	const struct ast_channel_tech *t;
-@@ -6915,6 +6916,8 @@ int ast_do_masquerade(struct ast_channel *original)
- 		xfer_colp = NULL;
- 	}
- 
-+	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.
-@@ -7258,6 +7261,12 @@ int ast_do_masquerade(struct ast_channel *original)
- 		ast_indicate(original, visible_indication);
- 	}
- 
-+	/* 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
-