# HG changeset patch # User ohnobinki@delllappy.cdm # Date 2009-01-05 18:01:46 # Node ID a0d8a5b201020f52f73296318ed8e41f36a21e2e # Parent c6f0584f31816657a9441321734187f740afdff5 initial import of vsftpd; fix for linking on an amd64 system with separate [/usr]/lib and [/usr]/lib64 dirs diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/ChangeLog @@ -0,0 +1,424 @@ +# ChangeLog for net-ftp/vsftpd +# Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.107 2009/01/02 16:33:32 cla Exp $ + + 05 Jan 2009; Nathan Brink +Initial import from Gentoo's Portage. Fixed issue with linking when {/usr/lib and /usr/lib64} and {/lib64 and lib} are not symlinked. + + 02 Jan 2009; Dawid Węgliński vsftpd-2.0.7-r1.ebuild: + Stable on amd64 (bug #248458) + + 31 Dec 2008; Friedrich Oslage + vsftpd-2.0.7-r1.ebuild: + Stable on sparc, bug #248458 + + 28 Dec 2008; Tobias Scherbaum + vsftpd-2.0.7-r1.ebuild: + ppc stable, bug #248458 + + 27 Dec 2008; Brent Baude vsftpd-2.0.7-r1.ebuild: + stable ppc64, bug 248458 + + 26 Dec 2008; Raúl Porcel + -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 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 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 +vsftpd-2.0.7.ebuild: + Version bump + + 02 Jun 2008; Jeremy Olexa 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ò 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 vsftpd-2.0.6.ebuild: + amd64 stable, bug #214959 + + 29 Mar 2008; Dawid Węgliński vsftpd-2.0.6.ebuild: + Stable on x86 (bug #214959) + + 28 Mar 2008; Brent Baude vsftpd-2.0.6.ebuild: + stable ppc, bug 214959 + + 27 Mar 2008; Markus Rothe vsftpd-2.0.6.ebuild: + Stable on ppc64; bug #214959 + + 26 Mar 2008; Raúl Porcel vsftpd-2.0.6.ebuild: + alpha/ia64/sparc stable + + 26 Feb 2008; Raúl Porcel + -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 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 +vsftpd-2.0.6.ebuild: + Version bump + + 25 Dec 2007; Christian Heim metadata.xml: + Removing uberlord from metadata.xml as per #199318. Assigning to + maintainer-needed. + + 09 Jul 2007; Roy Marples vsftpd-2.0.5-r3.ebuild: + Keyworded ~x86-fbsd + +*vsftpd-2.0.5-r3 (26 Jun 2007) + + 26 Jun 2007; Roy Marples + +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 metadata.xml: + add no-herd + + 11 May 2007; Jose Luis Rivero 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 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 files/vsftpd.init, + +vsftpd-2.0.5-r1.ebuild: + Bump for a non-bash init script. + + 17 Mar 2007; Steve Dibb vsftpd-2.0.5.ebuild: + amd64 stable, bug 166805 + + 18 Feb 2007; nixnut vsftpd-2.0.5.ebuild: + Stable on ppc wrt bug 166805 + + 16 Feb 2007; Markus Rothe vsftpd-2.0.5.ebuild: + Stable on ppc64; bug #166805 + + 14 Feb 2007; Gustavo Zacarias vsftpd-2.0.5.ebuild: + Stable on sparc wrt #166805 + + 14 Feb 2007; Christian Faulhammer vsftpd-2.0.5.ebuild: + stable x86; bug 166805 + + 14 Jan 2007; Roy Marples + +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 vsftpd-2.0.5.ebuild: + Support cross compiling, #155975 thanks to Attila Fazekas. + + 14 Oct 2006; Roy Marples + -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 +vsftpd-2.0.5.ebuild: + Version bump. + + 16 May 2006; Markus Rothe vsftpd-2.0.4-r1.ebuild: + Stable on ppc64; bug #132650 + + 14 May 2006; Thomas Cort vsftpd-2.0.4-r1.ebuild: + Stable on alpha wrt Bug #132650. + + 14 May 2006; Chris Gianelloni + vsftpd-2.0.4-r1.ebuild: + Stable on x86 wrt bug #132650. + + 14 May 2006; Jason Wever vsftpd-2.0.4-r1.ebuild: + Stable on SPARC wrt bug #132650. + + 14 May 2006; Luis Medinas vsftpd-2.0.4-r1.ebuild: + Stable on amd64. Bug #132650. + + 11 May 2006; Tobias Scherbaum + vsftpd-2.0.4-r1.ebuild: + ppc stable, bug #132650 + + 08 May 2006; Roy Marples 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 +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 +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 + +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 vsftpd-2.0.3-r1.ebuild: + Stable on sh + + 19 Sep 2005; Roy Marples -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 vsftpd-2.0.3-r1.ebuild: + Mark 2.0.3-r1 stable on alpha + + 14 Aug 2005; Michael Hanselmann + vsftpd-2.0.3-r1.ebuild: + Stable on ppc. + + 08 Aug 2005; Markus Rothe vsftpd-2.0.3-r1.ebuild: + Stable on ppc64 + + 03 Aug 2005; Roy Marples files/vsftpd.conf: + Fixed vsftpd.conf example wrt bug #101137 + + 28 Jul 2005; Gustavo Zacarias + vsftpd-2.0.3-r1.ebuild: + Stable on sparc + + 27 Jul 2005; Roy Marples + -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 + +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 + -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 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ò + +*vsftpd-2.0.2 (13 Mar 2005) + + 13 Mar 2005; +vsftpd-2.0.2.ebuild: + - version bump. fixes an issue with SSL secured data connections dropping out + + 09 Feb 2005; vsftpd-2.0.1.ebuild: + - remove fPIC filtering on vsftpd-2.0.1 (no longer needed) bug #74519 + + 09 Feb 2005; Jeffrey Forman vsftpd-2.0.1.ebuild: + didnt compile, fixed the ebuild per bug 79202, thanks Rob! + + 22 Jan 2005; vsftpd-1.2.2.ebuild: + - remove fPIC filtering on vsftpd-1.2.2. (no longer needed) bug #74519 + + 17 Jan 2005; Jeffrey Forman vsftpd-2.0.1.ebuild: + Add support to build vsftpd without pam, bug 65981, thanks Rob! + + 29 Dec 2004; Ciaran McCreesh : + Change encoding to UTF-8 for GLEP 31 compliance + + 30 Sep 2004; Jeffrey Forman files/vsftpd.init.d: + updated init.d/vsftpd to remove source cmd per bug #51908 + + 28 Sep 2004; Tom Gall vsftpd-1.2.2.ebuild, + +vsftpd-1.2.2-ppc64.diff: + fix bug #64175 for ppc64 + + 25 Sep 2004; Tom Martin 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 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 vsftpd-2.0.1.ebuild: + ~ on all arch's for testing + + 23 Sep 2004; Jeffrey Forman : + New ebuild, vsftp-2.0.1, -$arch on all. Adds SSL/TLS support + + 13 Jul 2004; Tom Gall vsftpd-1.2.2.ebuild: + stable on ppc64, bug #53116 + + 15 Jun 2004; Brandon Hale vsftpd-1.2.2.ebuild: + Stable on x86, bug #53116 + + 15 Jun 2004; Jason Wever vsftpd-1.2.2.ebuild: + Marked stable on sparc wrt bug #53116. + + 15 Jun 2004; Bryan Østergaard vsftpd-1.2.2.ebuild: + Stable on alpha, bug 53116. + +*vsftpd-1.2.2 (15 Jun 2004) + + 15 Jun 2004; vsftpd-1.2.2.ebuild: + security version bump bug #53116 + + 10 Jun 2004; Aron Griffis vsftpd-1.2.0-r1.ebuild, + vsftpd-1.2.1.ebuild: + Fix use invocation + + 05 Jun 2004; Michael Hanselmann vsftpd-1.2.1.ebuild: + Added ~ppc to KEYWORDS. + + 03 Jun 2004; Tom Gall vsftpd-1.2.1.ebuild: + stable on ppc64, bug #52907 + + 30 Mar 2004; Michael Sterrett vsftpd-1.2.0-r1.ebuild, + vsftpd-1.2.1.ebuild: + move filter-flags into src_unpack() + + 29 Mar 2004; vsftpd-1.2.1.ebuild: + adding s390 keywords + + 14 Mar 2004; Jason Wever vsftpd-1.2.1.ebuild: + Stable on sparc. + + 02 Mar 2004; Jason Wever vsftpd-1.2.1.ebuild: + Added the super spiffy ~sparc keyword :) + + 27 Feb 2004; Rajiv Aaron Manglani vsftpd-1.2.1.ebuild: + marked stable on x86. + + 26 Feb 2004; Aron Griffis vsftpd-1.2.1.ebuild: + stable on alpha and ia64 + + 01 Feb 2004; Jon Portnoy vsftpd-1.2.1.ebuild : + AMD64 keywords. + + 07 Jan 2004; Jason Wever vsftpd-1.2.0-r1.ebuild: + Marked stable on sparc. + +*vsftpd-1.2.1 (10 Dec 2003) + + 10 Dec 2003; Rajiv Aaron Manglani 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 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 files/vsftpd.init.d: + check for 'listen' in conf file. bug #33648. + + 08 Dec 2003; 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 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 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 vsftpd-1.2.0.ebuild: + reported broken on alpha. + +*vsftpd-1.2.0 (09 Jun 2003) + + 09 Jun 2003; Nick Hadaway 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 vsftpd-1.1.3-r1.ebuild: + Fix #21079. + + 06 Feb 2003; Guy Martin 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 : Fix my ebuild. + +*vsftpd-1.1.3 (15 Feb 2003) + + 18 Feb 2003; vsftpd-1.1.3.ebuild : + filter -fPIC. + + 15 Feb 2003; Donny Davies : Chase latest release. + #12435; optional pam and tcpd support. + + 06 Dec 2002; Rodney Rees : changed sparc ~sparc keywords + +*vsftpd-1.1.2 (19 Oct 2002) + + 19 Oct 2002; Donny Davies : + 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 : + Added HOMEPAGE variable and set SRC_URI to the homepage download location. + + 3 May 2002; Donny Davies : + Added LICENSE, SLOT. diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/Manifest @@ -0,0 +1,11 @@ +AUX vsftpd-2.0.3-gentoo.patch 7128 RMD160 99ef0aee94847405e6185cc95acbc72cba0df0e0 SHA1 4608e2656d83cc17fcef229a8f4b66c803b899d8 SHA256 8f3215d43948364d431312dd4109af09e9a83ebbafb7a1c388f2aefea4df9154 +AUX vsftpd-2.0.6-caps.patch 649 RMD160 161b4610fdedcc3b1173055e534682fc5450b1d7 SHA1 cf63310bcee83e68079377c1da55e2b0d0111ebf SHA256 1435d0bc4e0d0e5f4a86ba2c42e77663be10d494cc9bc3af782c104a062e2778 +AUX vsftpd-2.0.6-libcap1.patch 582 RMD160 239fa2c23770e81a0b45f8df154a52b42af1f542 SHA1 d3fb0ae32f445092e9ab5af2209ac16af2ac0a5d SHA256 8c72a4f34ca8f4f3fb2da49d4cfde288c346d29bac3036f25b64c51f1543a51c +AUX vsftpd-2.0.7-uclibc.patch 582 RMD160 7e1a930162d0936076a6e4601585d73b649073d8 SHA1 d47b6b0ac66c7ebfc08b472c04c4fc8b076be4ef SHA256 adef1463cb329454706cf094b453f41d70dee8a46b72ef144f94b938de319002 +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.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b +EBUILD vsftpd-2.0.7-r1.ebuild 3413 RMD160 4e6968e972b3aee4a2854c3cb66c3237635ce075 SHA1 819bfaa04ac4abdd49a8947e6565a56a44ca1476 SHA256 80dd33fcfc8218a5c95c3ea6fe460725e70afc0e00ccb25de4b61a227859cf11 +MISC ChangeLog 15121 RMD160 1e7f7dd6f864e965314b98bb17b57c000ca146d3 SHA1 818a7cf1a62fff9098f91db796657b2055c0d095 SHA256 5053ac19cad67a7b782284cddeb53cd27717b21c0b6512e0acfbec26e117e286 diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.0.3-gentoo.patch @@ -0,0 +1,193 @@ +diff --unified defs.h defs.h +--- defs.h 2004-06-04 16:37:29.000000000 +0200 ++++ defs.h 2004-09-24 11:36:16.443227600 +0200 +@@ -1,7 +1,7 @@ + #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 + +--- tunables.c.orig 2005-06-08 11:29:01.261176985 +0100 ++++ tunables.c 2005-06-08 11:30:33.521084952 +0100 +@@ -89,7 +89,7 @@ + unsigned int tunable_max_per_ip = 0; + unsigned int tunable_trans_chunk_size = 0; + +-const char* tunable_secure_chroot_dir = "/usr/share/empty"; ++const char* tunable_secure_chroot_dir = "/usr/share/vsftpd/empty"; + const char* tunable_ftp_username = "ftp"; + const char* tunable_chown_username = "root"; + const char* tunable_xferlog_file = "/var/log/xferlog"; +@@ -97,11 +97,11 @@ + const char* tunable_message_file = ".message"; + const char* tunable_nopriv_user = "nobody"; + const char* tunable_ftpd_banner = 0; +-const char* tunable_banned_email_file = "/etc/vsftpd.banned_emails"; +-const char* tunable_chroot_list_file = "/etc/vsftpd.chroot_list"; ++const char* tunable_banned_email_file = "/etc/vsftpd/banned_emails"; ++const char* tunable_chroot_list_file = "/etc/vsftpd/chroot_list"; + const char* tunable_pam_service_name = "ftp"; + const char* tunable_guest_username = "ftp"; +-const char* tunable_userlist_file = "/etc/vsftpd.user_list"; ++const char* tunable_userlist_file = "/etc/vsftpd/user_list"; + const char* tunable_anon_root = 0; + const char* tunable_local_root = 0; + const char* tunable_banner_file = 0; +@@ -113,7 +113,7 @@ + const char* tunable_hide_file = 0; + const char* tunable_deny_file = 0; + const char* tunable_user_sub_token = 0; +-const char* tunable_email_password_file = "/etc/vsftpd.email_passwords"; ++const char* tunable_email_password_file = "/etc/vsftpd/email_passwords"; + const char* tunable_rsa_cert_file = "/usr/share/ssl/certs/vsftpd.pem"; + const char* tunable_dsa_cert_file = 0; + const char* tunable_ssl_ciphers = "DES-CBC3-SHA"; +--- vsftpd.8.orig 2005-06-08 12:12:51.753585388 +0100 ++++ vsftpd.8 2005-06-08 12:13:21.411085181 +0100 +@@ -21,7 +21,7 @@ + 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. +@@ -29,6 +29,6 @@ + An optional + .Op configuration file + may be given on the command line. The default configuration file is +-.Pa /etc/vsftpd.conf . ++.Pa /etc/vsftpd/vsftpd.conf . + .Sh SEE ALSO + .Xr vsftpd.conf 5 +--- vsftpd.conf.5.orig 2005-06-08 12:13:29.831523597 +0100 ++++ vsftpd.conf.5 2005-06-08 12:15:04.012059074 +0100 +@@ -4,7 +4,7 @@ + .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 +@@ -136,7 +136,7 @@ + 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. + +@@ -164,7 +164,7 @@ + .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. + +@@ -371,7 +371,7 @@ + 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 +@@ -651,7 +651,7 @@ + .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 +@@ -680,7 +680,7 @@ + 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 +@@ -732,7 +732,7 @@ + .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 +@@ -852,10 +852,10 @@ + 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 +@@ -891,7 +891,7 @@ + .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 +--- vsftpd.conf.orig 2005-10-20 07:53:27.857892494 +0100 ++++ vsftpd.conf 2005-10-20 09:44:04.631292771 +0100 +@@ -1,4 +1,4 @@ +-# 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. +@@ -8,6 +8,10 @@ + # Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's + # capabilities. + # ++# Listen on IPv4. xinet users must set NO or comment out ++# otherwise it must be set YES ++listen=YES ++# + # Allow anonymous FTP? (Beware - allowed by default if you comment this out). + anonymous_enable=YES + # +@@ -88,18 +92,17 @@ + # 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_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. + #ls_recurse_enable=YES +- diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-caps.patch @@ -0,0 +1,16 @@ +diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c +--- vsftpd-2.0.5.orig/sysdeputil.c 2007-01-05 17:58:28.000000000 +0000 ++++ vsftpd-2.0.5/sysdeputil.c 2007-01-05 17:55:30.000000000 +0000 +@@ -154,11 +154,8 @@ + #include + + #if defined(VSF_SYSDEP_HAVE_CAPABILITIES) && !defined(VSF_SYSDEP_HAVE_LIBCAP) +-#include + #include +-#include +-#include +-_syscall2(int, capset, cap_user_header_t, header, const cap_user_data_t, data) ++#include + /* Gross HACK to avoid warnings - linux headers overlap glibc headers */ + #undef __NFDBITS + #undef __FDMASK diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.0.6-libcap1.patch @@ -0,0 +1,22 @@ +diff -ur vsftpd-2.0.5.orig/sysdeputil.c vsftpd-2.0.5/sysdeputil.c +--- vsftpd-2.0.5.orig/sysdeputil.c 2007-01-05 17:58:28.000000000 +0000 ++++ vsftpd-2.0.5/sysdeputil.c 2007-01-05 17:55:30.000000000 +0000 +@@ -508,6 +505,18 @@ + } + + #ifndef VSF_SYSDEP_HAVE_LIBCAP ++ ++static int ++capset(struct __user_cap_header_struct *header, ++ const struct __user_cap_data_struct *data); ++ ++static int ++capset(struct __user_cap_header_struct *header, ++ const struct __user_cap_data_struct *data) ++{ ++ return syscall(__NR_capset, header, data); ++} ++ + static int + do_checkcap(void) + { diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch b/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/files/vsftpd-2.0.7-uclibc.patch @@ -0,0 +1,20 @@ +--- sysutil.c.orig 2008-10-13 10:07:34.000000000 +0200 ++++ sysutil.c 2008-10-13 10:08:00.000000000 +0200 +@@ -601,7 +601,7 @@ + vsf_sysutil_wait_exited_normally( + const struct vsf_sysutil_wait_retval* p_waitret) + { +- return WIFEXITED(p_waitret->exit_status); ++ return WIFEXITED((struct vsf_sysutil_wait_retval *)p_waitret->exit_status); + } + + int +@@ -611,7 +611,7 @@ + { + bug("not a normal exit in vsf_sysutil_wait_get_exitcode"); + } +- return WEXITSTATUS(p_waitret->exit_status); ++ return WEXITSTATUS((struct vsf_sysutil_wait_retval *)p_waitret->exit_status); + } + + void diff --git a/net-ftp/vsftpd/files/vsftpd.conf b/net-ftp/vsftpd/files/vsftpd.conf new file mode 100644 --- /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 --- /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 --- /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 --- /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/vsftpd-2.0.7-r1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild new file mode 100644 --- /dev/null +++ b/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild @@ -0,0 +1,123 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.7-r1.ebuild,v 1.6 2009/01/02 16:33:32 cla 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 logrotate pam tcpd ssl selinux xinetd" + +DEPEND="caps? ( sys-libs/libcap ) + pam? ( virtual/pam ) + tcpd? ( >=sys-apps/tcp-wrappers-7.6 ) + ssl? ( >=dev-libs/openssl-0.9.7d )" +RDEPEND="${DEPEND} + net-ftp/ftpbase + logrotate? ( app-admin/logrotate ) + selinux? ( sec-policy/selinux-ftpd ) + xinetd? ( sys-apps/xinetd )" + +src_unpack() { + unpack ${A} + cd "${S}" + + # Patch the source, config and the manpage to use /etc/vsftpd/ + epatch "${FILESDIR}/${PN}-2.0.3-gentoo.patch" + # uclibc fix, from Debian + epatch "${FILESDIR}"/${PN}-2.0.7-uclibc.patch + + # Fix building without the libcap + epatch "${FILESDIR}/${PN}-2.0.6-caps.patch" + has_version " vsf_findlibs.sh + if use tcpd; then + echo "#define VSF_BUILD_TCPWRAPPERS" >> builddefs.h + echo "echo \"-lwrap\" \"-lnsl\"" >> vsf_findlibs.sh + fi + if use ssl; then + echo "#define VSF_BUILD_SSL" >> builddefs.h + echo "echo \"-lssl -lcrypto\"" >> vsf_findlibs.sh + fi + if use pam; then + echo "\"-lpam\"" >> vsf_findlibs.sh + else + echo "#undef VSF_BUILD_PAM" >> builddefs.h + fi + + # Ensure that we don't link against libcap unless asked + if use caps ; then + echo "echo \"-lcap\"" >> vsf_findlibs.sh + else + sed -i '/^#define VSF_SYSDEP_HAVE_LIBCAP$/ d' sysdeputil.c + sed -i '/libcap/ d' vsf_findlibs.sh + 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 + dosbin vsftpd || die + + dodoc AUDIT BENCHMARKS BUGS Changelog FAQ \ + README README.security REWARD SIZE \ + SPEED TODO TUNING + newdoc vsftpd.conf vsftpd.conf.example + + docinto security + dodoc SECURITY/* + + insinto "/usr/share/doc/${PF}/examples" + doins -r EXAMPLE/* + + insinto /etc/vsftpd + newins vsftpd.conf vsftpd.conf.example + + if use logrotate ; then + insinto /etc/logrotate.d + newins "${FILESDIR}/vsftpd.logrotate" vsftpd + fi + + if use xinetd ; then + insinto /etc/xinetd.d + newins "${FILESDIR}/vsftpd.xinetd" vsftpd + fi + + newinitd "${FILESDIR}/vsftpd.init" vsftpd + + keepdir /usr/share/vsftpd/empty +} + +pkg_preinst() { + # If we use xinetd, then we comment out listen=YES + # so that our default config works under xinetd - fixes #78347 + if use xinetd ; then + sed -i '/\listen=YES/s/^/#/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" +}