diff -Nru vsftpd-3.0.2/debian/changelog vsftpd-3.0.2/debian/changelog --- vsftpd-3.0.2/debian/changelog 2012-09-21 19:17:09.000000000 +0200 +++ vsftpd-3.0.2/debian/changelog 2012-12-19 12:34:09.000000000 +0100 @@ -1,3 +1,21 @@ +vsftpd (3.0.2-1ubuntu1) raring; urgency=low + + * Merge from debian unstable, remaining changes: + - Use snakeoil SSL certificates and key. + - debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart. + - Add apport hook: + + debian/vsftpd.apport: Added. + + debian/control: Build-depends on dh-apport. + + debian/rules: Add --with apport. + - Use debhelper 8 + - debian/vsftpd.postinst: Check that group exists first, + then the user, then trying adding the user to the group. + - Add debian/watch file. + - debian/patches/09-disable-anonymous.patch: Disable anonymous login by + default. + + -- Lorenzo De Liso Tue, 18 Dec 2012 19:59:37 +0100 + vsftpd (3.0.2-1) unstable; urgency=low * Merging upstream version 3.0.2. @@ -44,6 +62,22 @@ -- Daniel Baumann Wed, 06 Jun 2012 15:50:51 +0200 +vsftpd (2.3.5-3ubuntu1) quantal; urgency=low + + * Merge from Debian testing (LP: #1003644). Remaining changes: + + 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. + + Add debian/watch file. + + debian/patches/09-disable-anonymous.patch: Disable anonymous login + by default. (LP: #528860) + * debian/patches/12-ubuntu-us-snakeoil-ssl.patch: Use snakeoil SSL + certificates and key. + + -- Andres Rodriguez Wed, 23 May 2012 16:59:36 -0400 + vsftpd (2.3.5-3) unstable; urgency=low [ Daniel Baumann ] @@ -72,6 +106,30 @@ -- Daniel Baumann Sat, 21 Jan 2012 10:56:03 +0100 +vsftpd (2.3.5-1ubuntu2) precise; urgency=low + + * debian/rules: Fix hardening based on Debian changes from 2.3.5-2 and -3. + + -- Kees Cook Tue, 27 Mar 2012 16:05:54 -0700 + +vsftpd (2.3.5-1ubuntu1) precise; urgency=low + + [ Ubuntu Merge-o-Matic ] + * Merge from Debian testing. Remaining changes: + + 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. + + debian/vsftpd.postinst: Check that group exists first, + then the user, then trying adding the user to the group. (LP: #629234) + + Add debian/watch file. + + debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. + (LP: #528860) + + -- Chuck Short Mon, 23 Jan 2012 09:16:04 -0500 + vsftpd (2.3.5-1) unstable; urgency=low * Merging upstream version 2.3.5. @@ -87,6 +145,32 @@ -- Daniel Baumann Sun, 08 Jan 2012 10:54:36 +0100 +vsftpd (2.3.4-1ubuntu2) precise; urgency=low + + * debian/vsftpd.upstart: Fix transition from runlevel 1 -> 2. + (LP: #820700) + + -- Chuck Short Mon, 02 Jan 2012 09:40:36 -0500 + +vsftpd (2.3.4-1ubuntu1) precise; urgency=low + + * Merge from debian unstable. Remaining changes: + + 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. + + debian/vsftpd.postinst: Check that group exists first, + then the user, then trying adding the user to the group. (LP: #629234) + + Add debian/watch file. + + debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. + (LP: #528860) + + Dropped: + - debian/patches/11-CVE-2011-0762.patch: No longer needed. + + -- Chuck Short Tue, 06 Sep 2011 00:04:36 +0000 + vsftpd (2.3.4-1) unstable; urgency=low * Merging upstream version 2.3.4: @@ -159,6 +243,52 @@ -- Nico Golde Wed, 07 Sep 2011 20:39:59 +0000 +vsftpd (2.3.2-3ubuntu5) oneiric; urgency=low + + * Rebuild for OpenSSL 1.0.0. + + -- Colin Watson Wed, 25 May 2011 22:42:28 +0100 + +vsftpd (2.3.2-3ubuntu4) natty; urgency=low + + * SECURITY UPDATE: denial of service via crafted glob expressions + - debian/patches/11-CVE-2011-0762.patch: limit number of iterations in + access.c, defs.h, ls.*. + - CVE-2011-0762 + + -- Marc Deslauriers Fri, 25 Mar 2011 14:29:29 -0400 + +vsftpd (2.3.2-3ubuntu3) natty; urgency=low + + * debian/vsftpd.upstart: Fix start of vsftpd even if not in standalone mode. + Thanks to Stephane Chazelas (LP: #648202) + + -- Andres Rodriguez Fri, 25 Feb 2011 15:16:09 -0500 + +vsftpd (2.3.2-3ubuntu2) natty; urgency=low + + * debian/vsftpd.postinst: Use complete name match when checking for existing + ftp user/group, to avoid install failure (LP: #656415) + + -- Thierry Carrez (ttx) Wed, 01 Dec 2010 13:46:44 +0100 + +vsftpd (2.3.2-3ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - 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. + - debian/vsftpd.postinst: Check that group exists first, + then the user, then trying adding the user to the group. (LP: #629234) + - Add debian/watch file. + - debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. + (LP: #528860) + + -- Chuck Short Tue, 09 Nov 2010 07:00:12 +0000 + vsftpd (2.3.2-3) unstable; urgency=medium * Adding patch from Philipp Kern to fix vsftpd on @@ -186,6 +316,23 @@ -- Daniel Baumann Wed, 01 Sep 2010 14:29:49 +0200 +vsftpd (2.3.0-1ubuntu1) natty; urgency=low + + * Merge from debian unstable. Remaining changes: + - 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. + - debian/vsftpd.postinst: Check that group exists first, + then the user, then trying adding the user to the group. (LP: #629234) + - Add debian/watch file. + - debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. + (LP: #528860) + + -- Chuck Short Tue, 12 Oct 2010 12:17:42 +0100 + vsftpd (2.3.0-1) unstable; urgency=low * Merging upstream version 2.3.0. @@ -193,6 +340,25 @@ -- Daniel Baumann Sat, 14 Aug 2010 14:09:51 +0200 +vsftpd (2.3.0~pre2-4ubuntu2) maverick; urgency=low + + * debian/vsftpd.postinst: Check that the group exists first, then + the user, then try adding the user to the group, LP: #629234 + + -- Dustin Kirkland Fri, 03 Sep 2010 08:32:27 -0600 + +vsftpd (2.3.0~pre2-4ubuntu1) 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. + + -- Chuck Short Mon, 12 Jul 2010 08:57:17 -0400 + vsftpd (2.3.0~pre2-4) unstable; urgency=low * Updating standards version to 3.9.0. @@ -201,6 +367,22 @@ -- 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 @@ -244,6 +426,63 @@ -- 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). @@ -291,6 +530,17 @@ -- 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 @@ -330,6 +580,18 @@ -- 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 @@ -341,6 +603,23 @@ -- 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. @@ -383,6 +662,16 @@ -- 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. @@ -395,6 +684,22 @@ -- 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 @@ -532,6 +837,13 @@ -- 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. @@ -542,6 +854,27 @@ -- 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. @@ -549,6 +882,18 @@ -- 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. @@ -565,6 +910,23 @@ -- 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. @@ -608,6 +970,43 @@ -- 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). @@ -616,6 +1015,12 @@ -- 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). diff -Nru vsftpd-3.0.2/debian/compat vsftpd-3.0.2/debian/compat --- vsftpd-3.0.2/debian/compat 2012-09-21 19:16:04.000000000 +0200 +++ vsftpd-3.0.2/debian/compat 2012-12-19 12:27:35.000000000 +0100 @@ -1 +1 @@ -9 +8 diff -Nru vsftpd-3.0.2/debian/control vsftpd-3.0.2/debian/control --- vsftpd-3.0.2/debian/control 2012-09-21 19:16:04.000000000 +0200 +++ vsftpd-3.0.2/debian/control 2012-12-19 12:27:31.000000000 +0100 @@ -1,10 +1,11 @@ Source: vsftpd Section: net Priority: extra -Maintainer: Daniel Baumann +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Daniel Baumann Build-Depends: - debhelper (>= 9), libcap2-dev [linux-any], libpam0g-dev, libssl-dev, - libwrap0-dev + debhelper (>= 8), libcap2-dev [linux-any], libpam0g-dev, libssl-dev, + libwrap0-dev, dh-apport Standards-Version: 3.9.3 Homepage: http://vsftpd.beasts.org/ diff -Nru vsftpd-3.0.2/debian/patches/09-disable-anonymous.patch vsftpd-3.0.2/debian/patches/09-disable-anonymous.patch --- vsftpd-3.0.2/debian/patches/09-disable-anonymous.patch 1970-01-01 01:00:00.000000000 +0100 +++ vsftpd-3.0.2/debian/patches/09-disable-anonymous.patch 2012-12-19 00:24:17.000000000 +0100 @@ -0,0 +1,18 @@ +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-3.0.2/debian/patches/12-ubuntu-use-snakeoil-ssl.patch vsftpd-3.0.2/debian/patches/12-ubuntu-use-snakeoil-ssl.patch --- vsftpd-3.0.2/debian/patches/12-ubuntu-use-snakeoil-ssl.patch 1970-01-01 01:00:00.000000000 +0100 +++ vsftpd-3.0.2/debian/patches/12-ubuntu-use-snakeoil-ssl.patch 2012-12-19 00:25:15.000000000 +0100 @@ -0,0 +1,13 @@ +Index: vsftpd-2.3.5-3ubuntu1/vsftpd.conf +=================================================================== +--- vsftpd-2.3.5-3ubuntu1.orig/vsftpd.conf 2012-05-23 16:28:07.256441930 -0400 ++++ vsftpd-2.3.5-3ubuntu1/vsftpd.conf 2012-05-23 16:32:47.068439261 -0400 +@@ -144,4 +144,7 @@ + # + # This option specifies the location of the RSA certificate to use for SSL + # encrypted connections. +-rsa_cert_file=/etc/ssl/private/vsftpd.pem ++rsa_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem ++# This option specifies the location of the RSA key to use for SSL ++# encrypted connections. ++rsa_private_key_file=/etc/ssl/private/ssl-cert-snakeoil.key diff -Nru vsftpd-3.0.2/debian/patches/series vsftpd-3.0.2/debian/patches/series --- vsftpd-3.0.2/debian/patches/series 2012-09-21 19:16:04.000000000 +0200 +++ vsftpd-3.0.2/debian/patches/series 2012-12-19 00:28:36.000000000 +0100 @@ -10,3 +10,5 @@ 10-remote-dos.patch 11-alpha.patch 12-buildflags.patch +09-disable-anonymous.patch +12-ubuntu-use-snakeoil-ssl.patch diff -Nru vsftpd-3.0.2/debian/rules vsftpd-3.0.2/debian/rules --- vsftpd-3.0.2/debian/rules 2012-09-21 19:16:04.000000000 +0200 +++ vsftpd-3.0.2/debian/rules 2012-12-19 00:25:37.000000000 +0100 @@ -10,7 +10,7 @@ endif %: - dh ${@} + dh ${@} --with apport override_dh_auto_build: $(MAKE) CFLAGS="$(CFLAGS) $(CPPFLAGS)" LIBS="$(LIBS)" LINK="" diff -Nru vsftpd-3.0.2/debian/vsftpd.apport vsftpd-3.0.2/debian/vsftpd.apport --- vsftpd-3.0.2/debian/vsftpd.apport 1970-01-01 01:00:00.000000000 +0100 +++ vsftpd-3.0.2/debian/vsftpd.apport 2012-12-19 00:30:34.000000000 +0100 @@ -0,0 +1,30 @@ +#!/usr/bin/python + +'''apport hook for vsftpd + +(c) 2010 Andres Rodriguez. +Author: Andres Rodriguez + +This program is free software; you can redistribute it and/or modify it +under the terms of the GNU General Public License as published by the +Free Software Foundation; either version 2 of the License, or (at your +option) any later version. See http://www.gnu.org/copyleft/gpl.html for +the full text of the license. +''' + +from apport.hookutils import * + +def add_info(report, ui): + response = ui.yesno("The contents of your /etc/vsftpd.conf file " + "may help developers diagnose your bug more " + "quickly. However, it may contain sensitive " + "information. Do you want to include it in your " + "bug report?") + + if response == None: # user cancelled + raise StopIteration + + elif response == True: + attach_conffiles(report,'vsftpd') + + attach_file_if_exists(report, os.path.expanduser('/var/log/vsftpd.log'), 'vsftpd.log') diff -Nru vsftpd-3.0.2/debian/vsftpd.init vsftpd-3.0.2/debian/vsftpd.init --- vsftpd-3.0.2/debian/vsftpd.init 2012-09-21 19:16:04.000000000 +0200 +++ vsftpd-3.0.2/debian/vsftpd.init 1970-01-01 01:00:00.000000000 +0100 @@ -1,101 +0,0 @@ -#!/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 -# Description: Provides a lightweight, efficient FTP server written -# for security. -### 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 - -. /lib/lsb/init-functions - -if [ ! -e "${LOGFILE}" ] -then - touch "${LOGFILE}" - chmod 640 "${LOGFILE}" - chown root:adm "${LOGFILE}" -fi - -if [ ! -d "${CHROOT}" ] -then - mkdir -p "${CHROOT}" -fi - -case "${1}" in - start) - if [ -e /etc/vsftpd.conf ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" /etc/vsftpd.conf - then - echo "/etc/vsftpd.conf listen disabled - service will not start" - exit 1 - fi - - 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) - ${0} stop - ${0} start - ;; - - 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: ${0} {start|stop|restart|reload|status}" - exit 1 - ;; -esac - -exit 0 diff -Nru vsftpd-3.0.2/debian/vsftpd.upstart vsftpd-3.0.2/debian/vsftpd.upstart --- vsftpd-3.0.2/debian/vsftpd.upstart 1970-01-01 01:00:00.000000000 +0100 +++ vsftpd-3.0.2/debian/vsftpd.upstart 2012-12-19 00:30:34.000000000 +0100 @@ -0,0 +1,29 @@ +# vsftpd - FTP Daemon +# + +description "vsftpd daemon" +author "Chuck Short " + +start on runlevel [2345] or 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 || stop +end script + +exec /usr/sbin/vsftpd + diff -Nru vsftpd-3.0.2/debian/watch vsftpd-3.0.2/debian/watch --- vsftpd-3.0.2/debian/watch 1970-01-01 01:00:00.000000000 +0100 +++ vsftpd-3.0.2/debian/watch 2012-12-19 00:26:54.000000000 +0100 @@ -0,0 +1,2 @@ +version=3 +ftp://vsftpd.beasts.org/users/cevans/vsftpd-(\d.*).tar.gz