From 518034998f92163e9a5d73817467f9fe1ebd1a516dc078a28036bcbdb51aa1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Fri, 4 Jan 2019 06:19:36 +0000
Subject: [PATCH] Accepting request 662676 from
 home:pmonrealgonzalez:branches:network

- Added compatibility with SuSEfirewall2 [bsc#1118044]

OBS-URL: https://build.opensuse.org/request/show/662676
OBS-URL: https://build.opensuse.org/package/show/network/openssh?expand=0&rev=167
---
 openssh-askpass-gnome.spec |  2 +-
 openssh.changes            |  5 +++++
 openssh.spec               | 25 +++++++++----------------
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index a77086c..920a89e 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh-askpass-gnome
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
diff --git a/openssh.changes b/openssh.changes
index 4b10c51..1a108cc 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan  3 11:44:45 UTC 2019 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
+
+- Added compatibility with SuSEfirewall2 [bsc#1118044]
+
 -------------------------------------------------------------------
 Tue Dec 11 11:56:43 UTC 2018 - Pedro Monreal Gonzalez <pmonrealgonzalez@suse.com>
 
diff --git a/openssh.spec b/openssh.spec
index 96b1fb9..edb5e59 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package openssh
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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,19 +21,14 @@
 %define sandbox_seccomp 1
 %endif
 
-%if 0%{?suse_version} > 1500
-%bcond_with susefirewall
-%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 _fwdir      %{_sysconfdir}/sysconfig/SuSEfirewall2.d
+%define _fwdefdir   %{_fwdir}/services
 %define _appdefdir  %( grep "configdirspec=" $( which xmkmf ) | sed -r 's,^[^=]+=.*-I(.*)/config.*$,\\1/app-defaults,' )
 %define CHECKSUM_SUFFIX .hmac
 %define CHECKSUM_HMAC_KEY "HMAC_KEY:OpenSSH-FIPS@SLE"
@@ -116,7 +111,7 @@ BuildRequires:  pkgconfig
 BuildRequires:  zlib-devel
 BuildRequires:  pkgconfig(krb5)
 BuildRequires:  pkgconfig(libsystemd)
-Requires(post): %fillup_prereq
+Requires(post): %{fillup_prereq}
 Requires(pre):  pwdutils
 Recommends:     %{name}-helpers = %{version}-%{release}
 Recommends:     audit
@@ -172,7 +167,7 @@ cp %{SOURCE3} %{SOURCE4} %{SOURCE11} .
 
 %autopatch -p1
 
-#set libexec dir in the LDAP patch
+# set libexec dir in the LDAP patch
 sed -i.libexec 's,@LIBEXECDIR@,%{_libexecdir}/ssh,' \
     $( grep -Rl @LIBEXECDIR@ \
         $( grep "^+++" openssh-7.7p1-ldap.patch | sed -r 's@^.+/([^/\t ]+).*$@\1@' )
@@ -188,7 +183,7 @@ PIEFLAGS="-fpie"
 CFLAGS="%{optflags} $PIEFLAGS -fstack-protector"
 CXXFLAGS="%{optflags} $PIEFLAGS -fstack-protector"
 LDFLAGS="-pie -Wl,--as-needed"
-#CPPFLAGS="% {optflags} -DUSE_INTERNAL_B64"
+#CPPFLAGS="%%{optflags} -DUSE_INTERNAL_B64"
 export LDFLAGS CFLAGS CXXFLAGS CPPFLAGS
 %configure \
     --sysconfdir=%{_sysconfdir}/ssh \
@@ -231,11 +226,9 @@ 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 %{with susefirewall}
 # 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
@@ -249,7 +242,7 @@ install -D -m 0755 %{SOURCE9} %{buildroot}%{_sbindir}/sshd-gen-keys-start
 # re-define the __os_install_post macro: the macro strips
 # the binaries and thereby invalidates any hashes created earlier.
 #
-# this shows up earlier because otherwise the % expand of
+# this shows up earlier because otherwise the %%expand of
 # the macro is too late.
 %{expand:%%global __os_install_post {%__os_install_post
 for b in \
@@ -313,9 +306,9 @@ 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 %{with susefirewall}
+%dir %{_fwdir}
+%dir %{_fwdefdir}
 %config %{_fwdefdir}/sshd
-%endif
 
 %files helpers
 %attr(0755,root,root) %dir %{_sysconfdir}/ssh