Hello community, here is the log from the commit of package vsftpd for openSUSE:Factory checked in at 2018-04-06 17:43:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/vsftpd (Old) and /work/SRC/openSUSE:Factory/.vsftpd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "vsftpd" Fri Apr 6 17:43:01 2018 rev:64 rq:593273 version:3.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/vsftpd/vsftpd.changes 2017-12-16 20:45:24.492611586 +0100 +++ /work/SRC/openSUSE:Factory/.vsftpd.new/vsftpd.changes 2018-04-06 17:43:01.325632616 +0200 @@ -1,0 +2,5 @@ +Tue Apr 3 11:48:08 UTC 2018 - [email protected] + +- Add firewalld service file (bsc#1083705) + +------------------------------------------------------------------- New: ---- vsftpd.firewalld ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ vsftpd.spec ++++++ --- /var/tmp/diff_new_pack.6EdJvF/_old 2018-04-06 17:43:03.881540292 +0200 +++ /var/tmp/diff_new_pack.6EdJvF/_new 2018-04-06 17:43:03.885540147 +0200 @@ -1,7 +1,7 @@ # # spec file for package vsftpd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -21,6 +21,11 @@ %else %global with_systemd 0 %endif +%if 0%{?suse_version} >= 1500 +%define use_firewalld 1 +%else +%define use_firewalld 0 +%endif Name: vsftpd Version: 3.0.3 Release: 0 @@ -38,6 +43,7 @@ Source8: [email protected] Source9: %{name}.keyring Source10: vsftpd.socket +Source11: %{name}.firewalld Source1000: https://security.appspot.com/downloads/%{name}-%{version}.tar.gz.asc Patch1: vsftpd-2.0.4-lib64.diff Patch3: vsftpd-2.0.4-xinetd.diff @@ -81,13 +87,15 @@ BuildRequires: pam-devel Requires: logrotate Requires(pre): shadow +Provides: ftp-server +%if %{use_firewalld} +Requires(post): firewall-macros +%endif %if 0%{?suse_version} >= 1330 -Requires(pre): group(nobody) Requires: group(nobody) Requires: user(ftp) +Requires(pre): group(nobody) %endif -Provides: ftp-server -BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{with_systemd} BuildRequires: systemd %{?systemd_requires} @@ -164,8 +172,13 @@ install -D -m 755 %{SOURCE3} %{buildroot}%{_initddir}/%{name} ln -sf %{_initddir}/%{name} %{buildroot}/%{_sbindir}/rc%{name} %endif +# install firewall information file +%if %{use_firewalld} +install -D -m 644 %{SOURCE11} %{buildroot}%{_libexecdir}/firewalld/services/%{name}.xml +%else install -d %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/ install -m 644 %{SOURCE6} %{buildroot}%{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%endif %pre getent passwd ftpsecure >/dev/null || useradd -r -g nobody -s /bin/false -c "Secure FTP User" -d %{_localstatedir}/lib/empty ftpsecure @@ -187,6 +200,9 @@ %insserv_cleanup %restart_on_update %{name} %endif +%if %{use_firewalld} +%{firewalld_reload} +%endif %postun %if %{with_systemd} @@ -197,7 +213,6 @@ %endif %files -%defattr(-,root,root) %if %{with_systemd} %{_unitdir}/%{name}.service %{_unitdir}/%{name}.socket @@ -216,9 +231,17 @@ %config(noreplace) %{_sysconfdir}/logrotate.d/%{name} %{_mandir}/man5/%{name}.conf.* %{_mandir}/man8/%{name}.* -%doc BUGS AUDIT Changelog LICENSE README README.security -%doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE COPYING +%license LICENSE +%doc BUGS AUDIT Changelog README README.security +%license COPYING +%doc REWARD SPEED TODO SECURITY TUNING SIZE FAQ EXAMPLE %doc README.SUSE +%if %{use_firewalld} +%dir %{_libexecdir}/firewalld +%dir %{_libexecdir}/firewalld/services +%{_libexecdir}/firewalld/services/%{name}.xml +%else %config %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services/%{name} +%endif %changelog ++++++ vsftpd.firewalld ++++++ <?xml version="1.0" encoding="utf-8"?> <service> <short>vsftpd ports</short> <description>vsftpd ports for both active and passive connections</description> <port protocol="tcp" port="21"/> <!-- control connection port --> <port protocol="tcp" port="30000-30100"/> <!-- passive mode port range --> </service>
