[Pkg-voip-commits] [asterisk] 01/01: Merge branch 'master' into wheezy-backports

[Jeremy Lainé]

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

sharky pushed a commit to branch wheezy-backports
in repository asterisk.

commit acee1f106081e9d3ee825ba494adda3f2291897b
Merge: 429c298 5ac831c
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Sun Jun 15 10:04:20 2014 +0200

    Merge branch 'master' into wheezy-backports
    
    Conflicts:
    	debian/changelog

 .version                      |   2 +-
 ChangeLog                     |  69 ++++++
 UPGRADE.txt                   |  13 +
 apps/app_mixmonitor.c         |   8 +-
 asterisk-11.10.0-summary.html | 400 ------------------------------
 asterisk-11.10.0-summary.txt  | 500 --------------------------------------
 asterisk-11.10.2-summary.html |  68 ++++++
 asterisk-11.10.2-summary.txt  | 103 ++++++++
 channels/chan_sip.c           |  12 +-
 configs/http.conf.sample      |   6 +
 debian/changelog              |  12 +-
 include/asterisk/tcptls.h     |  63 ++++-
 include/asterisk/utils.h      |   1 +
 main/http.c                   |  39 ++-
 main/manager.c                |  81 +++----
 main/tcptls.c                 | 553 +++++++++++++++++++++++++++++++++++-------
 main/utils.c                  |  21 +-
 res/res_http_websocket.c      |   9 +-
 18 files changed, 917 insertions(+), 1043 deletions(-)

diff --cc debian/changelog
index fc0a86d,d10c735..99e9b0e
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,10 +1,16 @@@
- asterisk (1:11.10.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.10.2~dfsg-1~bpo70+1) wheezy-backports; urgency=high
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Mon, 09 Jun 2014 08:05:58 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Sun, 15 Jun 2014 10:03:48 +0200
++
+ asterisk (1:11.10.2~dfsg-1) unstable; urgency=high
+ 
+   * New upstream security release, fixes:
+     - AST-2014-006: Asterisk Manager User Unauthorized Shell Access
+     - AST-2014-007: Exhaustion of Allowed Concurrent HTTP Connections
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 13 Jun 2014 22:02:37 +0200
  
  asterisk (1:11.10.0~dfsg-1) unstable; urgency=medium
  

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