[proftpd-dfsg] 02/03: Merge tag 'upstream/1.3.5b'

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit 52729f79b3f6fd0448af8719abf9623b3897f5aa
Merge: 93c05e0 94ac349
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sat Dec 10 20:47:53 2016 +0100

    Merge tag 'upstream/1.3.5b'
    
    Upstream version 1.3.5b

 Make.rules.in                  |   1 +
 NEWS                           |  23 ++++-
 RELEASE_NOTES                  |   7 ++
 configure                      |  22 ++++-
 configure.in                   |  22 ++++-
 contrib/dist/rpm/proftpd.spec  |   2 +-
 contrib/mod_geoip.c            |  24 ++---
 contrib/mod_ldap.c             |   9 ++
 contrib/mod_sftp/fxp.c         |  53 ++++++++---
 contrib/mod_sftp/kbdint.c      |   8 +-
 contrib/mod_sftp/kex.c         | 201 ++++++++++++++++++++++++++++++-----------
 contrib/mod_sftp/keys.c        |  45 +++++----
 contrib/mod_sftp/mod_sftp.c    |   8 +-
 contrib/mod_sftp/mod_sftp.h.in |   4 +-
 contrib/mod_sftp/scp.c         | 119 ++++++++++++++----------
 contrib/mod_sftp/utf8.c        |   6 +-
 contrib/mod_sftp_pam.c         |   2 +-
 contrib/mod_sql_mysql.c        |  12 ++-
 contrib/mod_tls.c              | 181 +++++++++++++++++++++++++++++++------
 include/version.h              |   4 +-
 lib/Makefile.in                |   4 +-
 lib/tpl.c                      |   4 -
 modules/Makefile.in            |   4 +-
 modules/mod_auth.c             |  36 +++++---
 modules/mod_core.c             |   4 +-
 modules/mod_facts.c            |  69 +++++++-------
 modules/mod_log.c              |  26 ++++--
 modules/mod_ls.c               |  54 +++++++++++
 modules/mod_xfer.c             |  37 +++++---
 src/Makefile.in                |   4 +-
 src/data.c                     |  30 ++++--
 src/encode.c                   |   8 +-
 src/fsio.c                     |  27 +++++-
 src/ftpscrub.c                 | 145 -----------------------------
 src/inet.c                     |   2 +
 src/main.c                     |  11 ++-
 src/pool.c                     |  59 ++++++------
 src/support.c                  |   6 +-
 tests/api/fsio.c               |  16 ++++
 tests/api/str.c                |   3 +-
 utils/Makefile.in              |   4 +-
 41 files changed, 841 insertions(+), 465 deletions(-)

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