Hello community,
here is the log from the commit of package yast2-samba-client for openSUSE:Factory
checked in at Fri Aug 21 17:35:05 CEST 2009.
--------
--- yast2-samba-client/yast2-samba-client.changes 2009-06-26 15:27:51.000000000 +0200
+++ yast2-samba-client/yast2-samba-client.changes 2009-08-21 12:03:05.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Aug 21 11:51:11 CEST 2009 - jsuchome@suse.cz
+
+- include /etc/samba/dhcp.conf in temporary smb.conf if such
+ configuration is allowed in sysconfig (bnc#520648)
+- 2.18.2
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-samba-client-2.18.1.tar.bz2
New:
----
yast2-samba-client-2.18.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-client.spec ++++++
--- /var/tmp/diff_new_pack.gWwQpr/_old 2009-08-21 17:33:50.000000000 +0200
+++ /var/tmp/diff_new_pack.gWwQpr/_new 2009-08-21 17:33:50.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-client (Version 2.18.1)
+# spec file for package yast2-samba-client (Version 2.18.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,10 +19,10 @@
Name: yast2-samba-client
-Version: 2.18.1
+Version: 2.18.2
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-client-2.18.1.tar.bz2
+Source0: yast2-samba-client-2.18.2.tar.bz2
Prefix: /usr
Group: System/YaST
License: GPL v2 or later
@@ -40,7 +40,7 @@
workgroup/domain and authentication against an SMB domain.
%prep
-%setup -n yast2-samba-client-2.18.1
+%setup -n yast2-samba-client-2.18.2
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-samba-client-2.18.1.tar.bz2 -> yast2-samba-client-2.18.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/VERSION new/yast2-samba-client-2.18.2/VERSION
--- old/yast2-samba-client-2.18.1/VERSION 2009-06-26 15:03:16.000000000 +0200
+++ new/yast2-samba-client-2.18.2/VERSION 2009-08-21 12:01:33.000000000 +0200
@@ -1 +1 @@
-2.18.1
+2.18.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/configure new/yast2-samba-client-2.18.2/configure
--- old/yast2-samba-client-2.18.1/configure 2009-06-26 15:03:20.000000000 +0200
+++ new/yast2-samba-client-2.18.2/configure 2009-08-21 12:01:52.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.63 for yast2-samba-client 2.18.1.
+# Generated by GNU Autoconf 2.63 for yast2-samba-client 2.18.2.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -596,8 +596,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-samba-client'
PACKAGE_TARNAME='yast2-samba-client'
-PACKAGE_VERSION='2.18.1'
-PACKAGE_STRING='yast2-samba-client 2.18.1'
+PACKAGE_VERSION='2.18.2'
+PACKAGE_STRING='yast2-samba-client 2.18.2'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
ac_unique_file="RPMNAME"
@@ -1274,7 +1274,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures yast2-samba-client 2.18.1 to adapt to many kinds of systems.
+\`configure' configures yast2-samba-client 2.18.2 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1346,7 +1346,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-samba-client 2.18.1:";;
+ short | recursive ) echo "Configuration of yast2-samba-client 2.18.2:";;
esac
cat <<\_ACEOF
@@ -1426,7 +1426,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-samba-client configure 2.18.1
+yast2-samba-client configure 2.18.2
generated by GNU Autoconf 2.63
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1440,7 +1440,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by yast2-samba-client $as_me 2.18.1, which was
+It was created by yast2-samba-client $as_me 2.18.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
$ $0 $@
@@ -2287,7 +2287,7 @@
# Define the identity of the package.
PACKAGE='yast2-samba-client'
- VERSION='2.18.1'
+ VERSION='2.18.2'
cat >>confdefs.h <<_ACEOF
@@ -2511,7 +2511,7 @@
-VERSION="2.18.1"
+VERSION="2.18.2"
RPMNAME="yast2-samba-client"
MAINTAINER="Jiri Suchomel "
@@ -3452,7 +3452,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-samba-client $as_me 2.18.1, which was
+This file was extended by yast2-samba-client $as_me 2.18.2, which was
generated by GNU Autoconf 2.63. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -3502,7 +3502,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_version="\\
-yast2-samba-client config.status 2.18.1
+yast2-samba-client config.status 2.18.2
configured by $0, generated by GNU Autoconf 2.63,
with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/configure.in new/yast2-samba-client-2.18.2/configure.in
--- old/yast2-samba-client-2.18.1/configure.in 2009-06-26 15:03:17.000000000 +0200
+++ new/yast2-samba-client-2.18.2/configure.in 2009-08-21 12:01:48.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-client, 2.18.1, http://bugs.opensuse.org/, yast2-samba-client)
+AC_INIT(yast2-samba-client, 2.18.2, http://bugs.opensuse.org/, yast2-samba-client)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])
@@ -18,7 +18,7 @@
AM_INIT_AUTOMAKE(tar-ustar -Wno-portability)
dnl Important YaST2 variables
-VERSION="2.18.1"
+VERSION="2.18.2"
RPMNAME="yast2-samba-client"
MAINTAINER="Jiri Suchomel "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/src/Samba.ycp new/yast2-samba-client-2.18.2/src/Samba.ycp
--- old/yast2-samba-client-2.18.1/src/Samba.ycp 2009-06-26 15:02:04.000000000 +0200
+++ new/yast2-samba-client-2.18.2/src/Samba.ycp 2009-06-26 15:30:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Data for configuration of samba-client, input and output functions.
* Authors: Stanislav Visnovsky
*
- * $Id: Samba.ycp 57460 2009-06-05 12:09:24Z jsuchome $
+ * $Id: Samba.ycp 57773 2009-06-26 13:23:26Z jsuchome $
*
* Representation of the configuration of samba-client.
* Input and output routines.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/src/SambaNetJoin.pm new/yast2-samba-client-2.18.2/src/SambaNetJoin.pm
--- old/yast2-samba-client-2.18.1/src/SambaNetJoin.pm 2008-10-29 14:41:20.000000000 +0100
+++ new/yast2-samba-client-2.18.2/src/SambaNetJoin.pm 2009-08-20 14:09:35.000000000 +0200
@@ -39,13 +39,15 @@
my $protocol = SambaAD->ADS () ne "" ? "ads" : "rpc";
my $netbios_name = SambaConfig->GlobalGetStr("netbios name", undef);
my $conf_file = SCR->Read (".target.tmpdir")."/smb.conf";
+ my $include = "";
+ $include = "\n\tinclude = /etc/samba/dhcp.conf" if (SCR->Read (".sysconfig.network.dhcp.DHCLIENT_MODIFY_SMB_CONF") eq "yes");
if ($protocol eq "ads") {
my $realm = SambaAD->Realm ();
- SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
+ SCR->Write (".target.string", $conf_file, "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
}
else {
- SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ SCR->Write (".target.string", $conf_file, "[global]$include\n\tsecurity = domain\n\tworkgroup = $domain\n");
}
# FIXME -P is probably wrong, but suppresses password prompt
@@ -82,15 +84,19 @@
my $conf_file = $tmpdir."/smb.conf";
my $cmd = "";
+ my $include = "";
+ # bnc#520648 (DHCP may know WINS server address)
+ $include = "\n\tinclude = /etc/samba/dhcp.conf" if (SCR->Read (".sysconfig.network.dhcp.DHCLIENT_MODIFY_SMB_CONF") eq "yes");
+
if ($protocol eq "ads") {
my $krb_file = $tmpdir."/krb5.conf";
my $realm = SambaAD->Realm ();
- SCR->Write (".target.string", $conf_file, "[global]\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
+ SCR->Write (".target.string", $conf_file, "[global]$include\n\trealm = $realm\n\tsecurity = ADS\n\tworkgroup = $domain\n");
$cmd = "KRB5_CONFIG=$krb_file ";
SCR->Write (".target.string", $krb_file, "[realms]\n\t$realm = {\n\tkdc = $server\n\t}\n");
}
else {
- SCR->Write (".target.string", $conf_file, "[global]\n\tsecurity = domain\n\tworkgroup = $domain\n");
+ SCR->Write (".target.string", $conf_file, "[global]$include\n\tsecurity = domain\n\tworkgroup = $domain\n");
}
$cmd = $cmd."net $protocol join "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/src/complex.ycp new/yast2-samba-client-2.18.2/src/complex.ycp
--- old/yast2-samba-client-2.18.1/src/complex.ycp 2009-06-26 15:02:36.000000000 +0200
+++ new/yast2-samba-client-2.18.2/src/complex.ycp 2009-06-26 15:30:51.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: complex.ycp 45827 2008-03-28 11:58:54Z jsuchome $
+ * $Id: complex.ycp 57773 2009-06-26 13:23:26Z jsuchome $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-samba-client-2.18.1/src/dialogs.ycp new/yast2-samba-client-2.18.2/src/dialogs.ycp
--- old/yast2-samba-client-2.18.1/src/dialogs.ycp 2009-06-26 15:02:46.000000000 +0200
+++ new/yast2-samba-client-2.18.2/src/dialogs.ycp 2009-06-26 15:30:51.000000000 +0200
@@ -3,7 +3,7 @@
* Summary: Dialogs definitions
* Authors: Stanislav Visnovsky
*
- * $Id: dialogs.ycp 52277 2008-10-16 07:52:03Z jsuchome $
+ * $Id: dialogs.ycp 57773 2009-06-26 13:23:26Z jsuchome $
*/
{
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org