This is an automated email from the git hooks/post-receive script.
frankie pushed a commit to branch master
in repository proftpd-dfsg.
commit 4e3f42ceca9e93d3e44560d605de948d1e199f00
Merge: de13ef1 a585ccf
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date: Wed Jan 27 12:17:57 2016 +0100
Merge tag 'upstream/1.3.5a'
Upstream version 1.3.5a
.gitignore | 31 +
.travis.yml | 42 +
ChangeLog | 8 +-
Makefile.in | 3 +
NEWS | 53 +-
RELEASE_NOTES | 38 +-
config.h.in | 3 +
configure | 126 +
configure.in | 16 +
contrib/INSTALL.mod_wrap | 31 +
contrib/README.mod_wrap | 242 +
proftpd.spec => contrib/dist/rpm/proftpd.spec | 10 +-
contrib/ftpasswd | 2 +-
contrib/ftpmail | 2 +-
contrib/ftpquota | 2 +-
contrib/mod_ban.c | 2 +-
contrib/mod_copy.c | 106 +-
contrib/mod_ctrls_admin.c | 2 +-
contrib/mod_deflate.c | 2 +-
contrib/mod_dnsbl/mod_dnsbl.c | 2 +-
contrib/mod_dnsbl/mod_dnsbl.h.in | 2 +-
contrib/mod_dynmasq.c | 2 +-
contrib/mod_exec.c | 2 +-
contrib/mod_geoip.c | 46 +-
contrib/mod_ifsession.c | 2 +-
contrib/mod_ifversion.c | 2 +-
contrib/mod_ldap.c | 10 +-
contrib/mod_load/mod_load.c | 2 +-
contrib/mod_load/{mod_load.c => mod_load.c.in} | 9 +-
contrib/mod_qos.c | 2 +-
contrib/mod_quotatab.c | 35 +-
contrib/mod_quotatab.h | 2 +-
contrib/mod_quotatab_file.c | 2 +-
contrib/mod_quotatab_sql.c | 2 +-
contrib/mod_radius.c | 2 +-
contrib/mod_rewrite.c | 2 +-
contrib/mod_sftp/agent.c | 2 +-
contrib/mod_sftp/agent.h | 2 +-
contrib/mod_sftp/auth-hostbased.c | 6 +-
contrib/mod_sftp/auth-kbdint.c | 2 +-
contrib/mod_sftp/auth-password.c | 2 +-
contrib/mod_sftp/auth-publickey.c | 6 +-
contrib/mod_sftp/auth.c | 10 +-
contrib/mod_sftp/auth.h | 2 +-
contrib/mod_sftp/blacklist.c | 2 +-
contrib/mod_sftp/blacklist.h | 2 +-
contrib/mod_sftp/channel.c | 2 +-
contrib/mod_sftp/channel.h | 2 +-
contrib/mod_sftp/cipher.c | 4 +-
contrib/mod_sftp/cipher.h | 2 +-
contrib/mod_sftp/compress.c | 2 +-
contrib/mod_sftp/compress.h | 2 +-
contrib/mod_sftp/configure | 15 +
contrib/mod_sftp/configure.in | 18 +
contrib/mod_sftp/crypto.c | 2 +-
contrib/mod_sftp/crypto.h | 2 +-
contrib/mod_sftp/date.c | 2 +-
contrib/mod_sftp/date.h | 2 +-
contrib/mod_sftp/disconnect.c | 2 +-
contrib/mod_sftp/disconnect.h | 2 +-
contrib/mod_sftp/display.c | 2 +-
contrib/mod_sftp/display.h | 2 +-
contrib/mod_sftp/fxp.c | 37 +-
contrib/mod_sftp/fxp.h | 2 +-
contrib/mod_sftp/interop.c | 2 +-
contrib/mod_sftp/interop.h | 2 +-
contrib/mod_sftp/kbdint.c | 6 +-
contrib/mod_sftp/kbdint.h | 2 +-
contrib/mod_sftp/kex.c | 16 +-
contrib/mod_sftp/kex.h | 2 +-
contrib/mod_sftp/keys.c | 2 +-
contrib/mod_sftp/keys.h | 2 +-
contrib/mod_sftp/keystore.c | 2 +-
contrib/mod_sftp/keystore.h | 2 +-
contrib/mod_sftp/mac.c | 8 +-
contrib/mod_sftp/mac.h | 2 +-
contrib/mod_sftp/misc.c | 2 +-
contrib/mod_sftp/misc.h | 2 +-
contrib/mod_sftp/mod_sftp.c | 2 +-
contrib/mod_sftp/mod_sftp.h.in | 2 +-
contrib/mod_sftp/msg.c | 2 +-
contrib/mod_sftp/msg.h | 2 +-
contrib/mod_sftp/packet.c | 2 +-
contrib/mod_sftp/packet.h | 2 +-
contrib/mod_sftp/rfc4716.c | 2 +-
contrib/mod_sftp/rfc4716.h | 2 +-
contrib/mod_sftp/scp.c | 2 +-
contrib/mod_sftp/scp.h | 2 +-
contrib/mod_sftp/service.c | 2 +-
contrib/mod_sftp/service.h | 2 +-
contrib/mod_sftp/session.c | 2 +-
contrib/mod_sftp/session.h | 2 +-
contrib/mod_sftp/ssh2.h | 2 +-
contrib/mod_sftp/tap.c | 2 +-
contrib/mod_sftp/tap.h | 2 +-
contrib/mod_sftp/utf8.c | 2 +-
contrib/mod_sftp/utf8.h | 2 +-
contrib/mod_sftp_pam.c | 2 +-
contrib/mod_sftp_sql.c | 28 +-
contrib/mod_shaper.c | 8 +-
contrib/mod_site_misc.c | 2 +-
contrib/mod_snmp/PROFTPD-MIB.txt | 2 +-
contrib/mod_snmp/agentx.h | 2 +-
contrib/mod_snmp/asn1.c | 7 +-
contrib/mod_snmp/asn1.h | 2 +-
contrib/mod_snmp/mod_snmp.h.in | 2 +-
contrib/mod_snmp/msg.c | 2 +-
contrib/mod_snmp/msg.h | 2 +-
contrib/mod_snmp/notify.c | 4 +-
contrib/mod_snmp/packet.c | 2 +-
contrib/mod_snmp/packet.h | 2 +-
contrib/mod_snmp/pdu.c | 2 +-
contrib/mod_snmp/pdu.h | 2 +-
contrib/mod_snmp/smi.c | 14 +-
contrib/mod_snmp/smi.h | 2 +-
contrib/mod_snmp/stacktrace.c | 2 +-
contrib/mod_snmp/stacktrace.h | 2 +-
contrib/mod_snmp/uptime.c | 2 +-
contrib/mod_snmp/uptime.h | 2 +-
contrib/mod_sql.c | 42 +-
contrib/mod_sql.h | 2 +-
contrib/mod_sql_mysql.c | 2 +-
contrib/mod_sql_odbc.c | 2 +-
contrib/mod_sql_passwd.c | 2 +-
contrib/mod_sql_postgres.c | 7 +-
contrib/mod_sql_sqlite.c | 7 +-
contrib/mod_tls.c | 226 +-
contrib/mod_tls.h | 2 +-
contrib/mod_tls_memcache.c | 2 +-
contrib/mod_tls_shmcache.c | 2 +-
contrib/mod_unique_id.c | 2 +-
contrib/mod_wrap.c | 2 +-
contrib/mod_wrap2/mod_wrap2.c | 33 +-
contrib/mod_wrap2/mod_wrap2.h.in | 2 +-
contrib/mod_wrap2_file.c | 64 +-
contrib/mod_wrap2_sql.c | 2 +-
doc/Configuration.pdf | Bin 0 -> 1456937 bytes
doc/Configuration.sgml | 35 +
doc/contrib/ftpasswd.html | 6 +-
doc/contrib/ftpmail.html | 6 +-
doc/contrib/ftpquota.html | 6 +-
doc/contrib/index.html | 6 +-
doc/contrib/mod_ban.html | 6 +-
doc/contrib/mod_copy.html | 37 +-
doc/contrib/mod_ctrls_admin.html | 6 +-
doc/contrib/mod_deflate.html | 6 +-
doc/contrib/mod_dnsbl.html | 6 +-
doc/contrib/mod_dynmasq.html | 6 +-
doc/contrib/mod_exec.html | 6 +-
doc/contrib/mod_geoip.html | 6 +-
doc/contrib/mod_ifsession.html | 6 +-
doc/contrib/mod_ifversion.html | 6 +-
doc/contrib/mod_ldap.html | 6 +-
doc/contrib/mod_load.html | 6 +-
doc/contrib/mod_log_forensic.html | 6 +-
doc/contrib/mod_qos.html | 6 +-
doc/contrib/mod_quotatab.html | 6 +-
doc/contrib/mod_quotatab_file.html | 6 +-
doc/contrib/mod_quotatab_ldap.html | 4 +-
doc/contrib/mod_quotatab_radius.html | 4 +-
doc/contrib/mod_quotatab_sql.html | 6 +-
doc/contrib/mod_radius.html | 6 +-
doc/contrib/mod_ratio.html | 6 +-
doc/contrib/mod_readme.html | 6 +-
doc/contrib/mod_rewrite.html | 6 +-
doc/contrib/mod_sftp.html | 6 +-
doc/contrib/mod_sftp_pam.html | 6 +-
doc/contrib/mod_sftp_sql.html | 6 +-
doc/contrib/mod_shaper.html | 6 +-
doc/contrib/mod_site_misc.html | 6 +-
doc/contrib/mod_snmp.html | 6 +-
doc/contrib/mod_sql.html | 6 +-
doc/contrib/mod_sql_odbc.html | 6 +-
doc/contrib/mod_sql_passwd.html | 6 +-
doc/contrib/mod_sql_sqlite.html | 6 +-
doc/contrib/mod_tls.html | 6 +-
doc/contrib/mod_tls_memcache.html | 6 +-
doc/contrib/mod_tls_shmcache.html | 6 +-
doc/contrib/mod_unique_id.html | 6 +-
doc/contrib/mod_wrap.html | 6 +-
doc/contrib/mod_wrap2.html | 6 +-
doc/contrib/mod_wrap2_file.html | 6 +-
doc/contrib/mod_wrap2_sql.html | 6 +-
doc/howto/ASCII.html | 6 +-
doc/howto/AuthFiles.html | 4 +-
doc/howto/Authentication.html | 6 +-
doc/howto/BCP.html | 6 +-
doc/howto/Chroot.html | 6 +-
doc/howto/Classes.html | 6 +-
doc/howto/Compiling.html | 6 +-
doc/howto/ConfigFile.html | 6 +-
doc/howto/ConfigurationTricks.html | 6 +-
doc/howto/ConnectionACLs.html | 6 +-
doc/howto/Controls.html | 6 +-
doc/howto/CreateHome.html | 6 +-
doc/howto/DNS.html | 6 +-
doc/howto/DSO.html | 6 +-
doc/howto/Debugging.html | 6 +-
doc/howto/Directory.html | 6 +-
doc/howto/DisplayFiles.html | 8 +-
doc/howto/ECCN.html | 2 +-
doc/howto/FTP.html | 6 +-
doc/howto/FXP.html | 6 +-
doc/howto/Filters.html | 6 +-
doc/howto/Globbing.html | 6 +-
doc/howto/KeepAlives.html | 6 +-
doc/howto/Limit.html | 6 +-
doc/howto/ListOptions.html | 6 +-
doc/howto/LogLevels.html | 2 +-
doc/howto/LogMessages.html | 2 +-
doc/howto/Logging.html | 6 +-
doc/howto/Memcache.html | 6 +-
doc/howto/NAT.html | 2 +-
doc/howto/Nonroot.html | 4 +-
doc/howto/Quotas.html | 6 +-
doc/howto/Radius.html | 6 +-
doc/howto/Rewrite.html | 4 +-
doc/howto/SQL.html | 6 +-
doc/howto/SSH.html | 6 +-
doc/howto/Scoreboard.html | 6 +-
doc/howto/Sendfile.html | 6 +-
doc/howto/ServerType.html | 6 +-
doc/howto/Stopping.html | 6 +-
doc/howto/TLS.html | 6 +-
doc/howto/Testing.html | 6 +-
doc/howto/Timestamps.html | 6 +-
doc/howto/Tracing.html | 6 +-
doc/howto/Translations.html | 6 +-
doc/howto/Umask.html | 6 +-
doc/howto/Upgrade.html | 6 +-
doc/howto/Versioning.html | 6 +-
doc/howto/Vhost.html | 6 +-
doc/howto/VirtualUsers.html | 6 +-
doc/howto/index.html | 6 +-
doc/mod_sample.c | 2 +-
doc/modules/index.html | 6 +-
doc/modules/mod_auth.html | 6 +-
doc/modules/mod_auth_file.html | 6 +-
doc/modules/mod_auth_pam.html | 6 +-
doc/modules/mod_auth_unix.html | 6 +-
doc/modules/mod_cap.html | 6 +-
doc/modules/mod_core.html | 6 +-
doc/modules/mod_ctrls.html | 6 +-
doc/modules/mod_delay.html | 6 +-
doc/modules/mod_dso.html | 6 +-
doc/modules/mod_facl.html | 6 +-
doc/modules/mod_facts.html | 6 +-
doc/modules/mod_ident.html | 6 +-
doc/modules/mod_lang.html | 6 +-
doc/modules/mod_log.html | 6 +-
doc/modules/mod_ls.html | 6 +-
doc/modules/mod_memcache.html | 6 +-
doc/modules/mod_rlimit.html | 6 +-
doc/modules/mod_site.html | 6 +-
doc/modules/mod_xfer.html | 6 +-
doc/utils/ftpasswd.html | 6 +-
doc/utils/ftpmail.html | 6 +-
doc/utils/ftpquota.html | 6 +-
doc/utils/index.html | 6 +-
doc/utils/prxs.html | 6 +-
include/ascii.h | 2 +-
include/auth.h | 2 +-
include/bindings.h | 2 +-
include/child.h | 2 +-
include/class.h | 2 +-
include/cmd.h | 12 +-
include/compat.h | 2 +-
include/conf.h | 10 +-
include/ctrls.h | 2 +-
include/data.h | 2 +-
include/default_paths.h | 2 +-
include/dirtree.h | 10 +-
include/display.h | 2 +-
include/encode.h | 2 +-
include/env.h | 2 +-
include/event.h | 2 +-
include/expr.h | 2 +-
include/feat.h | 2 +-
include/filter.h | 2 +-
include/fsio.h | 6 +-
include/ftp.h | 2 +-
include/help.h | 2 +-
include/{xferlog.h => ident.h} | 23 +-
include/inet.h | 2 +-
include/{child.h => lastlog.h} | 52 +-
include/libsupp.h | 2 +-
include/log.h | 2 +-
include/memcache.h | 2 +-
include/mkhome.h | 2 +-
include/mod_ctrls.h | 2 +-
include/mod_log.h | 2 +-
include/modules.h | 2 +-
include/netacl.h | 2 +-
include/netaddr.h | 2 +-
include/netio.h | 2 +-
include/options.h | 2 +-
include/parser.h | 2 +-
include/pidfile.h | 2 +-
include/pool.h | 2 +-
include/pr-syslog.h | 2 +-
include/privs.h | 2 +-
include/proctitle.h | 2 +-
include/proftpd.h | 2 +-
include/regexp.h | 2 +-
include/response.h | 2 +-
include/rlimit.h | 2 +-
include/scoreboard.h | 2 +-
include/session.h | 5 +-
include/sets.h | 2 +-
include/stash.h | 2 +-
include/str.h | 2 +-
include/support.h | 2 +-
include/table.h | 2 +-
include/throttle.h | 2 +-
include/timers.h | 2 +-
include/trace.h | 2 +-
src/version.c => include/utf8.h | 31 +-
include/var.h | 2 +-
include/version.h | 6 +-
include/xferlog.h | 2 +-
lib/Makefile.in | 28 -
lib/libcap/_makenames.c | 4 +-
lib/libcap/cap_alloc.c | 4 +-
lib/libcap/cap_extint.c | 4 +-
lib/libcap/cap_file.c | 4 +-
lib/libcap/cap_flag.c | 4 +-
lib/libcap/cap_proc.c | 4 +-
lib/libcap/cap_sys.c | 4 +-
lib/libcap/cap_text.c | 4 +-
lib/libcap/libcap.h | 4 +-
lib/libltdl/.cvsignore | 12 +
lib/libltdl/acinclude.m4 | 7080 ++++++++++++++++++++
lib/libltdl/config.guess | 1526 +++++
lib/libltdl/config.sub | 1658 +++++
lib/libltdl/install-sh | 519 ++
lib/libltdl/ltmain.sh | 6956 +++++++++++++++++++
lib/libltdl/missing | 367 +
lib/pr-syslog.c | 2 +-
lib/pr_fnmatch_loop.c | 5 +-
lib/sstrncpy.c | 7 +-
lib/tpl.c | 2 +-
modules/Makefile.in | 383 --
modules/mod_auth.c | 14 +-
modules/mod_auth_file.c | 10 +-
modules/mod_auth_pam.c | 2 +-
modules/mod_auth_unix.c | 2 +-
modules/mod_cap.c | 2 +-
modules/mod_core.c | 8 +-
modules/mod_ctrls.c | 2 +-
modules/mod_delay.c | 2 +-
modules/mod_dso.c | 2 +-
modules/mod_facl.c | 2 +-
modules/mod_facts.c | 2 +-
modules/mod_ident.c | 2 +-
modules/mod_lang.c | 2 +-
modules/mod_log.c | 2 +-
modules/mod_ls.c | 42 +-
modules/mod_memcache.c | 2 +-
modules/mod_rlimit.c | 2 +-
modules/mod_site.c | 2 +-
modules/mod_xfer.c | 30 +-
src/Makefile.in | 961 ---
src/auth.c | 2 +-
src/bindings.c | 20 +-
src/child.c | 2 +-
src/class.c | 2 +-
src/cmd.c | 89 +-
src/ctrls.c | 22 +-
src/data.c | 22 +-
src/dirtree.c | 2 +-
src/display.c | 21 +-
src/encode.c | 2 +-
src/env.c | 2 +-
src/event.c | 2 +-
src/expr.c | 2 +-
src/feat.c | 2 +-
src/filter.c | 2 +-
src/fsio.c | 75 +-
src/ftpdctl.8 | 62 -
src/ftpdctl.c | 2 +-
{utils => src}/ftpscrub.c | 16 +-
src/help.c | 2 +-
src/ident.c | 239 +
src/inet.c | 31 +-
src/lastlog.c | 2 +-
src/log.c | 4 +-
src/main.c | 56 +-
src/memcache.c | 2 +-
src/mkhome.c | 2 +-
src/modules.c | 2 +-
src/netacl.c | 2 +-
src/netaddr.c | 12 +-
src/netio.c | 2 +-
src/parser.c | 2 +-
src/pidfile.c | 2 +-
src/pool.c | 2 +-
src/privs.c | 144 +-
src/proctitle.c | 2 +-
src/proftpd.8 | 145 -
src/proftpd.conf.5 | 53 -
src/prxs | 322 -
src/prxs.in | 2 +-
src/regexp.c | 2 +-
src/response.c | 2 +-
src/rlimit.c | 2 +-
src/scoreboard.c | 52 +-
src/session.c | 2 +-
src/sets.c | 2 +-
src/stash.c | 2 +-
src/str.c | 2 +-
src/support.c | 2 +-
src/table.c | 2 +-
src/throttle.c | 2 +-
src/timers.c | 2 +-
src/trace.c | 2 +-
src/utf8.c | 203 +
src/var.c | 2 +-
src/version.c | 2 +-
src/wtmp.c | 2 +-
src/xferlog.5 | 173 -
src/xferlog.c | 2 +-
tests/api/array.c | 2 +-
tests/api/class.c | 2 +-
tests/api/cmd.c | 3 +-
tests/api/env.c | 2 +-
tests/api/event.c | 2 +-
tests/api/expr.c | 2 +-
tests/api/feat.c | 2 +-
tests/api/fsio.c | 21 +-
tests/api/modules.c | 2 +-
tests/api/netacl.c | 2 +-
tests/api/netaddr.c | 2 +-
tests/api/netio.c | 2 +-
tests/api/pool.c | 2 +-
tests/api/regexp.c | 2 +-
tests/api/response.c | 2 +-
tests/api/scoreboard.c | 2 +-
tests/api/sets.c | 2 +-
tests/api/stash.c | 2 +-
tests/api/str.c | 9 +-
tests/api/table.c | 2 +-
tests/api/tests.h | 2 +-
tests/api/timers.c | 2 +-
tests/api/var.c | 2 +-
tests/api/version.c | 2 +-
tests/t/commands.t | 11 +
tests/t/config/directory.t | 11 +
tests/t/etc/modules/mod_deflate/zmode.pdf | Bin 2288704 -> 0 bytes
tests/t/etc/modules/mod_geoip/GeoIP.dat | Bin 0 -> 1084888 bytes
tests/t/etc/modules/mod_geoip/GeoIPASNum.dat | Bin 0 -> 3658209 bytes
tests/t/etc/modules/mod_geoip/GeoIPv6.dat | Bin 0 -> 1232477 bytes
tests/t/etc/modules/mod_geoip/GeoLiteCity.dat | Bin 0 -> 30751876 bytes
.../modules/mod_quotatab_file/ftpquota.limittab | Bin 0 -> 130 bytes
.../modules/mod_quotatab_file/ftpquota.tallytab | Bin 0 -> 4 bytes
tests/t/http.t | 11 +
tests/t/lib/ProFTPD/Tests/Commands.pm | 3838 +++++++++++
tests/t/lib/ProFTPD/Tests/Commands/PORT.pm | 162 +
tests/t/lib/ProFTPD/Tests/Commands/STAT.pm | 378 +-
tests/t/lib/ProFTPD/Tests/Config/Directory.pm | 299 +
tests/t/lib/ProFTPD/Tests/Config/DisplayConnect.pm | 39 +-
tests/t/lib/ProFTPD/Tests/HTTP.pm | 270 +
tests/t/lib/ProFTPD/Tests/Modules/mod_auth_file.pm | 141 +
tests/t/lib/ProFTPD/Tests/Modules/mod_copy.pm | 288 +
tests/t/lib/ProFTPD/Tests/Modules/mod_sftp.pm | 333 +
.../t/lib/ProFTPD/Tests/Modules/mod_sql_sqlite.pm | 149 +
.../t/lib/ProFTPD/Tests/Modules/mod_wrap2_file.pm | 282 +-
tests/t/lib/ProFTPD/Tests/SMTP.pm | 173 +
tests/t/smtp.t | 11 +
utils/Makefile.in | 33 -
utils/ftpcount.1 | 59 -
utils/ftpcount.c | 2 +-
utils/ftpscrub.8 | 55 -
utils/ftpscrub.c | 2 +-
utils/ftpshut.8 | 130 -
utils/ftpshut.c | 2 +-
utils/ftptop.1 | 88 -
utils/ftptop.c | 2 +-
utils/ftpwho.1 | 67 -
utils/ftpwho.c | 2 +-
utils/misc.c | 2 +-
utils/scoreboard.c | 2 +-
utils/utils.h | 2 +-
482 files changed, 27316 insertions(+), 3714 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git