Hello community, here is the log from the commit of package openssh for openSUSE:Factory checked in at 2019-01-11 13:59:45 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openssh (Old) and /work/SRC/openSUSE:Factory/.openssh.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openssh" Fri Jan 11 13:59:45 2019 rev:125 rq:662751 version:7.9p1 Changes: -------- --- /work/SRC/openSUSE:Factory/openssh/openssh.changes 2018-12-19 13:27:48.837056913 +0100 +++ /work/SRC/openSUSE:Factory/.openssh.new.28833/openssh.changes 2019-01-11 13:59:47.052144614 +0100 @@ -1,0 +2,5 @@ +Thu Jan 3 11:44:45 UTC 2019 - Pedro Monreal Gonzalez <[email protected]> + +- Added compatibility with SuSEfirewall2 [bsc#1118044] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openssh-askpass-gnome.spec ++++++ --- /var/tmp/diff_new_pack.La9Yzr/_old 2019-01-11 13:59:48.244143414 +0100 +++ /var/tmp/diff_new_pack.La9Yzr/_new 2019-01-11 13:59:48.248143409 +0100 @@ -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 ++++++ openssh.spec ++++++ --- /var/tmp/diff_new_pack.La9Yzr/_old 2019-01-11 13:59:48.260143397 +0100 +++ /var/tmp/diff_new_pack.La9Yzr/_new 2019-01-11 13:59:48.264143393 +0100 @@ -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: 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 @@ %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 @@ 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 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 @@ # 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 @@ %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
