Accepting request 98058 from home:AndreasStieger:branches:network

- update to upstream 2.3.5:
- convert .changes file to unicode
- refresh vsftpd-2.0.4-conf.diff to vsftpd-2.3.5-conf.patch
- name patches explicitly without macro as per recommendations
- remove INSTALL file from binary package
- update license to GPL-2.0+
- mark /etc/sysconfig/SuSEfirewall2/services/vsftpd as config file

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

_service

@@ -1,12 +0,0 @@
-<services>
-  <service name="download_url">
-    <param name="protocol">https</param>
-    <param name="host">security.appspot.com</param>
-    <param name="path">/downloads/vsftpd-2.3.4.tar.gz</param>
-  </service>
-  <service name="verify_file">
-    <param name="file">_service:download_url:vsftpd-2.3.4.tar.gz</param>
-    <param name="verifier">sha256</param>
-    <param name="checksum">b466edf96437afa2b2bea6981d4ab8b0204b83ca0a2ac94bef6b62b42cc71a5a</param>
-  </service>
-</services>

vsftpd-2.3.5-conf.patch

@@ -1,5 +1,7 @@
---- vsftpd.conf.orig
+Index: vsftpd.conf
-+++ vsftpd.conf
+===================================================================
+--- vsftpd.conf.orig	2011-12-17 18:24:40.000000000 +0000
++++ vsftpd.conf	2011-12-23 17:16:43.000000000 +0000
 @@ -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.
@@ -172,7 +174,7 @@
  # Enable this and the server will recognise asynchronous ABOR requests. Not
  # recommended for security (the code is non-trivial). Not enabling it,
  # however, may confuse older FTP clients.
-@@ -77,38 +164,29 @@ connect_from_port_20=YES
+@@ -77,41 +164,29 @@ connect_from_port_20=YES
  # predicted this attack and has always been safe, reporting the size of the
  # raw file.
  # ASCII mangling is a horrible feature of the protocol.
@@ -192,6 +194,9 @@
 -# You may specify an explicit list of local users to chroot() to their home
 -# directory. If chroot_local_user is YES, then this list becomes a list of
 -# users to NOT chroot().
+-# (Warning! chroot'ing can be very dangerous. If using chroot, make sure that
+-# the user does not have write access to the top level directory within the
+-# chroot)
 -#chroot_local_user=YES
 -#chroot_list_enable=YES
 -# (default follows)

vsftpd-2.3.5.tar.bz2

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

vsftpd.changes

@@ -1,3 +1,26 @@
+-------------------------------------------------------------------
+Fri Dec 23 17:48:04 UTC 2011 - andreas.stieger@gmx.de
+
+- update to upstream 2.3.5:
+  * Try and force glibc to cache zoneinfo files in an attempt to work around
+    glibc parsing vulnerability. Thanks to Kingcope.
+  * Only report CHMOD in SITE HELP if it's enabled. Thanks to Martin Schwenke
+    <martin@meltin.net>.
+  * Some simple fixes and cleanups from Thorsten Brehm <tbrehm@dspace.de>.
+  * Only advertise "AUTH SSL" if one of SSLv2, SSLv3 is enabled. Thanks to
+    steve willing <eiji-gravion@hotmail.com>.
+  * Handle connect() failures properly. Thanks to Takayuki Nagata
+    <tnagata@redhat.com>.
+  * Add stronger checks for the configuration error of running with a
+    writeable root directory inside a chroot(). This may bite people who
+    carelessly turned on chroot_local_user but such is life.
+- convert .changes file to unicode
+- refresh vsftpd-2.0.4-conf.diff to vsftpd-2.3.5-conf.patch
+- name patches explicitly without macro as per recommendations
+- remove INSTALL file from binary package
+- update license to GPL-2.0+
+- mark /etc/sysconfig/SuSEfirewall2/services/vsftpd as config file
+
 -------------------------------------------------------------------
 Sat Nov 26 16:31:20 UTC 2011 - crrodriguez@opensuse.org
 
@@ -493,9 +516,9 @@ Mon Jul 28 15:55:40 CEST 2003 - mmj@suse.de
 Fri May 30 12:48:45 CEST 2003 - mmj@suse.de
 
 - Update to vsftpd-1.2.0 including:
-  · IPv6 support, so drop our patch
+  · IPv6 support, so drop our patch
-  · Many bugfixes and tunings
+  · Many bugfixes and tunings
-  · Build fixes
+  · Build fixes
 
 -------------------------------------------------------------------
 Thu Mar  6 16:34:30 CET 2003 - mmj@suse.de

vsftpd.spec

@@ -25,13 +25,13 @@ BuildRequires:  libcap
 %else
 BuildRequires:  libcap-devel
 %endif
-Version:        2.3.4
+Version:        2.3.5
 Release:        1
 Summary:        Very Secure FTP Daemon - Written from Scratch
-License:        GPLv2+
+License:        GPL-2.0+
 Group:          Productivity/Networking/Ftp/Servers
 Url:            https://security.appspot.com/vsftpd.html
-Source:         %name-%version.tar.gz
+Source:         %name-%version.tar.bz2
 Source1:        %name.pam
 Source2:        %name.logrotate
 Source3:        %name.init
@@ -39,14 +39,14 @@ Source4:        README.SUSE
 Source5:        %name.xml
 Source6:        %name.firewall
 Source7:        vsftpd.service
-Patch1:         %name-2.0.4-lib64.diff
+Patch1:         vsftpd-2.0.4-lib64.diff
-Patch3:         %name-2.0.4-xinetd.diff
+Patch3:         vsftpd-2.0.4-xinetd.diff
-Patch4:         %name-2.0.4-enable-ssl.patch
+Patch4:         vsftpd-2.0.4-enable-ssl.patch
-Patch5:         %name-2.0.4-dmapi.patch
+Patch5:         vsftpd-2.0.4-dmapi.patch
-Patch6:         %name-2.0.5-vuser.patch
+Patch6:         vsftpd-2.0.5-vuser.patch
-Patch7:         %name-2.0.5-enable-debuginfo.patch
+Patch7:         vsftpd-2.0.5-enable-debuginfo.patch
-Patch8:         %name-2.0.5-utf8-log-names.patch
+Patch8:         vsftpd-2.0.5-utf8-log-names.patch
-Patch9:         %name-2.0.4-conf.diff
+Patch9:         vsftpd-2.3.5-conf.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Provides:       ftp-server
 PreReq:         %insserv_prereq /usr/sbin/useradd
@@ -127,9 +127,9 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) /etc/logrotate.d/%name
 %_mandir/man5/%name.conf.*
 %_mandir/man8/%name.*
-%doc INSTALL BUGS AUDIT Changelog LICENSE README README.security
+%doc BUGS AUDIT Changelog LICENSE README README.security
 %doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE COPYING
 %doc README.SUSE
-%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
+%config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name}
 
 %changelog