Hello community,
here is the log from the commit of package yast2-samba-server for openSUSE:Factory
checked in at Mon Mar 28 14:32:02 CEST 2011.
--------
--- yast2-samba-server/yast2-samba-server.changes 2011-01-10 14:19:06.000000000 +0100
+++ /mounts/work_src_done/STABLE/yast2-samba-server/yast2-samba-server.changes 2011-03-28 13:53:50.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Mar 28 13:48:28 CEST 2011 - jsuchome@suse.cz
+
+- removed obsolete On value from 'ldap ssl' option
+- added help texts for LDAP settings (bnc#531523)
+- 2.21.0
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-samba-server-2.20.2.tar.bz2
New:
----
yast2-samba-server-2.21.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-samba-server.spec ++++++
--- /var/tmp/diff_new_pack.fxlaUh/_old 2011-03-28 14:29:57.000000000 +0200
+++ /var/tmp/diff_new_pack.fxlaUh/_new 2011-03-28 14:29:57.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-samba-server (Version 2.20.2)
+# spec file for package yast2-samba-server
#
# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-samba-server
-Version: 2.20.2
+Version: 2.21.0
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-samba-server-2.20.2.tar.bz2
+Source0: yast2-samba-server-2.21.0.tar.bz2
Prefix: /usr
@@ -53,7 +53,7 @@
configuration.
%prep
-%setup -n yast2-samba-server-2.20.2
+%setup -n yast2-samba-server-2.21.0
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-samba-server-2.20.2.tar.bz2 -> yast2-samba-server-2.21.0.tar.bz2 ++++++
++++ 4154 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/MAINTAINER new/yast2-samba-server-2.21.0/MAINTAINER
--- old/yast2-samba-server-2.20.2/MAINTAINER 2009-11-24 15:14:18.000000000 +0100
+++ new/yast2-samba-server-2.21.0/MAINTAINER 2011-03-28 13:52:57.000000000 +0200
@@ -1 +1 @@
-Lukas Ocilka
+Jiří Suchomel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/VERSION new/yast2-samba-server-2.21.0/VERSION
--- old/yast2-samba-server-2.20.2/VERSION 2011-01-10 13:48:16.000000000 +0100
+++ new/yast2-samba-server-2.21.0/VERSION 2011-03-28 13:49:22.000000000 +0200
@@ -1 +1 @@
-2.20.2
+2.21.0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/configure.in new/yast2-samba-server-2.21.0/configure.in
--- old/yast2-samba-server-2.20.2/configure.in 2011-01-06 17:05:53.000000000 +0100
+++ new/yast2-samba-server-2.21.0/configure.in 2009-06-25 12:12:26.000000000 +0200
@@ -1,9 +1,9 @@
dnl configure.in for yast2-samba-server
dnl
-dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.18.9 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-samba-server, 2.20.1, http://bugs.opensuse.org/, yast2-samba-server)
+AC_INIT(yast2-samba-server, 2.18.1, http://bugs.opensuse.org/, yast2-samba-server)
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.20.1"
+VERSION="2.18.1"
RPMNAME="yast2-samba-server"
MAINTAINER="Lukas Ocilka "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/missing new/yast2-samba-server-2.21.0/missing
--- old/yast2-samba-server-2.20.2/missing 2011-01-06 17:05:56.000000000 +0100
+++ new/yast2-samba-server-2.21.0/missing 2009-06-25 12:12:30.000000000 +0200
@@ -1,10 +1,10 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2006-05-10.23
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
# This program is free software; you can redistribute it and/or modify
@@ -18,7 +18,9 @@
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
-# along with this program. If not, see http://www.gnu.org/licenses/.
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+# 02110-1301, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -87,9 +89,6 @@
tar try tar, gnutar, gtar, then tar without non-portable flags
yacc create \`y.tab.[ch]', if possible, from existing .[ch]
-Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
-\`g' are ignored when checking the name.
-
Send bug reports to ."
exit $?
;;
@@ -107,22 +106,15 @@
esac
-# normalize program name to check for.
-program=`echo "$1" | sed '
- s/^gnu-//; t
- s/^gnu//; t
- s/^g//; t'`
-
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
-# the program). This is about non-GNU programs, so use $1 not
-# $program.
+# the program).
case $1 in
- lex*|yacc*)
+ lex|yacc)
# Not GNU programs, they don't have --version.
;;
- tar*)
+ tar)
if test -n "$run"; then
echo 1>&2 "ERROR: \`tar' requires --run"
exit 1
@@ -146,7 +138,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $program in
+case $1 in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -156,7 +148,7 @@
touch aclocal.m4
;;
- autoconf*)
+ autoconf)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`${configure_ac}'. You might want to install the
@@ -165,7 +157,7 @@
touch configure
;;
- autoheader*)
+ autoheader)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified \`acconfig.h' or \`${configure_ac}'. You might want
@@ -195,7 +187,7 @@
while read f; do touch "$f"; done
;;
- autom4te*)
+ autom4te)
echo 1>&2 "\
WARNING: \`$1' is needed, but is $msg.
You might have modified some files without having the
@@ -218,7 +210,7 @@
fi
;;
- bison*|yacc*)
+ bison|yacc)
echo 1>&2 "\
WARNING: \`$1' $msg. You should only need it if
you modified a \`.y' file. You may need the \`Bison' package
@@ -248,7 +240,7 @@
fi
;;
- lex*|flex*)
+ lex|flex)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.l' file. You may need the \`Flex' package
@@ -271,7 +263,7 @@
fi
;;
- help2man*)
+ help2man)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a dependency of a manual page. You may need the
@@ -285,11 +277,11 @@
else
test -z "$file" || exec >$file
echo ".ab help2man is required to generate this page"
- exit $?
+ exit 1
fi
;;
- makeinfo*)
+ makeinfo)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -318,7 +310,7 @@
touch $file
;;
- tar*)
+ tar)
shift
# We have already tried tar in the generic part.
@@ -371,6 +363,5 @@
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-time-zone: "UTC"
-# time-stamp-end: "; # UTC"
+# time-stamp-end: "$"
# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/src/helps.ycp new/yast2-samba-server-2.21.0/src/helps.ycp
--- old/yast2-samba-server-2.20.2/src/helps.ycp 2010-02-19 17:22:10.000000000 +0100
+++ new/yast2-samba-server-2.21.0/src/helps.ycp 2011-03-28 13:53:09.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Stanislav Visnovsky
* Lukas Ocilka
*
- * $Id: helps.ycp 60883 2010-02-19 16:22:09Z locilka $
+ * $Id: helps.ycp 63675 2011-03-28 11:53:06Z jsuchome $
*/
{
@@ -255,8 +255,35 @@
_("<p><b>Inherit ACLS</b> can be used to ensure
that if default ACLs exist on parent directories, they are always
honored when creating a subdirectory.</p>
-")
+"),
+
+ // help for LDAP Settings dialog
+ "samba_ldap_setting_auth_widget" : _("<p><b><big>LDAP Settings</big></b><br>
+Here, it is possible to determine the LDAP server to use for authentication.
+</p>
+<p>
+Setting <b>LDAP Password Back-End</b> allows storing user information in LDAP tree specified by URL. With <b>LDAP Idmap Back-End</b>, store SID/uid/gid mapping tables in LDAP.
+</p><p>
+In Authentication section, set the credentials for LDAP server, including full Administrator DN.
+</p>
+<b>Search Base DN</b> is the LDAP suffix appended to Samba specific LDAP objects.
+</p><p>
+To test the connection to your LDAP server, click <b>Test Connection</b>. To set expert LDAP settings or use default values, click <b>Advanced Settings</b>.<p>"),
+
+ // help for SambaLDAPSettingsSuffixesWidget
+ "samba_ldap_setting_suffixes_widget" : _("<p><b>User Suffix</b> specifies where users are added to LDAP tree. The value is pre-pended to the value of <b>Search Base DN</b>. Similarly, <b>Group Suffix</b> specifies the place for groups, <b>Machine Suffix</b> for machines and <b>Idmap Suffix</b> for idmap mappings.</p>"),
+
+ // help for SambaLDAPSettingsTimeoutsWidget
+ "samba_ldap_settings_timeouts_widget" : _("<p><b>Replication Sleep</b> is the amount of milliseconds Samba will wait after writing to LDAP server, so LDAP replicas can catch up.</p>
+<p><b>Time-Out</b> specifies the timeout for LDAP operations (in seconds).</p>"),
+
+ // help for SambaLDAPSettingsSecurityWidget
+ "samba_ldap_settings_security_widget" : _("<p>Define whether to use SSL for LDAP connection with <b>Use SSL or TLS</b>.</p>"),
+
+ // help for SambaLDAPSettingsMiscWidget
+ "samba_ldap_settings_misc_widget" : _("<p><b>Delete DN</b> specifies if delete operation deletes the complete LDAP entry or only the Samba specific attributes.</p>
+<p>With <b>Synchronize Passwords</b>, define possible synchronization of LDAP password with the NT and LM hashes. See <tt>smb.conf</tt> manual page for details.</p>"),
];
map warnings = $[
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-samba-server-2.20.2/src/ldap-widget.ycp new/yast2-samba-server-2.21.0/src/ldap-widget.ycp
--- old/yast2-samba-server-2.20.2/src/ldap-widget.ycp 2009-11-24 15:14:17.000000000 +0100
+++ new/yast2-samba-server-2.21.0/src/ldap-widget.ycp 2011-03-28 13:53:09.000000000 +0200
@@ -5,7 +5,7 @@
* Authors: Martin Lazar
* Lukas Ocilka
*
- * $Id: ldap-widget.ycp 53838 2008-12-03 13:10:23Z locilka $
+ * $Id: ldap-widget.ycp 63675 2011-03-28 11:53:06Z jsuchome $
*
* This file contains CWM widgets related to Samba LDAP Settings:
* - Samba LDAP Settings Essential Widget
@@ -437,9 +437,7 @@
// translators: combo box value
list<list> ldap_ssl_values = [ ["Off", _("No")],
// translators: combo box value
-["Start_tls", _("TLS")],
-// translators: combo box value
-["On", _("SSL")] ];
+["Start_tls", _("TLS")], ];
void SambaLDAPSettingsSecurityWidgetInit(string key) ``{
init_ldap_combo("ldap ssl", ldap_ssl_values);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org