diff -Nru vsftpd-2.3.0~pre2/Changelog vsftpd-2.3.2/Changelog --- vsftpd-2.3.0~pre2/Changelog 2010-03-26 04:17:15.000000000 +0000 +++ vsftpd-2.3.2/Changelog 2010-08-19 21:14:11.000000000 +0000 @@ -1226,3 +1226,22 @@ - Change REST + STOR so that it's possible to overwrite part of file without truncating it. (v2.3.0pre2) +- Boot the session if we see a USER where encryption was required. May prevent +the transmission of plaintext passwords by buggy clients. Idea from +Marcin Hlybin . +- Fix failure to transmit a large ASCII file over SSL, if it contains \n -> \r\n +fixups. + +At this point: v2.3.0 released! +=============================== + +- Fix silly regression re: log files being overwritten from the start. +- Rename a few file-open functions to make it clearer what they do. + +At this point: v2.3.1 released! +=============================== + +- Argh! Fix version number. + +At this point: v2.3.2 released! +=============================== diff -Nru vsftpd-2.3.0~pre2/debian/changelog vsftpd-2.3.2/debian/changelog --- vsftpd-2.3.0~pre2/debian/changelog 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/changelog 2011-07-27 04:49:02.000000000 +0000 @@ -1,20 +1,42 @@ -vsftpd (2.3.0~pre2-4ubuntu2~lucid1~ppa2) lucid; urgency=low +vsftpd (2.3.2-3ubuntu5~lucid1~ppa1) lucid; urgency=low - * No change backport + * New upstream. - -- X3-01 Sat, 31 Jul 2010 11:47:38 -0700 + -- X3-01 Wed, 27 Jul 2011 05:36:24 -0000 -vsftpd (2.3.0~pre2-4ubuntu1) maverick; urgency=low +vsftpd (2.3.2-3) unstable; urgency=medium - * Merge from debian unstable: - - Use snakeoil SSL certificates and key. - - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart - - Add apport hook: (LP: #513978): - - debian/vsftpd.apport: Added. - - debian/control: Build-depends on dh-apport. - - debian/rules: Add --with apport. + * Adding patch from Philipp Kern to fix vsftpd on + s390 (Closes: #602726). - -- Chuck Short Mon, 12 Jul 2010 08:57:17 -0400 + -- Daniel Baumann Tue, 09 Nov 2010 01:00:27 +0100 + +vsftpd (2.3.2-2) experimental; urgency=low + + * Adding Brazilian Portuguese debconf translations from Chanely + Marques (Closes: #595658). + + -- Daniel Baumann Sun, 05 Sep 2010 21:18:38 +0200 + +vsftpd (2.3.2-1) experimental; urgency=low + + * Merging upstream version 2.3.2. + + -- Daniel Baumann Wed, 01 Sep 2010 14:34:05 +0200 + +vsftpd (2.3.1-1) experimental; urgency=low + + * Merging upstream version 2.3.1. + * Removing logging.patch, went upstream. + + -- Daniel Baumann Wed, 01 Sep 2010 14:29:49 +0200 + +vsftpd (2.3.0-1) unstable; urgency=low + + * Merging upstream version 2.3.0. + * Updating standards version to 3.9.1. + + -- Daniel Baumann Sat, 14 Aug 2010 14:09:51 +0200 vsftpd (2.3.0~pre2-4) unstable; urgency=low @@ -24,22 +46,6 @@ -- Daniel Baumann Tue, 06 Jul 2010 00:08:41 +0200 -vsftpd (2.3.0~pre2-3ubuntu1) maverick; urgency=low - - * Merge from debian unstable: - - Use snakeoil SSL certificates and key. - - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart - - Add apport hook: (LP: #513978): - - debian/vsftpd.apport: Added. - - debian/control: Build-depends on dh-apport. - - debian/rules: Add --with apport. - - Dropped: - + debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8: - Use the debian version instead. - - Add debian/watch file - - -- Chuck Short Mon, 21 Jun 2010 14:07:17 -0400 - vsftpd (2.3.0~pre2-3) unstable; urgency=low * Adding patch from Regid Ichira to fix @@ -83,63 +89,6 @@ -- Daniel Baumann Sun, 14 Mar 2010 15:59:30 +0100 -vsftpd (2.2.2-3ubuntu7) maverick; urgency=low - - * debian/vsftpd.upstart: Fix typo. Thanks Jürgen Kreileder. - (LP: #577165) - - -- Angel Abad Thu, 13 May 2010 20:48:52 +0200 - -vsftpd (2.2.2-3ubuntu6) lucid; urgency=low - - * debian/vsftpd.upstart: Update upstart job. (LP: #563973) - - -- Chuck Short Thu, 15 Apr 2010 13:28:58 -0400 - -vsftpd (2.2.2-3ubuntu5) lucid; urgency=low - - [Chuck Short] - * debian/vsftpd.postinst: Add a group from the username selected by the user. (LP: #530832) - * debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. (LP: #528860) - - [Andres Rodriguez] - * Add apport hook (LP: #531978): - - debian/vsftpd.apport: Added. - - debian/control: Build-depends on dh-apport. - - debian/rules: Add --with apport. - - -- Chuck Short Mon, 15 Mar 2010 15:16:32 -0400 - -vsftpd (2.2.2-3ubuntu4) lucid; urgency=low - - * debian/vsftpd.upstart: Fix up upstart script. Thanks to Paul Elliott. - (LP: #511057) - - -- Chuck Short Fri, 22 Jan 2010 13:13:02 -0500 - -vsftpd (2.2.2-3ubuntu3) lucid; urgency=low - - * Fix missing parameter in upstart script. (LP: #511057) - - -- Paul Elliott Fri, 22 Jan 2010 08:11:47 +0000 - -vsftpd (2.2.2-3ubuntu2) lucid; urgency=low - - * debian/rules, debian/vsftpd.upstart: migrate to vsftpd to upstart. - - -- Chuck Short Sun, 17 Jan 2010 14:18:56 -0500 - -vsftpd (2.2.2-3ubuntu1) lucid; urgency=low - - * Merged from debian testing:: - - Use LSB functions in the init script. - - Use snakeoil SSL certificates and key. - - Add update-inetd dependency. - - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8. - (LP: #364958) - - -- Chuck Short Tue, 05 Jan 2010 10:01:25 -0500 - vsftpd (2.2.2-3) unstable; urgency=low * Moving chroot creation out of the start sequence (Closes: #472329). @@ -187,17 +136,6 @@ -- Daniel Baumann Fri, 06 Nov 2009 13:40:19 +0100 -vsftpd (2.2.0-4ubuntu1) lucid; urgency=low - - * Merge from debian unstable, remaining changes: - - Use LSB functions in the init script. - - Use snakeoil SSL certificates and key. - - Add update-inetd dependency. - - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8. - (LP: #364958) - - -- Chuck Short Wed, 21 Oct 2009 22:23:37 +0100 - vsftpd (2.2.0-4) unstable; urgency=low * Adding patch from Michael Stapelberg to @@ -237,18 +175,6 @@ -- Daniel Baumann Sun, 20 Sep 2009 18:33:01 +0200 -vsftpd (2.2.0-1ubuntu1) karmic; urgency=low - - * Merge from debian unstable, remaining changes: - - Use LSB functions in the init script. - - Use snakeoil SSL certificates and key. - - Do not create rc.d stop symlinks. - - Add update-inetd dependency. - - debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8. - (LP: #364958) - - -- Chuck Short Fri, 14 Aug 2009 07:59:11 +0100 - vsftpd (2.2.0-1) unstable; urgency=low * Improving English in messages outputted in postinst script, thanks @@ -260,23 +186,6 @@ -- Daniel Baumann Thu, 13 Aug 2009 23:47:26 +0200 -vsftpd (2.2.0~pre4-2ubuntu2) karmic; urgency=low - - * debian/patches/07_vsftpd-enable-utf8.patch: Add support for UTF8 - (LP: #364958). - - -- Chuck Short Tue, 11 Aug 2009 09:40:01 -0400 - -vsftpd (2.2.0~pre4-2ubuntu1) karmic; urgency=low - - * Merge from debian unstable, remaining changes: - - Use LSB functions in the init script. - - Use snakeoil SSL certificates and key. - - Do not create rc.d stop symlinks - - Add update-inetd dependency. - - -- Chuck Short Mon, 20 Jul 2009 05:55:34 +0100 - vsftpd (2.2.0~pre4-2) unstable; urgency=low * Updating depends in update target of rules. @@ -319,16 +228,6 @@ -- Daniel Baumann Fri, 10 Jul 2009 14:40:37 +0200 -vsftpd (2.1.2-1ubuntu1) karmic; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Use LSB functions in the init script - - Use snakeoil SSL certificate and key - - Do not create rc.d stop symlinks - - Add update-inetd dependency - - -- Adrien Cunin Mon, 15 Jun 2009 00:33:10 +0200 - vsftpd (2.1.2-1) unstable; urgency=low * Using correct rfc-2822 date formats in changelog. @@ -341,22 +240,6 @@ -- Daniel Baumann Sat, 30 May 2009 10:16:14 +0200 -vsftpd (2.1.1~pre1-2ubuntu1) karmic; urgency=low - - * Merge from Debian unstable. Remaining changes: - - Use LSB functions in the init script - - Use snakeoil SSL certificate and key - - Do not create rc.d stop symlinks - - Add update-inetd dependency - * Dropped postinst change removing rc.d stop symlinks, was only useful for - edgy and hardy upgrades - * This upload includes changes closing a few bugs: - - New upstream release (LP: #333478) - - Call adduser with --quiet in postinst (LP: #272084) - - Extend username length limit (LP: #343738) - - -- Adrien Cunin Fri, 08 May 2009 23:17:40 +0200 - vsftpd (2.1.1~pre1-2) unstable; urgency=medium * Correcting wrong charset definition in Galizian debconf translations @@ -494,13 +377,6 @@ -- Daniel Baumann Sat, 31 Jan 2009 00:47:00 +0100 -vsftpd (2.0.7-0ubuntu1) intrepid; urgency=low - - * New upstream release - - Fixes SSL shutdown bug (LP: #254905) - - -- Adrien Cunin Tue, 16 Sep 2008 19:20:32 +0200 - vsftpd (2.0.6-1.2) unstable; urgency=low * Non-maintainer upload to fix a RC bug. @@ -511,27 +387,6 @@ -- Rogério Brito Fri, 26 Sep 2008 10:01:46 -0300 -vsftpd (2.0.6-1.1ubuntu2) intrepid; urgency=low - - * Removed update-rc.d "multiuser" option and updated init info (LP: #254273) - http://lists.ubuntu.com/archives/ubuntu-devel-announce/2008-June/000430.html - * Added Homepage field on debian/control - * Upgrade standards to 3.8.0 - - -- Nicolas Valcárcel Tue, 12 Aug 2008 20:23:05 -0500 - -vsftpd (2.0.6-1.1ubuntu1) intrepid; urgency=low - - * Merge from debian unstable, remaining changes: - - lsb init script - - use snakeoil ssl certs - - add update-inetd dependency - - Modify Maintainer value to match DebianMaintainerField spec. - * Dropped: - - remove stop links from rc0 and rc6: pre-hardy upgrades. - - -- Mathias Gug Fri, 09 May 2008 18:27:41 -0400 - vsftpd (2.0.6-1.1) unstable; urgency=low * Non-maintainer upload to solve release goal. @@ -539,18 +394,6 @@ -- Petter Reinholdtsen Mon, 17 Mar 2008 09:46:02 +0100 -vsftpd (2.0.6-1ubuntu1) hardy; urgency=low - - * Merge from Debian unstable, remaining changes: - - remove stop links from rc0 and rc6 - - lsb init script - - use snakeoil ssl certs - - add update-inetd dependency - * debian/control: - - Modify Maintainer value to match DebianMaintainerField spec. - - -- Matti Lindell Mon, 25 Feb 2008 09:53:13 +0200 - vsftpd (2.0.6-1) unstable; urgency=low * New upstream release. Closes: #467128. @@ -567,23 +410,6 @@ -- Matej Vela Sat, 23 Feb 2008 11:39:37 +0100 -vsftpd (2.0.5-2ubuntu2) feisty; urgency=low - - * debian/control: Add update-inetd dependency (Ubuntu netbase - drops inetd dependency but update-inetd is needed in postinst, - Closes Ubuntu: #75432). - - -- Lionel Porcheron Wed, 13 Dec 2006 11:02:41 +0100 - -vsftpd (2.0.5-2ubuntu1) feisty; urgency=low - - * Merge from debian unstable, remaining changes: - - remove stop links from rc0 and rc6 - - lsb init script - - use snakeoil ssl certs - - -- Scott James Remnant Tue, 28 Nov 2006 15:56:37 +0000 - vsftpd (2.0.5-2) unstable; urgency=low * New maintainer. Closes: #385929. @@ -627,43 +453,6 @@ -- Daniel Jacobowitz Sun, 23 Jul 2006 18:46:23 -0400 -vsftpd (2.0.4-0ubuntu5) edgy; urgency=low - - * Remove stop script symlinks from rc0 and rc6. - - -- Scott James Remnant Mon, 18 Sep 2006 16:34:57 +0100 - -vsftpd (2.0.4-0ubuntu4) dapper; urgency=low - - * Switch default config to use ssl-cert-snakeoil certificates. - * Add Depends on ssl-cert. - - -- Fabio M. Di Nitto Fri, 03 Feb 2006 17:05:04 +0100 - -vsftpd (2.0.4-0ubuntu3) dapper; urgency=low - - * Create /var/run/vsftpd if necessary before starting the daemon. - - -- Colin Watson Thu, 2 Feb 2006 09:13:03 +0000 - -vsftpd (2.0.4-0ubuntu2) dapper; urgency=low - - * Upload as upstream version. - - -- Matthias Klose Thu, 19 Jan 2006 15:27:31 +0000 - -vsftpd (2.0.4-0ubuntu1) dapper; urgency=low - - * New upstream version. - - -- Matthias Klose Thu, 19 Jan 2006 16:19:35 +0100 - -vsftpd (2.0.3-1ubuntu1) breezy; urgency=low - - * Resynchronise with Debian. - - -- Adam Conrad Thu, 21 Apr 2005 08:43:37 +0000 - vsftpd (2.0.3-1) unstable; urgency=low * New upstream release (Closes: #300132). @@ -672,12 +461,6 @@ -- Daniel Jacobowitz Fri, 01 Apr 2005 22:47:55 -0500 -vsftpd (2.0.1-1ubuntu1) hoary; urgency=low - - * pretty init scriptage - - -- LaMont Jones Wed, 23 Mar 2005 15:52:34 -0700 - vsftpd (2.0.1-1) unstable; urgency=low * New upstream release (Closes: #249977, #257773). @@ -850,4 +633,3 @@ * Abort if kernel 2.4.0 or 2.4.1 is running. -- Daniel Jacobowitz Thu, 08 Mar 2001 01:24:06 -0500 - diff -Nru vsftpd-2.3.0~pre2/debian/control vsftpd-2.3.2/debian/control --- vsftpd-2.3.0~pre2/debian/control 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/control 2011-07-27 04:49:02.000000000 +0000 @@ -1,14 +1,13 @@ Source: vsftpd Section: net Priority: extra -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Daniel Baumann +Maintainer: Daniel Baumann Uploaders: Daniel Baumann Build-Depends: debhelper (>= 7.0.50~), libcap2-dev [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], libpam0g-dev, libssl-dev, libwrap0-dev, quilt (>= 0.46-7) -Standards-Version: 3.9.0 +Standards-Version: 3.9.1 Homepage: http://vsftpd.beasts.org/ Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/vsftpd.git Vcs-Git: git://git.debian-maintainers.org/git/daniel/vsftpd.git diff -Nru vsftpd-2.3.0~pre2/debian/patches/07_vsftpd-enable-utf8.patch vsftpd-2.3.2/debian/patches/07_vsftpd-enable-utf8.patch --- vsftpd-2.3.0~pre2/debian/patches/07_vsftpd-enable-utf8.patch 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/patches/07_vsftpd-enable-utf8.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,55 +0,0 @@ -diff -Naurp vsftpd-2.2.0.orig/features.c vsftpd-2.2.0/features.c ---- vsftpd-2.2.0.orig/features.c 2008-12-04 01:00:47.000000000 -0500 -+++ vsftpd-2.2.0/features.c 2009-08-11 09:36:10.000000000 -0400 -@@ -21,6 +21,10 @@ handle_feat(struct vsf_session* p_sess) - vsf_cmdio_write_raw(p_sess, " AUTH SSL\r\n"); - vsf_cmdio_write_raw(p_sess, " AUTH TLS\r\n"); - } -+ if (tunable_utf8_filesystem) -+ { -+ vsf_cmdio_write_raw(p_sess, " UTF8\r\n"); -+ } - if (tunable_port_enable) - { - vsf_cmdio_write_raw(p_sess, " EPRT\r\n"); -diff -Naurp vsftpd-2.2.0.orig/parseconf.c vsftpd-2.2.0/parseconf.c ---- vsftpd-2.2.0.orig/parseconf.c 2009-07-18 01:56:02.000000000 -0400 -+++ vsftpd-2.2.0/parseconf.c 2009-08-11 09:36:10.000000000 -0400 -@@ -28,6 +28,7 @@ static struct parseconf_bool_setting - parseconf_bool_array[] = - { - { "anonymous_enable", &tunable_anonymous_enable }, -+ { "utf8_filesystem", &tunable_utf8_filesystem }, - { "local_enable", &tunable_local_enable }, - { "pasv_enable", &tunable_pasv_enable }, - { "port_enable", &tunable_port_enable }, -diff -Naurp vsftpd-2.2.0.orig/tunables.c vsftpd-2.2.0/tunables.c ---- vsftpd-2.2.0.orig/tunables.c 2009-07-15 16:08:27.000000000 -0400 -+++ vsftpd-2.2.0/tunables.c 2009-08-11 09:36:10.000000000 -0400 -@@ -10,6 +10,7 @@ - - int tunable_anonymous_enable; - int tunable_local_enable; -+int tunable_utf8_filesystem; - int tunable_pasv_enable; - int tunable_port_enable; - int tunable_chroot_local_user; -@@ -146,6 +147,7 @@ tunables_load_defaults() - { - tunable_anonymous_enable = 1; - tunable_local_enable = 0; -+ tunable_utf8_filesystem = 0; - tunable_pasv_enable = 1; - tunable_port_enable = 1; - tunable_chroot_local_user = 0; -diff -Naurp vsftpd-2.2.0.orig/tunables.h vsftpd-2.2.0/tunables.h ---- vsftpd-2.2.0.orig/tunables.h 2009-07-06 21:37:28.000000000 -0400 -+++ vsftpd-2.2.0/tunables.h 2009-08-11 09:36:10.000000000 -0400 -@@ -11,6 +11,7 @@ void tunables_load_defaults(); - /* Booleans */ - extern int tunable_anonymous_enable; /* Allow anon logins */ - extern int tunable_local_enable; /* Allow local logins */ -+extern int tunable_utf8_filesystem; /* Server uses UTF8 Filesystem */ - extern int tunable_pasv_enable; /* Allow PASV */ - extern int tunable_port_enable; /* Allow PORT */ - extern int tunable_chroot_local_user; /* Restrict local to home dir */ diff -Nru vsftpd-2.3.0~pre2/debian/patches/09-disable-anonymous.patch vsftpd-2.3.2/debian/patches/09-disable-anonymous.patch --- vsftpd-2.3.0~pre2/debian/patches/09-disable-anonymous.patch 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/patches/09-disable-anonymous.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -diff -Naurp vsftpd-2.2.2.orig/vsftpd.conf vsftpd-2.2.2/vsftpd.conf ---- vsftpd-2.2.2.orig/vsftpd.conf 2010-03-15 14:58:59.982885227 -0400 -+++ vsftpd-2.2.2/vsftpd.conf 2010-03-15 15:00:01.732885109 -0400 -@@ -19,11 +19,11 @@ listen=YES - # exclusive. - #listen_ipv6=YES - # --# Allow anonymous FTP? (Beware - allowed by default if you comment this out). --anonymous_enable=YES -+# Allow anonymous FTP? (Disabled by default) -+anonymous_enable=NO - # - # Uncomment this to allow local users to log in. --#local_enable=YES -+local_enable=YES - # - # Uncomment this to enable any form of FTP write command. - #write_enable=YES diff -Nru vsftpd-2.3.0~pre2/debian/patches/10-logging.patch vsftpd-2.3.2/debian/patches/10-logging.patch --- vsftpd-2.3.0~pre2/debian/patches/10-logging.patch 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/patches/10-logging.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -Authors: - Regid Ichira - Jean-Louis Dupond -Description: - In recent versions of sysutil.c, vsf_sysutil_create_or_open_file() does not - O_APPEND anymore leading to messed up logging (Closes: #579684). - -diff -Naurp vsftpd.orig/logging.c vsftpd/logging.c ---- vsftpd.orig/logging.c 2009-10-19 05:24:23.000000000 +0200 -+++ vsftpd/logging.c 2010-07-06 00:01:14.133022535 +0200 -@@ -41,7 +41,7 @@ vsf_log_init(struct vsf_session* p_sess) - } - if (tunable_dual_log_enable || tunable_xferlog_std_format) - { -- retval = vsf_sysutil_create_or_open_file(tunable_xferlog_file, 0600); -+ retval = vsf_sysutil_create_or_append_file(tunable_xferlog_file, 0600); - if (vsf_sysutil_retval_is_error(retval)) - { - die2("failed to open xferlog log file:", tunable_xferlog_file); -@@ -52,7 +52,7 @@ vsf_log_init(struct vsf_session* p_sess) - { - if (!tunable_syslog_enable) - { -- retval = vsf_sysutil_create_or_open_file(tunable_vsftpd_log_file, 0600); -+ retval = vsf_sysutil_create_or_append_file(tunable_vsftpd_log_file, 0600); - if (vsf_sysutil_retval_is_error(retval)) - { - die2("failed to open vsftpd log file:", tunable_vsftpd_log_file); -diff -Naurp vsftpd.orig/sysutil.c vsftpd/sysutil.c ---- vsftpd.orig/sysutil.c 2010-03-27 09:58:27.000000000 +0100 -+++ vsftpd/sysutil.c 2010-07-06 00:01:14.137022485 +0200 -@@ -1197,6 +1197,12 @@ vsf_sysutil_create_or_open_file(const ch - return open(p_filename, O_CREAT | O_WRONLY | O_NONBLOCK, mode); - } - -+int -+vsf_sysutil_create_or_append_file(const char* p_filename, unsigned int mode) -+{ -+ return open(p_filename, O_CREAT | O_WRONLY | O_NONBLOCK | O_APPEND, mode); -+} -+ - void - vsf_sysutil_dupfd2(int old_fd, int new_fd) - { -diff -Naurp vsftpd.orig/sysutil.h vsftpd/sysutil.h ---- vsftpd.orig/sysutil.h 2010-03-27 09:58:27.000000000 +0100 -+++ vsftpd/sysutil.h 2010-07-06 00:01:14.137022485 +0200 -@@ -87,8 +87,10 @@ int vsf_sysutil_create_file(const char* - int vsf_sysutil_create_overwrite_file(const char* p_filename); - /* Creates file or appends if already exists */ - int vsf_sysutil_create_append_file(const char* p_filename); --/* Creates or appends */ -+/* Creates or opens */ - int vsf_sysutil_create_or_open_file(const char* p_filename, unsigned int mode); -+/* Creates or appends */ -+int vsf_sysutil_create_or_append_file(const char* p_filename, unsigned int mode); - void vsf_sysutil_dupfd2(int old_fd, int new_fd); - void vsf_sysutil_close(int fd); - int vsf_sysutil_close_failok(int fd); diff -Nru vsftpd-2.3.0~pre2/debian/patches/10-s390.patch vsftpd-2.3.2/debian/patches/10-s390.patch --- vsftpd-2.3.0~pre2/debian/patches/10-s390.patch 1970-01-01 00:00:00.000000000 +0000 +++ vsftpd-2.3.2/debian/patches/10-s390.patch 2011-07-27 04:49:02.000000000 +0000 @@ -0,0 +1,15 @@ +Author: Philipp Kern +Description: Fix vsftpd on s390 (Closes: #602726). + +diff -Naurp vsftpd.orig/sysdeputil.c vsftpd/sysdeputil.c +--- vsftpd.orig/sysdeputil.c 2010-03-26 04:25:33.000000000 +0100 ++++ vsftpd/sysdeputil.c 2010-11-09 00:56:57.759463692 +0100 +@@ -64,7 +64,7 @@ + #include + + /* BEGIN config */ +-#if defined(__linux__) ++#if defined(__linux__) && !defined(__s390__) + #include + #include + #define VSF_SYSDEP_HAVE_LINUX_CLONE diff -Nru vsftpd-2.3.0~pre2/debian/patches/series vsftpd-2.3.2/debian/patches/series --- vsftpd-2.3.0~pre2/debian/patches/series 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/patches/series 2011-07-27 04:49:02.000000000 +0000 @@ -5,7 +5,6 @@ 05-link-local.patch 06-whitespaces.patch 07-greedy.patch -07_vsftpd-enable-utf8.patch -09-disable-anonymous.patch +08-utf8.patch 09-manpage.patch -10-logging.patch +10-s390.patch diff -Nru vsftpd-2.3.0~pre2/debian/po/cs.po vsftpd-2.3.2/debian/po/cs.po --- vsftpd-2.3.0~pre2/debian/po/cs.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/cs.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-05-30 08:24+0000\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-06-21 08:20+0200\n" "Last-Translator: Vítězslav Kotrla \n" "Language-Team: Czech \n" +"Language: cs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -28,9 +29,9 @@ "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." msgstr "" -"Pokud by byl FTP server spuštěn se superuživatelskými oprávněními, mohlo by dojít " -"ke kompromitaci zabezpečení systému. Proto musí FTP server pro svoji činnost používat " -"vyhrazený neprivilegovaný účet." +"Pokud by byl FTP server spuštěn se superuživatelskými oprávněními, mohlo by " +"dojít ke kompromitaci zabezpečení systému. Proto musí FTP server pro svoji " +"činnost používat vyhrazený neprivilegovaný účet." #. Type: string #. Description @@ -47,5 +48,6 @@ #. Type: string #. Description #: ../vsftpd.templates:2001 -msgid "Please specify the directory that will be used as root for the FTP server." +msgid "" +"Please specify the directory that will be used as root for the FTP server." msgstr "Zadejte prosím adresář, ve kterém bude umístěn kořen FTP serveru:" diff -Nru vsftpd-2.3.0~pre2/debian/po/de.po vsftpd-2.3.2/debian/po/de.po --- vsftpd-2.3.0~pre2/debian/po/de.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/de.po 2011-07-27 04:49:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-06 19:01+0200\n" "Last-Translator: Daniel Baumann \n" "MIME-Version: 1.0\n" @@ -16,13 +16,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Eigenes Systemkonto für den vsftpd FTP-Daemon:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -33,19 +33,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Bitte wählen Sie den Benutzernamen dieses Kontos." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "FTP-Wurzelverzeichnis:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/es.po vsftpd-2.3.2/debian/po/es.po --- vsftpd-2.3.0~pre2/debian/po/es.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/es.po 2011-07-27 04:49:02.000000000 +0000 @@ -7,10 +7,11 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-03-30 22:35+0200\n" "Last-Translator: Fernando González de Requena \n" "Language-Team: Spanish \n" +"Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,13 +19,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Cuenta del sistema dedicada para el demonio de FTP vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -35,19 +36,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Elija un nombre de usuario para esa cuenta." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Directorio raíz del servidor de FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/fi.po vsftpd-2.3.2/debian/po/fi.po --- vsftpd-2.3.0~pre2/debian/po/fi.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/fi.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: vsftpd\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-07 22:19+0300\n" "Last-Translator: Esko Arajärvi \n" "Language-Team: Finnish \n" +"Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,13 +19,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Dedikoitu järjestelmätunnus vsfptd:n FTP-taustaohjelman ajamiseen:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -35,19 +36,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Valitse kyseisen tunnuksen nimi." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "FTP-juurihakemisto:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "Anna hakemisto, jota käytetään FTP-palvelimen juurena." diff -Nru vsftpd-2.3.0~pre2/debian/po/fr.po vsftpd-2.3.2/debian/po/fr.po --- vsftpd-2.3.0~pre2/debian/po/fr.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/fr.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,23 +6,24 @@ msgstr "" "Project-Id-Version: 2.1.0-1\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-03-26 01:12+0100\n" "Last-Translator: Steve Petruzzello \n" "Language-Team: French \n" +"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Identifiant dédié pour le démon FTP vsftpd :" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -32,19 +33,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Veuillez choisir cet identifiant." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Répertoire racine FTP :" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/gl.po vsftpd-2.3.2/debian/po/gl.po --- vsftpd-2.3.0~pre2/debian/po/gl.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/gl.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: templates_[yW3423]\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-15 21:32+0200\n" "Last-Translator: marce villarino \n" "Language-Team: Galician \n" +"Language: gl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,13 +19,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Conta de usuario do sistema adicada ao daemon FTP vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -35,19 +36,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Escolla o nome de usuario desa conta." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Directorio raíz do FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "Especifique o directorio que se empregará como raíz polo servidor FTP." diff -Nru vsftpd-2.3.0~pre2/debian/po/it.po vsftpd-2.3.2/debian/po/it.po --- vsftpd-2.3.0~pre2/debian/po/it.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/it.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-03-26 08:52+0100\n" "Last-Translator: Vincenzo Campanella \n" "Language-Team: Italian \n" +"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,13 +18,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Account di sistema dedicato per il demone FTP di vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -34,19 +35,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Scegliere il nome utente di tale account." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Directory radice FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/ja.po vsftpd-2.3.2/debian/po/ja.po --- vsftpd-2.3.0~pre2/debian/po/ja.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/ja.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,23 +6,24 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-09 19:20+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" +"Language: ja\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "vsftpd FTP デーモン専用のシステムアカウント:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -32,19 +33,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "アカウントのユーザ名を選んでください。" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "FTP の root ディレクトリ:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/pt_BR.po vsftpd-2.3.2/debian/po/pt_BR.po --- vsftpd-2.3.0~pre2/debian/po/pt_BR.po 1970-01-01 00:00:00.000000000 +0000 +++ vsftpd-2.3.2/debian/po/pt_BR.po 2011-07-27 04:49:02.000000000 +0000 @@ -0,0 +1,55 @@ +# Brazilian Portuguese translation of vsftpd debconf templates. +# 2010 Chanely Marques +# This file is distributed under the same license as the vsftpd package. +# +msgid "" +msgstr "" +"Project-Id-Version: vsftpd 2.3.0.2-4\n" +"Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" +"PO-Revision-Date: 2010-09-04 14:01-0300\n" +"Last-Translator: Chanely Marques \n" +"Language-Team: Brazilian Portuguese \n" +"Language: pt_BR\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: string +#. Description +#: ../vsftpd.templates:1001 +msgid "Dedicated system account for the vsftpd FTP daemon:" +msgstr "Conta do sistema dedicada ao daemon FTP vsftpd:" + +#. Type: string +#. Description +#: ../vsftpd.templates:1001 +msgid "" +"The FTP server must use a dedicated account for its operation so that the " +"system's security is not compromised by running it with superuser privileges." +msgstr "" +"O servidor FTP deve usar uma conta dedicada para sua operação, de modo que a " +"segurança do sistema não seja comprometida por ser executado com privilégios " +"de superusuário." + +#. Type: string +#. Description +#: ../vsftpd.templates:1001 +msgid "Please choose that account's username." +msgstr "Por favor, escolha a conta de usuário." + +#. Type: string +#. Description +#: ../vsftpd.templates:2001 +msgid "FTP root directory:" +msgstr "Diretório raiz do FTP:" + +#. Type: string +#. Description +#: ../vsftpd.templates:2001 +msgid "" +"Please specify the directory that will be used as root for the FTP server." +msgstr "" +"Por favor, especifique o diretório que será usado como raiz para o servidor " +"FTP." diff -Nru vsftpd-2.3.0~pre2/debian/po/pt.po vsftpd-2.3.2/debian/po/pt.po --- vsftpd-2.3.0~pre2/debian/po/pt.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/pt.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-03-26 19:12+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" +"Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -17,13 +18,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Conta dedicada do sistema para o deamon FTP vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -34,19 +35,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Por favor escolha o nome dessa conta." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Directório raiz FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/ru.po vsftpd-2.3.2/debian/po/ru.po --- vsftpd-2.3.0~pre2/debian/po/ru.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/ru.po 2011-07-27 04:49:02.000000000 +0000 @@ -7,26 +7,27 @@ msgstr "" "Project-Id-Version: vsftpd 2.0.7-4\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-08 21:08+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" +"Language: ru\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Generator: KBabel 1.11.4\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" -"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Специально выделенная системная учётная запись для FTP службы vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -36,19 +37,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Укажите имя такой учётной записи." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Корневой каталог FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/sv.po vsftpd-2.3.2/debian/po/sv.po --- vsftpd-2.3.0~pre2/debian/po/sv.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/sv.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,10 +6,11 @@ msgstr "" "Project-Id-Version: vsftpd\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-04-07 18:36+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: swedish \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,13 +19,13 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "Dedikerat systemkonto för ftp-tjänsten vsftpd:" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -34,19 +35,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "Ange kontots användarnamn." #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "Rot-katalog för FTP:" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "Ange katalog som ska agera rot-nivå för ftp-servern." diff -Nru vsftpd-2.3.0~pre2/debian/po/templates.pot vsftpd-2.3.2/debian/po/templates.pot --- vsftpd-2.3.0~pre2/debian/po/templates.pot 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/templates.pot 2011-07-27 04:49:02.000000000 +0000 @@ -8,23 +8,24 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -32,19 +33,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "" diff -Nru vsftpd-2.3.0~pre2/debian/po/zh_CN.po vsftpd-2.3.2/debian/po/zh_CN.po --- vsftpd-2.3.0~pre2/debian/po/zh_CN.po 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/po/zh_CN.po 2011-07-27 04:49:02.000000000 +0000 @@ -6,23 +6,24 @@ msgstr "" "Project-Id-Version: vsftpd\n" "Report-Msgid-Bugs-To: vsftpd@packages.debian.org\n" -"POT-Creation-Date: 2009-03-26 07:45+0100\n" +"POT-Creation-Date: 2010-09-05 21:17+0200\n" "PO-Revision-Date: 2009-03-26 16:48+0800\n" "Last-Translator: Deng Xiyue \n" "Language-Team: Debian Chinese GB \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Dedicated system account for the vsftpd FTP daemon:" msgstr "指定操作 vsftpd FTP 守护进程的专用系统帐户：" #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "" "The FTP server must use a dedicated account for its operation so that the " "system's security is not compromised by running it with superuser privileges." @@ -32,19 +33,19 @@ #. Type: string #. Description -#: ../vsftpd.templates:2001 +#: ../vsftpd.templates:1001 msgid "Please choose that account's username." msgstr "请选择账户的用户名。" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "FTP root directory:" msgstr "FTP 根目录：" #. Type: string #. Description -#: ../vsftpd.templates:3001 +#: ../vsftpd.templates:2001 msgid "" "Please specify the directory that will be used as root for the FTP server." msgstr "请指定用作 FTP 服务器根目录的目录。" diff -Nru vsftpd-2.3.0~pre2/debian/rules vsftpd-2.3.2/debian/rules --- vsftpd-2.3.0~pre2/debian/rules 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/rules 2011-07-27 04:49:02.000000000 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -DEB_UPDATE_RCD_PARAMS := start 20 2 3 4 5 . stop 80 1 . DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) ifneq ($(DEB_HOST_ARCH_OS),kfreebsd) diff -Nru vsftpd-2.3.0~pre2/debian/vsftpd.init vsftpd-2.3.2/debian/vsftpd.init --- vsftpd-2.3.0~pre2/debian/vsftpd.init 1970-01-01 00:00:00.000000000 +0000 +++ vsftpd-2.3.2/debian/vsftpd.init 2011-07-27 04:49:02.000000000 +0000 @@ -0,0 +1,116 @@ +#!/bin/sh + +### BEGIN INIT INFO +# Provides: vsftpd +# Required-Start: $remote_fs $syslog +# Required-Stop: $remote_fs $syslog +# Default-Start: 2 3 4 5 +# Default-Stop: 1 +# Short-Description: Very secure FTP server +### END INIT INFO + +set -e + +DAEMON="/usr/sbin/vsftpd" +NAME="vsftpd" +PATH="/sbin:/bin:/usr/sbin:/usr/bin" +LOGFILE="/var/log/vsftpd.log" +CHROOT="/var/run/vsftpd/empty" + +test -x "${DAEMON}" || exit 0 + +if [ ! -e "${LOGFILE}" ] +then + touch "${LOGFILE}" + chmod 640 "${LOGFILE}" + chown root:adm "${LOGFILE}" +fi + +if [ ! -d "${CHROOT}" ] +then + mkdir -p "${CHROOT}" +fi + +Check_standalone_mode () +{ + # Return 1 if vsftpd.conf doesn't have listen=yes or listen_ipv6=yes + # (mandatory for standalone operation). + + CONFFILE="/etc/vsftpd.conf" + + if [ -e "${CONFFILE}" ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}" + then + echo "${CONFFILE}: listen disabled - service will not start" + return 1 + fi +} + +case "${1}" in + start) + Check_standalone_mode || exit 0 + echo -n "Starting FTP server: " + + start-stop-daemon --start --background -m --oknodo --pidfile /var/run/vsftpd/vsftpd.pid --exec ${DAEMON} + + echo "${NAME}." + ;; + + stop) + echo -n "Stopping FTP server: " + + start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --exec ${DAEMON} + rm -f /var/run/vsftpd/vsftpd.pid + + echo "${NAME}." + + ;; + + restart) + echo -n "Stopping FTP server: " + + start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --oknodo --exec ${DAEMON} + rm -f /var/run/vsftpd/vsftpd.pid + + echo "${NAME}." + Check_standalone_mode || exit 0 + echo -n "Starting FTP server: " + + start-stop-daemon --start --background -m --pidfile /var/run/vsftpd/vsftpd.pid --exec ${DAEMON} + + echo "${NAME}." + ;; + + reload|force-reload) + echo "Reloading FTP server configuration: " + + start-stop-daemon --stop --pidfile /var/run/vsftpd/vsftpd.pid --signal 1 --exec $DAEMON + + echo "${NAME}." + ;; + + status) + PID="$(cat /var/run/vsftpd/vsftpd.pid 2>/dev/null)" || true + + if [ ! -f /var/run/vsftpd/vsftpd.pid ] || [ -z "${PID}" ] + then + echo "${NAME} is not running" + exit 3 + fi + + if ps "${PID}" >/dev/null 2>&1 + then + echo "${NAME} is running" + exit 0 + else + echo "${NAME} is not running" + exit 1 + fi + ;; + + *) + echo "Usage: /etc/init.d/${NAME} {start|stop|restart|reload|status}" + exit 1 + ;; +esac + +exit 0 diff -Nru vsftpd-2.3.0~pre2/debian/vsftpd.upstart vsftpd-2.3.2/debian/vsftpd.upstart --- vsftpd-2.3.0~pre2/debian/vsftpd.upstart 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/vsftpd.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -# vsftpd - FTP Daemon -# - -description "vsftpd daemon" -author "Chuck Short " - -start on (filesystem - and net-device-up IFACE!=lo) -stop on runlevel [!2345] -respawn - -pre-start script - check_standalone_mode() - { - # Return 1 if vsftpd.conf doesn't have listen yes or listen_ipv6=yes - CONFFILE="/etc/vsftpd.conf" - - if [ -e "${CONFFILE}" ] && !egrep -iq "^ *listen(_ipv6)? *= *yes" "${CONFFILE}" - then - echo "${CONFFILE}: listen disabled - service will not start" - return 1 - fi - } - [ -d /var/run/vsftpd ] || install -m 755 -o root -g root -d /var/run/vsftpd - [ -d /var/run/vsftpd/empty ] || install -m 755 -o root -g root -d /var/run/vsftpd/empty - check_standalone_mode || exit 0 -end script - -exec /usr/sbin/vsftpd - diff -Nru vsftpd-2.3.0~pre2/debian/watch vsftpd-2.3.2/debian/watch --- vsftpd-2.3.0~pre2/debian/watch 2011-07-27 04:49:02.000000000 +0000 +++ vsftpd-2.3.2/debian/watch 1970-01-01 00:00:00.000000000 +0000 @@ -1,2 +0,0 @@ -version=3 -ftp://vsftpd.beasts.org/users/cevans/vsftpd-(\d.*).tar.gz diff -Nru vsftpd-2.3.0~pre2/defs.h vsftpd-2.3.2/defs.h --- vsftpd-2.3.0~pre2/defs.h 2010-03-26 03:06:55.000000000 +0000 +++ vsftpd-2.3.2/defs.h 2010-08-06 00:43:50.000000000 +0000 @@ -15,8 +15,9 @@ #define VSFTP_LISTEN_BACKLOG 32 #define VSFTP_SECURE_UMASK 077 #define VSFTP_ROOT_UID 0 -/* Must be greater than both VSFTP_MAX_COMMAND_LINE and VSFTP_DIR_BUFSIZE */ -#define VSFTP_PRIVSOCK_MAXSTR VSFTP_DATA_BUFSIZE +/* Must be at least the size of VSFTP_MAX_COMMAND_LINE, VSFTP_DIR_BUFSIZE and + VSFTP_DATA_BUFSIZE*2 */ +#define VSFTP_PRIVSOCK_MAXSTR VSFTP_DATA_BUFSIZE * 2 #define VSFTP_AS_LIMIT 100UL * 1024 * 1024 #endif /* VSF_DEFS_H */ diff -Nru vsftpd-2.3.0~pre2/logging.c vsftpd-2.3.2/logging.c --- vsftpd-2.3.0~pre2/logging.c 2009-10-19 03:24:23.000000000 +0000 +++ vsftpd-2.3.2/logging.c 2010-08-19 00:04:03.000000000 +0000 @@ -41,7 +41,7 @@ } if (tunable_dual_log_enable || tunable_xferlog_std_format) { - retval = vsf_sysutil_create_or_open_file(tunable_xferlog_file, 0600); + retval = vsf_sysutil_create_or_open_file_append(tunable_xferlog_file, 0600); if (vsf_sysutil_retval_is_error(retval)) { die2("failed to open xferlog log file:", tunable_xferlog_file); @@ -52,7 +52,8 @@ { if (!tunable_syslog_enable) { - retval = vsf_sysutil_create_or_open_file(tunable_vsftpd_log_file, 0600); + retval = vsf_sysutil_create_or_open_file_append(tunable_vsftpd_log_file, + 0600); if (vsf_sysutil_retval_is_error(retval)) { die2("failed to open vsftpd log file:", tunable_vsftpd_log_file); diff -Nru vsftpd-2.3.0~pre2/postlogin.c vsftpd-2.3.2/postlogin.c --- vsftpd-2.3.0~pre2/postlogin.c 2010-03-26 04:01:06.000000000 +0000 +++ vsftpd-2.3.2/postlogin.c 2010-08-18 23:51:41.000000000 +0000 @@ -1026,12 +1026,12 @@ */ if (is_unique || (p_sess->is_anonymous && !tunable_anon_other_write_enable)) { - new_file_fd = str_create(p_filename); + new_file_fd = str_create_exclusive(p_filename); } else { /* For non-anonymous, allow open() to overwrite or append existing files */ - new_file_fd = str_create_append(p_filename); + new_file_fd = str_create(p_filename); if (!is_append && offset == 0) { do_truncate = 1; diff -Nru vsftpd-2.3.0~pre2/prelogin.c vsftpd-2.3.2/prelogin.c --- vsftpd-2.3.0~pre2/prelogin.c 2010-03-17 20:08:29.000000000 +0000 +++ vsftpd-2.3.2/prelogin.c 2010-08-05 23:31:04.000000000 +0000 @@ -230,16 +230,14 @@ { vsf_cmdio_write( p_sess, FTP_LOGINERR, "Non-anonymous sessions must use encryption."); - str_empty(&p_sess->user_str); - return; + vsf_sysutil_exit(0); } if (tunable_ssl_enable && is_anon && !p_sess->control_use_ssl && tunable_force_anon_logins_ssl) { vsf_cmdio_write( p_sess, FTP_LOGINERR, "Anonymous sessions must use encryption."); - str_empty(&p_sess->user_str); - return; + vsf_sysutil_exit(0); } if (tunable_userlist_enable) { diff -Nru vsftpd-2.3.0~pre2/README vsftpd-2.3.2/README --- vsftpd-2.3.0~pre2/README 2010-03-17 02:41:17.000000000 +0000 +++ vsftpd-2.3.2/README 2010-08-19 21:13:44.000000000 +0000 @@ -1,4 +1,4 @@ -This is vsftpd, version 2.3.0 +This is vsftpd, version 2.3.2 Author: Chris Evans Contact: scarybeasts@gmail.com Website: http://vsftpd.beasts.org/ diff -Nru vsftpd-2.3.0~pre2/sysstr.c vsftpd-2.3.2/sysstr.c --- vsftpd-2.3.0~pre2/sysstr.c 2008-02-02 01:30:41.000000000 +0000 +++ vsftpd-2.3.2/sysstr.c 2010-08-18 23:52:04.000000000 +0000 @@ -100,19 +100,13 @@ } int -str_create(const struct mystr* p_str) -{ - return vsf_sysutil_create_file(str_getbuf(p_str)); -} - -int -str_create_overwrite(const struct mystr* p_str) +str_create_exclusive(const struct mystr* p_str) { - return vsf_sysutil_create_overwrite_file(str_getbuf(p_str)); + return vsf_sysutil_create_file_exclusive(str_getbuf(p_str)); } int -str_create_append(const struct mystr* p_str) +str_create(const struct mystr* p_str) { return vsf_sysutil_create_or_open_file( str_getbuf(p_str), tunable_file_open_mode); diff -Nru vsftpd-2.3.0~pre2/sysstr.h vsftpd-2.3.2/sysstr.h --- vsftpd-2.3.0~pre2/sysstr.h 2008-02-02 01:30:40.000000000 +0000 +++ vsftpd-2.3.2/sysstr.h 2010-08-18 23:51:53.000000000 +0000 @@ -21,9 +21,8 @@ kVSFSysStrOpenReadOnly = 1 }; int str_open(const struct mystr* p_str, const enum EVSFSysStrOpenMode mode); -int str_create_append(const struct mystr* p_str); int str_create(const struct mystr* p_str); -int str_create_overwrite(const struct mystr* p_str); +int str_create_exclusive(const struct mystr* p_str); int str_chmod(const struct mystr* p_str, unsigned int mode); int str_stat(const struct mystr* p_str, struct vsf_sysutil_statbuf** p_ptr); int str_lstat(const struct mystr* p_str, struct vsf_sysutil_statbuf** p_ptr); diff -Nru vsftpd-2.3.0~pre2/sysutil.c vsftpd-2.3.2/sysutil.c --- vsftpd-2.3.0~pre2/sysutil.c 2010-03-26 04:03:49.000000000 +0000 +++ vsftpd-2.3.2/sysutil.c 2010-08-19 00:11:57.000000000 +0000 @@ -1176,7 +1176,7 @@ } int -vsf_sysutil_create_file(const char* p_filename) +vsf_sysutil_create_file_exclusive(const char* p_filename) { /* umask() also contributes to end mode */ return open(p_filename, O_CREAT | O_EXCL | O_WRONLY | O_APPEND, @@ -1184,17 +1184,16 @@ } int -vsf_sysutil_create_overwrite_file(const char* p_filename) +vsf_sysutil_create_or_open_file(const char* p_filename, unsigned int mode) { - return open(p_filename, O_CREAT | O_TRUNC | O_WRONLY | - O_APPEND | O_NONBLOCK, - tunable_file_open_mode); + return open(p_filename, O_CREAT | O_WRONLY | O_NONBLOCK, mode); } int -vsf_sysutil_create_or_open_file(const char* p_filename, unsigned int mode) +vsf_sysutil_create_or_open_file_append(const char* p_filename, + unsigned int mode) { - return open(p_filename, O_CREAT | O_WRONLY | O_NONBLOCK, mode); + return open(p_filename, O_CREAT | O_WRONLY | O_NONBLOCK | O_APPEND, mode); } void diff -Nru vsftpd-2.3.0~pre2/sysutil.h vsftpd-2.3.2/sysutil.h --- vsftpd-2.3.0~pre2/sysutil.h 2010-03-26 04:04:01.000000000 +0000 +++ vsftpd-2.3.2/sysutil.h 2010-08-19 00:09:02.000000000 +0000 @@ -82,11 +82,10 @@ int vsf_sysutil_open_file(const char* p_filename, const enum EVSFSysUtilOpenMode); /* Fails if file already exists */ -int vsf_sysutil_create_file(const char* p_filename); -/* Overwrites if file already exists */ -int vsf_sysutil_create_overwrite_file(const char* p_filename); +int vsf_sysutil_create_file_exclusive(const char* p_filename); /* Creates file or appends if already exists */ -int vsf_sysutil_create_append_file(const char* p_filename); +int vsf_sysutil_create_or_open_file_append(const char* p_filename, + unsigned int mode); /* Creates or appends */ int vsf_sysutil_create_or_open_file(const char* p_filename, unsigned int mode); void vsf_sysutil_dupfd2(int old_fd, int new_fd); diff -Nru vsftpd-2.3.0~pre2/vsftpver.h vsftpd-2.3.2/vsftpver.h --- vsftpd-2.3.0~pre2/vsftpver.h 2010-03-17 02:40:58.000000000 +0000 +++ vsftpd-2.3.2/vsftpver.h 2010-08-19 21:13:34.000000000 +0000 @@ -1,7 +1,7 @@ #ifndef VSF_VERSION_H #define VSF_VERSION_H -#define VSF_VERSION "2.3.0" +#define VSF_VERSION "2.3.2" #endif /* VSF_VERSION_H */