Accepting request 45399 from network

checked in (request 45399)

OBS-URL: https://build.opensuse.org/request/show/45399
OBS-URL: https://build.opensuse.org/package/show/network/vsftpd?expand=0&rev=13

vsftpd-2.0.4-conf.diff

@@ -1,7 +1,7 @@
 Index: vsftpd.conf
 ===================================================================
---- vsftpd.conf.orig	2009-10-19 04:04:23.000000000 +0200
+--- vsftpd.conf.orig
-+++ vsftpd.conf	2010-08-10 06:51:08.357391000 +0200
++++ 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,8 +1,8 @@
 Index: postlogin.c
 ===================================================================
---- postlogin.c.orig	2010-03-26 05:01:06.000000000 +0100
+--- postlogin.c.orig
-+++ postlogin.c	2010-08-10 06:51:06.796475000 +0200
++++ postlogin.c
-@@ -1036,6 +1036,11 @@ handle_upload_common(struct vsf_session*
+@@ -1015,6 +1015,11 @@ handle_upload_common(struct vsf_session*
      {
        do_truncate = 1;
      }

vsftpd-2.0.4-enable-ssl.patch

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

vsftpd-2.0.4-lib64.diff

@@ -1,7 +1,7 @@
-Index: vsf_findlibs.sh
+Index: vsftpd-2.2.2/vsf_findlibs.sh
 ===================================================================
---- vsf_findlibs.sh.orig	2009-10-19 04:05:21.000000000 +0200
+--- vsftpd-2.2.2.orig/vsf_findlibs.sh
-+++ vsf_findlibs.sh	2010-08-10 06:51:05.899564000 +0200
++++ vsftpd-2.2.2/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,7 @@
-Index: xinetd.d/vsftpd
+Index: vsftpd-2.2.2/xinetd.d/vsftpd
 ===================================================================
---- xinetd.d/vsftpd.orig	2008-02-02 02:30:40.000000000 +0100
+--- vsftpd-2.2.2.orig/xinetd.d/vsftpd
-+++ xinetd.d/vsftpd	2010-08-10 06:51:06.236565000 +0200
++++ vsftpd-2.2.2/xinetd.d/vsftpd
 @@ -1,18 +1,23 @@
 -# default: on
 +# default: off

vsftpd-2.0.5-enable-debuginfo.patch

@@ -1,7 +1,7 @@
 Index: Makefile
 ===================================================================
---- Makefile.orig	2009-05-22 21:44:52.000000000 +0200
+--- Makefile.orig
-+++ Makefile	2010-08-10 06:51:07.756405000 +0200
++++ 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,7 @@
-Index: str.c
+Index: vsftpd-2.2.2/str.c
 ===================================================================
---- str.c.orig	2008-12-17 06:54:16.000000000 +0100
+--- vsftpd-2.2.2.orig/str.c
-+++ str.c	2010-08-10 06:51:08.032395000 +0200
++++ vsftpd-2.2.2/str.c
 @@ -27,6 +27,24 @@ static int str_equal_internal(const char
                                const char* p_buf2, unsigned int buf2_len);
  
@@ -91,10 +91,10 @@ Index: str.c
      }
    }
  }
-Index: str.h
+Index: vsftpd-2.2.2/str.h
 ===================================================================
---- str.h.orig	2008-12-17 06:53:23.000000000 +0100
+--- vsftpd-2.2.2.orig/str.h
-+++ str.h	2010-08-10 06:51:08.037398000 +0200
++++ vsftpd-2.2.2/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,7 @@
 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.orig
-+++ EXAMPLE/VIRTUAL_USERS/vsftpd.pam	2010-08-10 06:51:07.074476000 +0200
++++ 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.2.2.tar.bz2

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

vsftpd-2.3.0.tar.bz2

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

vsftpd.changes

@@ -1,23 +1,3 @@
--------------------------------------------------------------------
-Tue Aug 10 04:55:16 UTC 2010 - cristian.rodriguez@opensuse.org
-
-- Update to 2.3.0
-- Add extremely simply HTTP support. It's very experimental, ignorant of HTTP
-protocol and headers, and likely has all sorts of other issues. The use case
-it might satisfy is if you need to serve simple static unathenticated content
-with large levels of paranoia.
-- Fix port_promiscuous breakage.
-- Minor FAQ update.
-- Use a larger address space limit if using text_userdb_names=YES
-- Always use CLONE_NEWNET if possible when in HTTP mode.
-- Change REST + STOR so that it's possible to overwrite part of file without
-truncating it.
-- Boot the session if we see a USER where encryption was required. May prevent
-the transmission of plaintext passwords by buggy clients.
-- Fix failure to transmit a large ASCII file over SSL, if it contains \n -> \r\n
-fixups.
- 
-
 -------------------------------------------------------------------
 Tue May 25 13:05:30 UTC 2010 - cristian.rodriguez@opensuse.org
 

vsftpd.spec

@@ -25,7 +25,7 @@ BuildRequires:  libcap
 %else
 BuildRequires:  libcap-devel
 %endif
-Version:        2.3.0
+Version:        2.2.2
 Release:        2
 Summary:        Very Secure FTP Daemon - Written from Scratch
 License:        GPLv2+
@@ -49,7 +49,7 @@ Patch9:         %name-2.0.4-conf.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
 PreReq:         %insserv_prereq /usr/sbin/useradd
-Requires:		logrotate
+
 %description
 Vsftpd is an FTP server, or daemon. The "vs" stands for Very Secure.
 Obviously this is not a guarantee, but the entire codebase was written
@@ -63,13 +63,13 @@ tests.
 
 %prep
 %setup -q
-%patch1
+%patch1 -p1
-%patch3
+%patch3 -p1
 %patch4
 %patch5
 %patch6
 %patch7
-%patch8
+%patch8 -p1
 %patch9
 
 %build
@@ -100,9 +100,6 @@ install -m 644 %{S:6} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/SuSEfirewall2.d/se
 %preun
 %stop_on_removal %name
 
-%post
-%{fillup_and_insserv -f %{name}}
-
 %postun
 %insserv_cleanup
 %restart_on_update %name
@@ -114,7 +111,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 /usr/sbin/%name
 /usr/sbin/rc%name
-%config /etc/init.d/%name
+/etc/init.d/%name
 %_datadir/omc/svcinfo.d/vsftpd.xml
 %dir /usr/share/empty
 %config(noreplace) /etc/xinetd.d/%name