Version bump

Package-Manager: portage-2.1.6.7/cvs/Linux i686

6 files changed, 345 insertions, 12 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index a9d06c1139e4..464f4236be3f 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,13 @@
 # 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.109 2009/02/09 09:33:14 angelos Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.110 2009/02/23 17:41:05 armin76 Exp $
+
+*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
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 24726f26ca04..fd5393d2fea3 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,24 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 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-2.1.0-caps.patch 575 RMD160 a7b27df472ccbb5068d5f9961fe6bb010063e98c SHA1 f98d3cfbc1eb68f6e852cf9cbf5ad80407be5557 SHA256 4888021a25625041746b91025af0c2a2cb1fde758eda1d6c94098d4de0c1e370
+AUX vsftpd-2.1.0-dont-link-caps.patch 682 RMD160 fff89775de0d95562603b890e181703acb5dd6ce SHA1 c18bc7639643fe2b1ea91717d97eae191e73660c SHA256 6662a7961043e2888ff377a7689b31934f75d0ebf4bfad916a5432ff05cfcb52
+AUX vsftpd-2.1.0-gentoo.patch 7575 RMD160 0695c1e679a8b0a7f1a4d599ee01571c7db0049b SHA1 69cd031c3f958f94ff64b573d4af235e79d84051 SHA256 3bacbc4828edf8d24f08600090ca60c9af8c1603032fc6cf3748960ac971f2bd
 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.6.tar.gz 158516 RMD160 33e9782e2c99986c2c8b60fc29880cedad7ba1fa SHA1 23fcc21996cd1404f6957d83bfb2e8004401a858 SHA256 8e35c3962477c5c539d9be489d0d3794840f5eda15690e492a6f1f256398ce30
 DIST vsftpd-2.0.7.tar.gz 162801 RMD160 8947c7ae00214fb30c9d7d2cfba5116643e1d8c7 SHA1 760afe849d1ebe10592ef29032b6e00e7f1bbf79 SHA256 5d86a6d627f2d8e35dbdefdbd445f6016d349955107b247076bbcc36cde1046b
+DIST vsftpd-2.1.0.tar.gz 178636 RMD160 0066ac526bb184e3ada9d4e53e520d82dfc71633 SHA1 3edd0868e03164eac11ab1fa9eac3ca4a30cd33a SHA256 82fdb75d44f1bbf1ee7930265a772dd13ebd314d389692c6788e9e2b4b116c87
 EBUILD vsftpd-2.0.6.ebuild 3044 RMD160 cf2e521ad9956cd0012d3f96142f94fdcf8224da SHA1 8b398867467e17bf923739214ce129f3badd8c9b SHA256 04be29d36f762c17711cfb0fed0beced92ec3d43cc3efc461742387b7c3cd8e9
 EBUILD vsftpd-2.0.7-r1.ebuild 3047 RMD160 14b056fbb99508d38345e401cbf5ef2c790b559d SHA1 6baf5cd99b624695033a74412b6c384b3fa06266 SHA256 5f930793d2cc508081067a84245d5e8c6bb0bab5479fc3a6da50150020e3d41a
-MISC ChangeLog 15220 RMD160 5082bd33eabbd35548b364f4e45c34fed026b298 SHA1 fb16814b62b155768a5ae9ddd4f25888588658e4 SHA256 2b6be7859330e7ff25b8f311b3d2482fb501ef3b6fd3824fddb65c3529e2cbec
+EBUILD vsftpd-2.1.0.ebuild 2995 RMD160 2fa02ddedec8a819a8f07a6e2c64b4fed47123fe SHA1 353a00fe4fb9b72b0d49f4acd743ffdaa9cdc256 SHA256 8286c8158dacfce481fe81a48a3b37e497c985f8d27d29fa7d4a783aaa4b4506
+MISC ChangeLog 15448 RMD160 f80c7167b58f3fc771bffa87330e2ad8905e676f SHA1 f4c0a34788f1fbb38e8a07bd877ad2ed2e7689f8 SHA256 dc6e3297e59e42ba1cec7749e7ce922f88a9f1432e0197fb8ca11ac5ca4a02fc
 MISC metadata.xml 461 RMD160 278f77b63e921b04c1f5dbba5ccdce9a9ea102ba SHA1 ab6b6b939d90e49d290a562dda3a053b9aaba3bd SHA256 c317698005dced22f4bfe2b4cc97d1671db4ba337d6452501e842c385ae9a433
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAkmP+GEACgkQKhnDs22gwa8IgACgu12a/kWNHJ54WoKLlFd0d+cE
-aIEAn01LFR+w+mnsibDHFsl8XvG03+q2
-=DGDF
------END PGP SIGNATURE-----
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 000000000000..bd29762e9f48
--- /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.1.0-dont-link-caps.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-dont-link-caps.patch
new file mode 100644
index 000000000000..41ebba6ee3ff
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-dont-link-caps.patch
@@ -0,0 +1,18 @@
+diff -ur vsftpd-2.1.0.orig/vsf_findlibs.sh vsftpd-2.1.0/vsf_findlibs.sh
+--- vsftpd-2.1.0.orig/vsf_findlibs.sh	2009-02-23 18:32:17.000000000 +0100
++++ vsftpd-2.1.0/vsf_findlibs.sh	2009-02-23 18:32:23.000000000 +0100
+@@ -42,14 +42,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";
+-else
+-  locate_library /usr/lib/libcap.so && echo "-lcap";
+-  locate_library /lib/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.1.0-gentoo.patch b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
new file mode 100644
index 000000000000..f428fb41beca
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.1.0-gentoo.patch
@@ -0,0 +1,193 @@
+diff -ur vsftpd-2.1.0.orig/defs.h vsftpd-2.1.0/defs.h
+--- vsftpd-2.1.0.orig/defs.h	2009-02-23 17:57:17.000000000 +0100
++++ vsftpd-2.1.0/defs.h	2009-02-23 17:57:29.000000000 +0100
+@@ -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
+ 
+diff -ur vsftpd-2.1.0.orig/tunables.c vsftpd-2.1.0/tunables.c
+--- vsftpd-2.1.0.orig/tunables.c	2009-02-23 17:57:17.000000000 +0100
++++ vsftpd-2.1.0/tunables.c	2009-02-23 17:59:12.000000000 +0100
+@@ -242,7 +242,7 @@
+   /* -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);
+@@ -250,11 +250,11 @@
+   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);
+@@ -267,7 +267,7 @@
+   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);
+diff -ur vsftpd-2.1.0.orig/vsftpd.8 vsftpd-2.1.0/vsftpd.8
+--- vsftpd-2.1.0.orig/vsftpd.8	2009-02-23 17:57:17.000000000 +0100
++++ vsftpd-2.1.0/vsftpd.8	2009-02-23 18:00:03.000000000 +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.
+@@ -30,6 +30,6 @@
+ .Op configuration file
+ may be given on the command line. This file must be owned as root if running as
+ root. The default configuration file is
+-.Pa /etc/vsftpd.conf .
++.Pa /etc/vsftpd/vsftpd.conf .
+ .Sh SEE ALSO
+ .Xr vsftpd.conf 5
+diff -ur vsftpd-2.1.0.orig/vsftpd.conf vsftpd-2.1.0/vsftpd.conf
+--- vsftpd-2.1.0.orig/vsftpd.conf	2009-02-23 17:57:17.000000000 +0100
++++ vsftpd-2.1.0/vsftpd.conf	2009-02-23 18:00:56.000000000 +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
+ #
+@@ -87,14 +91,14 @@
+ # 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
+diff -ur vsftpd-2.1.0.orig/vsftpd.conf.5 vsftpd-2.1.0/vsftpd.conf.5
+--- vsftpd-2.1.0.orig/vsftpd.conf.5	2009-02-23 17:57:17.000000000 +0100
++++ vsftpd-2.1.0/vsftpd.conf.5	2009-02-23 17:57:29.000000000 +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
+@@ -138,7 +138,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.
+ 
+@@ -177,7 +177,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.
+ 
+@@ -430,7 +430,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
+@@ -761,7 +761,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
+@@ -798,7 +798,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
+@@ -859,7 +859,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
+@@ -982,10 +982,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
+@@ -1021,7 +1021,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
diff --git a/net-ftp/vsftpd/vsftpd-2.1.0.ebuild b/net-ftp/vsftpd/vsftpd-2.1.0.ebuild
new file mode 100644
index 000000000000..8cce4d3d4c54
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-2.1.0.ebuild
@@ -0,0 +1,105 @@
+# 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.1.0.ebuild,v 1.1 2009/02/23 17:41:05 armin76 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 )
+	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}"
+
+	# Patch the source, config and the manpage to use /etc/vsftpd/
+	epatch "${FILESDIR}/${PN}-2.1.0-gentoo.patch"
+
+	# Fix building without the libcap
+	epatch "${FILESDIR}/${PN}-2.1.0-caps.patch"
+	has_version "<sys-libs/libcap-2" && epatch "${FILESDIR}"/${PN}-2.0.6-libcap1.patch
+
+	# 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.1.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
+	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
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/vsftpd.logrotate" vsftpd
+
+	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"
+}