Hello community,
here is the log from the commit of package yast2-ldap-server
checked in at Fri Oct 24 20:34:55 CEST 2008.
--------
--- yast2-ldap-server/yast2-ldap-server.changes 2008-10-15 15:35:08.000000000 +0200
+++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-10-24 16:51:28.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Oct 24 16:28:16 CEST 2008 - rhafer@suse.de
+
+- Version 2.17.12
+ * SLP Checkbox had no effect in Proposal and was not displayed
+ in "normal" Mode (bnc#437267)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
yast2-ldap-server-2.17.11.tar.bz2
New:
----
yast2-ldap-server-2.17.12.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.le7756/_old 2008-10-24 20:33:54.000000000 +0200
+++ /var/tmp/diff_new_pack.le7756/_new 2008-10-24 20:33:54.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.17.11)
+# spec file for package yast2-ldap-server (Version 2.17.12)
#
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -19,12 +19,12 @@
Name: yast2-ldap-server
-Version: 2.17.11
+Version: 2.17.12
Release: 1
License: GPL v2 or later; X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.17.11.tar.bz2
+Source0: yast2-ldap-server-2.17.12.tar.bz2
Prefix: /usr
BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools yast2-ldap-client
Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-perl-bindings yast2-users
@@ -41,7 +41,7 @@
Andreas Bauer
%prep
-%setup -n yast2-ldap-server-2.17.11
+%setup -n yast2-ldap-server-2.17.12
%build
%{prefix}/bin/y2tool y2autoconf
@@ -86,6 +86,10 @@
/usr/share/YaST2/scrconf/*
%doc %{prefix}/share/doc/packages/yast2-ldap-server
%changelog
+* Fri Oct 24 2008 rhafer@suse.de
+- Version 2.17.12
+ * SLP Checkbox had no effect in Proposal and was not displayed
+ in "normal" Mode (bnc#437267)
* Wed Oct 15 2008 rhafer@suse.de
- Version 2.17.11
* Error message when initialization fails (bnc#435642)
++++++ yast2-ldap-server-2.17.11.tar.bz2 -> yast2-ldap-server-2.17.12.tar.bz2 ++++++
++++ 55146 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-ldap-server-2.17.11/config.h.in new/yast2-ldap-server-2.17.12/config.h.in
--- old/yast2-ldap-server-2.17.11/config.h.in 2008-10-15 14:56:16.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/config.h.in 2008-10-24 16:31:48.000000000 +0200
@@ -45,6 +45,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Name of package */
#undef PACKAGE
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-ldap-server-2.17.11/configure.in new/yast2-ldap-server-2.17.12/configure.in
--- old/yast2-ldap-server-2.17.11/configure.in 2008-10-15 14:55:56.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/configure.in 2008-10-24 16:31:17.000000000 +0200
@@ -3,7 +3,7 @@
dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! --
dnl (edit configure.in.in instead)
-AC_INIT(yast2-ldap-server, 2.17.11, http://bugs.opensuse.org/, yast2-ldap-server)
+AC_INIT(yast2-ldap-server, 2.17.12, 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.17.11"
+VERSION="2.17.12"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp "
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-ldap-server-2.17.11/src/dialogs.ycp new/yast2-ldap-server-2.17.12/src/dialogs.ycp
--- old/yast2-ldap-server-2.17.11/src/dialogs.ycp 2008-10-01 15:46:50.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/src/dialogs.ycp 2008-10-24 16:27:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Dialogs definitions
* Authors: Andreas Bauer
*
- * $Id: dialogs.ycp 51750 2008-10-01 13:46:49Z rhafer $
+ * $Id: dialogs.ycp 52533 2008-10-24 14:27:32Z rhafer $
*/
{
@@ -218,6 +218,7 @@
UI::ChangeWidget( `cb_register_slp, `Enabled, false );
Wizard::SetNextButton( `finish , Label::FinishButton());
}
+ UI::ChangeWidget( `cb_register_slp, `Value, defaults["slpRegister"]:false );
any ret = nil;
map event = $[];
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-ldap-server-2.17.11/src/LdapServer.pm new/yast2-ldap-server-2.17.12/src/LdapServer.pm
--- old/yast2-ldap-server-2.17.11/src/LdapServer.pm 2008-10-15 14:52:51.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/src/LdapServer.pm 2008-10-24 16:27:46.000000000 +0200
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Ralf Haferkamp , Andreas Bauer
#
-# $Id: LdapServer.pm 52251 2008-10-15 12:52:47Z rhafer $
+# $Id: LdapServer.pm 52533 2008-10-24 14:27:32Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -217,6 +217,7 @@
$use_ldap_listener = ( "yes" eq SCR->Read('.sysconfig.openldap.OPENLDAP_START_LDAP') );
$ldap_interfaces = SCR->Read('.sysconfig.openldap.OPENLDAP_LDAP_INTERFACES');
+ $registerSlp = ( "yes" eq SCR->Read('.sysconfig.openldap.OPENLDAP_REGISTER_SLP') );
Progress->NextStage();
my $configBackend = SCR->Read('.sysconfig.openldap.OPENLDAP_CONFIG_BACKEND');
@@ -557,6 +558,14 @@
Progress->Finish();
return 0;
}
+ if ( $registerSlp )
+ {
+ SCR->Write('.sysconfig.openldap.OPENLDAP_REGISTER_SLP', 'yes');
+ }
+ else
+ {
+ SCR->Write('.sysconfig.openldap.OPENLDAP_REGISTER_SLP', 'no');
+ }
# FIXME:
# Explicit cache flush, see bnc#350581 for details
@@ -741,6 +750,22 @@
$restartRequired = 1;
}
}
+ if ( $registerSlp )
+ {
+ if (SCR->Read('.sysconfig.openldap.OPENLDAP_REGISTER_SLP') eq "no" )
+ {
+ SCR->Write('.sysconfig.openldap.OPENLDAP_REGISTER_SLP', 'yes');
+ $restartRequired = 1;
+ }
+ }
+ else
+ {
+ if (SCR->Read('.sysconfig.openldap.OPENLDAP_REGISTER_SLP') eq "yes" )
+ {
+ SCR->Write('.sysconfig.openldap.OPENLDAP_REGISTER_SLP', 'no');
+ $restartRequired = 1;
+ }
+ }
# FIXME:
# Explicit cache flush, see bnc#350581 for details
SCR->Write(".sysconfig.openldap", undef);
@@ -1337,8 +1362,22 @@
my $self = shift;
my $defaults = shift;
$self->WriteServiceEnabled( $defaults->{'serviceEnabled'} );
- $defaults->{'serviceEnabled'} = YaST::YCP::Boolean($defaults->{'serviceEnabled'});
- $defaults->{'slpRegister'} = YaST::YCP::Boolean($defaults->{'slpRegister'});
+ if ( defined $defaults->{'serviceEnabled'} )
+ {
+ $defaults->{'serviceEnabled'} = YaST::YCP::Boolean($defaults->{'serviceEnabled'});
+ }
+ else
+ {
+ $defaults->{'serviceEnabled'} = $dbDefaults{'serviceEnabled'};
+ }
+ if ( defined $defaults->{'slpRegister'} )
+ {
+ $defaults->{'slpRegister'} = YaST::YCP::Boolean($defaults->{'slpRegister'});
+ }
+ else
+ {
+ $defaults->{'slpRegister'} = $dbDefaults{'slpRegister'};
+ }
y2debug("SetInitialDefaults: ". Data::Dumper->Dump([$defaults]));
%dbDefaults = %$defaults;
$usingDefaults = 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-ldap-server-2.17.11/src/ldap-server_proposal.ycp new/yast2-ldap-server-2.17.12/src/ldap-server_proposal.ycp
--- old/yast2-ldap-server-2.17.11/src/ldap-server_proposal.ycp 2008-10-01 15:14:13.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/src/ldap-server_proposal.ycp 2008-10-24 16:27:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Proposal function dispatcher.
* Authors: Andreas Bauer
*
- * $Id: ldap-server_proposal.ycp 51738 2008-10-01 12:06:34Z rhafer $
+ * $Id: ldap-server_proposal.ycp 52533 2008-10-24 14:27:32Z rhafer $
*
* Proposal function dispatcher for ldap-server configuration.
* See source/installation/proposal/proposal-API.txt
@@ -131,7 +131,7 @@
_("LDAP Password: ") + rootPWString
] ) +
_("Start LDAP Server: ") + HTML::Bold( _("YES") ) + HTML::Newline() +
- _("Register at SLP Daemon: ") + HTML::Bold( LdapServer::ReadSLPEnabled() ? _("YES") : _("NO") ) +
+ _("Register at SLP Daemon: ") + HTML::Bold( defaults["slpRegister"]:false ? _("YES") : _("NO") ) +
HTML::Newline() +
fw_text;
} else {
@@ -233,7 +233,7 @@
Ldap::SetDefaults( ldapclient_defaults );
Ldap::SetBindPassword( defaults["rootpw_clear"]:"" );
- //LdapServer::WriteSLPEnabled( true );
+ LdapServer::WriteSLPEnabled( defaults["slpRegister"]:false );
LdapServer::Write();
}
}
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-ldap-server-2.17.11/src/tree_structure.ycp new/yast2-ldap-server-2.17.12/src/tree_structure.ycp
--- old/yast2-ldap-server-2.17.11/src/tree_structure.ycp 2008-10-07 17:46:50.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/src/tree_structure.ycp 2008-10-24 16:27:46.000000000 +0200
@@ -4,7 +4,7 @@
* Summary: Widget Tree structure
* Authors: Andreas Bauer
*
- * $Id: tree_structure.ycp 51897 2008-10-07 08:58:23Z rhafer $
+ * $Id: tree_structure.ycp 52533 2008-10-24 14:27:32Z rhafer $
*/
{
textdomain "ldap-server";
@@ -93,9 +93,18 @@
else
{
UI::ChangeWidget( `rb_service_enable, `CurrentButton, `rb_no );
+ UI::ChangeWidget( `cb_register_slp, `Enabled, false );
UI::ChangeWidget( `fr_listener, `Enabled, false );
UI::ChangeWidget( `fr_firewall, `Enabled, false );
}
+ if ( LdapServer::ReadSLPEnabled() )
+ {
+ UI::ChangeWidget( `cb_register_slp, `Value, true );
+ }
+ else
+ {
+ UI::ChangeWidget( `cb_register_slp, `Value, false );
+ }
if ( LdapServer::ReadProtocolListenerEnabled("ldap") )
{
UI::ChangeWidget( `cb_interface_ldap, `Value, true );
@@ -130,11 +139,13 @@
if ( handler_cmd == `rb_no ) // service was just disabled
{
+ UI::ChangeWidget( `cb_register_slp, `Enabled, false );
UI::ChangeWidget( `fr_listener, `Enabled, false );
UI::ChangeWidget( `fr_firewall, `Enabled, false );
}
else if ( handler_cmd == `rb_yes ) // service was just disabled
{
+ UI::ChangeWidget( `cb_register_slp, `Enabled, true );
UI::ChangeWidget( `fr_listener, `Enabled, true );
UI::ChangeWidget( `fr_firewall, `Enabled, true );
}
@@ -157,6 +168,7 @@
LdapServer::WriteServiceEnabled( false );
}
+ LdapServer::WriteSLPEnabled( (boolean) UI::QueryWidget( `id( `cb_register_slp ), `Value ) );
LdapServer::WriteProtocolListenerEnabled( "ldap", (boolean) UI::QueryWidget( `id( `cb_interface_ldap ), `Value ) );
LdapServer::WriteProtocolListenerEnabled( "ldapi", (boolean) UI::QueryWidget( `id( `cb_interface_ldapi ), `Value ) );
if ( (boolean) UI::QueryWidget( `id( `cb_interface_ldaps ), `Value ) )
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-ldap-server-2.17.11/src/widgets.ycp new/yast2-ldap-server-2.17.12/src/widgets.ycp
--- old/yast2-ldap-server-2.17.11/src/widgets.ycp 2008-10-15 14:47:41.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/src/widgets.ycp 2008-10-24 16:27:46.000000000 +0200
@@ -34,7 +34,7 @@
`Left( `RadioButton( `id( `rb_yes ), `opt( `notify ), Label::YesButton(), true ) )
)
),
-// `Left( `CheckBox( `id( `cb_register_slp ), _("Register at an &SLP Daemon"), LdapServer::ReadSLPEnabled() )),
+ `Left( `CheckBox( `id( `cb_register_slp ), _("Register at an &SLP Daemon"), LdapServer::ReadSLPEnabled() )),
`HStretch()
)
)
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-ldap-server-2.17.11/VERSION new/yast2-ldap-server-2.17.12/VERSION
--- old/yast2-ldap-server-2.17.11/VERSION 2008-10-15 14:48:22.000000000 +0200
+++ new/yast2-ldap-server-2.17.12/VERSION 2008-10-24 16:30:34.000000000 +0200
@@ -1 +1 @@
-2.17.11
+2.17.12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org