[Pkg-voip-commits] [asterisk] 02/02: Merge branch 'jessie' 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 d4bdf57a16fac9aa135b80620014d8c2a649bfa7
Merge: 944dc47 2feeab3
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Tue Jan 27 20:32:30 2015 +0100

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

 .version                          |   2 +-
 ChangeLog                         |  26 +++
 UPGRADE.txt                       |  12 ++
 asterisk-11.13.0-summary.html     | 237 ----------------------------
 asterisk-11.13.0-summary.txt      | 321 --------------------------------------
 asterisk-11.13.1-summary.html     |  65 ++++++++
 asterisk-11.13.1-summary.txt      |  95 +++++++++++
 debian/changelog                  |  23 ++-
 debian/gbp.conf                   |   3 +
 debian/patches/AST-2014-012.patch |  33 ++++
 debian/patches/AST-2014-014.patch |  83 ++++++++++
 debian/patches/AST-2014-017.patch |  54 +++++++
 debian/patches/AST-2014-018.patch |  40 +++++
 debian/patches/AST-2014-019.patch |  99 ++++++++++++
 debian/patches/series             |   6 +
 debian/rules                      |  12 ++
 main/tcptls.c                     |  24 ++-
 res/res_jabber.c                  |   7 +-
 res/res_xmpp.c                    |   8 +-
 19 files changed, 579 insertions(+), 571 deletions(-)

diff --cc debian/changelog
index de08768,bfd58c3..b69e02d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,21 +1,27 @@@
- asterisk (1:11.13.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.13.1~dfsg-2~bpo70+1) wheezy-backports; urgency=high
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 26 Sep 2014 20:55:35 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 27 Jan 2015 20:32:20 +0100
++
+ asterisk (1:11.13.1~dfsg-2) testing-proposed-updates; urgency=high
+ 
+   * New upstream release: fixes AST-2014-011 (CVE-2014-3566, POODLE).
+   * Add a local gbp.conf for branch jessie
+   * New patches for recent security issues (Closes: #771463):
+     - AST-2014-012 (CVE-2014-8412): Mixed IP address families in ACLs
+       may permit unwanted traffic
+     - AST-2014-014 (CVE-2014-8414): High call load may result in hung
+       channels in ConfBridge
+     - AST-2014-017 (CVE-2014-8417): Mark CONFBRIDGE as a sensitive
+       function for external APIs
+     - AST-2014-018 (CVE-2014-8418): Mark DB as a sensitive function for
+       external APIs
+   * AST-2014-019.patch (CVE-2014-9374): Remote Crash Vulnerability in
+     WebSocket Server (Closes: #773230).
+   * sanity check to avoid changing the ABI hash.
+ 
+  -- Tzafrir Cohen <tzafrir at debian.org>  Thu, 01 Jan 2015 01:25:11 +0200
  
  asterisk (1:11.13.0~dfsg-1) unstable; urgency=medium
  

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