[ejabberd/f14/master: 3/3] Merge branch 'master' into f14/master

[Peter Lemenkov]

commit 842228315e9ddb5a0ca89f7762678956a723aa0a
Merge: bc33ebe 695666a
Author: Peter Lemenkov <lemenkov at gmail.com>
Date:   Wed Aug 18 15:04:25 2010 +0400

    Merge branch 'master' into f14/master
    
    Conflicts:
    	ejabberd-0001-Fix-PAM-service-example-name-to-match-actual-one.patch
    	ejabberd-0002-Mention-mod_ctlextra-as-an-ejabberd-module.patch
    	ejabberd-0003-Fixed-delays-in-s2s-connections.patch
    	ejabberd-0004-Introducing-mod_admin_extra.patch
    	ejabberd-0005-Fedora-specific-changes-to-ejabberdctl.patch
    	ejabberd-0006-Change-directory-to-readable-by-everyone.patch
    	ejabberd-0007-Install-.so-objects-with-0755-permissions.patch
    	ejabberd-0008-Use-versioned-directory-for-storing-docs.patch
    	ejabberd-0009-Support-SASL-GSSAPI-authentication-thanks-to-Mikael-.patch
    	ejabberd-0009-Use-versioned-directory-for-storing-docs.patch
    	ejabberd-0012-Use-versioned-directory-for-storing-docs.patch
    	ejabberd.spec

 ...-service-example-name-to-match-actual-one.patch |    4 +-
 ...ention-mod_ctlextra-as-an-ejabberd-module.patch |    4 +-
 ...berd-0003-Fixed-delays-in-s2s-connections.patch |    4 +-
 ejabberd-0004-Introducing-mod_admin_extra.patch    |    4 +-
 ...05-Fedora-specific-changes-to-ejabberdctl.patch |    4 +-
 ...-Change-directory-to-readable-by-everyone.patch |    6 +-
 ...Install-.so-objects-with-0755-permissions.patch |    6 +-
 ...-Use-versioned-directory-for-storing-docs.patch |    6 +-
 ...L-GSSAPI-authentication-thanks-to-Mikael-.patch |  366 +++++++++++---------
 ejabberd-0010-Fix-http-poll.patch                  |   28 ++
 ejabberd.spec                                      |   33 ++-
 11 files changed, 278 insertions(+), 187 deletions(-)
---
diff --cc ejabberd.spec
index db5c8e8,797b9b9..c695384
--- a/ejabberd.spec
+++ b/ejabberd.spec
@@@ -351,6 -354,13 +354,14 @@@ rm -rf %{buildroot
  %doc %{_docdir}/%{name}-%{version}/*.txt
  
  %changelog
+ * Wed Aug 18 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.5-3
+ - Fixed http-poll (BOSH)
+ - New version of GSSAPI patch (backported from upstream)
++- Fixed logrotate rule
+ 
+ * Wed Aug  4 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.5-2
+ - Don't require dos2unix for building anymore
+ 
  * Wed Aug  4 2010 Peter Lemenkov <lemenkov at gmail.com> 2.1.5-1
  - Ver. 2.1.5
  - OpenSSL >= 0.9.8