[Pkg-xmpp-commits] [jabberd2] 02/07: Merge tag 'upstream/2.4.0'

[Simon Josefsson]

This is an automated email from the git hooks/post-receive script.

jas pushed a commit to branch master
in repository jabberd2.

commit 79a30b621ae738ac2620b5096040f2bc6a818695
Merge: 64d9107 baefa8e
Author: Simon Josefsson <simon at josefsson.org>
Date:   Mon Jul 18 13:57:22 2016 +0200

    Merge tag 'upstream/2.4.0'
    
    Upstream version 2.4.0
    
    # gpg: Signatur gjordes mån 18 jul 2016 13:57:21 CEST med RSA nyckel-id 32F8119D
    # gpg: Korrekt signatur från "Simon Josefsson <simon at josefsson.org>"
    # gpg:       även känd som "Simon Josefsson <simon at yubico.com>"

 .gitignore                    |   1 +
 .travis.yml                   |  24 ++++
 Makefile.am                   |   5 +-
 NEWS                          |  52 ++++++++
 README.md                     |   4 +
 c2s/authreg.c                 |   1 +
 c2s/c2s.c                     |  17 ++-
 c2s/c2s.h                     |   3 +
 c2s/main.c                    |  43 ++++---
 configure.ac                  |  35 ++---
 etc/c2s.xml.dist.in           |  13 +-
 etc/router-filter.xml.dist.in |   6 +
 etc/sm.xml.dist.in            |  22 +++-
 jabberd2.pro                  |  41 ++++++
 mio/mio_impl.h                |  49 ++++---
 router/filter.c               |  43 ++++++-
 router/router.c               |  42 +++---
 router/router.h               |   1 +
 router/user.c                 |  18 ++-
 s2s/in.c                      |  20 +--
 s2s/main.c                    |  67 +++++-----
 s2s/out.c                     |  32 +++--
 sm/Makefile.am                |  10 +-
 sm/dispatch.c                 |  24 ++--
 sm/mm.c                       |   5 +-
 sm/mod_announce.c             | 105 +++++++--------
 sm/mod_deliver.c              |   6 +-
 sm/mod_disco.c                |  24 ++--
 sm/mod_iq_version.c           |  38 +++---
 sm/mod_privacy.c              |  29 ++---
 sm/mod_roster_publish.c       |   7 +-
 sm/mod_status.c               |  26 ++--
 sm/mod_template_roster.c      |  16 ++-
 sm/mod_verify.c               | 291 ++++++++++++++++++++++++++++++++++++++++++
 sm/pres.c                     |  21 ++-
 storage/authreg_db.c          |  15 ++-
 storage/authreg_ldap.c        |  13 +-
 storage/authreg_ldapfull.c    |   9 +-
 storage/authreg_mysql.c       |  49 +++----
 storage/authreg_pgsql.c       |  22 ++--
 storage/authreg_sqlite.c      | 146 ++++++++++-----------
 storage/storage.c             |   1 +
 storage/storage.h             |   7 +-
 storage/storage_db.c          |  37 +++++-
 storage/storage_mysql.c       |  43 ++++---
 storage/storage_pgsql.c       |  15 ++-
 storage/storage_sqlite.c      |  84 +++---------
 sx/callback.c                 |   3 +-
 sx/io.c                       |  34 +++--
 sx/plugins.h                  |   7 +-
 sx/sasl.c                     |  49 ++++---
 sx/ssl.c                      | 207 +++++++++++++++---------------
 sx/sx.h                       |  16 ++-
 sx/websocket.c                |  58 +++++----
 tests/Makefile.am             |   2 +-
 tests/check_config.c          |  25 ++--
 tools/db-setup.sqlite         |  19 +++
 tools/git                     |  13 +-
 util/access.c                 |   7 +-
 util/base64.c                 |  95 +++++++++++++-
 util/config.c                 |  19 +--
 util/crypt_blowfish.c         |  17 +--
 util/jid.c                    |  13 +-
 util/nad.c                    | 110 +++++++++++-----
 util/nad.h                    |  24 ++--
 util/sha1.c                   |  20 ++-
 util/xdata.c                  |   3 +-
 67 files changed, 1544 insertions(+), 779 deletions(-)

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