Hello community, here is the log from the commit of package yast2-samba-client for openSUSE:Factory checked in at Fri Nov 27 19:30:30 CET 2009. -------- --- yast2-samba-client/yast2-samba-client.changes 2009-09-03 14:40:24.000000000 +0200 +++ yast2-samba-client/yast2-samba-client.changes 2009-11-27 16:29:10.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Nov 24 10:51:19 CET 2009 - jsuchome@suse.cz + +- preserve case of keys in smb.conf (bnc#555579) +- 2.19.1 + +------------------------------------------------------------------- +Thu Nov 19 09:43:02 CET 2009 - jsuchome@suse.cz + +- install pam_mount if necessary (bnc#552211) +- 2.19.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-samba-client-2.18.3.tar.bz2 New: ---- yast2-samba-client-2.19.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-samba-client.spec ++++++ --- /var/tmp/diff_new_pack.RRYiuy/_old 2009-11-27 19:19:42.000000000 +0100 +++ /var/tmp/diff_new_pack.RRYiuy/_new 2009-11-27 19:19:42.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-samba-client (Version 2.18.3) +# spec file for package yast2-samba-client (Version 2.19.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,13 +19,13 @@ Name: yast2-samba-client -Version: 2.18.3 +Version: 2.19.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-samba-client-2.18.3.tar.bz2 +Source0: yast2-samba-client-2.19.1.tar.bz2 Prefix: /usr Group: System/YaST -License: GPL v2 or later +License: GPLv2+ BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-pam yast2-perl-bindings yast2-testsuite Requires: yast2-kerberos-client perl-XML-LibXML # new Pam.ycp API @@ -40,7 +40,7 @@ workgroup/domain and authentication against an SMB domain. %prep -%setup -n yast2-samba-client-2.18.3 +%setup -n yast2-samba-client-2.19.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-samba-client-2.18.3.tar.bz2 -> yast2-samba-client-2.19.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.3/VERSION new/yast2-samba-client-2.19.1/VERSION --- old/yast2-samba-client-2.18.3/VERSION 2009-09-03 14:39:30.000000000 +0200 +++ new/yast2-samba-client-2.19.1/VERSION 2009-11-24 10:51:45.000000000 +0100 @@ -1 +1 @@ -2.18.3 +2.19.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.3/agents/cfg_smbconf.scr new/yast2-samba-client-2.19.1/agents/cfg_smbconf.scr --- old/yast2-samba-client-2.18.3/agents/cfg_smbconf.scr 2008-12-18 14:46:51.000000000 +0100 +++ new/yast2-samba-client-2.19.1/agents/cfg_smbconf.scr 2009-11-24 10:32:24.000000000 +0100 @@ -4,7 +4,7 @@ `ag_ini( `IniAgent("/etc/samba/smb.conf", $[ - "options" : [ "no_nested_sections", "ignore_case", "line_can_continue", "comments_last", "repeat_names" ], + "options" : [ "no_nested_sections", "ignore_case_regexps", "line_can_continue", "comments_last", "repeat_names" ], "comments": [ "^[ \t]*$", // empty line "^[ \t]+[;#].*$", // comment char is not first char diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.3/src/Samba.ycp new/yast2-samba-client-2.19.1/src/Samba.ycp --- old/yast2-samba-client-2.18.3/src/Samba.ycp 2009-06-26 15:30:51.000000000 +0200 +++ new/yast2-samba-client-2.19.1/src/Samba.ycp 2009-11-19 09:44:08.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Data for configuration of samba-client, input and output functions. * Authors: Stanislav Visnovsky <visnov@suse.cz> * - * $Id: Samba.ycp 57773 2009-06-26 13:23:26Z jsuchome $ + * $Id: Samba.ycp 59604 2009-11-19 08:44:04Z jsuchome $ * * Representation of the configuration of samba-client. * Input and output routines. @@ -135,7 +135,7 @@ // network configuration (to be read from NetworkConfig module) global map network_setup = NetworkConfig::Export (); -boolean PAMMountModified () { +global boolean PAMMountModified () { return (pam_mount_volumes_orig == nil && pam_mount_volumes != []) @@ -1090,7 +1090,7 @@ * @return map of packages to be installed and to be removed */ global define map AutoPackages() ``{ - list<string> to_install = ["samba-client", "samba-winbind"]; + list<string> to_install = ["samba-client", "samba-winbind", "pam_mount"]; if (SambaAD::ADS () != "") to_install = (list<string>) union (to_install, ["krb5", "krb5-client"]); return $[ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.3/src/SambaConfig.pm new/yast2-samba-client-2.19.1/src/SambaConfig.pm --- old/yast2-samba-client-2.18.3/src/SambaConfig.pm 2008-12-18 14:46:51.000000000 +0100 +++ new/yast2-samba-client-2.19.1/src/SambaConfig.pm 2009-11-27 16:28:41.000000000 +0100 @@ -4,7 +4,7 @@ # Summary: Manage samba configuration data (smb.conf). # Authors: Martin Lazar <mlazar@suse.cz> # -# $Id: SambaConfig.pm 52796 2008-10-31 13:38:04Z jsuchome $ +# $Id: SambaConfig.pm 59830 2009-11-27 15:28:42Z jsuchome $ # # Functions for acess to samba configuration file. It provide # unified acces to configuration keys including aliases and other @@ -35,6 +35,8 @@ my %WinbindConfig; # configuration hash for /etc/security/pam_winbind.conf +my %OriginalKeys; # saving original names of smb.conf keys + ########################################################################### # global (static) variables (constants) @@ -171,6 +173,7 @@ # forget previous configuration %Config = (); + %OriginalKeys = (); # read the complete global section my $AllAtOnce = SCR->Read(".etc.smb.all"); @@ -193,16 +196,26 @@ next if $line->{kind} ne "value"; next if $line->{type} and not $section->{type}; # commented line - if (defined $Config{$share}{$line->{name}}) { - $self->ShareAddStr($share, $line->{name}, $line->{value}); + my $key = $line->{name}; + if ($key ne lc ($key)) { + # we are lowercasing keys later for simpler comparing, now save those + # which were not in lower case before + $OriginalKeys{$share} = {} if !defined $OriginalKeys{$share}; + $OriginalKeys{$share}{lc ($key)} = $key; + y2debug ("key $key not in lowercase"); + } + + if (defined $Config{$share}{$key}) { + $self->ShareAddStr($share, $key, $line->{value}); } else { - $self->ShareSetStr($share, $line->{name}, $line->{value}); + $self->ShareSetStr($share, $key, $line->{value}); } } } $self->UnsetModified(); y2debug ("Read config: ".Dumper(\%Config)); + y2debug ("original keys: ".Dumper(\%OriginalKeys)); # configuraton already read return 1 if not $forceReRead and %WinbindConfig; @@ -354,9 +367,12 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - SCR->Write(".etc.smb.value.global.$key", $val); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{global}{$key} if defined $OriginalKeys{global}{$key}; + SCR->Write(".etc.smb.value.global.$saved_key", $val); # ensure option is not commented - SCR->Write(".etc.smb.value_type.global.$key", [Integer(0)]); + SCR->Write(".etc.smb.value_type.global.$saved_key", [Integer(0)]); } } @@ -393,8 +409,11 @@ if (ref ($val) ne "ARRAY") { $val = [ String($val) ]; } - my $ret1 = SCR->Write(".etc.smb.value.$share.$key", $val); - my $ret = SCR->Write(".etc.smb.value_type.$share.$key", [ Integer($commentout)]); + # check if key was not changed on read + my $saved_key = $key; + $saved_key = $OriginalKeys{$share}{$key} if defined $OriginalKeys{$share}{$key}; + my $ret1 = SCR->Write(".etc.smb.value.$share.$saved_key", $val); + my $ret = SCR->Write(".etc.smb.value_type.$share.$saved_key", [ Integer($commentout)]); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.3/src/dialogs.ycp new/yast2-samba-client-2.19.1/src/dialogs.ycp --- old/yast2-samba-client-2.18.3/src/dialogs.ycp 2009-06-26 15:30:51.000000000 +0200 +++ new/yast2-samba-client-2.19.1/src/dialogs.ycp 2009-11-19 09:44:08.000000000 +0100 @@ -3,7 +3,7 @@ * Summary: Dialogs definitions * Authors: Stanislav Visnovsky <visnov@suse.cz> * - * $Id: dialogs.ycp 57773 2009-06-26 13:23:26Z jsuchome $ + * $Id: dialogs.ycp 59604 2009-11-19 08:44:04Z jsuchome $ */ { @@ -629,6 +629,10 @@ { packages = (list<string>)merge(packages,["krb5","krb5-client"]); } + if (Samba::PAMMountModified () && size (Samba::GetPAMMountVolumes ()) > 0) + { + packages = add (packages, "pam_mount"); + } if (!Package::InstallAll (packages)) { Popup::Error (Message::FailedToInstallPackages ()); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org