[Astlinux-commits] SF.net SVN: astlinux:[7943] branches/1.0/package/asterisk

[<abe...@us...>]

Revision: 7943
          http://sourceforge.net/p/astlinux/code/7943
Author:   abelbeck
Date:     2016-11-11 14:48:21 +0000 (Fri, 11 Nov 2016)
Log Message:
-----------
asterisk, version bump to 13.12.2

Modified Paths:
--------------
    branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
    branches/1.0/package/asterisk/asterisk.mk

Removed Paths:
-------------
    branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch

Modified: branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk-13-extension-changed-verbosity-chan_sip.patch	2016-11-11 14:48:21 UTC (rev 7943)
@@ -1,6 +1,6 @@
 --- asterisk-13/channels/chan_sip.c.orig	2015-04-23 10:22:04.000000000 -0500
 +++ asterisk-13/channels/chan_sip.c	2015-04-23 10:22:40.000000000 -0500
-@@ -17358,7 +17358,7 @@
+@@ -17356,7 +17356,7 @@
  	}
  
  	if (!force) {

Deleted: branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch
===================================================================
--- branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch	2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk-13-upstream-chan_sip-revert-lastrtprx-fix.patch	2016-11-11 14:48:21 UTC (rev 7943)
@@ -1,17 +0,0 @@
-X-Git-Url: http://git.asterisk.org/gitweb/?p=asterisk%2Fasterisk.git;a=blobdiff_plain;f=channels%2Fchan_sip.c;h=b661f0de227ff5023155faf7181892b28699a519;hp=b6b4cc86e50c7eb36d26abb0620f0f5c3fbb09e0;hb=cb30963d222cb1e12af9bbf8dfed58001c9fcaf4;hpb=57a9797e0ac51eae3b8f3254627646b9698a60d2
-
-diff --git a/channels/chan_sip.c b/channels/chan_sip.c
-index b6b4cc8..b661f0d 100644
---- a/channels/chan_sip.c
-+++ b/channels/chan_sip.c
-@@ -8628,9 +8628,7 @@ static struct ast_frame *sip_read(struct ast_channel *ast)
- 
- 	sip_pvt_lock(p);
- 	fr = sip_rtp_read(ast, p, &faxdetected);
--	if (fr && fr->frametype != AST_FRAME_NULL) {
--		p->lastrtprx = time(NULL);
--	}
-+	p->lastrtprx = time(NULL);
- 
- 	/* If we detect a CNG tone and fax detection is enabled then send us off to the fax extension */
- 	if (faxdetected && ast_test_flag(&p->flags[1], SIP_PAGE2_FAX_DETECT_CNG)) {

Modified: branches/1.0/package/asterisk/asterisk.mk
===================================================================
--- branches/1.0/package/asterisk/asterisk.mk	2016-11-11 14:02:14 UTC (rev 7942)
+++ branches/1.0/package/asterisk/asterisk.mk	2016-11-11 14:48:21 UTC (rev 7943)
@@ -7,7 +7,7 @@
 ASTERISK_VERSION := 11.24.1
 else
  ifeq ($(BR2_PACKAGE_ASTERISK_v13),y)
-ASTERISK_VERSION := 13.12.1
+ASTERISK_VERSION := 13.12.2
  else
 ASTERISK_VERSION := 15.0.0
  endif

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.