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

- update to latest upstream release 2.2.0

Browse Source
This commit is contained in:
Martin Nagy 2009-08-24 15:01:45 +00:00
parent 5aab3039e5
commit 6548046a1c
4 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.cvsignore
View File

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

2
sources
View File

@ -1 +1 @@
d628511be9092be8d167830d5c1d6889 vsftpd-2.2.0pre4.tar.gz e4eb190af270ae65d57a84274a38ec31 vsftpd-2.2.0.tar.gz

14
vsftpd-2.1.0-pam_hostname.patch
View File

@ -1,6 +1,6 @@
diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
--- vsftpd-2.2.0/sysdeputil.c.pam_hostname 2009-07-14 06:03:31.000000000 +0200 --- vsftpd-2.2.0/sysdeputil.c.pam_hostname 2009-08-08 03:51:10.000000000 +0200
+++ vsftpd-2.2.0/sysdeputil.c 2009-08-04 08:00:00.000000000 +0200 +++ vsftpd-2.2.0/sysdeputil.c 2009-08-24 12:24:07.220623773 +0200
@@ -16,6 +16,10 @@ @@ -16,6 +16,10 @@
#include "tunables.h" #include "tunables.h"
#include "builddefs.h" #include "builddefs.h"
@ -12,7 +12,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
/* For Linux, this adds nothing :-) */ /* For Linux, this adds nothing :-) */
#include "port/porting_junk.h" #include "port/porting_junk.h"
@@ -316,6 +320,10 @@ vsf_sysdep_check_auth(struct mystr* p_us @@ -325,6 +329,10 @@ vsf_sysdep_check_auth(struct mystr* p_us
const struct mystr* p_remote_host) const struct mystr* p_remote_host)
{ {
int retval; int retval;
@ -20,10 +20,10 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
+ struct sockaddr_in sin; + struct sockaddr_in sin;
+ struct hostent *host; + struct hostent *host;
+#endif +#endif
pam_item_t item;
const char* pam_user_name = 0; const char* pam_user_name = 0;
struct pam_conv the_conv = struct pam_conv the_conv =
{ @@ -345,7 +353,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
@@ -335,7 +343,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
return 0; return 0;
} }
#ifdef PAM_RHOST #ifdef PAM_RHOST
@ -37,7 +37,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
if (retval != PAM_SUCCESS) if (retval != PAM_SUCCESS)
{ {
(void) pam_end(s_pamh, retval); (void) pam_end(s_pamh, retval);
@@ -547,7 +560,7 @@ vsf_sysdep_has_capabilities(void) @@ -558,7 +571,7 @@ vsf_sysdep_has_capabilities(void)
} }
return s_runtime_has_caps; return s_runtime_has_caps;
} }
@ -46,7 +46,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_hostname vsftpd-2.2.0/sysdeputil.c
#ifndef VSF_SYSDEP_HAVE_LIBCAP #ifndef VSF_SYSDEP_HAVE_LIBCAP
static int static int
do_checkcap(void) do_checkcap(void)
@@ -1069,7 +1082,7 @@ vsf_sysutil_recv_fd(const int sock_fd) @@ -1080,7 +1093,7 @@ vsf_sysutil_recv_fd(const int sock_fd)
msg.msg_flags = 0; msg.msg_flags = 0;
/* In case something goes wrong, set the fd to -1 before the syscall */ /* In case something goes wrong, set the fd to -1 before the syscall */
p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg)); p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg));

7
vsftpd.spec
View File

@ -2,14 +2,14 @@
Name: vsftpd Name: vsftpd
Version: 2.2.0 Version: 2.2.0
Release: 0.2.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
@ -137,6 +137,9 @@ fi
%changelog %changelog
* Tue Aug 24 2009 Martin Nagy <mnagy@redhat.com> - 2.2.0-1
- update to latest upstream release 2.2.0
* Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.0-0.2.pre4 * Sat Aug 22 2009 Tomas Mraz <tmraz@redhat.com> - 2.2.0-0.2.pre4
- rebuilt with new openssl - rebuilt with new openssl