chase latest release + some small fixes

5 files changed, 221 insertions, 10 deletions

diff --git a/net-ftp/vsftpd/ChangeLog b/net-ftp/vsftpd/ChangeLog
index e44523442e7b..c38cc807194a 100644
--- a/net-ftp/vsftpd/ChangeLog
+++ b/net-ftp/vsftpd/ChangeLog
@@ -1,20 +1,23 @@
 # ChangeLog for net-ftp/vsftpd
 # Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.3 2002/09/21 02:26:29 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/ChangeLog,v 1.4 2002/10/19 06:45:57 woodchip Exp $
+
+*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  
+  Added HOMEPAGE variable and set SRC_URI to the homepage download location.
 
   3 May 2002; Donny Davies <woodchip@gentoo.org> :
-  
   Added LICENSE, SLOT.
 
 *vsftpd-1.0.1 (1 Feb 2002)
 
   1 Feb 2002; G.Bevin <gbevin@gentoo.org> ChangeLog :
-  
   Added initial ChangeLog which should be updated whenever the package is
   updated in any way. This changelog is targetted to users. This means that the
   comments should well explained and written in clean English. The details about
diff --git a/net-ftp/vsftpd/files/digest-vsftpd-1.1.2 b/net-ftp/vsftpd/files/digest-vsftpd-1.1.2
new file mode 100644
index 000000000000..ee9421d47fff
--- /dev/null
+++ b/net-ftp/vsftpd/files/digest-vsftpd-1.1.2
@@ -0,0 +1 @@
+MD5 cd52f4bdc4db706432cb9c92b83c6824 vsftpd-1.1.2.tar.gz 117792
diff --git a/net-ftp/vsftpd/files/vsftpd-1.1.2-gentoo.diff b/net-ftp/vsftpd/files/vsftpd-1.1.2-gentoo.diff
new file mode 100644
index 000000000000..4f6663e08a7f
--- /dev/null
+++ b/net-ftp/vsftpd/files/vsftpd-1.1.2-gentoo.diff
@@ -0,0 +1,159 @@
+diff -uNr vsftpd-1.1.2.orig/defs.h vsftpd-1.1.2/defs.h
+--- vsftpd-1.1.2.orig/defs.h	Tue Jul  9 18:51:57 2002
++++ vsftpd-1.1.2/defs.h	Sat Oct 19 01:57:41 2002
+@@ -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 -uNr vsftpd-1.1.2.orig/tunables.c vsftpd-1.1.2/tunables.c
+--- vsftpd-1.1.2.orig/tunables.c	Fri Oct 11 20:03:13 2002
++++ vsftpd-1.1.2/tunables.c	Sat Oct 19 02:05:54 2002
+@@ -63,19 +63,19 @@
+ unsigned int tunable_file_open_mode = 0666;
+ unsigned int tunable_max_per_ip = 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/vsftpd.log";
++const char* tunable_xferlog_file = "/var/log/vsftpd/vsftpd.log";
+ const char* tunable_message_file = ".message";
+ /* XXX -> "secure"? */
+ 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;
+diff -uNr vsftpd-1.1.2.orig/vsftpd.8 vsftpd-1.1.2/vsftpd.8
+--- vsftpd-1.1.2.orig/vsftpd.8	Sun Mar 11 20:14:07 2001
++++ vsftpd-1.1.2/vsftpd.8	Sat Oct 19 02:06:32 2002
+@@ -20,7 +20,7 @@
+ 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 -uNr vsftpd-1.1.2.orig/vsftpd.conf.5 vsftpd-1.1.2/vsftpd.conf.5
+--- vsftpd-1.1.2.orig/vsftpd.conf.5	Sun Oct 13 20:56:28 2002
++++ vsftpd-1.1.2/vsftpd.conf.5	Sat Oct 19 02:14:37 2002
+@@ -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
+@@ -115,7 +115,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.
+ 
+@@ -143,7 +143,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.
+ 
+@@ -301,7 +301,7 @@
+ .TP
+ .B xferlog_enable
+ If enabled, a log file will be maintained detailling uploads and downloads.
+-By default, this file will be placed at /var/log/vsftpd.log, but this location
++By default, this file will be placed at /var/log/vsftpd/vsftpd.log, but this location
+ may be overridden using the configuration setting
+ .BR xferlog_file .
+ 
+@@ -433,7 +433,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
+@@ -461,7 +461,7 @@
+ .BR chroot_local_user
+ is disabled.
+ 
+-Default: /etc/vsftpd.chroot_list
++Default: /etc/vsftpd/vsftpd.chroot_list
+ .TP
+ .B guest_username
+ See the boolean setting
+@@ -515,7 +515,7 @@
+ .B pam_service_name
+ This string is the name of the PAM service vsftpd will use.
+ 
+-Default: ftp
++Default: vsftpd
+ .TP
+ .B pasv_address
+ Use this option to override the IP address that vsftpd will advertise in
+@@ -528,7 +528,7 @@
+ directory should not be writable by the ftp user. This directory is used
+ as a secure chroot() jail at times vsftpd does not require filesystem access.
+ 
+-Default: /usr/share/empty
++Default: /usr/share/vsftpd/empty
+ .TP
+ .B user_config_dir
+ This powerful option allows the override of any config option specified in
+@@ -536,10 +536,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!
+ 
+@@ -550,7 +550,7 @@
+ .BR userlist_enable
+ option is active.
+ 
+-Default: /etc/vsftpd.user_list
++Default: /etc/vsftpd/vsftpd.user_list
+ .TP
+ .B xferlog_file
+ This option is the name of the file to which we write the transfer log. The
+@@ -558,7 +558,7 @@
+ .BR xferlog_enable
+ is set.
+ 
+-Default: /var/log/vsftpd.log
++Default: /var/log/vsftpd/vsftpd.log
+ 
+ .SH AUTHOR
+ chris@scary.beasts.org
diff --git a/net-ftp/vsftpd/files/vsftpd.pam b/net-ftp/vsftpd/files/vsftpd.pam
index 66507d58dfef..a7ca108fafb7 100644
--- a/net-ftp/vsftpd/files/vsftpd.pam
+++ b/net-ftp/vsftpd/files/vsftpd.pam
@@ -1,7 +1,7 @@
 #%PAM-1.0
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam,v 1.2 2002/05/04 03:42:50 woodchip Exp $
-auth     required  /lib/security/pam_listfile.so item=user sense=deny file=/etc/ftpusers onerr=succeed
-auth     required  /lib/security/pam_pwdb.so shadow nullok
-auth     required  /lib/security/pam_shells.so
-account  required  /lib/security/pam_pwdb.so
-session  required  /lib/security/pam_pwdb.so
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/files/vsftpd.pam,v 1.3 2002/10/19 06:45:57 woodchip Exp $
+auth     required   /lib/security/pam_listfile.so item=user sense=deny file=/etc/vsftpd/ftpusers onerr=succeed
+auth     required   /lib/security/pam_stack.so service=system-auth
+auth     required   /lib/security/pam_shells.so
+account  required   /lib/security/pam_stack.so service=system-auth
+session  required   /lib/security/pam_stack.so service=system-auth
diff --git a/net-ftp/vsftpd/vsftpd-1.1.2.ebuild b/net-ftp/vsftpd/vsftpd-1.1.2.ebuild
new file mode 100644
index 000000000000..7c6f8141d62a
--- /dev/null
+++ b/net-ftp/vsftpd/vsftpd-1.1.2.ebuild
@@ -0,0 +1,48 @@
+# Copyright 1999-2002 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/vsftpd/vsftpd-1.1.2.ebuild,v 1.1 2002/10/19 06:45:57 woodchip Exp $
+
+DESCRIPTION="Very Secure FTP Daemon written with speed, size and security in mind"
+SRC_URI="ftp://vsftpd.beasts.org/users/cevans/${P}.tar.gz"
+HOMEPAGE="http://vsftpd.beasts.org/"
+DEPEND="pam? ( >=sys-libs/pam-0.75 )"
+RDEPEND="|| ( sys-apps/xinetd >=sys-apps/ucspi-tcp-0.88-r3 )"
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~x86 ~sparc ~sparc64"
+
+src_unpack() {
+	unpack ${A} || die
+	cd ${S} || die
+	patch -p1 <${FILESDIR}/${P}-gentoo.diff || die "bad patchfile"
+}
+
+src_compile() {
+	emake CFLAGS="${CFLAGS}" || die "compile problem"
+}
+
+src_install() {
+	into /usr
+	doman vsftpd.conf.5 vsftpd.8
+	dosbin vsftpd
+
+	dodoc AUDIT BENCHMARKS BUGS Changelog FAQ INSTALL \
+		LICENSE README README.security REWARD SIZE \
+		SPEED TODO TUNING
+	newdoc ${FILESDIR}/vsftpd.conf vsftpd.conf.sample
+	newdoc vsftpd.conf vsftpd.conf.dist.sample
+	docinto security ; dodoc SECURITY/*
+	cp -a EXAMPLE ${D}/usr/share/doc/${PF}/examples
+
+	insinto /etc ; doins ${FILESDIR}/ftpusers
+	insinto /etc/vsftpd ; newins ${FILESDIR}/vsftpd.conf vsftpd.conf.sample
+	insinto /etc/xinetd.d ; newins ${FILESDIR}/vsftpd.xinetd vsftpd
+	insinto /etc/pam.d ; newins ${FILESDIR}/vsftpd.pam vsftpd
+}
+
+pkg_postinst() {
+	# empty dirs...
+	install -m0755 -o root -g root -d ${ROOT}/home/ftp
+	install -m0755 -o root -g root -d ${ROOT}/usr/share/vsftpd/empty
+	install -m0755 -o root -g root -d ${ROOT}/var/log/vsftpd
+}