rpms/vsftpd/devel .cvsignore, 1.20, 1.21 sources, 1.20, 1.21 vsftpd-2.1.0-pam_hostname.patch, 1.2, 1.3 vsftpd.spec, 1.96, 1.97

[Martin Nagy]

Author: mnagy

Update of /cvs/extras/rpms/vsftpd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv15322

Modified Files:
	.cvsignore sources vsftpd-2.1.0-pam_hostname.patch vsftpd.spec 
Log Message:
* Tue Aug 24 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-1
- update to latest upstream release 2.2.0



Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/.cvsignore,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- .cvsignore	4 Aug 2009 06:23:01 -0000	1.20
+++ .cvsignore	24 Aug 2009 15:01:45 -0000	1.21
@@ -1 +1 @@
-vsftpd-2.2.0pre4.tar.gz
+vsftpd-2.2.0.tar.gz


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	4 Aug 2009 06:23:01 -0000	1.20
+++ sources	24 Aug 2009 15:01:45 -0000	1.21
@@ -1 +1 @@
-d628511be9092be8d167830d5c1d6889  vsftpd-2.2.0pre4.tar.gz
+e4eb190af270ae65d57a84274a38ec31  vsftpd-2.2.0.tar.gz

vsftpd-2.1.0-pam_hostname.patch:
 sysdeputil.c |   19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

Index: vsftpd-2.1.0-pam_hostname.patch
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd-2.1.0-pam_hostname.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- vsftpd-2.1.0-pam_hostname.patch	4 Aug 2009 06:23:01 -0000	1.2
+++ vsftpd-2.1.0-pam_hostname.patch	24 Aug 2009 15:01:45 -0000	1.3
@@ -1,6 +1,6 @@
 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	2009-08-04 08:00:00.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-24 12:24:07.220623773 +0200
 @@ -16,6 +16,10 @@
  #include "tunables.h"
  #include "builddefs.h"
@@ -12,7 +12,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
  /* For Linux, this adds nothing :-) */
  #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)
  {
    int retval;
@@ -20,10 +20,10 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
 +  struct sockaddr_in sin;
 +  struct hostent *host;
 +#endif
+   pam_item_t item;
    const char* pam_user_name = 0;
    struct pam_conv the_conv =
-   {
-@@ -335,7 +343,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
+@@ -345,7 +353,12 @@ vsf_sysdep_check_auth(struct mystr* p_us
      return 0;
    }
  #ifdef PAM_RHOST
@@ -37,7 +37,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
    if (retval != PAM_SUCCESS)
    {
      (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;
  }
@@ -46,7 +46,7 @@ diff -up vsftpd-2.2.0/sysdeputil.c.pam_h
    #ifndef VSF_SYSDEP_HAVE_LIBCAP
  static int
  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;
    /* In case something goes wrong, set the fd to -1 before the syscall */
    p_fd = (int*)CMSG_DATA(CMSG_FIRSTHDR(&msg));


Index: vsftpd.spec
===================================================================
RCS file: /cvs/extras/rpms/vsftpd/devel/vsftpd.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -p -r1.96 -r1.97
--- vsftpd.spec	22 Aug 2009 18:43:51 -0000	1.96
+++ vsftpd.spec	24 Aug 2009 15:01:45 -0000	1.97
@@ -2,14 +2,14 @@
 
 Name: vsftpd
 Version: 2.2.0
-Release: 0.2.pre4%{?dist}
+Release: 1%{?dist}
 Summary: Very Secure Ftp Daemon
 
 Group: System Environment/Daemons
 # OpenSSL link exception
 License: GPLv2 with exceptions
 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
 Source2: vsftpd.pam
 Source3: vsftpd.ftpusers
@@ -137,6 +137,9 @@ fi
 
 
 %changelog
+* Tue Aug 24 2009 Martin Nagy <mnagy at redhat.com> - 2.2.0-1
+- update to latest upstream release 2.2.0
+
 * Sat Aug 22 2009 Tomas Mraz <tmraz at redhat.com> - 2.2.0-0.2.pre4
 - rebuilt with new openssl