[leaf-commits] src/bering-uclibc4/source/vsftpd buildtool.cfg, NONE, 1.1 buildtool.mk, NONE, 1.1 vsftpd-2.2.2.tar.gz, NONE, 1.1 vsftpd.conf, NONE, 1.1 vsftpd.cron, NONE, 1.1 vsftpd-default.patch, NONE, 1.1 vsftpd.init, NONE, 1.1

KP Kirchd?rfer <[email protected]>
Newsgroups gmane.linux.leaf.cvs
Message-ID <[email protected]> 
Update of /cvsroot/leaf/src/bering-uclibc4/source/vsftpd
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv16769

Added Files:
	buildtool.cfg buildtool.mk vsftpd-2.2.2.tar.gz vsftpd.conf 
	vsftpd.cron vsftpd-default.patch vsftpd.init 
Log Message:
fix build with a newer version


--- NEW FILE: vsftpd.conf ---
# Example config file /etc/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.
#
# READ THIS: This example file is NOT an exhaustive list of vsftpd options.
# Please read the vsftpd.conf.5 manual page to get a full idea of vsftpd's
# capabilities.
#
#
# Run standalone?  vsftpd can run either from an inetd or as a standalone
# daemon started from an initscript.
listen=YES
#
# Run standalone with IPv6?
# Like the listen parameter, except vsftpd will listen on an IPv6 socket
# instead of an IPv4 one. This parameter and the listen parameter are mutually
# exclusive.
#listen_ipv6=YES
#
# Allow anonymous FTP? (Beware - allowed by default if you comment this out).
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
#
# Activate logging of uploads/downloads.
xferlog_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
#
# You may override where the log file goes if you like. The default is shown
# below.
#xferlog_file=/var/log/vsftpd.log
#
# If you want, you can have your log file in standard ftpd xferlog format
#xferlog_std_format=YES
#
# 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=ftpsecure
#
# 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 on some FTP servers, ASCII support allows a denial of service
# attack (DoS) via the command "SIZE /big/file" in ASCII mode. vsftpd
# predicted this attack and has always been safe, reporting the size of the
# raw file.
# ASCII mangling is a horrible feature of the protocol.
#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 restrict local users to their home directories.  See the FAQ for
# the possible risks in this before using chroot_local_user or
# chroot_list_enable below.
#chroot_local_user=YES
#
# 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
#
# This option should be the name of a directory which is empty.  Also, the
# 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.
secure_chroot_dir=/var/run/vsftpd

--- NEW FILE: vsftpd-default.patch ---
diff -urN vsftpd-2.0.5.orig/builddefs.h vsftpd-2.0.5/builddefs.h
--- vsftpd-2.0.5.orig/builddefs.h	2006-07-02 23:53:47.000000000 +0200
+++ vsftpd-2.0.5/builddefs.h	2006-07-16 15:45:40.000000000 +0200
@@ -1,8 +1,8 @@
 #ifndef VSF_BUILDDEFS_H
 #define VSF_BUILDDEFS_H
 
-#undef VSF_BUILD_TCPWRAPPERS
-#define VSF_BUILD_PAM
+#define VSF_BUILD_TCPWRAPPERS
+#undef VSF_BUILD_PAM
 #undef VSF_BUILD_SSL
 
 #endif /* VSF_BUILDDEFS_H */
diff -urN vsftpd-2.2.2.orig/tunables.c vsftpd-2.2.2/tunables.c
--- vsftpd-2.2.2.orig/tunables.c	2009-07-15 22:08:27.000000000 +0200
+++ vsftpd-2.2.2/tunables.c	2010-06-06 11:29:27.000000000 +0200
@@ -186,7 +186,7 @@
   tunable_listen_ipv6 = 0;
   tunable_dual_log_enable = 0;
   tunable_syslog_enable = 0;
-  tunable_background = 0;
+  tunable_background = 1;
   tunable_virtual_use_local_privs = 0;
   tunable_session_support = 0;
   tunable_download_enable = 1;
@@ -246,7 +246,7 @@
   /* -rw------- */
   tunable_chown_upload_mode = 0600;
 
-  install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir);
+  install_str_setting("/var/run/vsftpd", &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);
@@ -254,11 +254,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);
@@ -271,7 +271,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);

--- NEW FILE: buildtool.mk ---
#############################################################
#
# vsftpd
#
# $Id: buildtool.mk,v 1.1 2010/06/06 09:37:40 kapeka Exp $
#############################################################

include $(MASTERMAKEFILE)
VSFTPD_DIR:=vsftpd-2.2.2
VSFTPD_TARGET_DIR:=$(BT_BUILD_DIR)/vsftpd


$(VSFTPD_DIR)/.source: 
	zcat $(VSFTPD_SOURCE) |  tar -xvf - 
	cat $(VSFTPD_PATCH1) | patch -d $(VSFTPD_DIR) -p1
	perl -i -p -e \
		'/^locate_library\(\).*/ && s,\$$,$(BT_STAGING_DIR)\$$,g' \
		$(VSFTPD_DIR)/vsf_findlibs.sh
	touch $(VSFTPD_DIR)/.source

$(VSFTPD_DIR)/.build:
	mkdir -p $(VSFTPD_TARGET_DIR)
	mkdir -p $(VSFTPD_TARGET_DIR)/usr/sbin
	mkdir -p $(VSFTPD_TARGET_DIR)/etc/init.d
	mkdir -p $(VSFTPD_TARGET_DIR)/etc/cron.daily
	$(MAKE) -C $(VSFTPD_DIR) CC=$(TARGET_CC) CFLAGS="-Wall -W -Wshadow $(BT_COPT_FLAGS)" LINK=
	$(BT_STRIP) $(BT_STRIP_BINOPTS) $(VSFTPD_DIR)/vsftpd
	cp -a $(VSFTPD_DIR)/vsftpd $(VSFTPD_TARGET_DIR)/usr/sbin/
	cp -a vsftpd.init $(VSFTPD_TARGET_DIR)/etc/init.d/vsftpd
	cp -a vsftpd.conf $(VSFTPD_TARGET_DIR)/etc/
	cp -a vsftpd.cron $(VSFTPD_TARGET_DIR)/etc/cron.daily/vsftpd
	cp -a $(VSFTPD_TARGET_DIR)/* $(BT_STAGING_DIR)
	touch $(VSFTPD_DIR)/.build

source: $(VSFTPD_DIR)/.source 

build: $(VSFTPD_DIR)/.build

clean:
	-rm $(VSFTPD_DIR)/.build
	$(MAKE) -C $(VSFTPD_DIR) clean
  
srcclean:
	rm -rf $(VSFTPD_DIR)

--- NEW FILE: vsftpd-2.2.2.tar.gz ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: buildtool.cfg ---
<File buildtool.mk>
  Server = cvs-sourceforge
  Revision = HEAD
  Directory = vsftpd
</File>

<File vsftpd-2.2.2.tar.gz>
  Server = cvs-sourceforge
  envname = VSFTPD_SOURCE
  Revision = HEAD
  Directory = vsftpd
</File>

<File vsftpd-default.patch>
  Server = cvs-sourceforge
  envname = VSFTPD_PATCH1
  Revision = HEAD
  Directory = vsftpd
</File>

<File vsftpd.init>
  Server = cvs-sourceforge
  Revision = HEAD
  Directory = vsftpd
</File>

<File vsftpd.cron>
  Server = cvs-sourceforge
  Revision = HEAD
  Directory = vsftpd
</File>

<File vsftpd.conf>
  Server = cvs-sourceforge
  Revision = HEAD
  Directory = vsftpd
</File>

<Package>
	<vsftpd>
		    Version = 2.2.2
		    Revision = 1
		    
		    Help <<EOF
		    vsftpd is a secure, stable and extremely fast ftp daemon.
		    Homepage: http://vsftpd.beasts.org
		    LEAF package by __PACKAGER__, __BUILDDATE__
		    EOF
		    
		    <Permissions>
			    Files = 644
			    Directories = 755
		    </Permissions>
		    
		    <Owner>
			    Files = root:root
			    Directories = root:root
		    </Owner>
		    
		    <Contents>
			    <File>
				    Filename	= usr/sbin/vsftpd
				    Source	= usr/sbin/vsftpd
				    Type	= binary
				    Permissions	= 755
			    </File>
			    <File>
				    Filename	= etc/vsftpd.conf
				    Source	= etc/vsftpd.conf
				    Description	= vsftpd configuration
				    Type	= conf
				    Type	= binary
				    Type	= local
			    </File>
			    <File>
				    Filename	= etc/init.d/vsftpd
				    Source	= etc/init.d/vsftpd
				    Type	= binary
				    Permissions	= 755
			    </File>
			    <File>
				    Filename	= etc/cron.daily/vsftpd
				    Source	= etc/cron.daily/vsftpd
				    Type	= binary
				    Permissions	= 755
			    </File>
			    <File>
				    Filename	= etc/vsftpd
				    Type	= directory
				    Type	= local
			    </File>
			    <File>
				    Filename	= var/run/vsftpd
				    Type	= directory
			    </File>
		    </Contents>
	</vsftpd>
</Package>

--- NEW FILE: vsftpd.cron ---
#!/bin/sh
# Save daily LOGDEPTH versions of syslogfile
LOGDEPTH=4
# syslogfile name
LOGFILE=/var/log/vsftpd.log

if [ -f $LOGFILE ]; then
	savelog -g wheel -m 644 -u root -c $LOGDEPTH $LOGFILE >/dev/null
	/etc/init.d/vsftpd reload
fi

--- NEW FILE: vsftpd.init ---
#!/bin/sh
# /etc/init.d/vsftpd
#
# Written by Sander Smeenk <[email protected]>
RCDLINKS="2,S20 3,S20 4,S20 5,S20 0,K20 1,K20 6,K20"

set -e

# Exit if vsftpd.conf doesn't have listen=yes or listen_ipv6=yes
# (mandatory for standalone operation)
if [ -f /etc/vsftpd.conf ] && ! egrep -iq "^ *listen(_ipv6)? *= *yes" /etc/vsftpd.conf; then 
    exit 0
fi

DAEMON=/usr/sbin/vsftpd
NAME=vsftpd

test -x $DAEMON || exit 0

[ -d /home/ftp ] || mkdir /home/ftp

case "$1" in
  start)
    echo -n "Starting FTP server: $NAME"
    start-stop-daemon --start --exec $DAEMON
    echo "."
    ;;
  stop)
    echo -n "Stopping FTP server: $NAME"
    start-stop-daemon --stop --oknodo --exec $DAEMON
    echo "."
      ;;
  restart)
    echo -n "Restarting FTP server: $NAME"
    start-stop-daemon --stop --oknodo --exec $DAEMON
    start-stop-daemon --start --exec $DAEMON
    echo "."
    ;;
  reload|force-reload)
    echo "Reloading $NAME configuration files"
    start-stop-daemon --stop --signal 1 --exec $DAEMON
    echo "."
    ;;
  *)
    echo "Usage: /etc/init.d/$NAME {start|stop|restart|reload}"
    exit 1
    ;;
esac

exit 0


------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate 
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the 
lucky parental unit.  See the prize list and enter to win: 
http://p.sf.net/sfu/thinkgeek-promo
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.