[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 75376caa06aeeaebda89f6c4d314e86d8301adba
Merge: 2a07066 eee02c7
Author: Jeremy Lainé <jeremy.laine at m4x.org>
Date:   Sat Mar 15 16:02:16 2014 +0100

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

 .version                                   |   2 +-
 ChangeLog                                  | 732 +++++++++++++++++++++++++++++
 UPGRADE.txt                                |  37 ++
 addons/chan_ooh323.c                       | 112 ++++-
 addons/ooh323c/src/ooGkClient.c            |   4 +-
 addons/ooh323c/src/ooGkClient.h            |   3 +-
 addons/ooh323c/src/ooTimer.c               |   6 +-
 addons/ooh323c/src/oochannels.c            |   6 +-
 apps/app_chanspy.c                         |   4 +-
 apps/app_confbridge.c                      | 127 +++--
 apps/app_dumpchan.c                        |  24 +-
 apps/app_meetme.c                          |  13 +-
 apps/app_mixmonitor.c                      |   4 +-
 apps/app_queue.c                           |  85 ++--
 apps/app_sms.c                             |   2 +-
 apps/app_verbose.c                         |   6 +-
 apps/confbridge/conf_state.c               |   3 +-
 apps/confbridge/conf_state_inactive.c      |   2 +-
 apps/confbridge/conf_state_multi.c         |   2 +
 apps/confbridge/conf_state_multi_marked.c  |  47 +-
 apps/confbridge/conf_state_single.c        |   2 +
 apps/confbridge/conf_state_single_marked.c |   2 +
 apps/confbridge/include/confbridge.h       |  12 +-
 asterisk-11.7.0-summary.html               | 457 ------------------
 asterisk-11.7.0-summary.txt                | 569 ----------------------
 asterisk-11.8.1-summary.html               |  63 +++
 asterisk-11.8.1-summary.txt                |  94 ++++
 cel/cel_pgsql.c                            |  12 +-
 channels/chan_dahdi.c                      |  13 +-
 channels/chan_iax2.c                       |   4 +-
 channels/chan_sip.c                        | 444 +++++++++--------
 channels/sip/include/sip.h                 |   1 +
 configs/confbridge.conf.sample             |   9 +-
 configs/logger.conf.sample                 |  19 +-
 configure                                  | 116 ++++-
 configure.ac                               |  13 +-
 debian/changelog                           |  28 +-
 debian/control                             |   4 +-
 debian/patches/ASTERISK-23310.patch        |  14 +
 debian/patches/freeradius-client           |   4 +-
 debian/patches/hyphen                      |   4 +-
 debian/patches/pjproject                   |  13 +-
 debian/patches/series                      |   2 +
 debian/patches/smsq_enable.patch           |  11 +
 funcs/func_db.c                            |   2 +-
 funcs/func_env.c                           |   2 +-
 funcs/func_lock.c                          |   2 +-
 funcs/func_realtime.c                      |   2 +-
 funcs/func_shell.c                         |   2 +-
 funcs/func_strings.c                       |  79 +++-
 funcs/func_timeout.c                       |  18 +-
 include/asterisk/logger.h                  | 101 +++-
 include/asterisk/rtp_engine.h              |   8 +-
 include/asterisk/test.h                    |   2 +-
 main/asterisk.c                            | 196 +++++---
 main/channel.c                             |  15 +-
 main/cli.c                                 | 361 +++++++++-----
 main/config.c                              |  23 +-
 main/db.c                                  |  26 +-
 main/http.c                                |  51 +-
 main/loader.c                              |  30 +-
 main/logger.c                              | 228 +++++++--
 main/manager.c                             |  61 ++-
 main/pbx.c                                 |  44 +-
 main/rtp_engine.c                          |   4 +-
 main/say.c                                 |   4 +-
 main/tcptls.c                              |   2 +-
 main/translate.c                           |  63 ++-
 main/xmldoc.c                              |   3 +-
 pbx/pbx_lua.c                              |  13 +-
 res/Makefile                               |   6 +-
 res/res_calendar.c                         |   5 +-
 res/res_fax.c                              |   4 +-
 res/res_fax_spandsp.c                      |   6 +-
 res/res_rtp_asterisk.c                     |  55 ++-
 sounds/Makefile                            |   9 +-
 76 files changed, 2733 insertions(+), 1825 deletions(-)

diff --cc debian/changelog
index dac9968,78d7ace..c19a224
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,26 +1,32 @@@
- asterisk (1:11.7.0~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
++asterisk (1:11.8.1~dfsg-1~bpo70+1) wheezy-backports; urgency=medium
 +
 +  * Backport to wheezy.
 +
-  -- Jeremy Lainé <jeremy.laine at m4x.org>  Sun, 22 Dec 2013 12:28:42 +0100
++ -- Jeremy Lainé <jeremy.laine at m4x.org>  Sat, 15 Mar 2014 16:01:48 +0100
++
+ asterisk (1:11.8.1~dfsg-1) unstable; urgency=high
+ 
+   * New upstream security release (Closes: #741313).
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 11 Mar 2014 07:44:54 +0100
+ 
+ asterisk (1:11.8.0~dfsg-2) unstable; urgency=medium
+ 
+   * Really fix versioned Breaks/Replaces for asterisk-dahdi (Closes: #732419).
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Thu, 06 Mar 2014 07:38:11 +0100
+ 
+ asterisk (1:11.8.0~dfsg-1) unstable; urgency=low
+ 
+   [ Jeremy Lainé ]
+   * New upstream release.
+     - rasterisk no longer prints a warning when live_dangerously is set.
+   * Patch ASTERISK-23310: fixes crash when a leg of a remote RTP bridge fails.
+ 
+   [ Frederic Van Espen ]
+   * smsq_enable.patch: enable smsq compilation (Closes: #738588)
+ 
+  -- Jeremy Lainé <jeremy.laine at m4x.org>  Tue, 04 Mar 2014 16:27:58 +0100
  
  asterisk (1:11.7.0~dfsg-1) unstable; urgency=high
  

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