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

[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 849f9fbb9f53c496f24bbca7abb0918e984abe6b
Merge: 23c5e44 f80b0f1
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Jun 13 11:51:34 2014 +0200

    Merge tag 'upstream/1.3.5'
    
    Upstream version 1.3.5

 ChangeLog                                          | 450 +++++++++++++++-
 NEWS                                               |  24 +-
 RELEASE_NOTES                                      |  56 +-
 contrib/mod_ban.c                                  |  85 ++-
 contrib/mod_exec.c                                 |  11 +-
 contrib/mod_ifsession.c                            |   9 +-
 contrib/mod_sftp/auth-kbdint.c                     |  26 +-
 contrib/mod_sftp/auth-password.c                   |  27 +-
 contrib/mod_sftp/auth.c                            |   7 +-
 contrib/mod_sftp/cipher.c                          |  32 +-
 contrib/mod_sftp/mod_sftp.c                        |  16 +-
 contrib/mod_sftp/mod_sftp.h.in                     |   5 +-
 contrib/mod_sql.c                                  |  55 +-
 contrib/mod_sql_passwd.c                           | 235 ++++++--
 contrib/mod_tls.c                                  | 247 ++++++---
 contrib/mod_wrap2/mod_wrap2.c                      |  70 ++-
 doc/contrib/mod_ban.html                           |  11 +-
 doc/contrib/mod_sftp.html                          |  57 +-
 doc/contrib/mod_site_misc.html                     |   8 +-
 doc/contrib/mod_sql_passwd.html                    |  16 +-
 doc/howto/Chroot.html                              |   6 +-
 doc/howto/TLS.html                                 |   6 +-
 doc/modules/mod_core.html                          | 105 +++-
 doc/modules/mod_rlimit.html                        |  48 +-
 include/fsio.h                                     |   8 +-
 include/version.h                                  |   6 +-
 locale/files.txt                                   |   2 +
 modules/mod_core.c                                 |  32 +-
 modules/mod_delay.c                                |  15 +-
 modules/mod_facl.c                                 |   9 +-
 modules/mod_rlimit.c                               |  87 ++-
 modules/mod_xfer.c                                 |  34 +-
 proftpd.spec                                       |   6 +-
 src/fsio.c                                         | 277 +++++++++-
 src/stash.c                                        |   6 +-
 tests/t/config/passiveports.t                      |  11 +
 tests/t/config/rlimitchroot.t                      |  11 +
 tests/t/lib/ProFTPD/Tests/Commands/MKD.pm          | 141 +++++
 .../ProFTPD/Tests/Config/DeleteAbortedStores.pm    | 304 +++++++++++
 .../{DeleteAbortedStores.pm => PassivePorts.pm}    | 225 ++++----
 tests/t/lib/ProFTPD/Tests/Config/RLimitChroot.pm   | 597 +++++++++++++++++++++
 tests/t/lib/ProFTPD/Tests/Config/SocketOptions.pm  | 144 +++++
 tests/t/lib/ProFTPD/Tests/Logging/ExtendedLog.pm   |  32 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_ban.pm       | 372 +++++++++++++
 tests/t/lib/ProFTPD/Tests/Modules/mod_rewrite.pm   | 280 +++++++++-
 tests/t/lib/ProFTPD/Tests/Modules/mod_sftp.pm      | 402 +++++++++++++-
 .../lib/ProFTPD/Tests/Modules/mod_sftp/rewrite.pm  | 176 ++++++
 .../t/lib/ProFTPD/Tests/Modules/mod_sql_passwd.pm  | 201 +++++++
 .../t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm  | 199 +++++++
 tests/t/lib/ProFTPD/Tests/Modules/mod_tls.pm       |  91 +++-
 .../t/lib/ProFTPD/Tests/Modules/mod_wrap2_file.pm  | 196 +++++++
 tests/tests.pl                                     |   2 +
 52 files changed, 5041 insertions(+), 437 deletions(-)

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