diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-26 14:59:25 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-01-26 14:59:25 +0000 |
| commit | 922a5d4eefa566f0c84a6c5e7767c268a78516b4 (patch) | |
| tree | c34a4f6b34a978c5b86170961d8802459150a39f | |
| parent | 6037da537be955dbce4944c201531c2c53d0d5f8 (diff) | |
| download | aports-922a5d4eefa566f0c84a6c5e7767c268a78516b4.tar.bz2 aports-922a5d4eefa566f0c84a6c5e7767c268a78516b4.tar.xz | |
main/asterisk: upgrade to 1.6.0.21
| -rw-r--r-- | main/asterisk/400-destroy-no-response-234131.patch | 39 | ||||
| -rw-r--r-- | main/asterisk/APKBUILD | 8 |
2 files changed, 3 insertions, 44 deletions
diff --git a/main/asterisk/400-destroy-no-response-234131.patch b/main/asterisk/400-destroy-no-response-234131.patch deleted file mode 100644 index 16eef510..00000000 --- a/main/asterisk/400-destroy-no-response-234131.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- 1.6.0/channels/chan_sip.c 2009/12/10 16:24:36 234130 -+++ 1.6.0/channels/chan_sip.c 2009/12/10 16:30:22 234131 -@@ -4523,6 +4523,9 @@ - ast_queue_control(p->owner, AST_CONTROL_CONGESTION); - ast_channel_unlock(p->owner); - } -+ -+ /* Give the channel a chance to act before we proceed with destruction */ -+ sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); - } - sip_pvt_unlock(p); - return 0; -@@ -5186,19 +5189,20 @@ - if (needcancel) { /* Outgoing call, not up */ - if (ast_test_flag(&p->flags[0], SIP_OUTGOING)) { - /* stop retransmitting an INVITE that has not received a response */ -- struct sip_pkt *cur; -- for (cur = p->packets; cur; cur = cur->next) { -- __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data)); -- } -- - /* if we can't send right now, mark it pending */ - if (p->invitestate == INV_CALLING) { - /* We can't send anything in CALLING state */ - ast_set_flag(&p->flags[0], SIP_PENDINGBYE); -- /* Do we need a timer here if we don't hear from them at all? */ -+ __sip_pretend_ack(p); -+ /* Do we need a timer here if we don't hear from them at all? Yes we do or else we will get hung dialogs and those are no fun. */ - sip_scheddestroy(p, DEFAULT_TRANS_TIMEOUT); - append_history(p, "DELAY", "Not sending cancel, waiting for timeout"); - } else { -+ struct sip_pkt *cur; -+ -+ for (cur = p->packets; cur; cur = cur->next) { -+ __sip_semi_ack(p, cur->seqno, cur->is_resp, cur->method ? cur->method : find_sip_method(cur->data)); -+ } - p->invitestate = INV_CANCELLED; - /* Send a new request: CANCEL */ - transmit_request(p, SIP_CANCEL, p->lastinvite, XMIT_RELIABLE, FALSE); diff --git a/main/asterisk/APKBUILD b/main/asterisk/APKBUILD index d76ed956..6adc2b15 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=1.6.0.20 -pkgrel=1 +pkgver=1.6.0.21 +pkgrel=0 pkgdesc="Asterisk: A Module Open Source PBX System" url="http://www.asterisk.org/" license="GPL" @@ -20,7 +20,6 @@ source="http://downloads.digium.com/pub/asterisk/releases/$pkgname-$pkgver.tar.g 103-rundir.patch 201-incomplete.patch 301-libpri-autoconf.patch - 400-destroy-no-response-234131.patch asterisk.initd asterisk.confd asterisk.logrotate" @@ -91,14 +90,13 @@ tds() { _find_and_move '*_tds*' } -md5sums="649c905c897824cebcf9bc2cee1f9398 asterisk-1.6.0.20.tar.gz +md5sums="a172fb030adab50bdff6ae3b5e765283 asterisk-1.6.0.21.tar.gz b00c9d98ce2ad445501248a197c6e436 100-uclibc-daemon.patch 6e1129e30c4fd2c25c86c81685a485a9 101-caps-uclibc.patch 97b39fd9777a2521d4f9f095482b7ac2 102-gsm-pic.patch 5008f51c737ec91f5047519bc9f25b85 103-rundir.patch 57825b74526187075ff7cb6816c55467 201-incomplete.patch 5771a5ab34b187dbfe8e23950b04213b 301-libpri-autoconf.patch -e35d40d688f6e4e4034c7aca8f955f46 400-destroy-no-response-234131.patch 0ce3219e05f55af884a7dc6b99c2b276 asterisk.initd ed31d7ba37bcf8b0346dcf8593c395f0 asterisk.confd 3e65172275684373e1a25c8a11224411 asterisk.logrotate" |