diff options
Diffstat (limited to 'net/vsftpd/patches')
| -rw-r--r-- | net/vsftpd/patches/patch-aa | 35 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ab | 13 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ac | 34 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ad | 29 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ae | 13 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-af | 71 | ||||
| -rw-r--r-- | net/vsftpd/patches/patch-ag | 13 |
7 files changed, 180 insertions, 28 deletions
diff --git a/net/vsftpd/patches/patch-aa b/net/vsftpd/patches/patch-aa index 0db2c7f14fe..3813bfaf37e 100644 --- a/net/vsftpd/patches/patch-aa +++ b/net/vsftpd/patches/patch-aa @@ -1,37 +1,16 @@ -$NetBSD: patch-aa,v 1.2 2002/08/22 11:24:07 martti Exp $ +$NetBSD: patch-aa,v 1.3 2003/05/09 23:31:40 salo Exp $ ---- Makefile.orig Mon Oct 8 23:35:27 2001 -+++ Makefile Mon Jul 29 10:12:19 2002 -@@ -1,8 +1,7 @@ +--- Makefile.orig 2002-10-22 01:15:16.000000000 +0200 ++++ Makefile 2003-05-09 23:46:09.000000000 +0200 +@@ -1,9 +1,9 @@ # Makefile for systems with GNU tools -CC = gcc ++#CC = gcc INSTALL = install IFLAGS = -idirafter dummyinc + #CFLAGS = -g -CFLAGS = -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion -+CFLAGS += -Wall -W -Wshadow #-pedantic -Werror -Wconversion ++CFLAGS += -O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion LIBS = `./vsf_findlibs.sh` LINK = -Wl,-s -@@ -21,21 +20,7 @@ - $(CC) -o vsftpd $(OBJS) $(LINK) $(LIBS) - - install: -- if [ -x /usr/local/sbin ]; then \ -- $(INSTALL) -m 755 vsftpd /usr/local/sbin/vsftpd; \ -- else \ -- $(INSTALL) -m 755 vsftpd /usr/sbin/vsftpd; fi -- if [ -x /usr/local/man ]; then \ -- $(INSTALL) -m 644 vsftpd.8 /usr/local/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/local/man/man5/vsftpd.conf.5; \ -- elif [ -x /usr/share/man ]; then \ -- $(INSTALL) -m 644 vsftpd.8 /usr/share/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/share/man/man5/vsftpd.conf.5; \ -- else \ -- $(INSTALL) -m 644 vsftpd.8 /usr/man/man8/vsftpd.8; \ -- $(INSTALL) -m 644 vsftpd.conf.5 /usr/man/man5/vsftpd.conf.5; fi -- if [ -x /etc/xinetd.d ]; then \ -- $(INSTALL) -m 644 xinetd.d/vsftpd /etc/xinetd.d/vsftpd; fi -+ $(BSD_INSTALL_PROGRAM) vsftpd $(PREFIX)/libexec/vsftpd - - clean: - rm -f *.o *.swp vsftpd diff --git a/net/vsftpd/patches/patch-ab b/net/vsftpd/patches/patch-ab new file mode 100644 index 00000000000..84794351449 --- /dev/null +++ b/net/vsftpd/patches/patch-ab @@ -0,0 +1,13 @@ +$NetBSD: patch-ab,v 1.1 2003/05/09 23:31:40 salo Exp $ + +--- defs.h.orig 2002-07-10 00:51:57.000000000 +0200 ++++ defs.h 2003-05-09 23:54:18.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef VSF_DEFS_H + #define VSF_DEFS_H + +-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" ++#define VSFTP_DEFAULT_CONFIG PKG_SYSCONFDIR"/vsftpd.conf" + + #define VSFTP_COMMAND_FD 0 + diff --git a/net/vsftpd/patches/patch-ac b/net/vsftpd/patches/patch-ac new file mode 100644 index 00000000000..35c9b6b22f2 --- /dev/null +++ b/net/vsftpd/patches/patch-ac @@ -0,0 +1,34 @@ +$NetBSD: patch-ac,v 1.1 2003/05/09 23:31:40 salo Exp $ + +--- vsftpd.conf.orig 2003-05-10 01:04:11.000000000 +0200 ++++ vsftpd.conf 2003-05-10 01:14:57.000000000 +0200 +@@ -1,4 +1,4 @@ +-# Example config file /etc/vsftpd.conf ++# Example config file @PKG_SYSCONFDIR@/vsftpd.conf + # + # The default compiled in settings are very paranoid. This sample file + # loosens things up a bit, to make the ftp daemon more usable. +@@ -83,14 +83,14 @@ + # useful for combatting certain DoS attacks. + #deny_email_enable=YES + # (default follows) +-#banned_email_file=/etc/vsftpd.banned_emails ++#banned_email_file=@PKG_SYSCONFDIR@/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=@PKG_SYSCONFDIR@/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 +@@ -98,3 +98,6 @@ + # the presence of the "-R" option, so there is a strong case for enabling it. + #ls_recurse_enable=YES + ++# By default the server will run standalone. Comment out the option below when ++# running from inetd. ++listen=YES diff --git a/net/vsftpd/patches/patch-ad b/net/vsftpd/patches/patch-ad new file mode 100644 index 00000000000..4c51d4feb7e --- /dev/null +++ b/net/vsftpd/patches/patch-ad @@ -0,0 +1,29 @@ +$NetBSD: patch-ad,v 1.1 2003/05/09 23:31:40 salo Exp $ + +--- tunables.c.orig 2002-10-25 00:46:21.000000000 +0200 ++++ tunables.c 2003-05-10 00:28:13.000000000 +0200 +@@ -65,19 +65,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 = "/var/chroot/vsftpd"; + const char* tunable_ftp_username = "ftp"; + const char* tunable_chown_username = "root"; + const char* tunable_xferlog_file = "/var/log/vsftpd.log"; + const char* tunable_message_file = ".message"; + /* XXX -> "secure"? */ +-const char* tunable_nopriv_user = "nobody"; ++const char* tunable_nopriv_user = "vsftpd"; + 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 = PKG_SYSCONFDIR"/vsftpd.banned_emails"; ++const char* tunable_chroot_list_file = PKG_SYSCONFDIR"/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 = PKG_SYSCONFDIR"/vsftpd.user_list"; + const char* tunable_anon_root = 0; + const char* tunable_local_root = 0; + const char* tunable_banner_file = 0; diff --git a/net/vsftpd/patches/patch-ae b/net/vsftpd/patches/patch-ae new file mode 100644 index 00000000000..7b4f28683bc --- /dev/null +++ b/net/vsftpd/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2003/05/09 23:31:41 salo Exp $ + +--- vsftpd.8.orig 2001-03-12 02:14:07.000000000 +0100 ++++ vsftpd.8 2003-05-10 00:26:17.000000000 +0200 +@@ -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 @PKG_SYSCONFDIR@/vsftpd.conf . + .Sh SEE ALSO + .Xr vsftpd.conf 5 + diff --git a/net/vsftpd/patches/patch-af b/net/vsftpd/patches/patch-af new file mode 100644 index 00000000000..a9dd9ca537c --- /dev/null +++ b/net/vsftpd/patches/patch-af @@ -0,0 +1,71 @@ +$NetBSD: patch-af,v 1.1 2003/05/09 23:31:41 salo Exp $ + +--- vsftpd.conf.5.orig 2002-11-09 16:41:11.000000000 +0100 ++++ vsftpd.conf.5 2003-05-10 00:25:51.000000000 +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 @PKG_SYSCONFDIR@/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 ++@PKG_SYSCONFDIR@/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 ++@PKG_SYSCONFDIR@/vsftpd.banned_emails, but you may override this with the + .BR banned_email_file + setting. + +@@ -448,7 +448,7 @@ + .BR deny_email_enable + is enabled. + +-Default: /etc/vsftpd.banned_emails ++Default: @PKG_SYSCONFDIR@/vsftpd.banned_emails + .TP + .B banner_file + This option is the name of a file containing text to display when someone +@@ -476,7 +476,7 @@ + .BR chroot_local_user + is disabled. + +-Default: /etc/vsftpd.chroot_list ++Default: @PKG_SYSCONFDIR@/vsftpd.chroot_list + .TP + .B guest_username + See the boolean setting +@@ -551,10 +551,10 @@ + with an example. If you set + .BR user_config_dir + to be +-.BR /etc/vsftpd_user_conf ++.BR @PKG_SYSCONFDIR@/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 @PKG_SYSCONFDIR@/vsftpd_user_conf/chris + for the duration of the session. The format of this file is as detailed in + this manual page! + +@@ -565,7 +565,7 @@ + .BR userlist_enable + option is active. + +-Default: /etc/vsftpd.user_list ++Default: @PKG_SYSCONFDIR@/vsftpd.user_list + .TP + .B xferlog_file + This option is the name of the file to which we write the transfer log. The diff --git a/net/vsftpd/patches/patch-ag b/net/vsftpd/patches/patch-ag new file mode 100644 index 00000000000..3efaa6c2fe2 --- /dev/null +++ b/net/vsftpd/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.1 2003/05/09 23:31:42 salo Exp $ + +--- builddefs.h.orig 2002-10-25 19:47:47.000000000 +0200 ++++ builddefs.h 2003-05-10 00:55:02.000000000 +0200 +@@ -1,7 +1,7 @@ + #ifndef VSF_BUILDDEFS_H + #define VSF_BUILDDEFS_H + +-#undef VSF_BUILD_TCPWRAPPERS ++#define VSF_BUILD_TCPWRAPPERS + + #endif /* VSF_BUILDDEFS_H */ + |