1 |
vostorga 09/08/23 16:11:14 |
2 |
|
3 |
Added: vsftpd-2.2.0-gentoo.patch |
4 |
Log: |
5 |
Version bump to 2.2.0 |
6 |
(Portage version: 2.1.6.13/cvs/Linux i686) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-ftp/vsftpd/files/vsftpd-2.2.0-gentoo.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: vsftpd-2.2.0-gentoo.patch |
15 |
=================================================================== |
16 |
diff -NrU5 vsftpd-2.2.0.original/defs.h vsftpd-2.2.0/defs.h |
17 |
--- vsftpd-2.2.0.original/defs.h 2009-08-23 15:23:00.000000000 -0600 |
18 |
+++ vsftpd-2.2.0/defs.h 2009-08-23 16:01:20.000000000 -0600 |
19 |
@@ -1,9 +1,9 @@ |
20 |
#ifndef VSF_DEFS_H |
21 |
#define VSF_DEFS_H |
22 |
|
23 |
-#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd.conf" |
24 |
+#define VSFTP_DEFAULT_CONFIG "/etc/vsftpd/vsftpd.conf" |
25 |
|
26 |
#define VSFTP_COMMAND_FD 0 |
27 |
|
28 |
#define VSFTP_PASSWORD_MAX 128 |
29 |
#define VSFTP_USERNAME_MAX 128 |
30 |
diff -NrU5 vsftpd-2.2.0.original/tunables.c vsftpd-2.2.0/tunables.c |
31 |
--- vsftpd-2.2.0.original/tunables.c 2009-08-23 15:23:00.000000000 -0600 |
32 |
+++ vsftpd-2.2.0/tunables.c 2009-08-23 16:00:14.000000000 -0600 |
33 |
@@ -244,23 +244,23 @@ |
34 |
tunable_delay_successful_login = 0; |
35 |
tunable_max_login_fails = 3; |
36 |
/* -rw------- */ |
37 |
tunable_chown_upload_mode = 0600; |
38 |
|
39 |
- install_str_setting("/usr/share/empty", &tunable_secure_chroot_dir); |
40 |
+ install_str_setting("/usr/share/vsftpd/empty", &tunable_secure_chroot_dir); |
41 |
install_str_setting("ftp", &tunable_ftp_username); |
42 |
install_str_setting("root", &tunable_chown_username); |
43 |
install_str_setting("/var/log/xferlog", &tunable_xferlog_file); |
44 |
install_str_setting("/var/log/vsftpd.log", &tunable_vsftpd_log_file); |
45 |
install_str_setting(".message", &tunable_message_file); |
46 |
install_str_setting("nobody", &tunable_nopriv_user); |
47 |
install_str_setting(0, &tunable_ftpd_banner); |
48 |
- install_str_setting("/etc/vsftpd.banned_emails", &tunable_banned_email_file); |
49 |
- install_str_setting("/etc/vsftpd.chroot_list", &tunable_chroot_list_file); |
50 |
+ install_str_setting("/etc/vsftpd/banned_emails", &tunable_banned_email_file); |
51 |
+ install_str_setting("/etc/vsftpd/chroot_list", &tunable_chroot_list_file); |
52 |
install_str_setting("ftp", &tunable_pam_service_name); |
53 |
install_str_setting("ftp", &tunable_guest_username); |
54 |
- install_str_setting("/etc/vsftpd.user_list", &tunable_userlist_file); |
55 |
+ install_str_setting("/etc/vsftpd/user_list", &tunable_userlist_file); |
56 |
install_str_setting(0, &tunable_anon_root); |
57 |
install_str_setting(0, &tunable_local_root); |
58 |
install_str_setting(0, &tunable_banner_file); |
59 |
install_str_setting(0, &tunable_pasv_address); |
60 |
install_str_setting(0, &tunable_listen_address); |
61 |
@@ -269,11 +269,11 @@ |
62 |
install_str_setting(0, &tunable_cmds_allowed); |
63 |
install_str_setting(0, &tunable_cmds_denied); |
64 |
install_str_setting(0, &tunable_hide_file); |
65 |
install_str_setting(0, &tunable_deny_file); |
66 |
install_str_setting(0, &tunable_user_sub_token); |
67 |
- install_str_setting("/etc/vsftpd.email_passwords", |
68 |
+ install_str_setting("/etc/vsftpd/email_passwords", |
69 |
&tunable_email_password_file); |
70 |
install_str_setting("/usr/share/ssl/certs/vsftpd.pem", |
71 |
&tunable_rsa_cert_file); |
72 |
install_str_setting(0, &tunable_dsa_cert_file); |
73 |
install_str_setting("DES-CBC3-SHA", &tunable_ssl_ciphers); |
74 |
diff -NrU5 vsftpd-2.2.0.original/vsftpd.8 vsftpd-2.2.0/vsftpd.8 |
75 |
--- vsftpd-2.2.0.original/vsftpd.8 2009-08-23 15:23:00.000000000 -0600 |
76 |
+++ vsftpd-2.2.0/vsftpd.8 2009-08-23 16:10:03.000000000 -0600 |
77 |
@@ -19,11 +19,11 @@ |
78 |
Alternatively, vsftpd can be launched in standalone mode, in which case vsftpd |
79 |
itself will listen on the network. This latter mode is easier to use, and |
80 |
recommended. It is activated by setting |
81 |
.Pa listen=YES |
82 |
in |
83 |
-.Pa /etc/vsftpd.conf . |
84 |
+.Pa /etc/vsftpd/vsftpd.conf . |
85 |
Direct execution of the |
86 |
.Nm vsftpd |
87 |
binary will then launch the FTP service ready for immediate client connections. |
88 |
.Sh OPTIONS |
89 |
An optional |
90 |
@@ -31,11 +31,11 @@ |
91 |
may be given on the command line. These files must be owned as root if running |
92 |
as root. Any command line option not starting with a "-" character is treated |
93 |
as a config file that will be loaded. Note that config files are loaded in the |
94 |
strict order that they are encountered on the command line. |
95 |
If no config files are specified, the default configuration file of |
96 |
-.Pa /etc/vsftpd.conf |
97 |
+.Pa /etc/vsftpd/vsftpd.conf |
98 |
will be loaded, after all other command line options are processed. |
99 |
.Pp |
100 |
Supported options are: |
101 |
.Bl -tag -width Ds |
102 |
.It Fl v |
103 |
@@ -45,16 +45,16 @@ |
104 |
-o options are supported, and they are applied in strict order relative to |
105 |
their appearance on the command line, including intermingling with loading of |
106 |
config files. |
107 |
.El |
108 |
.Sh EXAMPLES |
109 |
-vsftpd -olisten=NO /etc/vsftpd.conf -oftpd_banner=blah |
110 |
+vsftpd -olisten=NO /etc/vsftpd/vsftpd.conf -oftpd_banner=blah |
111 |
.Pp |
112 |
That example overrides vsftpd's built-in default for the "listen" option to be |
113 |
-NO, but then loads /etc/vsftpd.conf which may override that setting. Finally, |
114 |
+NO, but then loads /etc/vsftpd/vsftpd.conf which may override that setting. Finally, |
115 |
the "ftpd_banner" setting is set to "blah", which overrides any default vsftpd |
116 |
setting and any identical setting that was in the config file. |
117 |
.Sh FILES |
118 |
-.Pa /etc/vsftpd.conf |
119 |
+.Pa /etc/vsftpd/vsftpd.conf |
120 |
.Sh SEE ALSO |
121 |
.Xr vsftpd.conf 5 |
122 |
.end |
123 |
diff -NrU5 vsftpd-2.2.0.original/vsftpd.conf vsftpd-2.2.0/vsftpd.conf |
124 |
--- vsftpd-2.2.0.original/vsftpd.conf 2009-08-23 15:23:00.000000000 -0600 |
125 |
+++ vsftpd-2.2.0/vsftpd.conf 2009-08-23 15:35:03.000000000 -0600 |
126 |
@@ -1,6 +1,6 @@ |
127 |
-# Example config file /etc/vsftpd.conf |
128 |
+# Example config file /etc/vsftpd/vsftpd.conf |
129 |
# |
130 |
# The default compiled in settings are fairly paranoid. This sample file |
131 |
# loosens things up a bit, to make the ftp daemon more usable. |
132 |
# Please see vsftpd.conf.5 for all compiled in defaults. |
133 |
# |
134 |
@@ -85,19 +85,19 @@ |
135 |
# |
136 |
# You may specify a file of disallowed anonymous e-mail addresses. Apparently |
137 |
# useful for combatting certain DoS attacks. |
138 |
#deny_email_enable=YES |
139 |
# (default follows) |
140 |
-#banned_email_file=/etc/vsftpd.banned_emails |
141 |
+#banned_email_file=/etc/vsftpd/banned_emails |
142 |
# |
143 |
# You may specify an explicit list of local users to chroot() to their home |
144 |
# directory. If chroot_local_user is YES, then this list becomes a list of |
145 |
# users to NOT chroot(). |
146 |
#chroot_local_user=YES |
147 |
#chroot_list_enable=YES |
148 |
# (default follows) |
149 |
-#chroot_list_file=/etc/vsftpd.chroot_list |
150 |
+#chroot_list_file=/etc/vsftpd/chroot_list |
151 |
# |
152 |
# You may activate the "-R" option to the builtin ls. This is disabled by |
153 |
# default to avoid remote users being able to cause excessive I/O on large |
154 |
# sites. However, some broken FTP clients such as "ncftp" and "mirror" assume |
155 |
# the presence of the "-R" option, so there is a strong case for enabling it. |
156 |
diff -NrU5 vsftpd-2.2.0.original/vsftpd.conf.5 vsftpd-2.2.0/vsftpd.conf.5 |
157 |
--- vsftpd-2.2.0.original/vsftpd.conf.5 2009-08-23 15:23:00.000000000 -0600 |
158 |
+++ vsftpd-2.2.0/vsftpd.conf.5 2009-08-23 15:49:59.000000000 -0600 |
159 |
@@ -2,11 +2,11 @@ |
160 |
.SH NAME |
161 |
vsftpd.conf \- config file for vsftpd |
162 |
.SH DESCRIPTION |
163 |
vsftpd.conf may be used to control various aspects of vsftpd's behaviour. By |
164 |
default, vsftpd looks for this file at the location |
165 |
-.BR /etc/vsftpd.conf . |
166 |
+.BR /etc/vsftpd/vsftpd.conf . |
167 |
However, you may override this by specifying a command line argument to |
168 |
vsftpd. The command line argument is the pathname of the configuration file |
169 |
for vsftpd. This behaviour is useful because you may wish to use an advanced |
170 |
inetd such as |
171 |
.BR xinetd |
172 |
@@ -136,11 +136,11 @@ |
173 |
If activated, you may provide a list of local users who are placed in a |
174 |
chroot() jail in their home directory upon login. The meaning is slightly |
175 |
different if chroot_local_user is set to YES. In this case, the list becomes |
176 |
a list of users which are NOT to be placed in a chroot() jail. |
177 |
By default, the file containing this list is |
178 |
-/etc/vsftpd.chroot_list, but you may override this with the |
179 |
+/etc/vsftpd/chroot_list, but you may override this with the |
180 |
.BR chroot_list_file |
181 |
setting. |
182 |
|
183 |
Default: NO |
184 |
.TP |
185 |
@@ -175,11 +175,11 @@ |
186 |
Default: NO |
187 |
.TP |
188 |
.B deny_email_enable |
189 |
If activated, you may provide a list of anonymous password e-mail responses |
190 |
which cause login to be denied. By default, the file containing this list is |
191 |
-/etc/vsftpd.banned_emails, but you may override this with the |
192 |
+/etc/vsftpd/banned_emails, but you may override this with the |
193 |
.BR banned_email_file |
194 |
setting. |
195 |
|
196 |
Default: NO |
197 |
.TP |
198 |
@@ -431,11 +431,11 @@ |
199 |
access to low-security content without needing virtual users. When enabled, |
200 |
anonymous logins are prevented unless the password provided is listed in the |
201 |
file specified by the |
202 |
.BR email_password_file |
203 |
setting. The file format is one password per line, no extra whitespace. The |
204 |
-default filename is /etc/vsftpd.email_passwords. |
205 |
+default filename is /etc/vsftpd/email_passwords. |
206 |
|
207 |
Default: NO |
208 |
.TP |
209 |
.B session_support |
210 |
This controls whether vsftpd attempts to maintain sessions for logins. If |
211 |
@@ -762,11 +762,11 @@ |
212 |
This option is the name of a file containing a list of anonymous e-mail |
213 |
passwords which are not permitted. This file is consulted if the option |
214 |
.BR deny_email_enable |
215 |
is enabled. |
216 |
|
217 |
-Default: /etc/vsftpd.banned_emails |
218 |
+Default: /etc/vsftpd/banned_emails |
219 |
.TP |
220 |
.B banner_file |
221 |
This option is the name of a file containing text to display when someone |
222 |
connects to the server. If set, it overrides the banner string provided by |
223 |
the |
224 |
@@ -799,11 +799,11 @@ |
225 |
is enabled. If the option |
226 |
.BR chroot_local_user |
227 |
is enabled, then the list file becomes a list of users to NOT place in a |
228 |
chroot() jail. |
229 |
|
230 |
-Default: /etc/vsftpd.chroot_list |
231 |
+Default: /etc/vsftpd/chroot_list |
232 |
.TP |
233 |
.B cmds_allowed |
234 |
This options specifies a comma separated list of allowed FTP commands (post |
235 |
login. USER, PASS and QUIT and others are always allowed pre-login). Other |
236 |
commands are rejected. This is a powerful method of really locking down an |
237 |
@@ -860,11 +860,11 @@ |
238 |
.B email_password_file |
239 |
This option can be used to provide an alternate file for usage by the |
240 |
.BR secure_email_list_enable |
241 |
setting. |
242 |
|
243 |
-Default: /etc/vsftpd.email_passwords |
244 |
+Default: /etc/vsftpd/email_passwords |
245 |
.TP |
246 |
.B ftp_username |
247 |
This is the name of the user we use for handling anonymous FTP. The home |
248 |
directory of this user is the root of the anonymous FTP area. |
249 |
|
250 |
@@ -983,14 +983,14 @@ |
251 |
This powerful option allows the override of any config option specified in |
252 |
the manual page, on a per-user basis. Usage is simple, and is best illustrated |
253 |
with an example. If you set |
254 |
.BR user_config_dir |
255 |
to be |
256 |
-.BR /etc/vsftpd_user_conf |
257 |
+.BR /etc/vsftpd/user_conf |
258 |
and then log on as the user "chris", then vsftpd will apply the settings in |
259 |
the file |
260 |
-.BR /etc/vsftpd_user_conf/chris |
261 |
+.BR /etc/vsftpd/user_conf/chris |
262 |
for the duration of the session. The format of this file is as detailed in |
263 |
this manual page! PLEASE NOTE that not all settings are effective on a |
264 |
per-user basis. For example, many settings only prior to the user's session |
265 |
being started. Examples of settings which will not affect any behviour on |
266 |
a per-user basis include listen_address, banner_file, max_per_ip, max_clients, |
267 |
@@ -1022,11 +1022,11 @@ |
268 |
.B userlist_file |
269 |
This option is the name of the file loaded when the |
270 |
.BR userlist_enable |
271 |
option is active. |
272 |
|
273 |
-Default: /etc/vsftpd.user_list |
274 |
+Default: /etc/vsftpd/user_list |
275 |
.TP |
276 |
.B vsftpd_log_file |
277 |
This option is the name of the file to which we write the vsftpd style |
278 |
log file. This log is only written if the option |
279 |
.BR xferlog_enable |