[Pkg-voip-commits] [asterisk] 01/02: 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 944dc47073edab561e139224178b00866a9c475c
Merge: 5918e71 5e4a43f
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Fri Sep 26 20:55:58 2014 +0200

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

 .version                                |   2 +-
 ChangeLog                               | 375 +++++++++++++++++
 LICENSE                                 |   2 +-
 apps/app_dial.c                         |   4 +-
 apps/app_voicemail.c                    |   7 +-
 asterisk-11.12.0-summary.html           | 180 --------
 asterisk-11.12.0-summary.txt            | 237 -----------
 asterisk-11.13.0-summary.html           | 237 +++++++++++
 asterisk-11.13.0-summary.txt            | 321 +++++++++++++++
 channels/chan_iax2.c                    |  38 +-
 channels/chan_sip.c                     |  31 +-
 configs/sip.conf.sample                 |   4 +-
 configure                               | 508 +++++++++++------------
 configure.ac                            |   6 +-
 contrib/scripts/refcounter.py           |  82 +++-
 debian/changelog                        |  21 +-
 debian/patches/aelparse_manpage.patch   |  39 --
 debian/patches/neon_version_check.patch |  19 +
 debian/patches/res_fax_bounds.patch     |  17 +
 debian/patches/series                   |   4 +-
 debian/patches/smsq_manpage.patch       | 157 -------
 debian/rules                            |  14 +-
 doc/aelparse.8                          |  28 ++
 doc/smsq.8                              | 146 +++++++
 funcs/func_config.c                     |   4 +-
 include/asterisk/config.h               |   5 +-
 include/asterisk/utils.h                |   9 +
 main/app.c                              |   4 +-
 main/astobj2.c                          |  12 +-
 main/callerid.c                         |  65 ++-
 main/channel.c                          |  15 +-
 main/cli.c                              |   4 +-
 main/config.c                           |  68 ++-
 main/file.c                             |   4 +-
 main/logger.c                           |  45 +-
 main/manager.c                          |  18 +-
 main/utils.c                            |  25 +-
 menuselect/menuselect.c                 |   2 +-
 res/res_fax_spandsp.c                   |  21 +-
 res/res_musiconhold.c                   |  27 +-
 res/res_rtp_asterisk.c                  | 709 +++++++++++++++++++++-----------
 sounds/Makefile                         |   7 +-
 sounds/sounds.xml                       |  27 ++
 tests/test_callerid.c                   | 165 ++++++++
 tests/test_utils.c                      | 100 ++++-
 45 files changed, 2541 insertions(+), 1274 deletions(-)

diff --cc debian/changelog
index c996853,d9fa9a2..de08768
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,19 +1,25 @@@
- asterisk (1:11.12.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.13.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 28 Aug 2014 15:54:39 +0200
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 26 Sep 2014 20:55:35 +0200
++
+ asterisk (1:11.13.0~dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+     - Drop aelparse_manpage.patch and smsq_manpage.patch, fixed upstream.
+   * Fix an out of bounds error in res_fax.c.
+   * Allow res_calendar_ews to work with neon 0.30.x (Closes: #761677).
+   * Build with all hardening options enabled.
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Fri, 26 Sep 2014 12:30:57 +0200
+ 
+ asterisk (1:11.12.1~dfsg-1) unstable; urgency=high
+ 
+   * New upstream security release, fixes:
+     - AST-2014-010 a.k.a. CVE-2014-6610 (Closes: #762164).
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Mon, 22 Sep 2014 09:53:31 +0200
  
  asterisk (1:11.12.0~dfsg-1) unstable; urgency=medium
  

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