Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at 2025-08-12 17:03:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-samba-client (Old) and /work/SRC/openSUSE:Factory/.yast2-samba-client.new.1085 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-samba-client" Tue Aug 12 17:03:16 2025 rev:119 rq:1298743 version:5.0.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-samba-client/yast2-samba-client.changes 2025-03-05 13:40:00.247251045 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-samba-client.new.1085/yast2-samba-client.changes 2025-08-12 17:04:10.114245274 +0200 @@ -1,0 +2,8 @@ +Tue Jul 22 11:00:39 UTC 2025 - Noel Power <nopo...@suse.com> + +- Avoid bsc#1222564 which breaks nsswitch.conf by instead adjusting + nsswitch.conf using sed rather than yast Nsswitch module using + augeas; (bsc#1222564. +- 5.0.3 + +------------------------------------------------------------------- Old: ---- yast2-samba-client-5.0.2.tar.bz2 New: ---- yast2-samba-client-5.0.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.BhN8f7/_old 2025-08-12 17:04:10.918278779 +0200 +++ /var/tmp/diff_new_pack.BhN8f7/_new 2025-08-12 17:04:10.918278779 +0200 @@ -1,7 +1,7 @@ # # spec file for package yast2-samba-client # -# Copyright (c) 2025 SUSE LLC +# Copyright (c) 2025 SUSE LLC and contributors # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 5.0.2 +Version: 5.0.3 Release: 0 Summary: YaST2 - Samba Client Configuration License: GPL-2.0-only ++++++ yast2-samba-client-5.0.2.tar.bz2 -> yast2-samba-client-5.0.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-5.0.2/package/yast2-samba-client.changes new/yast2-samba-client-5.0.3/package/yast2-samba-client.changes --- old/yast2-samba-client-5.0.2/package/yast2-samba-client.changes 2025-03-04 18:22:16.000000000 +0100 +++ new/yast2-samba-client-5.0.3/package/yast2-samba-client.changes 2025-08-11 09:33:59.000000000 +0200 @@ -1,4 +1,12 @@ ------------------------------------------------------------------- +Tue Jul 22 11:00:39 UTC 2025 - Noel Power <nopo...@suse.com> + +- Avoid bsc#1222564 which breaks nsswitch.conf by instead adjusting + nsswitch.conf using sed rather than yast Nsswitch module using + augeas; (bsc#1222564. +- 5.0.3 + +------------------------------------------------------------------- Fri Feb 28 09:51:46 UTC 2025 - Noel Power <nopo...@suse.com> - Fix on AD join error "Failed to join domain: failed to create diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-5.0.2/package/yast2-samba-client.spec new/yast2-samba-client-5.0.3/package/yast2-samba-client.spec --- old/yast2-samba-client-5.0.2/package/yast2-samba-client.spec 2025-03-04 18:22:16.000000000 +0100 +++ new/yast2-samba-client-5.0.3/package/yast2-samba-client.spec 2025-08-11 09:33:59.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-samba-client -Version: 5.0.2 +Version: 5.0.3 Release: 0 Summary: YaST2 - Samba Client Configuration License: GPL-2.0-only diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-5.0.2/src/modules/SambaWinbind.pm new/yast2-samba-client-5.0.3/src/modules/SambaWinbind.pm --- old/yast2-samba-client-5.0.2/src/modules/SambaWinbind.pm 2025-03-04 18:22:16.000000000 +0100 +++ new/yast2-samba-client-5.0.3/src/modules/SambaWinbind.pm 2025-08-11 09:33:59.000000000 +0200 @@ -10,7 +10,7 @@ use strict; use Data::Dumper; - +use File::Copy; use YaST::YCP qw(:DATA :LOGGING); use YaPI; @@ -81,19 +81,31 @@ BEGIN{$TYPEINFO{AdjustNsswitch}=["function","boolean","boolean","boolean"]} sub AdjustNsswitch { my ($self, $on, $write_only) = @_; + my $etcnsswitch = "/etc/nsswitch.conf"; + my $usretcnsswitch = "/usr/etc/nsswitch.conf"; + my $cmd; + my $ret; + if (!-f $etcnsswitch) { + copy($usretcnsswitch, $etcnsswitch); + } foreach my $db ("passwd", "group") { - my $nsswitch = Nsswitch->ReadDb($db); if ($on) { - push @$nsswitch, "winbind" unless grep {$_ eq "winbind"} @$nsswitch; + $cmd = "sed -i '/.*winbind.*\$/! s/^$db:.*\$/& winbind/' $etcnsswitch"; } else { - @$nsswitch = grep {$_ ne "winbind"} @$nsswitch; + $cmd = "sed -i '/^$db:.*winbind.*/ s/ *winbind//g' $etcnsswitch"; } - y2debug("Nsswitch->WriteDB($db, ".Dumper($nsswitch).")"); - Nsswitch->WriteDb($db, $nsswitch); + my $result = SCR->Execute(".target.bash_output", $cmd); + if ($result->{"exit"} ne 0) { + y2debug ("sed %s failed, output: %s", $cmd, Dumper ($result)); + $ret = FALSE; + last; + } else { + $ret = TRUE; + } }; - my $ret = Nsswitch->Write(); - y2error("Nsswitch->Write() failed") if (!$ret); + + y2error("update to %s failed", $etcnsswitch) if (!$ret); # restart zmd (#174589) if (!$write_only && PackageSystem->Installed ("zmd") &&