[asterisk: 2/3] Merge remote-tracking branch 'origin/master'

[Jeffrey C. Ollie]

commit a431d9bd01851f631d00b2b4136a277587e338cc
Merge: 3e209d4 6708cb4
Author: Jeffrey C. Ollie <jeff at ocjtech.us>
Date:   Thu Nov 20 18:32:14 2014 -0600

    Merge remote-tracking branch 'origin/master'
    
    Conflicts:
    	asterisk.spec

 asterisk-11.13.1-libsrtp-15.patch |   12 ++++++++++++
 asterisk.spec                     |   12 +++++++++---
 2 files changed, 21 insertions(+), 3 deletions(-)
---
diff --cc asterisk.spec
index 4b32113,dab1c34..473311a
--- a/asterisk.spec
+++ b/asterisk.spec
@@@ -609,20 -528,11 +610,21 @@@ Conflicts: asterisk-voicemail-odbc <= %
  Voicemail implementation for Asterisk that stores voicemail on the
  local filesystem.
  
 +%package xmpp
 +Summary: Jabber/XMPP resources for Asterisk
 +Group: Applications/Internet
 +Requires: asterisk = %{version}-%{release}
 +Obsoletes: asterisk-jabber < 13.0.0
 +Conflicts: asterisk-jabber < 13.0.0
 +
 +%description xmpp
 +Jabber/XMPP resources for Asterisk.
 +
  %prep
  %setup -q -n asterisk-%{version}%{?_rc:-rc%{_rc}}%{?_beta:-beta%{_beta}}
- #patch1 -p1
- #patch2 -p1
+ %patch1 -p1
+ %patch2 -p1
+ %patch3 -p1
  
  cp %{S:3} menuselect.makedeps
  cp %{S:4} menuselect.makeopts
@@@ -1599,72 -1412,10 +1601,76 @@@ f
  %{_libdir}/asterisk/modules/app_directory_plain.so
  %{_libdir}/asterisk/modules/app_voicemail_plain.so
  
 +%files xmpp
 +%defattr(-,root,root,-)
 +%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/motif.conf
 +%attr(0640,asterisk,asterisk) %config(noreplace) %{_sysconfdir}/asterisk/xmpp.conf
 +%{_libdir}/asterisk/modules/chan_motif.so
 +%{_libdir}/asterisk/modules/res_xmpp.so
 +
  %changelog
- * Sat Oct 25 2014 Jeffrey C. Ollie <jeff at ocjtech.us> - 13.0.0-1
++
++* Thu Nov 20 2014 Jeffrey C. Ollie <jeff at ocjtech.us> - 13.0.0-1
 +- The Asterisk Development Team is pleased to announce the release of
 +- Asterisk 13.0.0. This release is available for immediate download at
 +- http://downloads.asterisk.org/pub/telephony/asterisk/releases
 +-
 +- Asterisk 13 is the next major release series of Asterisk. It is a Long Term
 +- Support (LTS) release, similar to Asterisk 11. For more information about
 +- support time lines for Asterisk releases, see the Asterisk versions page:
 +- https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
 +-
 +- For important information regarding upgrading to Asterisk 13, please see the
 +- Asterisk wiki:
 +-
 +- https://wiki.asterisk.org/wiki/display/AST/Upgrading+to+Asterisk+13
 +-
 +- A short list of new features includes:
 +-
 +- * Asterisk security events are now provided via AMI, allowing end users to
 +-   monitor their Asterisk system in real time for security related issues.
 +-
 +- * Both AMI and ARI now allow external systems to control the state of a mailbox.
 +-   Using AMI actions or ARI resources, external systems can programmatically
 +-   trigger Message Waiting Indicators (MWI) on subscribed phones. This is of
 +-   particular use to those who want to build their own VoiceMail application
 +-   using ARI.
 +-
 +- * ARI now supports the reception/transmission of out of call text messages using
 +-   any supported channel driver/protocol stack through ARI. Users receive out of
 +-   call text messages as JSON events over the ARI websocket connection, and can
 +-   send out of call text messages using HTTP requests.
 +-
 +- * The PJSIP stack now supports RFC 4662 Resource Lists, allowing Asterisk to act
 +-   as a Resource List Server. This includes defining lists of presence state,
 +-   mailbox state, or lists of presence state/mailbox state; managing
 +-   subscriptions to lists; and batched delivery of NOTIFY requests to
 +-   subscribers.
 +-
 +- * The PJSIP stack can now be used as a means of distributing device state or
 +-   mailbox state via PUBLISH requests to other Asterisk instances. This is
 +-   analogous to Asterisk's clustering support using XMPP or Corosync; unlike
 +-   existing clustering mechanisms, using the PJSIP stack to perform the
 +-   distribution of state does not rely on another daemon or server to perform the
 +-   work.
 +-
 +- And much more!
 +-
 +- More information about the new features can be found on the Asterisk wiki:
 +-
 +- https://wiki.asterisk.org/wiki/display/AST/Asterisk+13+Documentation
 +-
 +- A full list of all new features can also be found in the CHANGES file:
 +-
 +- http://svnview.digium.com/svn/asterisk/branches/13/CHANGES
 +-
 +- For a full list of changes in the current release, please see the ChangeLog:
 +-
 +- http://downloads.asterisk.org/pub/telephony/asterisk/releases/ChangeLog-13.0.0
 +
+ * Fri Nov 14 2014 Tom Callaway <spot at fedoraproject.org> - 11.13.1-2
+ - rebuild for new libsrtp
+ 
  * Mon Oct 20 2014 Jeffrey C. Ollie <jeff at ocjtech.us> - 11.13.1-1
  - The Asterisk Development Team has announced security releases for Certified
  - Asterisk 1.8.28 and 11.6 and Asterisk 1.8, 11, 12, and 13. The available