[Pkg-voip-commits] [asterisk] 01/01: drop ASTERISK-23310 patch, fixed upstream

[Jeremy Lainé]

This is an automated email from the git hooks/post-receive script.

sharky pushed a commit to branch master
in repository asterisk.

commit 841c0569e3cb406bfcfd5ca522eff6c3a1e3b1ad
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Mon Apr 28 14:25:39 2014 +0200

    drop ASTERISK-23310 patch, fixed upstream
---
 debian/changelog                    |  1 +
 debian/patches/ASTERISK-23310.patch | 14 --------------
 debian/patches/series               |  1 -
 3 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8b308b6..71a368b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 asterisk (1:11.9.0~dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream release.
+    - Drop ASTERISK-23310 patch, fixed upstream.
     - Drop dahdi_pri_event_removed patch, fixed upstream.
     - Drop freeradius-client patch, fixed upstream.
     - Drop hyphen patch, fixed upstream.
diff --git a/debian/patches/ASTERISK-23310.patch b/debian/patches/ASTERISK-23310.patch
deleted file mode 100644
index 533cb95..0000000
--- a/debian/patches/ASTERISK-23310.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: fixes a crash when one leg of a remote RTP bridge fails
-Author: Kinsey Moore <kmoore at digium.com>
-Bug: https://issues.asterisk.org/jira/browse/ASTERISK-23310
---- a/main/rtp_engine.c	(revision 408955)
-+++ b/main/rtp_engine.c	(working copy)
-@@ -1391,7 +1391,7 @@
- 				*rc = who;
- 				ast_debug(1, "Got a FRAME_CONTROL (%d) frame on channel %s\n", fr->subclass.integer, ast_channel_name(who));
- 				res = AST_BRIDGE_COMPLETE;
--				goto remote_bridge_cleanup;
-+				break;
- 			}
- 		} else {
- 			if ((fr->frametype == AST_FRAME_DTMF_BEGIN) ||
diff --git a/debian/patches/series b/debian/patches/series
index 13ce368..5f944e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -29,4 +29,3 @@ dahdi_create_channels
 reenable
 ignore_failed_channels.patch
 smsq_enable.patch
-ASTERISK-23310.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-voip/asterisk.git