summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'net-ftp/vsftpd')
-rw-r--r--net-ftp/vsftpd/ChangeLog528
-rw-r--r--net-ftp/vsftpd/Manifest14
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch15
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch21
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch264
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.2.0-logging.patch12
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch13
-rw-r--r--net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch20
-rw-r--r--net-ftp/vsftpd/files/vsftpd.conf105
-rw-r--r--net-ftp/vsftpd/files/vsftpd.init69
-rw-r--r--net-ftp/vsftpd/files/vsftpd.logrotate4
-rw-r--r--net-ftp/vsftpd/files/vsftpd.xinetd15
-rw-r--r--net-ftp/vsftpd/metadata.xml27
-rw-r--r--net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild113
14 files changed, 1220 insertions, 0 deletions
diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
new file mode 100644
index 0000000..5999eb8
--- /dev/null
+++ b/net-ftp/vsftpd/ChangeLog
@@ -0,0 +1,528 @@
+# ChangeLog for net-ftp/vsftpd
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.130 2010/09/27 17:19:35 hwoarang Exp $
+
+*vsftpd-2.3.2-r1 (27 Sep 2010)
+
+ 27 Sep 2010; Markos Chandras <hwoarang@gentoo.org>
+ +vsftpd-2.3.2-r1.ebuild, +files/vsftpd-2.3.2-as-needed.patch,
+ +files/vsftpd-2.3.2-kerberos.patch:
+ Revbump to fix -as-needed behavior(Bug #335977) and kerberos authentcation
+ (Bug #335980). Thanks to Joakim Tjernlund <Joakim.Tjernlund@transmode.se>
+
+ 20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
+ Add Dane Smith <smithdanea@gmail.com> as proxy maintainer
+
+ 20 Aug 2010; Alex Alexander <wired@gentoo.org> metadata.xml:
+ added myself as maintainer
+
+*vsftpd-2.3.2 (20 Aug 2010)
+
+ 20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> +vsftpd-2.3.2.ebuild,
+ metadata.xml:
+ Version bump. Bug #331441. Johan Bergström <bugs@bergstroem.nu> will be
+ proxy-maintainer
+
+ 20 Aug 2010; Markos Chandras <hwoarang@gentoo.org> metadata.xml:
+ Taking over maintainership
+
+ 20 Jul 2010; Michael Sterrett <mr_bones_@gentoo.org>
+ -files/vsftpd-2.0.3-gentoo.patch, -files/vsftpd-2.0.6-caps.patch,
+ -files/vsftpd-2.0.6-libcap1.patch, -vsftpd-2.0.7-r1.ebuild,
+ -files/vsftpd-2.0.7-uclibc.patch, -vsftpd-2.1.0-r1.ebuild,
+ -files/vsftpd-2.1.0-dont-link-caps.patch,
+ -files/vsftpd-2.1.0-gentoo.patch, -vsftpd-2.1.2.ebuild,
+ -files/vsftpd-2.1.2-dont-link-caps.patch, -vsftpd-2.2.0.ebuild,
+ -vsftpd-2.2.1.ebuild:
+ clean out old cruft
+
+ 18 Mar 2010; Raúl Porcel <armin76@gentoo.org> vsftpd-2.2.2.ebuild:
+ alpha/arm/ia64/s390/sh/sparc/x86 stable wrt #307817
+
+ 15 Mar 2010; Brent Baude <ranger@gentoo.org> vsftpd-2.2.2.ebuild:
+ stable ppc64, bug 307817
+
+ 15 Mar 2010; nixnut <nixnut@gentoo.org> vsftpd-2.2.2.ebuild:
+ ppc stable #307817
+
+ 14 Mar 2010; Markos Chandras <hwoarang@gentoo.org> vsftpd-2.2.2.ebuild:
+ Stable on amd64 wrt bug #307817
+
+*vsftpd-2.2.2 (30 Nov 2009)
+
+ 30 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org> +vsftpd-2.2.2.ebuild:
+ Version bump, bug #294325
+
+*vsftpd-2.2.1 (29 Oct 2009)
+
+ 29 Oct 2009; Bernard Cafarelli <voyageur@gentoo.org> +vsftpd-2.2.1.ebuild,
+ metadata.xml:
+ Version bump, bug #290970. Also add net-ftp as herd
+
+ 24 Aug 2009; Stephanie Lockwood-Childs <wormo@gentoo.org>
+ +files/vsftpd-2.2.0-dont-link-caps.patch:
+ Need new version of caps-disabling patch to apply cleanly to 2.2.0
+ (bug #282494, reported by Sergey Plyukhin)
+
+*vsftpd-2.2.0 (23 Aug 2009)
+
+ 23 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> +vsftpd-2.2.0.ebuild,
+ +files/vsftpd-2.2.0-gentoo.patch:
+ Version bump to 2.2.0
+
+*vsftpd-2.1.2 (30 May 2009)
+*vsftpd-2.1.0-r1 (30 May 2009)
+
+ 30 May 2009; Raúl Porcel <armin76@gentoo.org>
+ files/vsftpd-2.1.0-gentoo.patch, +files/vsftpd-2.1.2-dont-link-caps.patch,
+ -vsftpd-2.0.6.ebuild, -vsftpd-2.1.0.ebuild, +vsftpd-2.1.0-r1.ebuild,
+ +vsftpd-2.1.2.ebuild:
+ Version bump, fix xinetd example, bug #266881, force libcap-2, bug #266806,
+ bug #268353
+
+ 25 Apr 2009; Raúl Porcel <armin76@gentoo.org> vsftpd-2.1.0.ebuild:
+ arm/ia64/s390/sh/sparc stable wrt #266664
+
+ 19 Apr 2009; Markus Meier <maekke@gentoo.org> vsftpd-2.1.0:
+ amd64/x86 stable, bug #266664
+
+ 19 Apr 2009; Brent Baude <ranger@gentoo.org> vsftpd-2.1.0.ebuild:
+ Marking vsftpd-2.1.0 ppc64 and ppc for bug 266664
+
+ 18 Apr 2009; Tobias Klausmann <klausman@gentoo.org> vsftpd-2.1.0.ebuild:
+ Stable on alpha, bug #266664
+
+ 24 Feb 2009; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.7-r1.ebuild:
+ arm/s390/sh stable
+
+*vsftpd-2.1.0 (23 Feb 2009)
+
+ 23 Feb 2009; Raúl Porcel <armin76@gentoo.org>
+ +files/vsftpd-2.1.0-caps.patch, +files/vsftpd-2.1.0-dont-link-caps.patch,
+ +files/vsftpd-2.1.0-gentoo.patch, +vsftpd-2.1.0.ebuild:
+ Version bump
+
+ 09 Feb 2009; Christoph Mende <angelos@gentoo.org> vsftpd-2.0.7-r1.ebuild:
+ QA: Removed logrotate USE flag, the logrotate.d file is installed
+ unconditionally now (bug 258180)
+
+ 07 Jan 2009; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.7-r1.ebuild:
+ alpha/ia64/x86 stable wrt #248458
+
+ 02 Jan 2009; Dawid Węgliński <cla@gentoo.org> vsftpd-2.0.7-r1.ebuild:
+ Stable on amd64 (bug #248458)
+
+ 31 Dec 2008; Friedrich Oslage <bluebird@gentoo.org>
+ vsftpd-2.0.7-r1.ebuild:
+ Stable on sparc, bug #248458
+
+ 28 Dec 2008; Tobias Scherbaum <dertobi123@gentoo.org>
+ vsftpd-2.0.7-r1.ebuild:
+ ppc stable, bug #248458
+
+ 27 Dec 2008; Brent Baude <ranger@gentoo.org> vsftpd-2.0.7-r1.ebuild:
+ stable ppc64, bug 248458
+
+ 26 Dec 2008; Raúl Porcel <armin76@gentoo.org>
+ -files/vsftpd-2.0.5-anon-upload-umask.patch,
+ +files/vsftpd-2.0.7-uclibc.patch, vsftpd-2.0.7-r1.ebuild:
+ Also add a patch from Debian to fix uclibc build, bug #241720
+
+*vsftpd-2.0.7-r1 (26 Dec 2008)
+
+ 26 Dec 2008; Raúl Porcel <armin76@gentoo.org> files/vsftpd.init,
+ -vsftpd-2.0.5-r3.ebuild, -vsftpd-2.0.7.ebuild, +vsftpd-2.0.7-r1.ebuild:
+ Fix init script, bug 234278
+
+ 21 Aug 2008; Doug Goldstein <cardoe@gentoo.org> metadata.xml:
+ add GLEP 56 USE flag desc from use.local.desc
+
+*vsftpd-2.0.7 (31 Jul 2008)
+
+ 31 Jul 2008; Raúl Porcel <armin76@gentoo.org> +vsftpd-2.0.7.ebuild:
+ Version bump
+
+ 02 Jun 2008; Jeremy Olexa <darkside@gentoo.org> files/vsftpd.init:
+ Modified init script to allow vsftpd to stop correctly. Thanks to Vaclav
+ Adamik for the suggestion, bug #223225
+
+ 14 May 2008; Diego Pettenò <flameeyes@gentoo.org> vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Make the pam USE flag only depend on virtual/pam.
+
+ 04 Apr 2008; Kenneth Prugh <ken69267@gentoo.org> vsftpd-2.0.6.ebuild:
+ amd64 stable, bug #214959
+
+ 29 Mar 2008; Dawid Węgliński <cla@gentoo.org> vsftpd-2.0.6.ebuild:
+ Stable on x86 (bug #214959)
+
+ 28 Mar 2008; Brent Baude <ranger@gentoo.org> vsftpd-2.0.6.ebuild:
+ stable ppc, bug 214959
+
+ 27 Mar 2008; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.6.ebuild:
+ Stable on ppc64; bug #214959
+
+ 26 Mar 2008; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.6.ebuild:
+ alpha/ia64/sparc stable
+
+ 26 Feb 2008; Raúl Porcel <armin76@gentoo.org>
+ -files/vsftpd-2.0.5-caps.patch, +files/vsftpd-2.0.6-caps.patch,
+ +files/vsftpd-2.0.6-libcap1.patch, vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Finally fix the libcap mess, bug #210478
+
+ 21 Feb 2008; Raúl Porcel <armin76@gentoo.org> vsftpd-2.0.5-r3.ebuild,
+ vsftpd-2.0.6.ebuild:
+ Fix caps failure wrt #210478
+
+*vsftpd-2.0.6 (14 Feb 2008)
+
+ 14 Feb 2008; Raúl Porcel <armin76@gentoo.org> +vsftpd-2.0.6.ebuild:
+ Version bump
+
+ 25 Dec 2007; Christian Heim <phreak@gentoo.org> metadata.xml:
+ Removing uberlord from metadata.xml as per #199318. Assigning to
+ maintainer-needed.
+
+ 09 Jul 2007; Roy Marples <uberlord@gentoo.org> vsftpd-2.0.5-r3.ebuild:
+ Keyworded ~x86-fbsd
+
+*vsftpd-2.0.5-r3 (26 Jun 2007)
+
+ 26 Jun 2007; Roy Marples <uberlord@gentoo.org>
+ +files/vsftpd-2.0.5-anon-upload-umask.patch, +vsftpd-2.0.5-r3.ebuild:
+ Fix anon umask uploads, #183213 thanks to Serhij S. Stasyuk
+
+ 15 May 2007; Thilo Bangert <bangert@gentoo.org> metadata.xml:
+ add <herd>no-herd</herd>
+
+ 11 May 2007; Jose Luis Rivero <yoswink@gentoo.org> vsftpd-2.0.5-r2.ebuild:
+ Stable on alpha wrt bug #166805
+
+*vsftpd-2.0.5-r2 (10 Apr 2007)
+
+ 10 Apr 2007; Roy Marples <uberlord@gentoo.org> files/vsftpd.init,
+ +vsftpd-2.0.5-r2.ebuild:
+ Fix the init script to muliplex better, #173923 thanks to Grégoire Baron
+
+*vsftpd-2.0.5-r1 (02 Apr 2007)
+
+ 02 Apr 2007; Roy Marples <uberlord@gentoo.org> files/vsftpd.init,
+ +vsftpd-2.0.5-r1.ebuild:
+ Bump for a non-bash init script.
+
+ 17 Mar 2007; Steve Dibb <beandog@gentoo.org> vsftpd-2.0.5.ebuild:
+ amd64 stable, bug 166805
+
+ 18 Feb 2007; nixnut <nixnut@gentoo.org> vsftpd-2.0.5.ebuild:
+ Stable on ppc wrt bug 166805
+
+ 16 Feb 2007; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.5.ebuild:
+ Stable on ppc64; bug #166805
+
+ 14 Feb 2007; Gustavo Zacarias <gustavoz@gentoo.org> vsftpd-2.0.5.ebuild:
+ Stable on sparc wrt #166805
+
+ 14 Feb 2007; Christian Faulhammer <opfer@gentoo.org> vsftpd-2.0.5.ebuild:
+ stable x86; bug 166805
+
+ 14 Jan 2007; Roy Marples <uberlord@gentoo.org>
+ +files/vsftpd-2.0.5-caps.patch, vsftpd-2.0.5.ebuild:
+ Fix building without the caps USE flag, #159488.
+
+ 23 Nov 2006; Roy Marples <uberlord@gentoo.org> vsftpd-2.0.5.ebuild:
+ Support cross compiling, #155975 thanks to Attila Fazekas.
+
+ 14 Oct 2006; Roy Marples <uberlord@gentoo.org>
+ -files/vsftpd-2.0.3-gentoo.diff, -files/vsftpd.conf.d, files/vsftpd.init,
+ -files/vsftpd.init.d, -vsftpd-2.0.3-r1.ebuild:
+ Quiet stopping and punt old version.
+
+*vsftpd-2.0.5 (14 Jul 2006)
+
+ 14 Jul 2006; Roy Marples <uberlord@gentoo.org> +vsftpd-2.0.5.ebuild:
+ Version bump.
+
+ 16 May 2006; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.4-r1.ebuild:
+ Stable on ppc64; bug #132650
+
+ 14 May 2006; Thomas Cort <tcort@gentoo.org> vsftpd-2.0.4-r1.ebuild:
+ Stable on alpha wrt Bug #132650.
+
+ 14 May 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+ vsftpd-2.0.4-r1.ebuild:
+ Stable on x86 wrt bug #132650.
+
+ 14 May 2006; Jason Wever <weeve@gentoo.org> vsftpd-2.0.4-r1.ebuild:
+ Stable on SPARC wrt bug #132650.
+
+ 14 May 2006; Luis Medinas <metalgod@gentoo.org> vsftpd-2.0.4-r1.ebuild:
+ Stable on amd64. Bug #132650.
+
+ 11 May 2006; Tobias Scherbaum <dertobi123@gentoo.org>
+ vsftpd-2.0.4-r1.ebuild:
+ ppc stable, bug #132650
+
+ 08 May 2006; Roy Marples <uberlord@gentoo.org> vsftpd-2.0.4-r1.ebuild:
+ Don't install the installation document - lol.
+
+*vsftpd-2.0.4-r1 (31 Jan 2006)
+
+ 31 Jan 2006; Roy Marples <uberlord@gentoo.org> +vsftpd-2.0.4-r1.ebuild:
+ Let portage control stripping and configure libcap dependancy via the cap USE
+ flag, #120891.
+
+*vsftpd-2.0.4 (10 Jan 2006)
+
+ 10 Jan 2006; Roy Marples <uberlord@gentoo.org> +files/vsftpd.logrotate,
+ +vsftpd-2.0.4.ebuild:
+ logrotate support, #115320.
+ New release, #118464.
+
+*vsftpd-2.0.3-r2 (20 Oct 2005)
+
+ 20 Oct 2005; Roy Marples <uberlord@gentoo.org>
+ +files/vsftpd-2.0.3-gentoo.patch, +files/vsftpd.init, -files/vsftpd.pam,
+ -files/vsftpd.pam-include, +vsftpd-2.0.3-r2.ebuild:
+ New init script which allows for running multiple vsftpd daemons with
+ different config files - works like net.ethx scripts, #97140
+
+ Punted unused pam files.
+
+ Patch now updates the default vsftpd.conf for using /etc/vsftpd instead
+ of maintaining our own config.
+
+ 02 Oct 2005; MATSUU Takuto <matsuu@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+ Stable on sh
+
+ 19 Sep 2005; Roy Marples <uberlord@gentoo.org> -vsftpd-1.2.2.ebuild,
+ vsftpd-2.0.3-r1.ebuild:
+ New USE flag selinux now depends on the selinux-ftpd policy, wrt #106355.
+
+ Punted the old 1.2.2 ebuild - 2.0.3-r1 stable on all arches :)
+
+ 17 Sep 2005; Aron Griffis <agriffis@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+ Mark 2.0.3-r1 stable on alpha
+
+ 14 Aug 2005; Michael Hanselmann <hansmi@gentoo.org>
+ vsftpd-2.0.3-r1.ebuild:
+ Stable on ppc.
+
+ 08 Aug 2005; Markus Rothe <corsair@gentoo.org> vsftpd-2.0.3-r1.ebuild:
+ Stable on ppc64
+
+ 03 Aug 2005; Roy Marples <uberlord@gentoo.org> files/vsftpd.conf:
+ Fixed vsftpd.conf example wrt bug #101137
+
+ 28 Jul 2005; Gustavo Zacarias <gustavoz@gentoo.org>
+ vsftpd-2.0.3-r1.ebuild:
+ Stable on sparc
+
+ 27 Jul 2005; Roy Marples <uberlord@gentoo.org>
+ -files/vsftpd-2.0.1-gentoo.diff, -vsftpd-2.0.2.ebuild,
+ -vsftpd-2.0.3.ebuild, vsftpd-2.0.3-r1.ebuild:
+ Stable on amd64 and x86.
+
+*vsftpd-2.0.3-r1 (28 Jun 2005)
+
+ 28 Jun 2005; Roy Marples <uberlord@gentoo.org>
+ +files/vsftpd-2.0.3-gentoo.diff, +vsftpd-2.0.3-r1.ebuild,
+ files/vsftpd.conf:
+ Added dependency on ftpbase - fixes #96258
+
+ Changed default options of /etc/vsftpd/vsftpd.something
+ to /etc/vsftpd/something - exception is /etc/vsftpd/vsftpd.conf
+ This makes is more consistent with the default vsftpd installation.
+
+ Default log file is now /var/log/vsftpd.log - which is the package default
+
+ Default PAM service name is now ftp again
+
+ 07 Jun 2005; Roy Marples <uberlord@gentoo.org>
+ -files/vsftpd-1.0.1-gentoo.diff, -files/vsftpd-1.2.0-gentoo.diff.bz2,
+ metadata.xml, -vsftpd-1.0.1-r1.ebuild, -vsftpd-1.2.0-r1.ebuild,
+ -vsftpd-1.2.1.ebuild, -vsftpd-2.0.1.ebuild, vsftpd-2.0.3.ebuild:
+ punted old versions
+ ipv6 flag dropped for 2.0.3 - I'm sure xinetd users can add the ipv6
+ flag to the /etc/xinetd.d/vsftpd themselves if needed - fixes #75609
+ added background=YES and listen=YES to the default config - fixes #78347
+ tweaked DEPEND to work with sys-libs/pam and virtual/pam
+
+*vsftpd-2.0.3 (07 Jun 2005)
+
+ 07 Jun 2005; Roy Marples <uberlord@gentoo.org> files/vsftpd.init.d,
+ +files/vsftpd.pam-include, files/vsftpd.xinetd, files/vsftpd.xinetd.ipv6,
+ metadata.xml, +vsftpd-2.0.3.ebuild:
+ init.d script now checks for listen=YES or listen_ipv6=YES - fixes #54228
+ xinetd USE flag added to make support of it optional - fixes #75892
+ USERID removed from xinetd files - fixes #78764
+ init.d script now does a "killall vsftpd" when stopping - fixes #81819
+ cleaner ebuild - fixes #84733 thanks to Diego Pettenò <flameeyes@gentoo.org>
+
+*vsftpd-2.0.2 (13 Mar 2005)
+
+ 13 Mar 2005; <solar@gentoo.org> +vsftpd-2.0.2.ebuild:
+ - version bump. fixes an issue with SSL secured data connections dropping out
+
+ 09 Feb 2005; <solar@gentoo.org> vsftpd-2.0.1.ebuild:
+ - remove fPIC filtering on vsftpd-2.0.1 (no longer needed) bug #74519
+
+ 09 Feb 2005; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+ didnt compile, fixed the ebuild per bug 79202, thanks Rob!
+
+ 22 Jan 2005; <solar@gentoo.org> vsftpd-1.2.2.ebuild:
+ - remove fPIC filtering on vsftpd-1.2.2. (no longer needed) bug #74519
+
+ 17 Jan 2005; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+ Add support to build vsftpd without pam, bug 65981, thanks Rob!
+
+ 29 Dec 2004; Ciaran McCreesh <ciaranm@gentoo.org> :
+ Change encoding to UTF-8 for GLEP 31 compliance
+
+ 30 Sep 2004; Jeffrey Forman <jforman@gentoo.org> files/vsftpd.init.d:
+ updated init.d/vsftpd to remove source cmd per bug #51908
+
+ 28 Sep 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild,
+ +vsftpd-1.2.2-ppc64.diff:
+ fix bug #64175 for ppc64
+
+ 25 Sep 2004; Tom Martin <slarti@gentoo.org> vsftpd-2.0.1.ebuild:
+ Fixed the epatch line in the ebuild to not include `.bz2' (see jforman's
+ comment below).
+
+ 24 Sep 2004; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+ added patch for gentoo-friendly file locations, wrt bug #65116
+
+*vsftpd-2.0.1 (23 Sep 2004)
+
+ 23 Sep 2004; Jeffrey Forman <jforman@gentoo.org> vsftpd-2.0.1.ebuild:
+ ~ on all arch's for testing
+
+ 23 Sep 2004; Jeffrey Forman <jforman@gentoo.org> :
+ New ebuild, vsftp-2.0.1, -$arch on all. Adds SSL/TLS support
+
+ 13 Jul 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.2.ebuild:
+ stable on ppc64, bug #53116
+
+ 15 Jun 2004; Brandon Hale <tseng@gentoo.org> vsftpd-1.2.2.ebuild:
+ Stable on x86, bug #53116
+
+ 15 Jun 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.2.ebuild:
+ Marked stable on sparc wrt bug #53116.
+
+ 15 Jun 2004; Bryan Østergaard <kloeri@gentoo.org> vsftpd-1.2.2.ebuild:
+ Stable on alpha, bug 53116.
+
+*vsftpd-1.2.2 (15 Jun 2004)
+
+ 15 Jun 2004; <solar@gentoo.org> vsftpd-1.2.2.ebuild:
+ security version bump bug #53116
+
+ 10 Jun 2004; Aron Griffis <agriffis@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+ vsftpd-1.2.1.ebuild:
+ Fix use invocation
+
+ 05 Jun 2004; Michael Hanselmann <hansmi@gentoo.org> vsftpd-1.2.1.ebuild:
+ Added ~ppc to KEYWORDS.
+
+ 03 Jun 2004; Tom Gall <tgall@gentoo.org> vsftpd-1.2.1.ebuild:
+ stable on ppc64, bug #52907
+
+ 30 Mar 2004; Michael Sterrett <mr_bones_@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+ vsftpd-1.2.1.ebuild:
+ move filter-flags into src_unpack()
+
+ 29 Mar 2004; <randy@gentoo.org> vsftpd-1.2.1.ebuild:
+ adding s390 keywords
+
+ 14 Mar 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.1.ebuild:
+ Stable on sparc.
+
+ 02 Mar 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.1.ebuild:
+ Added the super spiffy ~sparc keyword :)
+
+ 27 Feb 2004; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.1.ebuild:
+ marked stable on x86.
+
+ 26 Feb 2004; Aron Griffis <agriffis@gentoo.org> vsftpd-1.2.1.ebuild:
+ stable on alpha and ia64
+
+ 01 Feb 2004; Jon Portnoy <avenj@gentoo.org> vsftpd-1.2.1.ebuild :
+ AMD64 keywords.
+
+ 07 Jan 2004; Jason Wever <weeve@gentoo.org> vsftpd-1.2.0-r1.ebuild:
+ Marked stable on sparc.
+
+*vsftpd-1.2.1 (10 Dec 2003)
+
+ 10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.1.ebuild,
+ files/vsftpd-1.2.1-gentoo.diff.bz2:
+ version bump. thanks to matt taylor for a new patch file.
+ fixes bug #33648.
+
+ 10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.1.2.ebuild,
+ vsftpd-1.1.3-r1.ebuild, vsftpd-1.1.3.ebuild, vsftpd-1.2.0.ebuild,
+ files/vsftpd-1.1.2-gentoo.diff, files/vsftpd-1.1.3-gentoo.diff,
+ files/vsftpd-1.1.3-ipv6.patch:
+ removed old ebuild files.
+
+ 10 Dec 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> files/vsftpd.init.d:
+ check for 'listen' in conf file. bug #33648.
+
+ 08 Dec 2003; <spider@gentoo.org> vsftpd-1.1.3-r1.ebuild,
+ vsftpd-1.1.3.ebuild, vsftpd-1.2.0-r1.ebuild, vsftpd-1.2.0.ebuild:
+ QA drive, fixing bug 35127
+
+ 09 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.0-r1.ebuild:
+ bumped vsftpd-1.2.0-r1.ebuild to x86 stable.
+
+*vsftpd-1.2.0-r1 (02 Sep 2003)
+
+ 02 Sep 2003; Rajiv Aaron Manglani <rajiv@gentoo.org> vsftpd-1.2.0-r1.ebuild,
+ files/vsftpd.conf.d, files/vsftpd.init.d:
+ added init.d and conf.d files for running vsftpd standalone.
+
+ 31 Jul 2003; Tavis Ormandy <taviso@gentoo.org> vsftpd-1.2.0.ebuild:
+ reported broken on alpha.
+
+*vsftpd-1.2.0 (09 Jun 2003)
+
+ 09 Jun 2003; Nick Hadaway <raker@gentoo.org> vsftpd-1.2.0.ebuild.
+ files/vsftpd-1.2.0-gentoo.diff.bz2:
+ Version bump. Fixed ipv6 logic for xinetd. Now ipv6 support is
+ included in the source so no patch is needed. Updated the gentoo
+ patch for this version.
+
+*vsftpd-1.1.3-r1 (06 Apr 2003)
+
+ 05 Jun 2003; Donny Davies <woodchip@gentoo.org> vsftpd-1.1.3-r1.ebuild:
+ Fix #21079.
+
+ 06 Feb 2003; Guy Martin <gmsoft@gentoo.org> vsftpd-1.1.3-r1.ebuild, files/digest-vsftpd-1.1.3-r1,
+ files/vsftpd-1.1.3-ipv6.patch, files/vsftpd.xinetd.ipv6 :
+ Added ipv6 support. Added ~hppa to KEYWORDS.
+
+ 24 Feb 2003; Donny Davies <woodchip@gentoo.org> : Fix my ebuild.
+
+*vsftpd-1.1.3 (15 Feb 2003)
+
+ 18 Feb 2003; <seemant@gentoo.org> vsftpd-1.1.3.ebuild :
+ filter -fPIC.
+
+ 15 Feb 2003; Donny Davies <woodchip@gentoo.org> : Chase latest release.
+ #12435; optional pam and tcpd support.
+
+ 06 Dec 2002; Rodney Rees <manson@gentoo.org> : changed sparc ~sparc keywords
+
+*vsftpd-1.1.2 (19 Oct 2002)
+
+ 19 Oct 2002; Donny Davies <woodchip@gentoo.org> :
+ Chase latest release. Tidy up patch. Make vsftpd.pam pam_stack aware.
+
+*vsftpd-1.0.1-r1 (3 May 2002)
+
+ 20 Sep 2002; Mike Frysinger <vapier@gentoo.org> :
+ Added HOMEPAGE variable and set SRC_URI to the homepage download location.
+
+ 3 May 2002; Donny Davies <woodchip@gentoo.org> :
+ Added LICENSE, SLOT.
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
new file mode 100644
index 0000000..3dc2438
--- /dev/null
+++ b/net-ftp/vsftpd/Manifest
@@ -0,0 +1,14 @@
+AUX vsftpd-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370
+AUX vsftpd-2.2.0-dont-link-caps.patch 806 RMD160 670bfa8433ea5c9769d238aaebb9fce1d43e9e40 SHA1 d28260190d4613dae798d0f09d267be1ffcbc0a7 SHA256 fd164d4702ae866cb06ad245653b4f25c73d1d701a211b1f972b45b98ab55dd2
+AUX vsftpd-2.2.0-gentoo.patch 11049 RMD160 ef4fafea61a4ecf37d771f2da75bb10570dec898 SHA1 8846603f85f9515a154cfd8c1823c3e2e4e7e0e9 SHA256 e1737c941837aaf8e060a649903934174528704feffd100f86180a7ec68f3760
+AUX vsftpd-2.2.0-logging.patch 445 RMD160 aa13c53f48348d84dcabd8eae5c67c084fe7c0b2 SHA1 25f0d5518bd1145ad3afded83322e0dd0937e94c SHA256 bbe2fd9aea800480f839c808e085bb8fe67bab9e4d0a152da5b949e2b41b82d8
+AUX vsftpd-2.3.2-as-needed.patch 423 RMD160 36b79388cd7f7c6e7e9f8b4903622f4a1fa48762 SHA1 5e33ee6613715f84fa67e6bd09aec1be13aac95c SHA256 ad393655b30887294dfcf46fe63ea24e3339f027a84fe7de03364500829496d9
+AUX vsftpd-2.3.2-kerberos.patch 842 RMD160 01a77e587615e4367f2740ea52631fd115c8ea0a SHA1 ff1ef2088b960a77051b4cf83491f1c4ce70c621 SHA256 d86bed62c0fd22372f4704a12d7f75ce42fc15765ceec802b4b0c5680bc9c200
+AUX vsftpd.conf 3842 RMD160 2b0971c60f2ae2f9d3136849dff4dcf8ce117d41 SHA1 ebd5847bb328d8df188d85ffc5ccd7fcd5983525 SHA256 08b680a8531ecc8ccd9bf7cd91dc2de0a49105803a6d8fdcbe0f0dd47de8f6e0
+AUX vsftpd.init 1922 RMD160 50925ca15a4f94662790244546454c523b6e4f95 SHA1 ef453f4925e941e21075be678387076e57246b3d SHA256 78941ea7744d65d4674b4df8ecee6df91e6ed601c47d64ce1f489af56ea250e2
+AUX vsftpd.logrotate 53 RMD160 0fba0639da0d827fc0decfcf9ccd34fc7ad23c68 SHA1 cf18de9f84ad9a44974a7ae0f29562e9a516d5f9 SHA256 b31f4db8e2f8640f83bc38d83444ab784f8fc9a6492f654bb4149e1f566da2f3
+AUX vsftpd.xinetd 432 RMD160 6e2b2d0517d0bf8a2a9d7ce42ca2ea4ce73fbca2 SHA1 5325ecbf0755ebd5778d69039393af075c1a9b40 SHA256 4e68c12108509823c74cd66f833299def48f497a4d660624362d3b4990af828f
+DIST vsftpd-2.3.2.tar.gz 187229 RMD160 27bdc9d3065390a9dc85b3ef5926ad16d3544d2d SHA1 d525974514ecf61cbbf9cb51066aa68d5a52033b SHA256 a4e04836d8e271f361030e6a679ad001046c3e37f59e9fee5114189f9e065336
+EBUILD vsftpd-2.3.2-r1.ebuild 3364 RMD160 27b6ac17d8602427743001adc4883283d067979c SHA1 220a3b5492404fb5707d08cdf0ed7c9e3b31e1c5 SHA256 9ea253051341b5b93dbb169dc8b76618ba21e376ff380311d8e5305c5f57141a
+MISC ChangeLog 18802 RMD160 5bcad64b50b7c51397dcea833a1b38d067377c98 SHA1 bd7361c0b868d19aefa986f3b8c85b0783797344 SHA256 e6486ae22de1bbc2949e46a332bd621bc02970288ceb83b9598975f339fbbf38
+MISC metadata.xml 787 RMD160 7dd2ce11a4b159f3ff13dfada4c3f64dfbdc2b65 SHA1 934d6bca5ca09d532a8035d0e8af2fccb7779f7f SHA256 e6454f27f20a66c40a8a4937d9ea920ce8c370a7363cf8a6370570ed47d16c86
diff --git a/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
new file mode 100644
index 0000000..bd29762
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-caps.patch
@@ -0,0 +1,15 @@
+diff -ur vsftpd-2.1.0.orig/sysdeputil.c vsftpd-2.1.0/sysdeputil.c
+--- vsftpd-2.1.0.orig/sysdeputil.c 2009-02-23 18:23:26.000000000 +0100
++++ vsftpd-2.1.0/sysdeputil.c 2009-02-23 18:23:51.000000000 +0100
+@@ -160,10 +160,8 @@
+ #include <sys/capability.h>
+
+ #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP)
+-#include <linux/unistd.h>
+ #include <linux/capability.h>
+-#include <errno.h>
+-#include <syscall.h>
++#include <sys/syscall.h>
+ int capset(cap_user_header_t header, const cap_user_data_t data)
+ {
+ return syscall(__NR_capset, header, data);
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
new file mode 100644
index 0000000..debcf06
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.2.0-dont-link-caps.patch
@@ -0,0 +1,21 @@
+diff -ur vsftpd-2.2.0.orig/vsf_findlibs.sh vsftpd-2.2.0/vsf_findlibs.sh
+--- vsftpd-2.2.0.orig/vsf_findlibs.sh 2009-08-23 22:15:39.000000000 -0700
++++ vsftpd-2.2.0/vsf_findlibs.sh 2009-08-23 22:16:31.000000000 -0700
+@@ -44,17 +44,6 @@
+ # For older HP-UX...
+ locate_library /usr/lib/libsec.sl && echo "-lsec";
+
+-# Look for libcap (capabilities)
+-if locate_library /lib/libcap.so.1; then
+- echo "/lib/libcap.so.1";
+-elif locate_library /lib/libcap.so.2; then
+- echo "/lib/libcap.so.2";
+-else
+- locate_library /usr/lib/libcap.so && echo "-lcap";
+- locate_library /lib/libcap.so && echo "-lcap";
+- locate_library /lib64/libcap.so && echo "-lcap";
+-fi
+-
+ # Solaris needs this for nanosleep()..
+ locate_library /lib/libposix4.so && echo "-lposix4";
+ locate_library /usr/lib/libposix4.so && echo "-lposix4";
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch
new file mode 100644
index 0000000..353dff3
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch
@@ -0,0 +1,264 @@
+diff -NrU5 vsftpd-2.2.0.original/defs.h vsftpd-2.2.0/defs.h
+--- vsftpd-2.2.0.original/defs.h 2009-08-23 15:23:00.000000000 -0600
++++ vsftpd-2.2.0/defs.h 2009-08-23 16:01:20.000000000 -0600
+@@ -1,9 +1,9 @@
+ #ifndef VSF_DEFS_H
+ #define VSF_DEFS_H
+
+-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf"
++#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf"
+
+ #define VSFTP_COMMAND_FD 0
+
+ #define VSFTP_PASSWORD_MAX 128
+ #define VSFTP_USERNAME_MAX 128
+diff -NrU5 vsftpd-2.2.0.original/tunables.c vsftpd-2.2.0/tunables.c
+--- vsftpd-2.2.0.original/tunables.c 2009-08-23 15:23:00.000000000 -0600
++++ vsftpd-2.2.0/tunables.c 2009-08-23 16:00:14.000000000 -0600
+@@ -244,23 +244,23 @@
+ tunable_delay_successful_login = 0;
+ tunable_max_login_fails = 3;
+ /* -rw------- */
+ tunable_chown_upload_mode = 0600;
+
+- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
++ install_str_setting("/usr/share/vsftpd/empty", &tunable_secure_chroot_dir);
+ install_str_setting("ftp", &tunable_ftp_username);
+ install_str_setting("root", &tunable_chown_username);
+ install_str_setting("/var/log/xferlog", &tunable_xferlog_file);
+ install_str_setting("/var/log/vsftpd.log", &tunable_vsftpd_log_file);
+ install_str_setting(".message", &tunable_message_file);
+ install_str_setting("nobody", &tunable_nopriv_user);
+ install_str_setting(0, &tunable_ftpd_banner);
+- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file);
+- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file);
++ install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file);
++ install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file);
+ install_str_setting("ftp", &tunable_pam_service_name);
+ install_str_setting("ftp", &tunable_guest_username);
+- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file);
++ install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file);
+ install_str_setting(0, &tunable_anon_root);
+ install_str_setting(0, &tunable_local_root);
+ install_str_setting(0, &tunable_banner_file);
+ install_str_setting(0, &tunable_pasv_address);
+ install_str_setting(0, &tunable_listen_address);
+@@ -269,11 +269,11 @@
+ install_str_setting(0, &tunable_cmds_allowed);
+ install_str_setting(0, &tunable_cmds_denied);
+ install_str_setting(0, &tunable_hide_file);
+ install_str_setting(0, &tunable_deny_file);
+ install_str_setting(0, &tunable_user_sub_token);
+- install_str_setting("/etc/vsftpd.email_passwords",
++ install_str_setting("/etc/vsftpd/email_passwords",
+ &tunable_email_password_file);
+ install_str_setting("/usr/share/ssl/certs/vsftpd.pem",
+ &tunable_rsa_cert_file);
+ install_str_setting(0, &tunable_dsa_cert_file);
+ install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers);
+diff -NrU5 vsftpd-2.2.0.original/vsftpd.8 vsftpd-2.2.0/vsftpd.8
+--- vsftpd-2.2.0.original/vsftpd.8 2009-08-23 15:23:00.000000000 -0600
++++ vsftpd-2.2.0/vsftpd.8 2009-08-23 16:10:03.000000000 -0600
+@@ -19,11 +19,11 @@
+ Alternatively, vsftpd can be launched in standalone mode, in which case vsftpd
+ itself will listen on the network. This latter mode is easier to use, and
+ recommended. It is activated by setting
+ .Pa listen=YES
+ in
+-.Pa /etc/vsftpd.conf .
++.Pa /etc/vsftpd/vsftpd.conf .
+ Direct execution of the
+ .Nm vsftpd
+ binary will then launch the FTP service ready for immediate client connections.
+ .Sh OPTIONS
+ An optional
+@@ -31,11 +31,11 @@
+ may be given on the command line. These files must be owned as root if running
+ as root. Any command line option not starting with a "-" character is treated
+ as a config file that will be loaded. Note that config files are loaded in the
+ strict order that they are encountered on the command line.
+ If no config files are specified, the default configuration file of
+-.Pa /etc/vsftpd.conf
++.Pa /etc/vsftpd/vsftpd.conf
+ will be loaded, after all other command line options are processed.
+ .Pp
+ Supported options are:
+ .Bl -tag -width Ds
+ .It Fl v
+@@ -45,16 +45,16 @@
+ -o options are supported, and they are applied in strict order relative to
+ their appearance on the command line, including intermingling with loading of
+ config files.
+ .El
+ .Sh EXAMPLES
+-vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah
++vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah
+ .Pp
+ That example overrides vsftpd's built-in default for the "listen" option to be
+-NO, but then loads /etc/vsftpd.conf which may override that setting. Finally,
++NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally,
+ the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd
+ setting and any identical setting that was in the config file.
+ .Sh FILES
+-.Pa /etc/vsftpd.conf
++.Pa /etc/vsftpd/vsftpd.conf
+ .Sh SEE ALSO
+ .Xr vsftpd.conf 5
+ .end
+diff -NrU5 vsftpd-2.2.0.original/vsftpd.conf vsftpd-2.2.0/vsftpd.conf
+--- vsftpd-2.2.0.original/vsftpd.conf 2009-08-23 15:23:00.000000000 -0600
++++ vsftpd-2.2.0/vsftpd.conf 2009-08-23 15:35:03.000000000 -0600
+@@ -1,6 +1,6 @@
+-# Example config file /etc/vsftpd.conf
++# Example config file /etc/vsftpd/vsftpd.conf
+ #
+ # The default compiled in settings are fairly paranoid. This sample file
+ # loosens things up a bit, to make the ftp daemon more usable.
+ # Please see vsftpd.conf.5 for all compiled in defaults.
+ #
+@@ -85,19 +85,19 @@
+ #
+ # You may specify a file of disallowed anonymous e-mail addresses. Apparently
+ # useful for combatting certain DoS attacks.
+ #deny_email_enable=YES
+ # (default follows)
+-#banned_email_file=/etc/vsftpd.banned_emails
++#banned_email_file=/etc/vsftpd/banned_emails
+ #
+ # You may specify an explicit list of local users to chroot() to their home
+ # directory. If chroot_local_user is YES, then this list becomes a list of
+ # users to NOT chroot().
+ #chroot_local_user=YES
+ #chroot_list_enable=YES
+ # (default follows)
+-#chroot_list_file=/etc/vsftpd.chroot_list
++#chroot_list_file=/etc/vsftpd/chroot_list
+ #
+ # You may activate the "-R" option to the builtin ls. This is disabled by
+ # default to avoid remote users being able to cause excessive I/O on large
+ # sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
+ # the presence of the "-R" option, so there is a strong case for enabling it.
+diff -NrU5 vsftpd-2.2.0.original/vsftpd.conf.5 vsftpd-2.2.0/vsftpd.conf.5
+--- vsftpd-2.2.0.original/vsftpd.conf.5 2009-08-23 15:23:00.000000000 -0600
++++ vsftpd-2.2.0/vsftpd.conf.5 2009-08-23 15:49:59.000000000 -0600
+@@ -2,11 +2,11 @@
+ .SH NAME
+ vsftpd.conf \- config file for vsftpd
+ .SH DESCRIPTION
+ vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By
+ default, vsftpd looks for this file at the location
+-.BR /etc/vsftpd.conf .
++.BR /etc/vsftpd/vsftpd.conf .
+ However, you may override this by specifying a command line argument to
+ vsftpd. The command line argument is the pathname of the configuration file
+ for vsftpd. This behaviour is useful because you may wish to use an advanced
+ inetd such as
+ .BR xinetd
+@@ -136,11 +136,11 @@
+ If activated, you may provide a list of local users who are placed in a
+ chroot() jail in their home directory upon login. The meaning is slightly
+ different if chroot_local_user is set to YES. In this case, the list becomes
+ a list of users which are NOT to be placed in a chroot() jail.
+ By default, the file containing this list is
+-/etc/vsftpd.chroot_list, but you may override this with the
++/etc/vsftpd/chroot_list, but you may override this with the
+ .BR chroot_list_file
+ setting.
+
+ Default: NO
+ .TP
+@@ -175,11 +175,11 @@
+ Default: NO
+ .TP
+ .B deny_email_enable
+ If activated, you may provide a list of anonymous password e-mail responses
+ which cause login to be denied. By default, the file containing this list is
+-/etc/vsftpd.banned_emails, but you may override this with the
++/etc/vsftpd/banned_emails, but you may override this with the
+ .BR banned_email_file
+ setting.
+
+ Default: NO
+ .TP
+@@ -431,11 +431,11 @@
+ access to low-security content without needing virtual users. When enabled,
+ anonymous logins are prevented unless the password provided is listed in the
+ file specified by the
+ .BR email_password_file
+ setting. The file format is one password per line, no extra whitespace. The
+-default filename is /etc/vsftpd.email_passwords.
++default filename is /etc/vsftpd/email_passwords.
+
+ Default: NO
+ .TP
+ .B session_support
+ This controls whether vsftpd attempts to maintain sessions for logins. If
+@@ -762,11 +762,11 @@
+ This option is the name of a file containing a list of anonymous e-mail
+ passwords which are not permitted. This file is consulted if the option
+ .BR deny_email_enable
+ is enabled.
+
+-Default: /etc/vsftpd.banned_emails
++Default: /etc/vsftpd/banned_emails
+ .TP
+ .B banner_file
+ This option is the name of a file containing text to display when someone
+ connects to the server. If set, it overrides the banner string provided by
+ the
+@@ -799,11 +799,11 @@
+ is enabled. If the option
+ .BR chroot_local_user
+ is enabled, then the list file becomes a list of users to NOT place in a
+ chroot() jail.
+
+-Default: /etc/vsftpd.chroot_list
++Default: /etc/vsftpd/chroot_list
+ .TP
+ .B cmds_allowed
+ This options specifies a comma separated list of allowed FTP commands (post
+ login. USER, PASS and QUIT and others are always allowed pre-login). Other
+ commands are rejected. This is a powerful method of really locking down an
+@@ -860,11 +860,11 @@
+ .B email_password_file
+ This option can be used to provide an alternate file for usage by the
+ .BR secure_email_list_enable
+ setting.
+
+-Default: /etc/vsftpd.email_passwords
++Default: /etc/vsftpd/email_passwords
+ .TP
+ .B ftp_username
+ This is the name of the user we use for handling anonymous FTP. The home
+ directory of this user is the root of the anonymous FTP area.
+
+@@ -983,14 +983,14 @@
+ This powerful option allows the override of any config option specified in
+ the manual page, on a per-user basis. Usage is simple, and is best illustrated
+ with an example. If you set
+ .BR user_config_dir
+ to be
+-.BR /etc/vsftpd_user_conf
++.BR /etc/vsftpd/user_conf
+ and then log on as the user "chris", then vsftpd will apply the settings in
+ the file
+-.BR /etc/vsftpd_user_conf/chris
++.BR /etc/vsftpd/user_conf/chris
+ for the duration of the session. The format of this file is as detailed in
+ this manual page! PLEASE NOTE that not all settings are effective on a
+ per-user basis. For example, many settings only prior to the user's session
+ being started. Examples of settings which will not affect any behviour on
+ a per-user basis include listen_address, banner_file, max_per_ip, max_clients,
+@@ -1022,11 +1022,11 @@
+ .B userlist_file
+ This option is the name of the file loaded when the
+ .BR userlist_enable
+ option is active.
+
+-Default: /etc/vsftpd.user_list
++Default: /etc/vsftpd/user_list
+ .TP
+ .B vsftpd_log_file
+ This option is the name of the file to which we write the vsftpd style
+ log file. This log is only written if the option
+ .BR xferlog_enable
diff --git a/net-ftp/vsftpd/files/vsftpd-2.2.0-logging.patch b/net-ftp/vsftpd/files/vsftpd-2.2.0-logging.patch
new file mode 100644
index 0000000..b6b5e7c
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.2.0-logging.patch
@@ -0,0 +1,12 @@
+diff -Nur vsftpd-2.0.5/logging.c vsftpd-2.0.5.1/logging.c
+--- vsftpd-2.0.5/logging.c 2005-05-25 23:04:17.000000000 +0800
++++ vsftpd-2.0.5.1/logging.c 2007-03-04 13:37:14.000000000 +0800
+@@ -159,7 +159,7 @@
+ return;
+ }
+ }
+- str_replace_unprintable(p_str, '?');
++ /*str_replace_unprintable(p_str, '?');*/
+ str_append_char(p_str, '\n');
+ /* Ignore write failure; maybe the disk filled etc. */
+ (void) str_write_loop(p_str, fd);
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch b/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
new file mode 100644
index 0000000..330026e
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.3.2-as-needed.patch
@@ -0,0 +1,13 @@
+Index: vsftpd-2.3.2/Makefile
+===================================================================
+--- vsftpd-2.3.2.orig/Makefile
++++ vsftpd-2.3.2/Makefile
+@@ -21,7 +21,7 @@ OBJS = main.o utility.o prelogin.o ftpcm
+ $(CC) -c $*.c $(CFLAGS) $(IFLAGS)
+
+ vsftpd: $(OBJS)
+- $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) $(LDFLAGS)
++ $(CC) -o vsftpd $(LDFLAGS) $(OBJS) $(LINK) $(LIBS)
+
+ install:
+ if [ -x /usr/local/sbin ]; then \
diff --git a/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch b/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch
new file mode 100644
index 0000000..702363e
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.3.2-kerberos.patch
@@ -0,0 +1,20 @@
+Index: vsftpd-2.3.2/twoprocess.c
+===================================================================
+--- vsftpd-2.3.2.orig/twoprocess.c
++++ vsftpd-2.3.2/twoprocess.c
+@@ -284,6 +284,7 @@ process_login_req(struct vsf_session* p_
+ {
+ enum EVSFPrivopLoginResult e_login_result = kVSFLoginNull;
+ char cmd;
++ vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD);
+ /* Blocks */
+ cmd = priv_sock_get_cmd(p_sess->parent_fd);
+ if (cmd != PRIV_SOCK_LOGIN)
+@@ -363,7 +364,6 @@ common_do_login(struct vsf_session* p_se
+ int was_anon = anon;
+ const struct mystr* p_orig_user_str = p_user_str;
+ int newpid;
+- vsf_sysutil_install_null_sighandler(kVSFSysUtilSigCHLD);
+ /* Tells the pre-login child all is OK (it may exit in response) */
+ priv_sock_send_result(p_sess->parent_fd, PRIV_SOCK_RESULT_OK);
+ if (!p_sess->control_use_ssl)
diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf
new file mode 100644
index 0000000..2ed7008
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.conf
@@ -0,0 +1,105 @@
+#
+# Example vsftpd config file
+#
+# See man 5 vsftpd.conf for more information.
+#
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.conf,v 1.6 2005/08/03 09:38:31 uberlord Exp $
+
+# Enable vsftpd to run as a standalone daemon
+# Comment these two out to run under inetd or xinetd
+background=YES
+listen=YES
+
+# Allow anonymous FTP?
+anonymous_enable=YES
+
+# Uncomment this to allow local users to log in.
+#local_enable=YES
+
+# Uncomment this to enable any form of FTP write command.
+#write_enable=YES
+
+# Default umask for local users is 077. You may wish to change this to 022,
+# if your users expect that (022 is used by most other ftpd's)
+#local_umask=022
+
+# Uncomment this to allow the anonymous FTP user to upload files. This only
+# has an effect if the above global write enable is activated. Also, you will
+# obviously need to create a directory writable by the FTP user.
+#anon_upload_enable=YES
+
+# Uncomment this if you want the anonymous FTP user to be able to create
+# new directories.
+#anon_mkdir_write_enable=YES
+
+# Activate directory messages - messages given to remote users when they
+# go into a certain directory.
+dirmessage_enable=YES
+
+# Make sure PORT transfer connections originate from port 20 (ftp-data).
+connect_from_port_20=YES
+
+# If you want, you can arrange for uploaded anonymous files to be owned by
+# a different user. Note! Using "root" for uploaded files is not
+# recommended!
+#chown_uploads=YES
+#chown_username=whoever
+
+# Activate logging of uploads/downloads.
+xferlog_enable=YES
+
+# If you want, you can have your log file in standard ftpd xferlog format
+#xferlog_std_format=YES
+
+# You may override where the log file goes if you like.
+xferlog_file=/var/log/vsftpd.log
+
+# You may change the default value for timing out an idle session.
+#idle_session_timeout=600
+
+# You may change the default value for timing out a data connection.
+#data_connection_timeout=120
+
+# It is recommended that you define on your system a unique user which the
+# ftp server can use as a totally isolated and unprivileged user.
+nopriv_user=nobody
+
+# Enable this and the server will recognise asynchronous ABOR requests. Not
+# recommended for security (the code is non-trivial). Not enabling it,
+# however, may confuse older FTP clients.
+#async_abor_enable=YES
+
+# By default the server will pretend to allow ASCII mode but in fact ignore
+# the request. Turn on the below options to have the server actually do ASCII
+# mangling on files when in ASCII mode.
+# Beware that turning on ascii_download_enable enables malicious remote parties
+# to consume your I/O resources, by issuing the command "SIZE /big/file" in
+# ASCII mode.
+# These ASCII options are split into upload and download because you may wish
+# to enable ASCII uploads (to prevent uploaded scripts etc. from breaking),
+# without the DoS risk of SIZE and ASCII downloads. ASCII mangling should be
+# on the client anyway..
+#ascii_upload_enable=YES
+#ascii_download_enable=YES
+
+# You may fully customise the login banner string:
+#ftpd_banner=Welcome to blah FTP service.
+
+# You may specify a file of disallowed anonymous e-mail addresses. Apparently
+# useful for combatting certain DoS attacks.
+#deny_email_enable=YES
+# (default follows)
+#banned_email_file=/etc/vsftpd/banned_emails
+
+# You may specify an explicit list of local users to chroot() to their home
+# directory. If chroot_local_user is YES, then this list becomes a list of
+# users to NOT chroot().
+#chroot_list_enable=YES
+# (default follows)
+#chroot_list_file=/etc/vsftpd/chroot_list
+
+# You may activate the "-R" option to the builtin ls. This is disabled by
+# default to avoid remote users being able to cause excessive I/O on large
+# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume
+# the presence of the "-R" option, so there is a strong case for enabling it.
+#ls_recurse_enable=YES
diff --git a/net-ftp/vsftpd/files/vsftpd.init b/net-ftp/vsftpd/files/vsftpd.init
new file mode 100644
index 0000000..e486e1f
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.init
@@ -0,0 +1,69 @@
+#!/sbin/runscript
+# Copyright 2003-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License, v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.init,v 1.7 2008/12/26 16:50:15 armin76 Exp $
+
+VSFTPD_NAME=${SVCNAME##*.}
+if [ -n "${VSFTPD_NAME}" -a "${SVCNAME}" != "vsftpd" ]; then
+ VSFTPD_PID="/var/run/vsftpd.${VSFTPD_NAME}.pid"
+ VSFTPD_CONF_DEFAULT="/etc/vsftpd/${VSFTPD_NAME}.conf"
+else
+ VSFTPD_PID="/var/run/vsftpd.pid"
+ VSFTPD_CONF_DEFAULT="/etc/vsftpd/vsftpd.conf"
+fi
+VSFTPD_CONF=${VSFTPD_CONF:-${VSFTPD_CONF_DEFAULT}}
+VSFTPD_EXEC=${VSFTPD_EXEC:-/usr/sbin/vsftpd}
+
+depend() {
+ need net
+ use dns logger
+}
+
+checkconfig() {
+ if [ ! -e ${VSFTPD_CONF} ] ; then
+ eerror "Please setup ${VSFTPD_CONF} before starting vsftpd"
+ eerror "There are sample configurations in /usr/share/doc/vsftpd"
+ return 1
+ fi
+
+ if egrep -iq "^ *background *= *yes" "${VSFTPD_CONF}" ; then
+ eerror "${VSFTPD_CONF} must not set background=YES"
+ return 1
+ fi
+
+ local has_ip=false has_ipv6=false ip_error=true
+ egrep -iq "^ *listen *= *yes" "${VSFTPD_CONF}" && has_ip=true
+ egrep -iq "^ *listen_ipv6 *= *yes" "${VSFTPD_CONF}" && has_ipv6=true
+ if ${has_ip} && ! ${has_ipv6} ; then
+ ip_error=false
+ elif ! ${has_ip} && ${has_ipv6} ; then
+ ip_error=false
+ fi
+ if ${ip_error} ; then
+ eerror "${VSFTPD_CONF} must contain listen=YES or listen_ipv6=YES"
+ eerror "but not both"
+ return 1
+ fi
+}
+
+start() {
+ checkconfig || return 1
+ ebegin "Starting ${SVCNAME}"
+ start-stop-daemon --start --exec ${VSFTPD_EXEC} \
+ --background --make-pidfile --pidfile "${VSFTPD_PID}" \
+ -- "${VSFTPD_CONF}"
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping ${SVCNAME}"
+ if [ -f ${VSFTPD_PID} ]; then
+ start-stop-daemon --stop --pidfile ${VSFTPD_PID}
+ else
+ ewarn "Couldn't found ${VSFTPD_PID} trying to stop over the process name ${SVCNAME}"
+ start-stop-daemon --stop --name ${SVCNAME}
+ fi
+ eend $?
+}
+
+# vim: ts=4
diff --git a/net-ftp/vsftpd/files/vsftpd.logrotate b/net-ftp/vsftpd/files/vsftpd.logrotate
new file mode 100644
index 0000000..f443e2e
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.logrotate
@@ -0,0 +1,4 @@
+/var/log/vsftpd.log {
+ missingok
+ notifempty
+}
diff --git a/net-ftp/vsftpd/files/vsftpd.xinetd b/net-ftp/vsftpd/files/vsftpd.xinetd
new file mode 100644
index 0000000..d1d88e9
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd.xinetd
@@ -0,0 +1,15 @@
+# default: off
+# description: Vsftpd is an FTP server, designed to be secure.
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.xinetd,v 1.4 2005/06/07 18:34:17 uberlord Exp $
+
+service ftp
+{
+ socket_type = stream
+ wait = no
+ user = root
+ server = /usr/sbin/vsftpd
+ server_args = /etc/vsftpd/vsftpd.conf
+ log_on_success += DURATION
+ nice = 10
+ disable = yes
+}
diff --git a/net-ftp/vsftpd/metadata.xml b/net-ftp/vsftpd/metadata.xml
new file mode 100644
index 0000000..0000276
--- /dev/null
+++ b/net-ftp/vsftpd/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <herd>net-ftp</herd>
+ <maintainer>
+ <email>hwoarang@gentoo.org</email>
+ <name>Markos Chandras</name>
+ </maintainer>
+ <maintainer>
+ <email>wired@gentoo.org</email>
+ <name>Alex Alexander</name>
+ </maintainer>
+ <maintainer>
+ <email>bugs@bergstroem.nu</email>
+ <name>Johan Bergström</name>
+ <description>Proxy Maintainer. CC him on bugs</description>
+ </maintainer>
+ <maintainer>
+ <email>smithdanea@gmail.com</email>
+ <name>Dane Smith</name>
+ <description>Proxy Maintainer. CC him on bugs</description>
+ </maintainer>
+ <longdescription lang="en">
+ Very Secure FTP Daemon written with speed, size and security
+ in mind
+ </longdescription>
+</pkgmetadata>
diff --git a/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
new file mode 100644
index 0000000..18aafe7
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.3.2-r1.ebuild,v 1.1 2010/09/27 17:19:35 hwoarang Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+HOMEPAGE="http://vsftpd.beasts.org/"
+SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="caps pam tcpd ssl selinux xinetd"
+
+DEPEND="caps? ( >=sys-libs/libcap-2 )
+ pam? ( virtual/pam )
+ tcpd? ( >=sys-apps/tcp-wrappers-7.6 )
+ ssl? ( >=dev-libs/openssl-0.9.7d )"
+RDEPEND="${DEPEND}
+ net-ftp/ftpbase
+ selinux? ( sec-policy/selinux-ftpd )
+ xinetd? ( sys-apps/xinetd )"
+
+src_unpack() {
+ unpack ${A}
+ cd "${S}"
+
+ # as-needed patch. Bug #335977
+ epatch "${FILESDIR}/${P}-as-needed.patch"
+
+ # kerberos patch. bug #335980
+ epatch "${FILESDIR}/${P}-kerberos.patch"
+
+ # Patch the source, config and the manpage to use /etc/vsftpd/
+ epatch "${FILESDIR}/${PN}-2.2.0-gentoo.patch"
+
+ # Fix building without the libcap
+ epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+
+ # Fix unicode logging
+ epatch "${FILESDIR}/${PN}-2.2.0-logging.patch" || die
+
+ # Configure vsftpd build defaults
+ use tcpd && echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h
+ use ssl && echo "#define VSF_BUILD_SSL" >> builddefs.h
+ use pam || echo "#undef VSF_BUILD_PAM" >> builddefs.h
+
+ # Ensure that we don't link against libcap unless asked
+ if ! use caps ; then
+ sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c
+ epatch "${FILESDIR}"/${PN}-2.2.0-dont-link-caps.patch
+ fi
+
+ # Let portage control stripping
+ sed -i '/^LINK[[:space:]]*=[[:space:]]*/ s/-Wl,-s//' Makefile
+}
+
+src_compile() {
+ emake CFLAGS="${CFLAGS}" CC="$(tc-getCC)" || die
+}
+
+src_install() {
+ into /usr
+ doman vsftpd.conf.5 vsftpd.8 || die "doman failed"
+ dosbin vsftpd || die "disbin failed"
+
+ dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \
+ README README.security REWARD SIZE \
+ SPEED TODO TUNING || die "dodoc failed"
+ newdoc vsftpd.conf vsftpd.conf.example || die "newdoc failed"
+
+ docinto security
+ dodoc SECURITY/* || die "dodoc failed"
+
+ insinto "/usr/share/doc/${PF}/examples"
+ doins -r EXAMPLE/* || die "doins faileD"
+
+ insinto /etc/vsftpd
+ newins vsftpd.conf vsftpd.conf.example || die "newins failed"
+
+ insinto /etc/logrotate.d
+ newins "${FILESDIR}/vsftpd.logrotate" vsftpd || die "newins failed"
+
+ if use xinetd ; then
+ insinto /etc/xinetd.d
+ newins "${FILESDIR}/vsftpd.xinetd" vsftpd || die "newins failed"
+ fi
+
+ newinitd "${FILESDIR}/vsftpd.init" vsftpd || die "newinitd failed"
+
+ keepdir /usr/share/vsftpd/empty
+}
+
+pkg_preinst() {
+ # If we use xinetd, then we set listen=NO
+ # so that our default config works under xinetd - fixes #78347
+ if use xinetd ; then
+ sed -i 's/listen=YES/listen=NO/g' "${D}"/etc/vsftpd/vsftpd.conf.example
+ fi
+}
+
+pkg_postinst() {
+ einfo "vsftpd init script can now be multiplexed."
+ einfo "The default init script forces /etc/vsftpd/vsftpd.conf to exist."
+ einfo "If you symlink the init script to another one, say vsftpd.foo"
+ einfo "then that uses /etc/vsftpd/foo.conf instead."
+ einfo
+ einfo "Example:"
+ einfo " cd /etc/init.d"
+ einfo " ln -s vsftpd vsftpd.foo"
+ einfo "You can now treat vsftpd.foo like any other service"
+}