Hello community, here is the log from the commit of package yast2-cluster for openSUSE:Factory checked in at 2020-12-04 21:29:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-cluster (Old) and /work/SRC/openSUSE:Factory/.yast2-cluster.new.5913 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-cluster" Fri Dec 4 21:29:17 2020 rev:43 rq:853068 version:4.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-cluster/yast2-cluster.changes 2020-11-04 18:32:11.180175106 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-cluster.new.5913/yast2-cluster.changes 2020-12-04 21:29:17.862194546 +0100 @@ -1,0 +2,8 @@ +Mon Dec 02 01:17:23 UTC 2020 - nick wang <[email protected]> + +- bsc#1179420, fix secauth and support crypto_cipher/crypto_hash +- bsc#1179007, not to write bind address when unicast +- Fix fail to configure ttl for the second ring +- Version 4.3.5 + +------------------------------------------------------------------- Old: ---- yast2-cluster-4.3.4.tar.bz2 New: ---- yast2-cluster-4.3.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-cluster.spec ++++++ --- /var/tmp/diff_new_pack.2OqPFn/_old 2020-12-04 21:29:18.374195281 +0100 +++ /var/tmp/diff_new_pack.2OqPFn/_new 2020-12-04 21:29:18.378195286 +0100 @@ -19,7 +19,7 @@ %define _fwdefdir %{_prefix}/lib/firewalld/services Name: yast2-cluster -Version: 4.3.4 +Version: 4.3.5 Release: 0 Summary: Configuration of cluster License: GPL-2.0-only ++++++ yast2-cluster-4.3.4.tar.bz2 -> yast2-cluster-4.3.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.3.4/package/yast2-cluster.changes new/yast2-cluster-4.3.5/package/yast2-cluster.changes --- old/yast2-cluster-4.3.4/package/yast2-cluster.changes 2020-11-04 06:55:46.000000000 +0100 +++ new/yast2-cluster-4.3.5/package/yast2-cluster.changes 2020-12-04 10:18:49.000000000 +0100 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Mon Dec 02 01:17:23 UTC 2020 - nick wang <[email protected]> + +- bsc#1179420, fix secauth and support crypto_cipher/crypto_hash +- bsc#1179007, not to write bind address when unicast +- Fix fail to configure ttl for the second ring +- Version 4.3.5 + +------------------------------------------------------------------- Tue Nov 3 05:08:44 UTC 2020 - nick wang <[email protected]> - bsc#1178373, include "/etc/sysconfig/nfs" into csync2.cfg diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.3.4/package/yast2-cluster.spec new/yast2-cluster-4.3.5/package/yast2-cluster.spec --- old/yast2-cluster-4.3.4/package/yast2-cluster.spec 2020-11-04 06:55:46.000000000 +0100 +++ new/yast2-cluster-4.3.5/package/yast2-cluster.spec 2020-12-04 10:18:49.000000000 +0100 @@ -18,7 +18,7 @@ %define _fwdefdir %{_prefix}/lib/firewalld/services Name: yast2-cluster -Version: 4.3.4 +Version: 4.3.5 Release: 0 Summary: Configuration of cluster License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.3.4/src/include/cluster/dialogs.rb new/yast2-cluster-4.3.5/src/include/cluster/dialogs.rb --- old/yast2-cluster-4.3.4/src/include/cluster/dialogs.rb 2020-11-04 06:55:46.000000000 +0100 +++ new/yast2-cluster-4.3.5/src/include/cluster/dialogs.rb 2020-12-04 10:18:49.000000000 +0100 @@ -414,15 +414,17 @@ udp = UI.QueryWidget(Id(:transport), :Value) == "udp" enable2 = UI.QueryWidget(Id(:enable2), :Value) - enable1 = udp - enable2 = udp && enable2 + UI.ChangeWidget(Id(:enable2_vbox), :Enabled, enable2) + UI.ChangeWidget(Id(:mcastport2), :Enabled, enable2) - UI.ChangeWidget(Id(:mcastaddr1), :Enabled, enable1) + enable1_addr = udp + enable2_addr = udp && enable2 - UI.ChangeWidget(Id(:mcastaddr2), :Enabled, enable2) + UI.ChangeWidget(Id(:mcastaddr1), :Enabled, enable1_addr) + UI.ChangeWidget(Id(:mcastaddr2), :Enabled, enable2_addr) - UI.ChangeWidget(Id(:bindnetaddr1), :Enabled, enable1) - UI.ChangeWidget(Id(:bindnetaddr2), :Enabled, enable2) + UI.ChangeWidget(Id(:bindnetaddr1), :Enabled, enable1_addr) + UI.ChangeWidget(Id(:bindnetaddr2), :Enabled, enable2_addr) ip = UI.QueryWidget(Id(:ip_version), :Value).to_s if ip == "ipv6" @@ -509,12 +511,15 @@ ) ) + #Refer to https://bugzilla.suse.com/show_bug.cgi?id=1179007 + #for the reason of option ":noAutoEnable" riface = CheckBoxFrame( Id(:enable2), - Opt(:notify), + Opt(:noAutoEnable, :notify), _("Redundant Channel"), false, VBox( + Id(:enable2_vbox), ComboBox( Id(:bindnetaddr2), Opt(:editable, :hstretch, :notify), @@ -720,18 +725,10 @@ ret end - def SaveSecurityToConf - if UI.QueryWidget(Id(:secauth), :Value) == true - SCR.Write(path(".openais.totem.secauth"), "on") - else - SCR.Write(path(".openais.totem.secauth"), "off") - end - - nil - end - def SaveSecurity Cluster.secauth = Convert.to_boolean(UI.QueryWidget(Id(:secauth), :Value)) + Cluster.crypto_hash = UI.QueryWidget(Id(:crypto_hash), :Value).to_s + Cluster.crypto_cipher = UI.QueryWidget(Id(:crypto_cipher), :Value).to_s nil end @@ -1078,6 +1075,19 @@ _("Enable Security Auth"), true, VBox( + HBox( + HSpacing(20), + Left(ComboBox( + Id(:crypto_hash), Opt(:hstretch, :notify), _("Crypto Hash:"), + ["sha1", "sha256", "sha384", "sha512", "md5"] + )), + HSpacing(5), + Left(ComboBox( + Id(:crypto_cipher), Opt(:hstretch, :notify), _("Crypto Cipher:"), + ["aes256", "aes192", "aes128", "3des"] + )), + HSpacing(20), + ), Label( _( "For a newly created cluster, push the button below to generate /etc/corosync/authkey." @@ -1097,6 +1107,8 @@ my_SetContents("security", contents) UI.ChangeWidget(Id(:secauth), :Value, Cluster.secauth) + UI.ChangeWidget(Id(:crypto_hash), :Value, Cluster.crypto_hash) + UI.ChangeWidget(Id(:crypto_cipher), :Value, Cluster.crypto_cipher) while true ret = UI.UserInput @@ -1117,7 +1129,7 @@ next end - if ret == :secauth + if ret == :secauth || ret == :crypto_cipher || ret == :crypto_hash if UI.QueryWidget(Id(:secauth), :Value) == true next end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.3.4/src/modules/Cluster.rb new/yast2-cluster-4.3.5/src/modules/Cluster.rb --- old/yast2-cluster-4.3.4/src/modules/Cluster.rb 2020-11-04 06:55:46.000000000 +0100 +++ new/yast2-cluster-4.3.5/src/modules/Cluster.rb 2020-12-04 10:18:49.000000000 +0100 @@ -65,6 +65,8 @@ # Settings: Define all variables needed for configuration of cluster @secauth = false + @crypto_hash = "none" + @crypto_cipher = "none" @cluster_name = "" @ip_version = "" @expected_votes = "" @@ -219,6 +221,8 @@ if Convert.to_string(SCR.Read(path(".openais.totem.secauth"))) == "on" @secauth = true + @crypto_hash = SCR.Read(path(".openais.totem.crypto_hash")) + @crypto_cipher = SCR.Read(path(".openais.totem.crypto_cipher")) else @secauth = false end @@ -378,8 +382,12 @@ if @secauth == true SCR.Write(path(".openais.totem.secauth"), "on") + SCR.Write(path(".openais.totem.crypto_hash"), @crypto_hash) + SCR.Write(path(".openais.totem.crypto_cipher"), @crypto_cipher) else SCR.Write(path(".openais.totem.secauth"), "off") + SCR.Write(path(".openais.totem.crypto_hash"), "none") + SCR.Write(path(".openais.totem.crypto_cipher"), "none") end SCR.Write(path(".openais.totem.transport"), @transport) @@ -433,17 +441,18 @@ else if @transport == "udpu" SCR.Write(path(".openais.totem.interface.interface1.mcastaddr"), "") + SCR.Write(path(".openais.totem.interface.interface1.bindnetaddr"), "") else SCR.Write( path(".openais.totem.interface.interface1.mcastaddr"), @mcastaddr2 ) + SCR.Write( + path(".openais.totem.interface.interface1.bindnetaddr"), + @bindnetaddr2 + ) end SCR.Write( - path(".openais.totem.interface.interface1.bindnetaddr"), - @bindnetaddr2 - ) - SCR.Write( path(".openais.totem.interface.interface1.mcastport"), @mcastport2 ) @@ -733,6 +742,8 @@ def Import(settings) settings = deep_copy(settings) @secauth = Ops.get_boolean(settings, "secauth", false) + @crypto_hash = settings["crypto_hash"] || "none" + @crypto_cipher = settings["crypto_cipher"] || "none" @transport = Ops.get_string(settings, "transport", "udp") @bindnetaddr1 = Ops.get_string(settings, "bindnetaddr1", "") @memberaddr = Ops.get_list(settings, "memberaddr", []) @@ -782,6 +793,8 @@ def Export result = {} Ops.set(result, "secauth", @secauth) + Ops.set(result, "crypto_hash", @crypto_hash) + Ops.set(result, "crypto_cipher", @crypto_cipher) Ops.set(result, "transport", @transport) Ops.set(result, "bindnetaddr1", @bindnetaddr1) Ops.set(result, "memberaddr", @memberaddr) @@ -894,6 +907,8 @@ publish :function => :SetWriteOnly, :type => "void (boolean)" publish :function => :SetAbortFunction, :type => "void (boolean ())" publish :variable => :secauth, :type => "boolean" + publish :variable => :crypto_hash, :type => "string" + publish :variable => :crypto_cipher, :type => "string" publish :variable => :bindnetaddr1, :type => "string" publish :variable => :mcastaddr1, :type => "string" publish :variable => :cluster_name, :type => "string" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-cluster-4.3.4/src/servers_non_y2/ag_openais new/yast2-cluster-4.3.5/src/servers_non_y2/ag_openais --- old/yast2-cluster-4.3.4/src/servers_non_y2/ag_openais 2020-11-04 06:55:46.000000000 +0100 +++ new/yast2-cluster-4.3.5/src/servers_non_y2/ag_openais 2020-12-04 10:18:49.000000000 +0100 @@ -691,6 +691,10 @@ elif len(path) == 2: if path[1] == "secauth": return '"%s"' % totem_options.get("secauth", "") + elif path[1] == "crypto_hash": + return '"%s"' % totem_options.get("crypto_hash", "none") + elif path[1] == "crypto_cipher": + return '"%s"' % totem_options.get("crypto_cipher", "none") elif path[1] == "autoid": #FIXME, check nodelist has nodeid for i in nodelist_options.get('node'): @@ -720,7 +724,7 @@ return '"%s"' % i.get("mcastaddr", "") elif path[3] == "mcastport": return '"%d"' % i.get("mcastport", 5405) - if path[3] == "ttl": + elif path[3] == "ttl": return '"%d"' % i.get("ttl", 1) else: return "nil" @@ -735,6 +739,8 @@ return '"%s"' % i.get("mcastaddr", "") elif path[3] == "mcastport": return '"%d"' % i.get("mcastport", 5405) + elif path[3] == "ttl": + return '"%d"' % i.get("ttl", 1) else: return "nil" elif path[2] == "member": @@ -853,6 +859,12 @@ elif path[1] == "secauth": totem_options["secauth"] = args return "true" + elif path[1] == "crypto_hash": + totem_options["crypto_hash"] = args + return "true" + elif path[1] == "crypto_cipher": + totem_options["crypto_cipher"] = args + return "true" elif path[1] == "rrpmode": totem_options["rrp_mode"] = args return "true" _______________________________________________ openSUSE Commits mailing list -- [email protected] To unsubscribe, email [email protected] List Netiquette: https://en.opensuse.org/openSUSE:Mailing_list_netiquette List Archives: https://lists.opensuse.org/archives/list/[email protected]
