[proftpd-dfsg] 02/04: Merge tag 'upstream/1.3.6'

Francesco Lovergine frankie at moszumanska.debian.org
Tue Feb 6 14:22:18 GMT 2018


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

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

commit 152c4d4d1df3a8a986182d173c5b68f11051bf77
Merge: 989994f 8eade2a
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Tue Feb 6 13:58:03 2018 +0100

    Merge tag 'upstream/1.3.6'
    
    Upstream version 1.3.6

 .gitattributes                                     |     2 +
 .github/ISSUE_TEMPLATE.md                          |    25 +
 .gitignore                                         |    84 +-
 .travis.yml                                        |    56 +-
 CREDITS                                            |    20 +-
 ChangeLog                                          |  6927 ++++-
 Make.rules.in                                      |    34 +-
 Makefile.in                                        |     4 +-
 NEWS                                               |   141 +-
 README                                             |   122 -
 README.md                                          |   100 +
 RELEASE_NOTES                                      |  1059 +-
 acconfig.h                                         |     3 -
 config.h.in                                        |   128 +-
 configure                                          |  9721 ++++---
 configure.in                                       |  1125 +-
 src/pidfile.c => contrib/dist/coverity/modeling.c  |    69 +-
 contrib/dist/rpm/proftpd.service                   |     2 +
 contrib/dist/rpm/proftpd.spec                      |   155 +-
 contrib/dist/systemd/README.systemd                |    25 +
 contrib/dist/systemd/proftpd.socket                |    16 +
 contrib/dist/systemd/proftpd at .service              |     7 +
 contrib/dist/travis/docker-rpmbuild.sh             |    30 +
 contrib/dist/vagrant/README.md                     |     9 +
 contrib/dist/vagrant/Vagrantfile                   |    21 +
 contrib/ftpasswd                                   |    49 +-
 contrib/ftpquota                                   |    26 +-
 contrib/{mod_snmp => mod_auth_otp}/Makefile.in     |    41 +-
 contrib/mod_auth_otp/auth-otp.8                    |    34 +
 contrib/mod_auth_otp/auth-otp.c                    |   290 +
 contrib/mod_auth_otp/base32.c                      |   177 +
 .../{mod_sftp/service.h => mod_auth_otp/base32.h}  |    21 +-
 contrib/mod_auth_otp/config.guess                  |  1530 ++
 contrib/mod_auth_otp/config.sub                    |  1779 ++
 contrib/{mod_sftp => mod_auth_otp}/configure       |   221 +-
 contrib/{mod_sftp => mod_auth_otp}/configure.in    |   139 +-
 contrib/mod_auth_otp/crypto.c                      |   128 +
 .../{mod_sftp/service.h => mod_auth_otp/crypto.h}  |    24 +-
 contrib/mod_auth_otp/db.c                          |   461 +
 contrib/mod_auth_otp/db.h                          |    60 +
 contrib/mod_auth_otp/install-sh                    |   250 +
 contrib/mod_auth_otp/mod_auth_otp.c                |  1069 +
 .../mod_auth_otp.h.in}                             |    72 +-
 contrib/mod_auth_otp/otp.c                         |   134 +
 contrib/{mod_sftp/kbdint.h => mod_auth_otp/otp.h}  |    37 +-
 contrib/mod_auth_otp/t/Makefile.in                 |    62 +
 contrib/mod_auth_otp/t/api/base32.c                |   139 +
 contrib/mod_auth_otp/t/api/otp.c                   |   262 +
 .../mod_auth_otp/t/api/stubs.c                     |    74 +-
 contrib/mod_auth_otp/t/api/tests.c                 |   121 +
 .../mkhome.h => contrib/mod_auth_otp/t/api/tests.h |    41 +-
 contrib/mod_ban.c                                  |   857 +-
 contrib/mod_copy.c                                 |   273 +-
 contrib/mod_ctrls_admin.c                          |   408 +-
 contrib/mod_deflate.c                              |   138 +-
 contrib/mod_digest.c                               |  2920 +++
 contrib/mod_dnsbl/Makefile.in                      |     2 +-
 contrib/mod_dnsbl/configure                        |    76 +-
 contrib/mod_dnsbl/configure.in                     |    25 +-
 contrib/mod_dnsbl/mod_dnsbl.c                      |   226 +-
 contrib/mod_dnsbl/mod_dnsbl.h.in                   |     5 +-
 contrib/mod_dynmasq.c                              |    49 +-
 contrib/mod_exec.c                                 |   375 +-
 contrib/mod_geoip.c                                |   404 +-
 contrib/mod_ifsession.c                            |   188 +-
 contrib/mod_ifversion.c                            |    15 +-
 contrib/mod_ldap.c                                 |   555 +-
 contrib/mod_load/Makefile.in                       |     2 +-
 contrib/mod_load/configure                         |    58 +-
 contrib/mod_load/configure.in                      |    52 +
 contrib/mod_load/mod_load.c                        |     5 +-
 contrib/mod_log_forensic.c                         |    71 +-
 contrib/mod_qos.c                                  |    26 +-
 contrib/mod_quotatab.c                             |   773 +-
 contrib/mod_quotatab.h                             |     7 +-
 contrib/mod_quotatab_file.c                        |    16 +-
 contrib/mod_quotatab_ldap.c                        |     6 +-
 contrib/mod_quotatab_radius.c                      |     6 +-
 contrib/mod_quotatab_sql.c                         |    27 +-
 contrib/mod_radius.c                               |  2250 +-
 contrib/mod_ratio.c                                |     8 +-
 contrib/mod_readme.c                               |    49 +-
 contrib/mod_rewrite.c                              |   616 +-
 contrib/mod_sftp/Makefile.in                       |    32 +-
 contrib/mod_sftp/agent.c                           |    20 +-
 contrib/mod_sftp/agent.h                           |    10 +-
 contrib/mod_sftp/auth-hostbased.c                  |    70 +-
 contrib/mod_sftp/auth-kbdint.c                     |    64 +-
 contrib/mod_sftp/auth-password.c                   |    20 +-
 contrib/mod_sftp/auth-publickey.c                  |   122 +-
 contrib/mod_sftp/auth.c                            |   634 +-
 contrib/mod_sftp/auth.h                            |    55 +-
 contrib/mod_sftp/blacklist.c                       |    21 +-
 contrib/mod_sftp/blacklist.h                       |     8 +-
 contrib/mod_sftp/channel.c                         |    29 +-
 contrib/mod_sftp/channel.h                         |     9 +-
 contrib/mod_sftp/cipher.c                          |   121 +-
 contrib/mod_sftp/cipher.h                          |    12 +-
 contrib/mod_sftp/compress.c                        |    60 +-
 contrib/mod_sftp/compress.h                        |    12 +-
 contrib/mod_sftp/configure                         |   202 +-
 contrib/mod_sftp/configure.in                      |    35 +-
 contrib/mod_sftp/crypto.c                          |   260 +-
 contrib/mod_sftp/crypto.h                          |    10 +-
 contrib/mod_sftp/date.c                            |     4 +-
 contrib/mod_sftp/date.h                            |    10 +-
 contrib/mod_sftp/disconnect.c                      |    19 +-
 contrib/mod_sftp/disconnect.h                      |    10 +-
 contrib/mod_sftp/display.c                         |    70 +-
 contrib/mod_sftp/display.h                         |     8 +-
 contrib/mod_sftp/fxp.c                             |  4693 ++--
 contrib/mod_sftp/fxp.h                             |    10 +-
 contrib/mod_sftp/interop.c                         |    66 +-
 contrib/mod_sftp/interop.h                         |    17 +-
 contrib/mod_sftp/kbdint.h                          |    10 +-
 contrib/mod_sftp/kex.c                             |  1229 +-
 contrib/mod_sftp/kex.h                             |    10 +-
 contrib/mod_sftp/keys.c                            |   993 +-
 contrib/mod_sftp/keys.h                            |    26 +-
 contrib/mod_sftp/keystore.c                        |    44 +-
 contrib/mod_sftp/keystore.h                        |    10 +-
 contrib/mod_sftp/mac.c                             |   172 +-
 contrib/mod_sftp/mac.h                             |    13 +-
 contrib/mod_sftp/misc.c                            |    99 +-
 contrib/mod_sftp/misc.h                            |    13 +-
 contrib/mod_sftp/mod_sftp.c                        |   638 +-
 contrib/mod_sftp/mod_sftp.h.in                     |    42 +-
 contrib/mod_sftp/msg.c                             |   127 +-
 contrib/mod_sftp/msg.h                             |    10 +-
 contrib/mod_sftp/packet.c                          |   139 +-
 contrib/mod_sftp/packet.h                          |    10 +-
 contrib/mod_sftp/rfc4716.c                         |    44 +-
 contrib/mod_sftp/rfc4716.h                         |    10 +-
 contrib/mod_sftp/scp.c                             |   269 +-
 contrib/mod_sftp/scp.h                             |    10 +-
 contrib/mod_sftp/service.c                         |     9 +-
 contrib/mod_sftp/service.h                         |     9 +-
 contrib/mod_sftp/session.c                         |     4 +-
 contrib/mod_sftp/session.h                         |    10 +-
 contrib/mod_sftp/ssh2.h                            |     6 +-
 contrib/mod_sftp/tap.c                             |    25 +-
 contrib/mod_sftp/tap.h                             |    10 +-
 contrib/mod_sftp/umac.c                            |   129 +-
 contrib/mod_sftp/umac.h                            |    55 +-
 contrib/mod_sftp/utf8.h                            |     4 +-
 contrib/mod_sftp_pam.c                             |    80 +-
 contrib/mod_sftp_sql.c                             |    27 +-
 contrib/mod_shaper.c                               |   122 +-
 contrib/mod_site_misc.c                            |   758 +-
 contrib/mod_snmp/Makefile.in                       |    10 +-
 contrib/mod_snmp/PROFTPD-MIB.txt                   |     2 -
 contrib/mod_snmp/agentx.h                          |    10 +-
 contrib/mod_snmp/asn1.c                            |    51 +-
 contrib/mod_snmp/asn1.h                            |    10 +-
 contrib/mod_snmp/configure                         |    76 +-
 contrib/mod_snmp/configure.in                      |     8 +-
 contrib/mod_snmp/db.c                              |     8 +-
 contrib/mod_snmp/db.h                              |     8 +-
 contrib/mod_snmp/mib.c                             |     5 +-
 contrib/mod_snmp/mib.h                             |    10 +-
 contrib/mod_snmp/mod_snmp.c                        |   303 +-
 contrib/mod_snmp/mod_snmp.h.in                     |     4 +-
 contrib/mod_snmp/msg.c                             |     5 +-
 contrib/mod_snmp/msg.h                             |    12 +-
 contrib/mod_snmp/notify.c                          |     7 +-
 contrib/mod_snmp/notify.h                          |    13 +-
 contrib/mod_snmp/packet.c                          |    16 +-
 contrib/mod_snmp/packet.h                          |    16 +-
 contrib/mod_snmp/pdu.c                             |     5 +-
 contrib/mod_snmp/pdu.h                             |    12 +-
 contrib/mod_snmp/smi.c                             |    17 +-
 contrib/mod_snmp/smi.h                             |    12 +-
 contrib/mod_snmp/stacktrace.c                      |    66 -
 contrib/mod_snmp/stacktrace.h                      |    34 -
 contrib/mod_snmp/uptime.c                          |     4 +-
 contrib/mod_snmp/uptime.h                          |    10 +-
 contrib/mod_sql.c                                  |  1503 +-
 contrib/mod_sql.h                                  |    12 +-
 contrib/mod_sql_mysql.c                            |   654 +-
 contrib/mod_sql_odbc.c                             |    96 +-
 contrib/mod_sql_passwd.c                           |   914 +-
 contrib/mod_sql_postgres.c                         |   568 +-
 contrib/mod_sql_sqlite.c                           |    47 +-
 contrib/mod_statcache.c                            |  2579 ++
 contrib/mod_tls.c                                  |  6924 ++++-
 contrib/mod_tls.h                                  |    69 +-
 contrib/mod_tls_fscache.c                          |   714 +
 contrib/mod_tls_memcache.c                         |  1691 +-
 contrib/mod_tls_redis.c                            |  1966 ++
 contrib/mod_tls_shmcache.c                         |  1890 +-
 contrib/mod_unique_id.c                            |    11 +-
 contrib/mod_wrap.c                                 |   132 +-
 contrib/mod_wrap2/Makefile.in                      |     2 +-
 contrib/mod_wrap2/configure                        |     2 +-
 contrib/mod_wrap2/configure.in                     |    19 +
 contrib/mod_wrap2/mod_wrap2.c                      |   144 +-
 contrib/mod_wrap2/mod_wrap2.h.in                   |    10 +-
 contrib/mod_wrap2_file.c                           |    24 +-
 contrib/mod_wrap2_redis.c                          |   481 +
 contrib/mod_wrap2_sql.c                            |    54 +-
 contrib/xferstats.holger-preiss                    |    39 +-
 doc/contrib/ftpasswd.html                          |    24 +-
 doc/contrib/ftpmail.html                           |    29 +-
 doc/contrib/ftpquota.html                          |    39 +-
 doc/contrib/index.html                             |    33 +-
 doc/contrib/mod_auth_otp.html                      |   469 +
 doc/contrib/mod_ban.html                           |   114 +-
 doc/contrib/mod_copy.html                          |    81 +-
 doc/contrib/mod_ctrls_admin.html                   |   130 +-
 doc/contrib/mod_deflate.html                       |    54 +-
 doc/contrib/mod_digest.html                        |   394 +
 doc/contrib/mod_dnsbl.html                         |    71 +-
 doc/contrib/mod_dynmasq.html                       |    34 +-
 doc/contrib/mod_exec.html                          |   100 +-
 doc/contrib/mod_geoip.html                         |   149 +-
 doc/contrib/mod_ifsession.html                     |    68 +-
 doc/contrib/mod_ifversion.html                     |    45 +-
 doc/contrib/mod_ldap.html                          |   610 +-
 doc/contrib/mod_load.html                          |    26 +-
 doc/contrib/mod_log_forensic.html                  |    56 +-
 doc/contrib/mod_qos.html                           |    39 +-
 doc/contrib/mod_quotatab.html                      |    52 +-
 doc/contrib/mod_quotatab_file.html                 |    16 +-
 doc/contrib/mod_quotatab_ldap.html                 |    12 +-
 doc/contrib/mod_quotatab_radius.html               |    12 +-
 doc/contrib/mod_quotatab_sql.html                  |    20 +-
 doc/contrib/mod_radius.html                        |   185 +-
 doc/contrib/mod_ratio.html                         |    81 +-
 doc/contrib/mod_readme.html                        |    31 +-
 doc/contrib/mod_rewrite.html                       |    68 +-
 doc/contrib/mod_sftp.html                          |   564 +-
 doc/contrib/mod_sftp_pam.html                      |    44 +-
 doc/contrib/mod_sftp_sql.html                      |    59 +-
 doc/contrib/mod_shaper.html                        |    51 +-
 doc/contrib/mod_site_misc.html                     |    65 +-
 doc/contrib/mod_snmp.html                          |   123 +-
 doc/contrib/mod_sql.html                           |   155 +-
 doc/contrib/mod_sql_odbc.html                      |    67 +-
 doc/contrib/mod_sql_passwd.html                    |   236 +-
 doc/contrib/mod_sql_sqlite.html                    |    36 +-
 doc/contrib/mod_statcache.html                     |   258 +
 doc/contrib/mod_tls.html                           |   578 +-
 doc/contrib/mod_tls_fscache.html                   |    94 +
 doc/contrib/mod_tls_memcache.html                  |    71 +-
 doc/contrib/mod_tls_redis.html                     |   129 +
 doc/contrib/mod_tls_shmcache.html                  |    75 +-
 doc/contrib/mod_unique_id.html                     |    49 +-
 doc/contrib/mod_wrap.html                          |    40 +-
 doc/contrib/mod_wrap2.html                         |    73 +-
 doc/contrib/mod_wrap2_file.html                    |    35 +-
 doc/contrib/mod_wrap2_redis.html                   |   145 +
 doc/contrib/mod_wrap2_sql.html                     |    81 +-
 doc/howto/ASCII.html                               |    14 +-
 doc/howto/AWS.html                                 |   532 +
 doc/howto/AuthFiles.html                           |    28 +-
 doc/howto/Authentication.html                      |    13 +-
 doc/howto/BCP.html                                 |    58 +-
 doc/howto/Chroot.html                              |    30 +-
 doc/howto/Classes.html                             |    28 +-
 doc/howto/Compiling.html                           |   103 +-
 doc/howto/ConfigFile.html                          |   240 +-
 doc/howto/ConfigurationTricks.html                 |    14 +-
 doc/howto/ConnectionACLs.html                      |    16 +-
 doc/howto/Controls.html                            |    27 +-
 doc/howto/CreateHome.html                          |    17 +-
 doc/howto/DNS.html                                 |    23 +-
 doc/howto/DSO.html                                 |    36 +-
 doc/howto/Debugging.html                           |    35 +-
 doc/howto/Directory.html                           |    51 +-
 doc/howto/DisplayFiles.html                        |    17 +-
 doc/howto/ECCN.html                                |     9 +-
 doc/howto/FTP.html                                 |    36 +-
 doc/howto/FXP.html                                 |    32 +-
 doc/howto/Filters.html                             |    13 +-
 doc/howto/Globbing.html                            |    22 +-
 doc/howto/KeepAlives.html                          |    18 +-
 doc/howto/Limit.html                               |    14 +-
 doc/howto/ListOptions.html                         |    23 +-
 doc/howto/LogLevels.html                           |    11 +-
 doc/howto/LogMessages.html                         |    17 +-
 doc/howto/Logging.html                             |   168 +-
 doc/howto/Memcache.html                            |    32 +-
 doc/howto/NAT.html                                 |    39 +-
 doc/howto/Nonroot.html                             |    23 +-
 doc/howto/Quotas.html                              |    73 +-
 doc/howto/Radius.html                              |    25 +-
 doc/howto/Redis.html                               |   207 +
 doc/howto/Regex.html                               |    21 +-
 doc/howto/Rewrite.html                             |    19 +-
 doc/howto/SQL.html                                 |   196 +-
 doc/howto/SSH.html                                 |    21 +-
 doc/howto/Scoreboard.html                          |    14 +-
 doc/howto/Sendfile.html                            |    18 +-
 doc/howto/ServerType.html                          |    11 +-
 doc/howto/Stopping.html                            |    17 +-
 doc/howto/TLS.html                                 |   180 +-
 doc/howto/Testing.html                             |    36 +-
 doc/howto/Timestamps.html                          |    30 +-
 doc/howto/Tracing.html                             |    20 +-
 doc/howto/Translations.html                        |    30 +-
 doc/howto/Umask.html                               |    15 +-
 doc/howto/Upgrade.html                             |    34 +-
 doc/howto/Versioning.html                          |    28 +-
 doc/howto/Vhost.html                               |   132 +-
 doc/howto/VirtualUsers.html                        |    20 +-
 doc/howto/ftpaccess.html                           |    64 +
 doc/howto/index.html                               |    32 +-
 doc/license.txt                                    |     2 +-
 doc/mod_sample.c                                   |     6 +-
 doc/modules/index.html                             |    14 +-
 doc/modules/mod_auth.html                          |   535 +-
 doc/modules/mod_auth_file.html                     |    39 +-
 doc/modules/mod_auth_pam.html                      |    34 +-
 doc/modules/mod_auth_unix.html                     |    98 +-
 doc/modules/mod_cap.html                           |    19 +-
 doc/modules/mod_core.html                          |  1836 +-
 doc/modules/mod_ctrls.html                         |    62 +-
 doc/modules/mod_delay.html                         |    86 +-
 doc/modules/mod_dso.html                           |    91 +-
 doc/modules/mod_facl.html                          |    35 +-
 doc/modules/mod_facts.html                         |    81 +-
 doc/modules/mod_ident.html                         |    49 +-
 doc/modules/mod_lang.html                          |   106 +-
 doc/modules/mod_log.html                           |   139 +-
 doc/modules/mod_ls.html                            |   165 +-
 doc/modules/mod_memcache.html                      |    47 +-
 doc/modules/mod_redis.html                         |   493 +
 doc/modules/mod_rlimit.html                        |    90 +-
 doc/modules/mod_site.html                          |    18 +-
 doc/modules/mod_xfer.html                          |   216 +-
 doc/utils/ftpasswd.html                            |    65 +-
 doc/utils/ftpcount.html                            |    18 +-
 doc/utils/ftpdctl.html                             |    16 +-
 doc/utils/ftpmail.html                             |    19 +-
 doc/utils/ftpquota.html                            |    40 +-
 doc/utils/ftpscrub.html                            |    11 +-
 doc/utils/ftpshut.html                             |    11 +-
 doc/utils/ftptop.html                              |    11 +-
 doc/utils/ftpwho.html                              |    13 +-
 doc/utils/index.html                               |    10 +-
 doc/utils/prxs.html                                |    19 +-
 include/ascii.h                                    |    27 +-
 include/auth.h                                     |    61 +-
 include/bindings.h                                 |    62 +-
 include/ccan-json.h                                |   120 +
 include/child.h                                    |     6 +-
 include/class.h                                    |    25 +-
 include/cmd.h                                      |    33 +-
 include/compat.h                                   |    55 +-
 include/conf.h                                     |    18 +-
 include/configdb.h                                 |   144 +
 include/ctrls.h                                    |     6 +-
 include/data.h                                     |    31 +-
 include/default_paths.h                            |    15 +-
 include/dirtree.h                                  |   148 +-
 include/display.h                                  |    14 +-
 include/encode.h                                   |    15 +-
 include/env.h                                      |     6 +-
 include/event.h                                    |     6 +-
 include/expr.h                                     |     8 +-
 include/feat.h                                     |     6 +-
 include/filter.h                                   |     8 +-
 include/fsio.h                                     |   202 +-
 include/ftp.h                                      |     9 +-
 include/{tpl.h => hanson-tpl.h}                    |     1 +
 include/help.h                                     |     6 +-
 include/ident.h                                    |     4 +-
 include/inet.h                                     |    28 +-
 include/json.h                                     |   153 +
 include/lastlog.h                                  |     8 +-
 include/libsupp.h                                  |     6 +-
 include/log.h                                      |    20 +-
 include/{mod_log.h => logfmt.h}                    |    19 +-
 include/memcache.h                                 |    13 +-
 include/mkhome.h                                   |     6 +-
 include/mod_ctrls.h                                |     5 +-
 include/modules.h                                  |    47 +-
 include/netacl.h                                   |    18 +-
 include/netaddr.h                                  |    41 +-
 include/netio.h                                    |    22 +-
 include/options.h                                  |    43 +-
 include/parser.h                                   |    64 +-
 include/pidfile.h                                  |    10 +-
 include/pool.h                                     |    14 +-
 include/pr-syslog.h                                |    12 +-
 include/privs.h                                    |     6 +-
 include/proctitle.h                                |     6 +-
 include/proftpd.h                                  |    34 +-
 include/redis.h                                    |   298 +
 include/regexp.h                                   |     6 +-
 include/response.h                                 |    13 +-
 include/rlimit.h                                   |     6 +-
 include/scoreboard.h                               |     8 +-
 include/session.h                                  |    13 +-
 include/sets.h                                     |     5 +-
 src/version.c => include/signals.h                 |    32 +-
 include/stash.h                                    |    25 +-
 include/str.h                                      |    67 +-
 include/support.h                                  |    40 +-
 include/table.h                                    |    43 +-
 include/throttle.h                                 |     6 +-
 include/timers.h                                   |     4 +-
 include/trace.h                                    |     6 +-
 include/utf8.h                                     |     6 +-
 include/var.h                                      |     6 +-
 include/version.h                                  |     6 +-
 include/xferlog.h                                  |    10 +-
 lib/Makefile.in                                    |     5 +-
 lib/ccan-json.c                                    |  1404 +
 lib/glibc-glob.c                                   |     2 +-
 lib/{tpl.c => hanson-tpl.c}                        |    28 +-
 lib/libcap/_makenames.c                            |     2 -
 lib/libcap/cap_alloc.c                             |     2 -
 lib/libcap/cap_extint.c                            |     2 -
 lib/libcap/cap_file.c                              |     2 -
 lib/libcap/cap_flag.c                              |     2 -
 lib/libcap/cap_proc.c                              |     2 -
 lib/libcap/cap_sys.c                               |     2 -
 lib/libcap/cap_text.c                              |     2 -
 lib/libcap/libcap.h                                |     2 -
 lib/libltdl/ltdl.c                                 |     4 +-
 lib/pr-syslog.c                                    |    94 +-
 lib/pr_fnmatch.c                                   |     6 +-
 lib/pr_fnmatch_loop.c                              |     2 +-
 lib/sstrncpy.c                                     |    20 +-
 locale/Makefile.in                                 |     2 +-
 locale/files.txt                                   |    61 +-
 modules/Makefile.in                                |     3 +
 modules/mod_auth.c                                 |  1208 +-
 modules/mod_auth_file.c                            |   400 +-
 modules/mod_auth_pam.c                             |   231 +-
 modules/mod_auth_unix.c                            |   722 +-
 modules/mod_cap.c                                  |   126 +-
 modules/mod_core.c                                 |  1828 +-
 modules/mod_ctrls.c                                |   195 +-
 modules/mod_delay.c                                |   524 +-
 modules/mod_dso.c                                  |    26 +-
 modules/mod_facl.c                                 |   454 +-
 modules/mod_facts.c                                |   660 +-
 modules/mod_ident.c                                |    65 +-
 modules/mod_lang.c                                 |   444 +-
 modules/mod_log.c                                  |   972 +-
 modules/mod_ls.c                                   |   675 +-
 modules/mod_memcache.c                             |    89 +-
 modules/mod_redis.c                                |  1942 ++
 modules/mod_rlimit.c                               |    46 +-
 modules/mod_site.c                                 |   292 +-
 modules/mod_xfer.c                                 |  1231 +-
 src/Makefile.in                                    |     5 +-
 src/ascii.c                                        |   180 +
 src/auth.c                                         |   932 +-
 src/bindings.c                                     |   297 +-
 src/child.c                                        |     6 +-
 src/class.c                                        |   101 +-
 src/cmd.c                                          |   129 +-
 src/configdb.c                                     |   965 +
 src/ctrls.c                                        |   190 +-
 src/data.c                                         |   594 +-
 src/dirtree.c                                      |  1479 +-
 src/display.c                                      |   104 +-
 src/encode.c                                       |    22 +-
 src/env.c                                          |    31 +-
 src/event.c                                        |    15 +-
 src/expr.c                                         |    13 +-
 src/feat.c                                         |    24 +-
 src/filter.c                                       |    22 +-
 src/fsio.c                                         |  7761 ++++--
 src/ftpdctl.c                                      |    34 +-
 src/help.c                                         |    55 +-
 src/ident.c                                        |     7 +-
 src/inet.c                                         |   609 +-
 src/json.c                                         |   844 +
 src/lastlog.c                                      |     8 +-
 src/log.c                                          |   226 +-
 src/main.c                                         |  1102 +-
 src/memcache.c                                     |   146 +-
 src/mkhome.c                                       |    18 +-
 src/modules.c                                      |    93 +-
 src/netacl.c                                       |   175 +-
 src/netaddr.c                                      |   325 +-
 src/netio.c                                        |   893 +-
 src/parser.c                                       |   848 +-
 src/pidfile.c                                      |    47 +-
 src/pool.c                                         |   119 +-
 src/privs.c                                        |    26 +-
 src/proctitle.c                                    |   119 +-
 src/proftpd.8.in                                   |     9 +-
 src/redis.c                                        |  5708 +++++
 src/regexp.c                                       |   107 +-
 src/response.c                                     |    74 +-
 src/rlimit.c                                       |    11 +-
 src/scoreboard.c                                   |   311 +-
 src/session.c                                      |    96 +-
 src/sets.c                                         |     6 +-
 src/signals.c                                      |   720 +
 src/stash.c                                        |   709 +-
 src/str.c                                          |   629 +-
 src/support.c                                      |   819 +-
 src/table.c                                        |   224 +-
 src/throttle.c                                     |     6 +-
 src/timers.c                                       |   110 +-
 src/trace.c                                        |   116 +-
 src/utf8.c                                         |     6 +-
 src/var.c                                          |    13 +-
 src/version.c                                      |     6 +-
 src/wtmp.c                                         |     6 +-
 src/xferlog.c                                      |    35 +-
 tests/Makefile.in                                  |    43 +-
 tests/api/array.c                                  |    63 +-
 tests/api/ascii.c                                  |   351 +
 tests/api/auth.c                                   |  1915 ++
 tests/api/class.c                                  |    42 +-
 tests/api/cmd.c                                    |   196 +-
 tests/api/configdb.c                               |   642 +
 tests/api/data.c                                   |  1097 +
 tests/api/display.c                                |   296 +
 tests/api/encode.c                                 |   303 +
 tests/api/env.c                                    |     8 +-
 tests/api/etc/str/utf8-space.txt                   |     1 +
 tests/api/event.c                                  |    90 +-
 tests/api/expr.c                                   |    12 +-
 tests/api/feat.c                                   |     6 +-
 tests/api/filter.c                                 |   164 +
 tests/api/fsio.c                                   |  4682 +++-
 tests/api/help.c                                   |   178 +
 tests/api/inet.c                                   |   815 +
 tests/api/json.c                                   |  1858 ++
 tests/api/misc.c                                   |  1193 +
 tests/api/modules.c                                |   408 +-
 tests/api/netacl.c                                 |   289 +-
 tests/api/netaddr.c                                |   766 +-
 tests/api/netio.c                                  |  1068 +-
 tests/api/parser.c                                 |   656 +
 tests/api/pidfile.c                                |   126 +
 tests/api/pool.c                                   |   243 +-
 tests/api/privs.c                                  |   185 +
 tests/api/redis.c                                  |  4475 ++++
 tests/api/regexp.c                                 |   247 +-
 tests/api/response.c                               |   277 +-
 tests/api/rlimit.c                                 |   191 +
 tests/api/scoreboard.c                             |  1398 +-
 tests/api/sets.c                                   |     6 +-
 tests/api/stash.c                                  |   411 +-
 tests/api/str.c                                    |   597 +-
 tests/api/stubs.c                                  |   137 +-
 tests/api/table.c                                  |   134 +-
 tests/api/tests.c                                  |    99 +-
 tests/api/tests.h                                  |    26 +-
 tests/api/timers.c                                 |    23 +-
 tests/api/trace.c                                  |   420 +
 tests/api/var.c                                    |     6 +-
 tests/api/version.c                                |     6 +-
 tests/t/commands/clnt.t                            |    11 +
 tests/t/config/anonallowrobots.t                   |    11 +
 tests/t/config/loginpasswordprompt.t               |    11 +
 tests/t/config/maxpasswordsize.t                   |    11 +
 tests/t/config/maxtransfersperhost.t               |    11 +
 tests/t/config/maxtransfersperuser.t               |    11 +
 tests/t/config/transferoptions.t                   |    11 +
 tests/t/config/virtualhost.t                       |    11 +
 tests/t/etc/modules/mod_auth_otp/ssh_host_dsa_key  |    12 +
 .../etc/modules/mod_auth_otp/ssh_host_dsa_key.pub  |     1 +
 tests/t/etc/modules/mod_auth_otp/ssh_host_rsa_key  |    27 +
 .../etc/modules/mod_auth_otp/ssh_host_rsa_key.pub  |     1 +
 tests/t/etc/modules/mod_geoip/GeoIP.dat            |   Bin 1084888 -> 754324 bytes
 tests/t/etc/modules/mod_geoip/GeoIPASNum.dat       |   Bin 3658209 -> 3899353 bytes
 tests/t/etc/modules/mod_geoip/GeoIPv6.dat          |   Bin 1232477 -> 1405637 bytes
 tests/t/etc/modules/mod_geoip/GeoLiteCity.dat      |   Bin 30751876 -> 15966443 bytes
 tests/t/etc/modules/mod_sftp/authorized_rsa_keys2  |    23 +
 .../etc/modules/mod_sftp/authorized_rsa_keys_no_nl |     9 +
 tests/t/etc/modules/mod_sftp/ssh_host_rsa1024_key  |    15 +
 .../etc/modules/mod_sftp/ssh_host_rsa1024_key.pub  |     1 +
 tests/t/etc/modules/mod_sftp/test_rsa2048_key2     |    27 +
 tests/t/etc/modules/mod_sftp/test_rsa2048_key2.pub |     1 +
 tests/t/etc/modules/mod_sftp/test_rsa_key_bug4155  |    27 +
 .../etc/modules/mod_sftp/test_rsa_key_bug4155.pub  |     1 +
 tests/t/etc/modules/mod_sql_odbc/odbc.ini          |    15 +
 tests/t/etc/modules/mod_sql_odbc/odbcinst.ini      |    11 +
 .../etc/modules/mod_tls/tls-get-passphrase-once.pl |    22 +
 tests/t/lib/ProFTPD/TestSuite/FTP.pm               |    30 +-
 tests/t/lib/ProFTPD/TestSuite/Utils.pm             |   126 +-
 tests/t/lib/ProFTPD/Tests/Commands/APPE.pm         |  2189 +-
 tests/t/lib/ProFTPD/Tests/Commands/CLNT.pm         |   106 +
 tests/t/lib/ProFTPD/Tests/Commands/CWD.pm          |  1882 +-
 tests/t/lib/ProFTPD/Tests/Commands/DELE.pm         |   166 +-
 tests/t/lib/ProFTPD/Tests/Commands/FEAT.pm         |    72 +-
 tests/t/lib/ProFTPD/Tests/Commands/HOST.pm         |  1135 +-
 tests/t/lib/ProFTPD/Tests/Commands/LIST.pm         |  2760 +-
 tests/t/lib/ProFTPD/Tests/Commands/MDTM.pm         |  1084 +-
 tests/t/lib/ProFTPD/Tests/Commands/MKD.pm          |  2032 +-
 tests/t/lib/ProFTPD/Tests/Commands/MLSD.pm         |   964 +-
 tests/t/lib/ProFTPD/Tests/Commands/MLST.pm         |   734 +-
 tests/t/lib/ProFTPD/Tests/Commands/NLST.pm         |  2055 +-
 tests/t/lib/ProFTPD/Tests/Commands/OPTS.pm         |     4 +-
 tests/t/lib/ProFTPD/Tests/Commands/RETR.pm         |  1603 +-
 tests/t/lib/ProFTPD/Tests/Commands/RMD.pm          |  1614 +-
 tests/t/lib/ProFTPD/Tests/Commands/RNFR.pm         |  1080 +-
 tests/t/lib/ProFTPD/Tests/Commands/RNTO.pm         |   631 +-
 tests/t/lib/ProFTPD/Tests/Commands/SIZE.pm         |  1182 +-
 tests/t/lib/ProFTPD/Tests/Commands/STAT.pm         |   940 +-
 tests/t/lib/ProFTPD/Tests/Commands/STOR.pm         |  2058 +-
 tests/t/lib/ProFTPD/Tests/Commands/STOU.pm         |   207 +-
 tests/t/lib/ProFTPD/Tests/Commands/TYPE.pm         |   135 +-
 .../ProFTPD/Tests/Config/AllowForeignAddress.pm    |   272 +-
 .../t/lib/ProFTPD/Tests/Config/AnonAllowRobots.pm  |   583 +
 .../ProFTPD/Tests/Config/AnonRejectPasswords.pm    |   291 +-
 tests/t/lib/ProFTPD/Tests/Config/AuthAliasOnly.pm  |   233 +-
 tests/t/lib/ProFTPD/Tests/Config/DefaultChdir.pm   |   126 +-
 tests/t/lib/ProFTPD/Tests/Config/DefaultRoot.pm    |    76 +-
 .../t/lib/ProFTPD/Tests/Config/Directory/Limits.pm |   161 -
 .../ProFTPD/Tests/Config/DisplayFileTransfer.pm    |   112 +-
 tests/t/lib/ProFTPD/Tests/Config/DisplayQuit.pm    |    86 +
 tests/t/lib/ProFTPD/Tests/Config/FactsOptions.pm   |     4 +-
 tests/t/lib/ProFTPD/Tests/Config/HiddenStores.pm   |   649 +-
 tests/t/lib/ProFTPD/Tests/Config/HideFiles.pm      |   182 +-
 tests/t/lib/ProFTPD/Tests/Config/Include.pm        |   116 +
 tests/t/lib/ProFTPD/Tests/Config/Limit/RMD.pm      |    32 +-
 tests/t/lib/ProFTPD/Tests/Config/ListOptions.pm    |   160 +-
 .../ProFTPD/Tests/Config/LoginPasswordPrompt.pm    |   215 +
 .../lib/ProFTPD/Tests/Config/MasqueradeAddress.pm  |   179 +
 tests/t/lib/ProFTPD/Tests/Config/MaxClients.pm     |   117 +
 .../t/lib/ProFTPD/Tests/Config/MaxPasswordSize.pm  |   184 +
 .../ProFTPD/Tests/Config/MaxTransfersPerHost.pm    |   236 +
 .../ProFTPD/Tests/Config/MaxTransfersPerUser.pm    |   236 +
 tests/t/lib/ProFTPD/Tests/Config/Order.pm          |   283 +-
 tests/t/lib/ProFTPD/Tests/Config/ServerIdent.pm    |   397 +-
 tests/t/lib/ProFTPD/Tests/Config/ShowSymlinks.pm   |    20 +-
 .../t/lib/ProFTPD/Tests/Config/TransferOptions.pm  |   271 +
 tests/t/lib/ProFTPD/Tests/Config/Umask.pm          |    15 +-
 tests/t/lib/ProFTPD/Tests/Config/VirtualHost.pm    |   139 +
 tests/t/lib/ProFTPD/Tests/HTTP.pm                  |     5 +-
 tests/t/lib/ProFTPD/Tests/Logging/ExtendedLog.pm   |  3082 ++-
 tests/t/lib/ProFTPD/Tests/Logins.pm                |   743 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_auth_otp.pm  |  1938 ++
 .../lib/ProFTPD/Tests/Modules/mod_auth_otp/sftp.pm |  1283 +
 .../lib/ProFTPD/Tests/Modules/mod_ban/memcache.pm  |   259 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm      |   334 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_ctrls.pm     |   103 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_delay.pm     |   704 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_digest.pm    |  8679 +++++++
 tests/t/lib/ProFTPD/Tests/Modules/mod_exec.pm      |   292 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_geoip.pm     |   183 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_geoip/sql.pm |   199 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_ifsession.pm |   378 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_lang.pm      |   711 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_ldap.pm      |    17 +
 .../lib/ProFTPD/Tests/Modules/mod_quotatab_sql.pm  |  1486 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_readme.pm    |   454 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_rlimit.pm    |   128 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_sftp.pm      | 25482 +++++++++++++------
 .../lib/ProFTPD/Tests/Modules/mod_sftp/rewrite.pm  |    14 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_sftp/sql.pm  |    25 +
 .../t/lib/ProFTPD/Tests/Modules/mod_sftp/wrap2.pm  |   173 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_sftp_pam.pm  |   216 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_sftp_sql.pm  |   481 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_shaper.pm    |   144 +
 tests/t/lib/ProFTPD/Tests/Modules/mod_site.pm      |  1438 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_site_misc.pm |  2059 +-
 tests/t/lib/ProFTPD/Tests/Modules/mod_snmp.pm      |   253 +-
 .../t/lib/ProFTPD/Tests/Modules/mod_sql_passwd.pm  |  4039 ++-
 .../t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm  |  6750 +++--
 tests/t/lib/ProFTPD/Tests/Modules/mod_statcache.pm |  2569 ++
 tests/t/lib/ProFTPD/Tests/Modules/mod_tls.pm       |   654 +-
 .../t/lib/ProFTPD/Tests/Modules/mod_tls_fscache.pm |   235 +
 .../lib/ProFTPD/Tests/Modules/mod_tls_memcache.pm  |   475 +-
 .../lib/ProFTPD/Tests/Modules/mod_tls_shmcache.pm  |   184 +-
 .../t/lib/ProFTPD/Tests/Modules/mod_wrap2_redis.pm |  2927 +++
 tests/t/lib/ProFTPD/Tests/Modules/mod_wrap2_sql.pm |   228 +-
 tests/t/lib/ProFTPD/Tests/SMTP.pm                  |     2 +-
 tests/t/lib/ProFTPD/Tests/SSH2.pm                  |   135 +
 tests/t/modules/mod_auth_otp.t                     |    11 +
 tests/t/modules/mod_auth_otp/sftp.t                |    11 +
 tests/t/modules/mod_digest.t                       |    11 +
 tests/t/modules/mod_dynmasq.t                      |    11 +
 tests/t/modules/mod_geoip/sql.t                    |    11 +
 tests/t/modules/mod_rlimit.t                       |    11 +
 tests/t/modules/mod_statcache.t                    |    11 +
 tests/t/modules/mod_tls_fscache.t                  |    11 +
 tests/t/modules/mod_wrap2_redis.t                  |    11 +
 tests/t/ssh2.t                                     |    11 +
 tests/tests.pl                                     |    54 +
 utils/Makefile.in                                  |     6 +-
 utils/ftpcount.c                                   |    35 +-
 utils/ftpscrub.c                                   |    17 +-
 utils/ftpshut.8.in                                 |     4 +-
 utils/ftpshut.c                                    |    74 +-
 utils/ftptop.c                                     |    18 +-
 utils/ftpwho.1.in                                  |     7 +-
 utils/ftpwho.c                                     |   320 +-
 utils/misc.c                                       |     3 +-
 utils/scoreboard.c                                 |    50 +-
 utils/utils.h                                      |     8 +-
 692 files changed, 206173 insertions(+), 49181 deletions(-)

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



More information about the Pkg-proftpd-maintainers mailing list