Hello community,
here is the log from the commit of package yast2-ldap-server for openSUSE:Factory
checked in at Mon Jul 19 14:42:10 CEST 2010.
--------
--- yast2-ldap-server/yast2-ldap-server.changes 2010-04-16 12:01:25.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2010-07-06 14:33:59.000000000 +0200
@@ -1,0 +2,8 @@
+Tue Jul 6 11:29:07 UTC 2010 - rhafer@novell.com
+
+- Version 2.19.1
+ * Write tls_cacert option to ldap.conf (bnc#619549)
+ * Rename ReadInitialDefaults() back to CreateInitialDefaults()
+ to stay backwards compatible. (bnc#615805)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ldap-server-2.19.0.tar.bz2
New:
----
yast2-ldap-server-2.19.1.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.sYdIdv/_old 2010-07-19 14:35:48.000000000 +0200
+++ /var/tmp/diff_new_pack.sYdIdv/_new 2010-07-19 14:35:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.19.0)
+# spec file for package yast2-ldap-server (Version 2.19.1)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,11 +19,11 @@
Name: yast2-ldap-server
-Version: 2.19.0
+Version: 2.19.1
Release: 1
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.19.0.tar.bz2
+Source0: yast2-ldap-server-2.19.1.tar.bz2
Prefix: /usr
@@ -39,7 +39,7 @@
Center and during installation.
%prep
-%setup -n yast2-ldap-server-2.19.0
+%setup -n yast2-ldap-server-2.19.1
%build
%{prefix}/bin/y2tool y2autoconf
++++++ yast2-ldap-server-2.19.0.tar.bz2 -> yast2-ldap-server-2.19.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/configure new/yast2-ldap-server-2.19.1/configure
--- old/yast2-ldap-server-2.19.0/configure 2010-04-16 11:28:43.000000000 +0200
+++ new/yast2-ldap-server-2.19.1/configure 2010-07-06 13:30:51.000000000 +0200
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.65 for yast2-ldap-server 2.19.0.
+# Generated by GNU Autoconf 2.65 for yast2-ldap-server 2.19.1.
#
# Report bugs to http://bugs.opensuse.org/.
#
@@ -701,8 +701,8 @@
# Identity of this package.
PACKAGE_NAME='yast2-ldap-server'
PACKAGE_TARNAME='yast2-ldap-server'
-PACKAGE_VERSION='2.19.0'
-PACKAGE_STRING='yast2-ldap-server 2.19.0'
+PACKAGE_VERSION='2.19.1'
+PACKAGE_STRING='yast2-ldap-server 2.19.1'
PACKAGE_BUGREPORT='http://bugs.opensuse.org/'
PACKAGE_URL=''
@@ -1479,7 +1479,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-ldap-server 2.19.0 to adapt to many kinds of systems.
+\`configure' configures yast2-ldap-server 2.19.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1551,7 +1551,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of yast2-ldap-server 2.19.0:";;
+ short | recursive ) echo "Configuration of yast2-ldap-server 2.19.1:";;
esac
cat <<\_ACEOF
@@ -1663,7 +1663,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-yast2-ldap-server configure 2.19.0
+yast2-ldap-server configure 2.19.1
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
@@ -2155,7 +2155,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-ldap-server $as_me 2.19.0, which was
+It was created by yast2-ldap-server $as_me 2.19.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
@@ -3078,7 +3078,7 @@
# Define the identity of the package.
PACKAGE='yast2-ldap-server'
- VERSION='2.19.0'
+ VERSION='2.19.1'
cat >>confdefs.h <<_ACEOF
@@ -3200,7 +3200,7 @@
-VERSION="2.19.0"
+VERSION="2.19.1"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp "
@@ -16020,7 +16020,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by yast2-ldap-server $as_me 2.19.0, which was
+This file was extended by yast2-ldap-server $as_me 2.19.1, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -16086,7 +16086,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-yast2-ldap-server config.status 2.19.0
+yast2-ldap-server config.status 2.19.1
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/configure.in new/yast2-ldap-server-2.19.1/configure.in
--- old/yast2-ldap-server-2.19.0/configure.in 2010-04-16 11:28:34.000000000 +0200
+++ new/yast2-ldap-server-2.19.1/configure.in 2010-07-06 13:30:42.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-server, 2.19.0, http://bugs.opensuse.org/, yast2-ldap-server)
+AC_INIT(yast2-ldap-server, 2.19.1, http://bugs.opensuse.org/, yast2-ldap-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.19.0"
+VERSION="2.19.1"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/dialogs.ycp new/yast2-ldap-server-2.19.1/src/dialogs.ycp
--- old/yast2-ldap-server-2.19.0/src/dialogs.ycp 2010-02-22 13:49:56.000000000 +0100
+++ new/yast2-ldap-server-2.19.1/src/dialogs.ycp 2010-07-06 13:28:22.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: dialogs.ycp 60936 2010-02-22 12:49:55Z rhafer $
+ * $Id: dialogs.ycp 62184 2010-07-06 11:28:21Z rhafer $
*/
{
@@ -206,7 +206,7 @@
any EnableServiceDialog()
{
- map defaults = LdapServer::ReadInitialDefaults();
+ map defaults = LdapServer::CreateInitialDefaults();
map firewall_settings = $[
"services": [ "service:openldap" ],
"display_details": true,
@@ -1075,7 +1075,7 @@
}
else
{
- map defaults = LdapServer::ReadInitialDefaults();
+ map defaults = LdapServer::CreateInitialDefaults();
defaults["configpw"] = pw;
LdapServer::SetInitialDefaults(defaults);
break;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/helps.ycp new/yast2-ldap-server-2.19.1/src/helps.ycp
--- old/yast2-ldap-server-2.19.0/src/helps.ycp 2010-02-22 13:49:56.000000000 +0100
+++ new/yast2-ldap-server-2.19.1/src/helps.ycp 2010-07-06 12:09:21.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Help texts of all the dialogs
* Authors: Andreas Bauer
*
- * $Id: helps.ycp 60936 2010-02-22 12:49:55Z rhafer $
+ * $Id: helps.ycp 62182 2010-07-06 10:09:20Z rhafer $
*/
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/LdapDatabase.ycp new/yast2-ldap-server-2.19.1/src/LdapDatabase.ycp
--- old/yast2-ldap-server-2.19.0/src/LdapDatabase.ycp 2010-04-16 11:21:44.000000000 +0200
+++ new/yast2-ldap-server-2.19.1/src/LdapDatabase.ycp 2010-07-06 13:26:09.000000000 +0200
@@ -148,7 +148,7 @@
boolean append_checked = true;
if ( createDefaults )
{
- db = LdapServer::ReadInitialDefaults();
+ db = LdapServer::CreateInitialDefaults();
}
else
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/LdapServer.pm new/yast2-ldap-server-2.19.1/src/LdapServer.pm
--- old/yast2-ldap-server-2.19.0/src/LdapServer.pm 2010-04-16 11:25:36.000000000 +0200
+++ new/yast2-ldap-server-2.19.1/src/LdapServer.pm 2010-07-06 13:28:22.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Ralf Haferkamp , Andreas Bauer
#
-# $Id: LdapServer.pm 61724 2010-04-16 09:25:35Z rhafer $
+# $Id: LdapServer.pm 62184 2010-07-06 11:28:21Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -811,6 +811,13 @@
["localhost"]);
SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".base",
[$ldapconf_base]);
+ my $tls = $self->ReadTlsConfig();
+ if ( ref($tls) eq "HASH" && $tls->{'caCertFile'} ne "" )
+ {
+ SCR->Write(".etc.ldap_conf.value.\"/etc/openldap/ldap.conf\".tls_cacert",
+ [$tls->{'caCertFile'}]);
+ }
+ SCR->Write(".etc.ldap_conf", "force" );
}
if (! $usesBackConfig )
{
@@ -1570,10 +1577,10 @@
#
# @return A Map containing the setting to use when creating the initial setup
#
-BEGIN { $TYPEINFO {ReadInitialDefaults} = ["function", [ "map", "string", "any"] ]; }
-sub ReadInitialDefaults
+BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; }
+sub CreateInitialDefaults
{
- y2milestone("ReadInitialDefaults");
+ y2milestone("CreateInitialDefaults");
my $self = shift;
if ( ! keys(%dbDefaults ) ) {
$self->InitDbDefaults();
@@ -1759,6 +1766,7 @@
$self->ChangeDatabaseIndex(1, $idx );
}
}
+ $self->WriteLdapConfBase($database->{'suffix'});
if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" )
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.19.1/src/ldap-server_proposal.ycp
--- old/yast2-ldap-server-2.19.0/src/ldap-server_proposal.ycp 2010-02-10 12:20:16.000000000 +0100
+++ new/yast2-ldap-server-2.19.1/src/ldap-server_proposal.ycp 2010-07-06 13:28:22.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Andreas Bauer
*
- * $Id: ldap-server_proposal.ycp 60780 2010-02-10 11:20:15Z rhafer $
+ * $Id: ldap-server_proposal.ycp 62184 2010-07-06 11:28:21Z rhafer $
*
* Proposal function dispatcher for ldap-server configuration.
* See source/installation/proposal/proposal-API.txt
@@ -73,7 +73,7 @@
{
LdapServer::WriteServiceEnabled( true );
}
- defaults = LdapServer::ReadInitialDefaults();
+ defaults = LdapServer::CreateInitialDefaults();
defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled();
defaults["rootpw_clear"] = Users::GetRootPassword();
LdapServer::SetInitialDefaults(defaults);
@@ -86,7 +86,7 @@
if( LdapServer::ReadServiceEnabled() )
{
string rootPWString = "";
- defaults = LdapServer::ReadInitialDefaults();
+ defaults = LdapServer::CreateInitialDefaults();
if (! LdapServer::ReadSetupSlave() )
{
if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() )
@@ -250,7 +250,7 @@
}
}
LdapServer::ReadFromDefaults();
- map defaults = LdapServer::ReadInitialDefaults();
+ map defaults = LdapServer::CreateInitialDefaults();
Progress::set(false);
Ldap::Read();
Progress::set(true);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/src/tree_structure.ycp new/yast2-ldap-server-2.19.1/src/tree_structure.ycp
--- old/yast2-ldap-server-2.19.0/src/tree_structure.ycp 2010-02-09 17:50:05.000000000 +0100
+++ new/yast2-ldap-server-2.19.1/src/tree_structure.ycp 2010-07-06 12:09:21.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widget Tree structure
* Authors: Andreas Bauer
*
- * $Id: tree_structure.ycp 60779 2010-02-09 16:50:04Z rhafer $
+ * $Id: tree_structure.ycp 62182 2010-07-06 10:09:20Z rhafer $
*/
{
textdomain "ldap-server";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.19.0/VERSION new/yast2-ldap-server-2.19.1/VERSION
--- old/yast2-ldap-server-2.19.0/VERSION 2010-04-16 11:26:50.000000000 +0200
+++ new/yast2-ldap-server-2.19.1/VERSION 2010-07-06 13:30:02.000000000 +0200
@@ -1 +1 @@
-2.19.0
+2.19.1
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org