Accepting request 724538 from network

OBS-URL: https://build.opensuse.org/request/show/724538
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/openssh?expand=0&rev=134

openssh.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Aug 19 11:24:36 CEST 2019 - kukuk@suse.de
+
+- don't install SuSEfirewall2 service on Factory, since SuSEfirewall2
+  has been replaced by firewalld, see [1].
+
+  [1]: https://lists.opensuse.org/opensuse-factory/2019-01/msg00490.html
+
 -------------------------------------------------------------------
 Mon Jul 22 16:55:25 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 

openssh.spec

@@ -236,9 +236,11 @@ install -m 755 contrib/ssh-copy-id %{buildroot}%{_bindir}
 install -m 644 contrib/ssh-copy-id.1 %{buildroot}%{_mandir}/man1
 sed -i -e s@%{_prefix}/libexec@%{_libexecdir}@g %{buildroot}%{_sysconfdir}/ssh/sshd_config
 
+%if 0%{?suse_version} < 1550
 # install firewall definitions
 mkdir -p %{buildroot}%{_fwdefdir}
 install -m 644 %{SOURCE7} %{buildroot}%{_fwdefdir}/sshd
+%endif
 
 # askpass wrapper
 sed -e "s,@LIBEXECDIR@,%{_libexecdir},g" < %{SOURCE6} > %{buildroot}%{_libexecdir}/ssh/ssh-askpass
@@ -318,9 +320,11 @@ rpm -q openssh-fips >& /dev/null && DISABLE_RESTART_ON_UPDATE=yes
 %dir %{_sysconfdir}/slp.reg.d
 %config %{_sysconfdir}/slp.reg.d/ssh.reg
 %{_fillupdir}/sysconfig.ssh
+%if 0%{?suse_version} < 1550
 %dir %{_fwdir}
 %dir %{_fwdefdir}
 %config %{_fwdefdir}/sshd
+%endif
 
 %files helpers
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh