rpms/vsftpd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to latest upstream release

Browse Source
This commit is contained in:
Martin Nagy 2009-02-24 08:21:29 +00:00
parent 803e8ab6b6
commit 203b7bfe73
4 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

@ -1 +1 @@
vsftpd-2.1.0pre4.tar.gz vsftpd-2.1.0.tar.gz

2
sources
View File

@ -1 +1 @@
ec4ded9c2708165087390a1f647c42ec vsftpd-2.1.0pre4.tar.gz 7890b54e7ffa6106ffbdfda53f47fa41 vsftpd-2.1.0.tar.gz

24
vsftpd-2.1.0-userlist_log.patch
View File

@ -1,6 +1,6 @@
diff -up vsftpd-2.1.0/logging.c.userlist_log vsftpd-2.1.0/logging.c diff -up vsftpd-2.1.0/logging.c.userlist_log vsftpd-2.1.0/logging.c
--- vsftpd-2.1.0/logging.c.userlist_log 2008-12-17 20:56:45.000000000 +0100 --- vsftpd-2.1.0/logging.c.userlist_log 2008-12-17 20:56:45.000000000 +0100
+++ vsftpd-2.1.0/logging.c 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/logging.c 2009-02-24 09:12:42.000000000 +0100
@@ -95,6 +95,13 @@ vsf_log_line(struct vsf_session* p_sess, @@ -95,6 +95,13 @@ vsf_log_line(struct vsf_session* p_sess,
vsf_log_common(p_sess, 1, what, p_str); vsf_log_common(p_sess, 1, what, p_str);
} }
@ -17,7 +17,7 @@ diff -up vsftpd-2.1.0/logging.c.userlist_log vsftpd-2.1.0/logging.c
{ {
diff -up vsftpd-2.1.0/logging.h.userlist_log vsftpd-2.1.0/logging.h diff -up vsftpd-2.1.0/logging.h.userlist_log vsftpd-2.1.0/logging.h
--- vsftpd-2.1.0/logging.h.userlist_log 2008-07-30 03:29:21.000000000 +0200 --- vsftpd-2.1.0/logging.h.userlist_log 2008-07-30 03:29:21.000000000 +0200
+++ vsftpd-2.1.0/logging.h 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/logging.h 2009-02-24 09:12:42.000000000 +0100
@@ -80,5 +80,16 @@ void vsf_log_do_log(struct vsf_session* @@ -80,5 +80,16 @@ void vsf_log_do_log(struct vsf_session*
void vsf_log_line(struct vsf_session* p_sess, enum EVSFLogEntryType what, void vsf_log_line(struct vsf_session* p_sess, enum EVSFLogEntryType what,
struct mystr* p_str); struct mystr* p_str);
@ -37,7 +37,7 @@ diff -up vsftpd-2.1.0/logging.h.userlist_log vsftpd-2.1.0/logging.h
diff -up vsftpd-2.1.0/parseconf.c.userlist_log vsftpd-2.1.0/parseconf.c diff -up vsftpd-2.1.0/parseconf.c.userlist_log vsftpd-2.1.0/parseconf.c
--- vsftpd-2.1.0/parseconf.c.userlist_log 2008-12-18 07:21:41.000000000 +0100 --- vsftpd-2.1.0/parseconf.c.userlist_log 2008-12-18 07:21:41.000000000 +0100
+++ vsftpd-2.1.0/parseconf.c 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/parseconf.c 2009-02-24 09:12:42.000000000 +0100
@@ -96,6 +96,7 @@ parseconf_bool_array[] = @@ -96,6 +96,7 @@ parseconf_bool_array[] =
{ "mdtm_write", &tunable_mdtm_write }, { "mdtm_write", &tunable_mdtm_write },
{ "lock_upload_files", &tunable_lock_upload_files }, { "lock_upload_files", &tunable_lock_upload_files },
@ -47,12 +47,12 @@ diff -up vsftpd-2.1.0/parseconf.c.userlist_log vsftpd-2.1.0/parseconf.c
{ "require_cert", &tunable_require_cert }, { "require_cert", &tunable_require_cert },
{ "validate_cert", &tunable_validate_cert }, { "validate_cert", &tunable_validate_cert },
diff -up vsftpd-2.1.0/prelogin.c.userlist_log vsftpd-2.1.0/prelogin.c diff -up vsftpd-2.1.0/prelogin.c.userlist_log vsftpd-2.1.0/prelogin.c
--- vsftpd-2.1.0/prelogin.c.userlist_log 2008-12-04 05:03:27.000000000 +0100 --- vsftpd-2.1.0/prelogin.c.userlist_log 2009-02-18 23:23:53.000000000 +0100
+++ vsftpd-2.1.0/prelogin.c 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/prelogin.c 2009-02-24 09:17:41.000000000 +0100
@@ -216,6 +216,20 @@ handle_user_command(struct vsf_session* @@ -219,6 +219,20 @@ handle_user_command(struct vsf_session*
(!located && !tunable_userlist_deny))
{ {
vsf_cmdio_write(p_sess, FTP_LOGINERR, "Permission denied."); vsf_cmdio_write(p_sess, FTP_LOGINERR, "Permission denied.");
check_login_fails(p_sess);
+ if (tunable_userlist_log) + if (tunable_userlist_log)
+ { + {
+ struct mystr str_log_line = INIT_MYSTR; + struct mystr str_log_line = INIT_MYSTR;
@ -71,8 +71,8 @@ diff -up vsftpd-2.1.0/prelogin.c.userlist_log vsftpd-2.1.0/prelogin.c
return; return;
} }
diff -up vsftpd-2.1.0/tunables.c.userlist_log vsftpd-2.1.0/tunables.c diff -up vsftpd-2.1.0/tunables.c.userlist_log vsftpd-2.1.0/tunables.c
--- vsftpd-2.1.0/tunables.c.userlist_log 2009-01-08 19:33:28.000000000 +0100 --- vsftpd-2.1.0/tunables.c.userlist_log 2009-02-24 09:12:42.000000000 +0100
+++ vsftpd-2.1.0/tunables.c 2009-01-08 19:35:00.000000000 +0100 +++ vsftpd-2.1.0/tunables.c 2009-02-24 09:12:42.000000000 +0100
@@ -72,6 +72,7 @@ int tunable_force_anon_data_ssl; @@ -72,6 +72,7 @@ int tunable_force_anon_data_ssl;
int tunable_mdtm_write; int tunable_mdtm_write;
int tunable_lock_upload_files; int tunable_lock_upload_files;
@ -91,7 +91,7 @@ diff -up vsftpd-2.1.0/tunables.c.userlist_log vsftpd-2.1.0/tunables.c
tunable_validate_cert = 0; tunable_validate_cert = 0;
diff -up vsftpd-2.1.0/tunables.h.userlist_log vsftpd-2.1.0/tunables.h diff -up vsftpd-2.1.0/tunables.h.userlist_log vsftpd-2.1.0/tunables.h
--- vsftpd-2.1.0/tunables.h.userlist_log 2008-12-17 06:47:11.000000000 +0100 --- vsftpd-2.1.0/tunables.h.userlist_log 2008-12-17 06:47:11.000000000 +0100
+++ vsftpd-2.1.0/tunables.h 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/tunables.h 2009-02-24 09:12:42.000000000 +0100
@@ -73,6 +73,7 @@ extern int tunable_force_anon_data_ssl; @@ -73,6 +73,7 @@ extern int tunable_force_anon_data_ssl;
extern int tunable_mdtm_write; /* Allow MDTM to set timestamps */ extern int tunable_mdtm_write; /* Allow MDTM to set timestamps */
extern int tunable_lock_upload_files; /* Lock uploading files */ extern int tunable_lock_upload_files; /* Lock uploading files */
@ -101,8 +101,8 @@ diff -up vsftpd-2.1.0/tunables.h.userlist_log vsftpd-2.1.0/tunables.h
extern int tunable_require_cert; /* SSL client cert required */ extern int tunable_require_cert; /* SSL client cert required */
extern int tunable_validate_cert; /* SSL certs must be valid */ extern int tunable_validate_cert; /* SSL certs must be valid */
diff -up vsftpd-2.1.0/vsftpd.conf.5.userlist_log vsftpd-2.1.0/vsftpd.conf.5 diff -up vsftpd-2.1.0/vsftpd.conf.5.userlist_log vsftpd-2.1.0/vsftpd.conf.5
--- vsftpd-2.1.0/vsftpd.conf.5.userlist_log 2009-01-08 19:33:28.000000000 +0100 --- vsftpd-2.1.0/vsftpd.conf.5.userlist_log 2009-02-24 09:12:42.000000000 +0100
+++ vsftpd-2.1.0/vsftpd.conf.5 2009-01-08 19:33:29.000000000 +0100 +++ vsftpd-2.1.0/vsftpd.conf.5 2009-02-24 09:12:42.000000000 +0100
@@ -585,6 +585,14 @@ Self-signed certs do not constitute OK v @@ -585,6 +585,14 @@ Self-signed certs do not constitute OK v
Default: NO Default: NO

7
vsftpd.spec
View File

@ -2,14 +2,14 @@
Name: vsftpd Name: vsftpd
Version: 2.1.0 Version: 2.1.0
Release: 0.3.pre4%{?dist} Release: 1%{?dist}
Summary: Very Secure Ftp Daemon Summary: Very Secure Ftp Daemon
Group: System Environment/Daemons Group: System Environment/Daemons
# OpenSSL link exception # OpenSSL link exception
License: GPLv2 with exceptions License: GPLv2 with exceptions
URL: http://vsftpd.beasts.org/ URL: http://vsftpd.beasts.org/
Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}pre4.tar.gz Source0: ftp://vsftpd.beasts.org/users/cevans/%{name}-%{version}.tar.gz
Source1: vsftpd.xinetd Source1: vsftpd.xinetd
Source2: vsftpd.pam Source2: vsftpd.pam
Source3: vsftpd.ftpusers Source3: vsftpd.ftpusers
@ -132,6 +132,9 @@ fi
%changelog %changelog
* Tue Feb 24 2009 Martin Nagy <mnagy@redhat.com> - 2.1.0-1
- update to latest upstream release
* Fri Jan 23 2009 Martin Nagy <mnagy@redhat.com> - 2.1.0-0.3.pre4 * Fri Jan 23 2009 Martin Nagy <mnagy@redhat.com> - 2.1.0-0.3.pre4
- update to latest upstream release - update to latest upstream release
- enable ptrace sandbox again - enable ptrace sandbox again