Accepting request 48701 from network

Copy from network/vsftpd based on submit request 48701 from user elvigia

OBS-URL: https://build.opensuse.org/request/show/48701
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/vsftpd?expand=0&rev=21

vsftpd-2.0.4-conf.diff

@@ -1,7 +1,5 @@
-Index: vsftpd.conf
-===================================================================
---- vsftpd.conf.orig	2009-10-19 04:04:23.000000000 +0200
-+++ vsftpd.conf	2010-08-10 06:51:08.357391000 +0200
+--- vsftpd.conf.orig
++++ vsftpd.conf
 @@ -4,23 +4,89 @@
  # loosens things up a bit, to make the ftp daemon more usable.
  # Please see vsftpd.conf.5 for all compiled in defaults.

vsftpd-2.0.4-dmapi.patch

@@ -1,7 +1,5 @@
-Index: postlogin.c
-===================================================================
---- postlogin.c.orig	2010-03-26 05:01:06.000000000 +0100
-+++ postlogin.c	2010-08-10 06:51:06.796475000 +0200
+--- postlogin.c.orig
++++ postlogin.c
 @@ -1036,6 +1036,11 @@ handle_upload_common(struct vsf_session*
      {
        do_truncate = 1;

vsftpd-2.0.4-enable-ssl.patch

@@ -1,7 +1,5 @@
-Index: builddefs.h
-===================================================================
---- builddefs.h.orig	2010-08-06 02:50:31.000000000 +0200
-+++ builddefs.h	2010-08-10 06:51:06.520558000 +0200
+--- builddefs.h.orig
++++ builddefs.h
 @@ -3,7 +3,7 @@
  
  #undef VSF_BUILD_TCPWRAPPERS

vsftpd-2.0.4-lib64.diff

@@ -1,7 +1,5 @@
-Index: vsf_findlibs.sh
-===================================================================
---- vsf_findlibs.sh.orig	2009-10-19 04:05:21.000000000 +0200
-+++ vsf_findlibs.sh	2010-08-10 06:51:05.899564000 +0200
+--- vsf_findlibs.sh.orig
++++ vsf_findlibs.sh
 @@ -14,6 +14,7 @@ fi
  # crypt library.
  if find_func pam_start sysdeputil.o; then

vsftpd-2.0.4-xinetd.diff

@@ -1,7 +1,5 @@
-Index: xinetd.d/vsftpd
-===================================================================
---- xinetd.d/vsftpd.orig	2008-02-02 02:30:40.000000000 +0100
-+++ xinetd.d/vsftpd	2010-08-10 06:51:06.236565000 +0200
+--- xinetd.d/vsftpd.orig
++++ xinetd.d/vsftpd
 @@ -1,18 +1,23 @@
 -# default: on
 +# default: off

vsftpd-2.0.5-enable-debuginfo.patch

@@ -1,7 +1,5 @@
-Index: Makefile
-===================================================================
---- Makefile.orig	2009-05-22 21:44:52.000000000 +0200
-+++ Makefile	2010-08-10 06:51:07.756405000 +0200
+--- Makefile.orig
++++ Makefile
 @@ -6,7 +6,7 @@ IFLAGS  = -idirafter dummyinc
  CFLAGS	=	-O2 -Wall -W -Wshadow #-pedantic -Werror -Wconversion
  

vsftpd-2.0.5-utf8-log-names.patch

@@ -1,7 +1,5 @@
-Index: str.c
-===================================================================
---- str.c.orig	2008-12-17 06:54:16.000000000 +0100
-+++ str.c	2010-08-10 06:51:08.032395000 +0200
+--- str.c.orig
++++ str.c
 @@ -27,6 +27,24 @@ static int str_equal_internal(const char
                                const char* p_buf2, unsigned int buf2_len);
  
@@ -91,10 +89,8 @@ Index: str.c
      }
    }
  }
-Index: str.h
-===================================================================
---- str.h.orig	2008-12-17 06:53:23.000000000 +0100
-+++ str.h	2010-08-10 06:51:08.037398000 +0200
+--- str.h.orig
++++ str.h
 @@ -36,6 +36,7 @@ void str_free(struct mystr* p_str);
  void str_trunc(struct mystr* p_str, unsigned int trunc_len);
  void str_reserve(struct mystr* p_str, unsigned int res_len);

vsftpd-2.0.5-vuser.patch

@@ -1,7 +1,5 @@
-Index: EXAMPLE/VIRTUAL_USERS/vsftpd.pam
-===================================================================
---- EXAMPLE/VIRTUAL_USERS/vsftpd.pam.orig	2008-02-02 02:30:40.000000000 +0100
-+++ EXAMPLE/VIRTUAL_USERS/vsftpd.pam	2010-08-10 06:51:07.074476000 +0200
+--- EXAMPLE/VIRTUAL_USERS/vsftpd.pam.orig
++++ EXAMPLE/VIRTUAL_USERS/vsftpd.pam
 @@ -1,2 +1,2 @@
 -auth required /lib/security/pam_userdb.so db=/etc/vsftpd_login
 -account required /lib/security/pam_userdb.so db=/etc/vsftpd_login

vsftpd-2.3.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6a9316001e420ffb27087dd8c8b79fa6980f8085a0cf4018c8fe018c8ef63410
-size 137555

vsftpd-2.3.2.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0e08489acc07a3f4279783f7ee50c30a6de2c9a61e435b0650ae3ddd135791df
+size 137529

vsftpd.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 21 16:31:39 UTC 2010 - cristian.rodriguez@opensuse.org
+
+- Update to version 2.3.2
+- Fix silly regression re: log files being overwritten from the start.
+- Rename a few file-open functions to make it clearer what they do 
+
 -------------------------------------------------------------------
 Tue Aug 10 04:55:16 UTC 2010 - cristian.rodriguez@opensuse.org
 

vsftpd.spec

@@ -1,5 +1,5 @@
 #
-# spec file for package vsftpd (Version 2.3.0)
+# spec file for package vsftpd (Version 2.3.2)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -25,7 +25,7 @@ BuildRequires:  libcap
 %else
 BuildRequires:  libcap-devel
 %endif
-Version:        2.3.0
+Version:        2.3.2
 Release:        1
 Summary:        Very Secure FTP Daemon - Written from Scratch
 License:        GPLv2+