added vsftpd-2.0.1-gentoo.diff for gentoo-friendly path locations

4 files changed, 191 insertions, 5 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index 8a167263ac95..33cf33e1888b 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.41 2004/09/23 15:16:25 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.42 2004/09/24 17:12:14 jforman Exp $
+
+  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)
 
diff --git a/net-ftp/vsftpd/Manifest b/net-ftp/vsftpd/Manifest
index 9e96f1d7640b..0b6cc874331e 100644
--- a/net-ftp/vsftpd/Manifest
+++ b/net-ftp/vsftpd/Manifest
@@ -1,10 +1,10 @@
-MD5 5bedec74df570934aa7a5a98a462ea14 ChangeLog 4706
+MD5 23542d478acfa4bf68bb84537b499d96 ChangeLog 4844
 MD5 d161cb0e313c1619fc61077d5b0c8821 metadata.xml 251
 MD5 d1a2ec32b0639d78243cc5aee840eb9f vsftpd-1.0.1-r1.ebuild 1325
 MD5 213703fc92069b2036caf192afb39068 vsftpd-1.2.0-r1.ebuild 2218
 MD5 284ab51c778b56a5f4155fbb7eb7492e vsftpd-1.2.1.ebuild 2237
 MD5 8db5a76f69189b1fc1bbbcce8f18e517 vsftpd-1.2.2.ebuild 2238
-MD5 ab106df9a5c93f06e60f272f2003c15d vsftpd-2.0.1.ebuild 2346
+MD5 961e1b17c9e3aaeb446e5d13fafd6d7d vsftpd-2.0.1.ebuild 2346
 MD5 3734a4e9aaa1cc7775943c0c97bedd4b files/digest-vsftpd-1.0.1-r1 63
 MD5 767d44cc19f7afc4085da8fd837193e4 files/digest-vsftpd-1.2.0-r1 64
 MD5 fd342c037bab05b6fcdd20c0d8fd6720 files/digest-vsftpd-1.2.1 64
@@ -20,3 +20,4 @@ MD5 aaa55785aee7dd51daf75a72232693f9 files/vsftpd.pam 481
 MD5 e50b10a57c22f7b27de250b8b65038a0 files/vsftpd.xinetd 468
 MD5 32951e2e5a1c743fa96533989167c54a files/vsftpd.xinetd.ipv6 488
 MD5 2b36bc74604934d6ce3ef5c6b2d77485 files/digest-vsftpd-2.0.1 64
+MD5 e0a15cbbb9ee8ae2099c0b267431f2da files/vsftpd-2.0.1-gentoo.diff 6762
diff --git a/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff
new file mode 100644
index 000000000000..14ea0b8d7ecf
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-2.0.1-gentoo.diff
@@ -0,0 +1,182 @@
+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
+ 
+Common subdirectories: dummyinc and dummyinc
+Common subdirectories: EXAMPLE and EXAMPLE
+Only in : gentoo.diff
+Common subdirectories: port and port
+Common subdirectories: RedHat and RedHat
+Common subdirectories: SECURITY and SECURITY
+diff --unified tunables.c tunables.c
+--- tunables.c	2004-07-02 13:26:17.000000000 +0200
++++ tunables.c	2004-09-24 11:43:21.714576528 +0200
+@@ -87,19 +87,19 @@
+ 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";
+-const char* tunable_vsftpd_log_file = "/var/log/vsftpd.log";
++const char* tunable_vsftpd_log_file = "/var/log/vsftpd/vsftpd.log";
+ 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_pam_service_name = "ftp";
++const char* tunable_banned_email_file = "/etc/vsftpd/vsftpd.banned_emails";
++const char* tunable_chroot_list_file = "/etc/vsftpd/vsftpd.chroot_list";
++const char* tunable_pam_service_name = "vsftpd";
+ const char* tunable_guest_username = "ftp";
+-const char* tunable_userlist_file = "/etc/vsftpd.user_list";
++const char* tunable_userlist_file = "/etc/vsftpd/vsftpd.user_list";
+ const char* tunable_anon_root = 0;
+ const char* tunable_local_root = 0;
+ const char* tunable_banner_file = 0;
+@@ -111,7 +111,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/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";
+diff --unified vsftpd.8 vsftpd.8
+--- vsftpd.8	2003-08-29 00:34:54.000000000 +0200
++++ vsftpd.8	2004-09-24 11:44:42.429306024 +0200
+@@ -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
+diff --unified vsftpd.conf.5 vsftpd.conf.5
+--- vsftpd.conf.5	2004-07-02 12:39:11.000000000 +0200
++++ vsftpd.conf.5	2004-09-24 11:47:19.060494464 +0200
+@@ -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/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/vsftpd.banned_emails, but you may override this with the
+ .BR banned_email_file
+ setting.
+ 
+@@ -192,7 +192,7 @@
+ If enabled, two log files are generated in parallel, going by default to
+ .BR /var/log/xferlog
+ and
+-.BR /var/log/vsftpd.log .
++.BR /var/log/vsftpd/vsftpd.log .
+ The former is a wu-ftpd style transfer log, parseable by standard tools. The
+ latter is vsftpd's own style log.
+ 
+@@ -355,7 +355,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/vsftpd.email_passwords.
+ 
+ Default: NO
+ .TP
+@@ -635,7 +635,7 @@
+ .BR deny_email_enable
+ is enabled.
+ 
+-Default: /etc/vsftpd.banned_emails
++Default: /etc/vsftpd/vsftpd.banned_emails
+ .TP
+ .B banner_file
+ This option is the name of a file containing text to display when someone
+@@ -664,7 +664,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/vsftpd.chroot_list
+ .TP
+ .B cmds_allowed
+ This options specifies a comma separated list of allowed FTP commands (post
+@@ -706,7 +706,7 @@
+ .BR secure_email_list_enable
+ setting.
+ 
+-Default: /etc/vsftpd.email_passwords
++Default: /etc/vsftpd/vsftpd.email_passwords
+ .TP
+ .B ftp_username
+ This is the name of the user we use for handling anonymous FTP. The home
+@@ -816,10 +816,10 @@
+ with an example. If you set
+ .BR user_config_dir
+ to be
+-.BR /etc/vsftpd_user_conf
++.BR /etc/vsftpd/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/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
+@@ -855,7 +855,7 @@
+ .BR userlist_enable
+ option is active.
+ 
+-Default: /etc/vsftpd.user_list
++Default: /etc/vsftpd/vsftpd.user_list
+ .TP
+ .B vsftpd_log_file
+ This option is the name of the file to which we write the vsftpd style
+@@ -869,7 +869,7 @@
+ .BR syslog_enable ,
+ then this file is not written and output is sent to the system log instead.
+ 
+-Default: /var/log/vsftpd.log
++Default: /var/log/vsftpd/vsftpd.log
+ .TP
+ .B xferlog_file
+ This option is the name of the file to which we write the wu-ftpd style
diff --git a/net-ftp/vsftpd/vsftpd-2.0.1.ebuild b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
index edf7d55a3f71..73c1cc927714 100644
--- a/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
+++ b/net-ftp/vsftpd/vsftpd-2.0.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.1.ebuild,v 1.2 2004/09/23 15:16:25 jforman Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-2.0.1.ebuild,v 1.3 2004/09/24 17:12:14 jforman Exp $
 
 inherit flag-o-matic eutils
 
@@ -22,7 +22,7 @@ src_unpack() {
 	filter-flags "-fPIC"
 	unpack ${A} || die
 	cd ${S} || die
-	epatch ${FILESDIR}/${PN}-1.2.1-gentoo.diff.bz2 || die
+	epatch ${FILESDIR}/${PN}-2.0.1-gentoo.diff.bz2 || die
 	use tcpd && echo '#define VSF_BUILD_TCPWRAPPERS' >> builddefs.h
 	use ssl && echo '#define VSF_BUILD_SSL' >> builddefs.h
 }