Hello community, here is the log from the commit of package yast2-cluster for openSUSE:Factory checked in at 2019-04-30 13:06:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-cluster.new.5536 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-cluster" Tue Apr 30 13:06:48 2019 rev:31 rq:699510 version:4.1.2 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes 2019-04-18 13:58:46.208002234 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-cluster.new.5536/yast2-cluster.changes 2019-04-30 13:06:48.749549756 +0200 @@ -1,0 +2,14 @@ +Thu Apr 25 07:00:13 UTC 2019 - nick wang <nwang@suse.com> + +- bsc#1132881, using ruby base64 to replace uuencode/uudecode + Remove the requirement of sharutils + +------------------------------------------------------------------- +Tue Apr 23 15:50:05 UTC 2019 - Stefan Weiberg <sweiberg@suse.com> + +- bsc#1132881, uuencode can't be executed if sharutils are not + installed: + + added sharutils to the package requirements + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster-4.1.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.1.2/package/yast2-cluster.changes new/yast2-cluster-4.1.2/package/yast2-cluster.changes --- old/yast2-cluster-4.1.2/package/yast2-cluster.changes 2019-04-18 09:53:25.000000000 +0200 +++ new/yast2-cluster-4.1.2/package/yast2-cluster.changes 2019-04-29 15:40:02.000000000 +0200 @@ -1,4 +1,18 @@ ------------------------------------------------------------------- +Thu Apr 25 07:00:13 UTC 2019 - nick wang <nwang@suse.com> + +- bsc#1132881, using ruby base64 to replace uuencode/uudecode + Remove the requirement of sharutils + +------------------------------------------------------------------- +Tue Apr 23 15:50:05 UTC 2019 - Stefan Weiberg <sweiberg@suse.com> + +- bsc#1132881, uuencode can't be executed if sharutils are not + installed: + + added sharutils to the package requirements + +------------------------------------------------------------------- Wed Apr 17 05:19:04 UTC 2019 - nick wang <nwang@suse.com> - Warn rrp_mode active is deprecated (bsc#1132640) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.1.2/package/yast2-cluster.spec new/yast2-cluster-4.1.2/package/yast2-cluster.spec --- old/yast2-cluster-4.1.2/package/yast2-cluster.spec 2019-04-18 09:53:25.000000000 +0200 +++ new/yast2-cluster-4.1.2/package/yast2-cluster.spec 2019-04-29 15:40:02.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-cluster # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.1.2/src/modules/Cluster.rb new/yast2-cluster-4.1.2/src/modules/Cluster.rb --- old/yast2-cluster-4.1.2/src/modules/Cluster.rb 2019-04-18 09:53:25.000000000 +0200 +++ new/yast2-cluster-4.1.2/src/modules/Cluster.rb 2019-04-29 15:40:02.000000000 +0200 @@ -31,6 +31,7 @@ # require "yast" require "y2firewall/firewalld" +require "base64" module Yast class ClusterClass < Module @@ -628,26 +629,20 @@ Builtins.sleep(sl) if @corokey != "" - out = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - Ops.add( - Ops.add("echo '", @corokey), - "' | uudecode -o /etc/corosync/authkey" - ) - ) - ) + if system("which 'uudecode'>/dev/null 2>&1") + cmd = "echo '" + @corokey + "' | uudecode -o /etc/corosync/authkey" + %x[ #{cmd} ] + else + File.write("/etc/corosync/authkey", Base64.decode64(@corokey)) + end end if @csync2key != "" - out = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - Ops.add( - Ops.add(Ops.add("echo '", @csync2key), "' | uudecode -o "), - @csync2_key_file - ) - ) - ) + if system("which 'uudecode'>/dev/null 2>&1") + cmd = "echo '" + @csync2key + "' | uudecode -o " + @csync2_key_file + %x[ #{cmd} ] + else + File.write(@csync2_key_file, Base64.decode64(@csync2key)) + end end # is that necessary? since enable pacemaker will trigger corosync/csync2? # FIXME if not necessary @@ -721,23 +716,24 @@ Ops.set(result, "rrpmode", @rrpmode) Ops.set(result, "csync2_host", @csync2_host) Ops.set(result, "csync2_include", @csync2_include) - if SCR.Read(path(".target.size"), "/etc/corosync/authkey") != -1 - out = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - "uuencode -m /etc/corosync/authkey /dev/stdout" - ) - ) - Ops.set(result, "corokey", Ops.get_string(out, "stdout", "")) + if File.exist?("/etc/corosync/authkey") + if system("which 'uuencode'>/dev/null 2>&1") + data = %x[ #{'uuencode -m /etc/corosync/authkey /dev/stdout'} ] + Ops.set(result, "corokey", data) + else + data = File.read("/etc/corosync/authkey") + Ops.set(result, "corokey", Base64.encode64(data)) + end end - if SCR.Read(path(".target.size"), "/etc/csync2/key_hagroup") != -1 - out = Convert.to_map( - SCR.Execute( - path(".target.bash_output"), - Ops.add(Ops.add("uuencode -m ", @csync2_key_file), " /dev/stdout ") - ) - ) - Ops.set(result, "csync2key", Ops.get_string(out, "stdout", "")) + + if File.exist?(@csync2_key_file) + if system("which 'uuencode'>/dev/null 2>&1") + data = %x[ #{'uuencode -m ' + @csync2_key_file + ' /dev/stdout'} ] + Ops.set(result, "csync2key", data) + else + data = File.read(@csync2_key_file) + Ops.set(result, "csync2key", Base64.encode64(data)) + end end deep_copy(result) end