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

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
-Patch3:         %name-2.0.4-xinetd.diff
-Patch4:         %name-2.0.4-enable-ssl.patch
-Patch5:         %name-2.0.4-dmapi.patch
-Patch6:         %name-2.0.5-vuser.patch
-Patch7:         %name-2.0.5-enable-debuginfo.patch
-Patch8:         %name-2.0.5-utf8-log-names.patch
-Patch9:         %name-2.0.4-conf.diff
+Patch1:         vsftpd-2.0.4-lib64.diff
+Patch3:         vsftpd-2.0.4-xinetd.diff
+Patch4:         vsftpd-2.0.4-enable-ssl.patch
+Patch5:         vsftpd-2.0.4-dmapi.patch
+Patch6:         vsftpd-2.0.5-vuser.patch
+Patch7:         vsftpd-2.0.5-enable-debuginfo.patch
+Patch8:         vsftpd-2.0.5-utf8-log-names.patch
+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