From cf45c4e386a51219ccb5529958b323635739054e5d97f193a485ee323b546c89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 11 Dec 2018 16:01:09 +0000 Subject: [PATCH] Accepting request 657258 from home:pmonrealgonzalez:branches:network - Update the firewall rules in Tumbleweed OBS-URL: https://build.opensuse.org/request/show/657258 OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=165 --- openssh.changes | 5 +++++ openssh.spec | 12 +++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/openssh.changes b/openssh.changes index 6fd31f7..4b10c51 100644 --- a/openssh.changes +++ b/openssh.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Dec 11 11:56:43 UTC 2018 - Pedro Monreal Gonzalez + +- Update the firewall rules in Tumbleweed + ------------------------------------------------------------------- Mon Nov 26 11:07:42 UTC 2018 - Vítězslav Čížek diff --git a/openssh.spec b/openssh.spec index 61701c9..96b1fb9 100644 --- a/openssh.spec +++ b/openssh.spec @@ -20,13 +20,19 @@ %ifnarch ppc %define sandbox_seccomp 1 %endif -%if 0%{?suse_version} >= 1500 + +%if 0%{?suse_version} > 1500 %bcond_with susefirewall -%bcond_without tirpc %else %bcond_without susefirewall + +%endif +%if 0%{?suse_version} >= 1500 +%bcond_without tirpc +%else %bcond_with tirpc %endif + %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services %define _appdefdir %( grep "configdirspec=" $( which xmkmf ) | sed -r 's,^[^=]+=.*-I(.*)/config.*$,\\1/app-defaults,' ) %define CHECKSUM_SUFFIX .hmac @@ -226,7 +232,7 @@ 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 %{with susefirewall} -#install firewall definitions +# install firewall definitions mkdir -p %{buildroot}%{_fwdefdir} install -m 644 %{SOURCE7} %{buildroot}%{_fwdefdir}/sshd %endif