Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory
checked in at Fri Jan 7 12:29:44 CET 2011.
--------
--- yast2-samba-client/yast2-samba-client.changes 2010-09-22 15:49:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-samba-client/yast2-samba-client.changes 2011-01-05 16:04:29.000000000 +0100
@@ -1,0 +2,13 @@
+Wed Jan 5 15:59:27 CET 2011 - jsuchome@suse.cz
+
+- import all config file sections, not only [global]
+- do not let dollar sign be part of autoYaST XML (bnc#662250)
+- 2.20.2
+
+-------------------------------------------------------------------
+Mon Jan 3 14:32:15 CET 2011 - jsuchome@suse.cz
+
+- updated schema file to include all known options (bnc#660979)
+- 2.20.1
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-samba-client-2.20.0.tar.bz2
New:
----
yast2-samba-client-2.20.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.YCfM1i/_old 2011-01-07 12:28:36.000000000 +0100
+++ /var/tmp/diff_new_pack.YCfM1i/_new 2011-01-07 12:28:36.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package yast2-samba-client (Version 2.20.0)
+# spec file for package yast2-samba-client (Version 2.20.2)
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,11 +19,11 @@
Name: yast2-samba-client
-Version: 2.20.0
+Version: 2.20.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.20.0.tar.bz2
+Source0: yast2-samba-client-2.20.2.tar.bz2
Prefix: /usr
@@ -47,7 +47,7 @@
workgroup/domain and authentication against an SMB domain.
%prep
-%setup -n yast2-samba-client-2.20.0
+%setup -n yast2-samba-client-2.20.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-samba-client-2.20.0.tar.bz2 -> yast2-samba-client-2.20.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/src/dialogs.ycp new/yast2-samba-client-2.20.2/src/dialogs.ycp
--- old/yast2-samba-client-2.20.0/src/dialogs.ycp 2010-09-21 15:59:41.000000000 +0200
+++ new/yast2-samba-client-2.20.2/src/dialogs.ycp 2010-09-22 15:48:59.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 62124 2010-06-21 12:43:49Z jsuchome $
+ * $Id: dialogs.ycp 62499 2010-09-22 13:48:57Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/src/helps.ycp new/yast2-samba-client-2.20.2/src/helps.ycp
--- old/yast2-samba-client-2.20.0/src/helps.ycp 2010-09-21 16:05:53.000000000 +0200
+++ new/yast2-samba-client-2.20.2/src/helps.ycp 2010-09-22 15:48:59.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Stanislav Visnovsky
*
- * $Id: helps.ycp 41789 2007-11-05 12:38:32Z jsuchome $
+ * $Id: helps.ycp 62499 2010-09-22 13:48:57Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/src/samba-client.rnc new/yast2-samba-client-2.20.2/src/samba-client.rnc
--- old/yast2-samba-client-2.20.0/src/samba-client.rnc 2008-12-18 14:46:51.000000000 +0100
+++ new/yast2-samba-client-2.20.2/src/samba-client.rnc 2011-01-05 15:59:02.000000000 +0100
@@ -8,6 +8,16 @@
element kdc { text }?
}? &
element global {
+ element cups_options { text }? &
+ element include { text }? &
+ element logon_drive { text }? &
+ element logon_home { text }? &
+ element logon_path { text }? &
+ element map_to_guest { text }? &
+ element passdb_backend { text }? &
+ element printcap_cache_time { text }? &
+ element printcap_name { text }? &
+ element printing { text }? &
element cached_login { text }? &
element idmap_gid { text }? &
element idmap_uid { text }? &
@@ -18,6 +28,49 @@
element winbind_offline_logon { text }? &
element workgroup { text }?
}? &
+ element groups {
+ element comment { text }? &
+ element inherit_acls { text }? &
+ element path { text }? &
+ element read_only { text }?
+ }? &
+ element homes {
+ element browseable { text }? &
+ element comment { text }? &
+ element inherit_acls { text }? &
+ element read_only { text }? &
+ element valid_users { text }?
+ }? &
+ element print_dollarsign_ {
+ element comment { text }? &
+ element create_mask { text }? &
+ element directory_mask { text }? &
+ element force_group { text }? &
+ element path { text }? &
+ element write_list { text }?
+ }? &
+ element printers {
+ element browseable { text }? &
+ element comment { text }? &
+ element create_mask { text }? &
+ element path { text }? &
+ element printable { text }?
+ }? &
+ element profiles {
+ element comment { text }? &
+ element create_mask { text }? &
+ element directory_mask { text }? &
+ element path { text }? &
+ element read_only { text }? &
+ element store_dos_attributes { text }?
+ }? &
+ element users {
+ element comment { text }? &
+ element inherit_acls { text }? &
+ element path { text }? &
+ element read_only { text }? &
+ element veto_files { text }?
+ }? &
element join {
element password { text }? &
element user { text }?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/src/SambaConfig.pm new/yast2-samba-client-2.20.2/src/SambaConfig.pm
--- old/yast2-samba-client-2.20.0/src/SambaConfig.pm 2010-02-23 11:41:41.000000000 +0100
+++ new/yast2-samba-client-2.20.2/src/SambaConfig.pm 2011-01-05 15:53:53.000000000 +0100
@@ -466,7 +466,9 @@
next unless $Config{$share}; # skip removed shares
next if $share =~ /^_/; # skip internal shares
my %section;
- $section{name} = $share;
+ my $name = $share;
+ $name =~ s/\$/_dollarsign_/; # $ cannot be in autoYaST XML (bnc#662250)
+ $section{name} = $name;
$section{comment} = $Config{$share}{_comment} if $Config{$share}{_comment};
$section{disabled} = Boolean(1) if $Config{$share}{_disabled};
while(my ($key, $val) = each %{$Config{$share}}) {
@@ -497,6 +499,7 @@
if ($config && ref $config eq "ARRAY") { # normal import
foreach my $section (@$config) {
my $name = $section->{name};
+ $name =~ s/_dollarsign_/\$/; # see Import
next unless $name;
$self->ShareSetComment($name, $section->{comment}) if $section->{comment};
$self->ShareDisable($name) if $section->{disabled};
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/src/Samba.ycp new/yast2-samba-client-2.20.2/src/Samba.ycp
--- old/yast2-samba-client-2.20.0/src/Samba.ycp 2010-02-11 09:54:01.000000000 +0100
+++ new/yast2-samba-client-2.20.2/src/Samba.ycp 2011-01-05 15:57:38.000000000 +0100
@@ -886,49 +886,67 @@
*/
global boolean Import (map settings) {
- if (haskey(settings, "global")) {
- map globals = settings["global"]:$[];
- SambaConfig::GlobalSetStr("workgroup",globals["workgroup"]:"WORKGROUP");
-
- if (tolower (globals["winbind_offline_logon"]:"") == "yes" &&
- tolower (globals["cached_login"]:"") == "yes")
- SetWinbindCaching (true);
+ globals_configured = false;
+ map globals = settings["global"]:$[];
+ list<map> sections = [];
+
+ foreach (string key, any value, (map) settings, {
+
+ // handle special keys separately
+ if (key == "shares_group")
+ {
+ shares_group = settings["shares_group"]:shares_group;
+ }
+ else if (key == "active_directory")
+ {
+ SambaAD::SetADS (settings["active_directory","kdc"]:"");
+ }
+ else if (key == "join")
+ {
+ password_data = settings["join"]:$[];
+ }
+ else if (key == "mkhomedir")
+ {
+ SetMkHomeDir (settings["mkhomedir"]:mkhomedir);
+ }
+ else if (key == "disable_dhcp_hostname")
+ {
+ disable_dhcp_hostname = settings["disable_dhcp_hostname"]:disable_dhcp_hostname;
+ }
+ else if (key != "winbind" && is (value, map))
+ {
+ // form a section to import SambaConfig
+ sections = add (sections, $[
+ "name" : key,
+ "parameters" : value
+ ]);
+ }
+ });
- if (haskey (globals, "usershare_max_shares") ||
- haskey (settings, "shares_group"))
- SetShares (tointeger (globals["usershare_max_shares"]:"0"),
- settings["shares_group"]:shares_group);
-
- if (tolower (globals["usershare_allow_guests"]:"") == "yes")
- SetGuessAccess (true);
-
- globals_configured = true;
- modified = true;
- } else {
- globals_configured = false;
- }
- if (haskey (settings, "shares_group"))
- shares_group = settings["shares_group"]:shares_group;
-
- if (haskey(settings, "active_directory"))
- {
- SambaAD::SetADS (settings["active_directory","kdc"]:"");
- }
// call this _after_ evaluation if AD is used
boolean winbind = settings["winbind"]:settings["global","winbind"]:false;
if (winbind != nil)
{
SetWinbind (winbind);
}
- if (haskey(settings, "join"))
+
+ if (sections != [])
{
- password_data = settings["join"]:$[];
+ SambaConfig::Import (sections);
}
- if (haskey (settings, "mkhomedir"))
+
+ // explicitely adapt some variables based on 'globals' section
+ if (globals != $[])
{
- SetMkHomeDir (settings["mkhomedir"]:mkhomedir);
+ if (haskey (globals, "usershare_max_shares") ||
+ haskey (settings, "shares_group"))
+ {
+ SetShares (tointeger (globals["usershare_max_shares"]:"0"),
+ settings["shares_group"]:shares_group);
+ }
+ globals_configured = true;
}
- disable_dhcp_hostname = settings["disable_dhcp_hostname"]:disable_dhcp_hostname;
+ modified = true;
return true;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.20.0/VERSION new/yast2-samba-client-2.20.2/VERSION
--- old/yast2-samba-client-2.20.0/VERSION 2010-09-22 15:48:25.000000000 +0200
+++ new/yast2-samba-client-2.20.2/VERSION 2011-01-05 16:01:45.000000000 +0100
@@ -1 +1 @@
-2.20.0
+2.20.2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org