Hello community, here is the log from the commit of package yast2-ldap-server for openSUSE:Factory checked in at Fri Jul 31 21:08:46 CEST 2009. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2009-07-13 15:46:46.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2009-07-31 10:52:57.000000000 +0200 @@ -1,0 +2,7 @@ +Fri Jul 31 09:48:56 CEST 2009 - rhafer@novell.com + +- Version 2.18.1 + * Fixes for AutoYaST integration, error out on invalid profiles + (bnc#522216) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ldap-server-2.18.0.tar.bz2 New: ---- yast2-ldap-server-2.18.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.suUC4b/_old 2009-07-31 21:02:47.000000000 +0200 +++ /var/tmp/diff_new_pack.suUC4b/_new 2009-07-31 21:02:47.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-server (Version 2.18.0) +# spec file for package yast2-ldap-server (Version 2.18.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,10 +19,10 @@ Name: yast2-ldap-server -Version: 2.18.0 +Version: 2.18.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.18.0.tar.bz2 +Source0: yast2-ldap-server-2.18.1.tar.bz2 Prefix: /usr Group: System/YaST License: GPL v2 or later X11/MIT @@ -35,7 +35,7 @@ Center and during installation. %prep -%setup -n yast2-ldap-server-2.18.0 +%setup -n yast2-ldap-server-2.18.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ldap-server-2.18.0.tar.bz2 -> yast2-ldap-server-2.18.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/VERSION new/yast2-ldap-server-2.18.1/VERSION --- old/yast2-ldap-server-2.18.0/VERSION 2009-07-13 15:03:19.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/VERSION 2009-07-31 09:51:59.000000000 +0200 @@ -1 +1 @@ -2.18.0 +2.18.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/autodocs-ycp.ami new/yast2-ldap-server-2.18.1/autodocs-ycp.ami --- old/yast2-ldap-server-2.18.0/autodocs-ycp.ami 2009-07-13 14:59:01.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/autodocs-ycp.ami 2009-07-31 09:52:32.000000000 +0200 @@ -1,5 +1,5 @@ # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57556 2009-06-15 13:33:12Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -8,20 +8,25 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs html_DATA = index.html $(filter-out index.html, $(wildcard *.html)) CLEANFILES = $(html_DATA) pod2htm*.tmp AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/configure new/yast2-ldap-server-2.18.1/configure --- old/yast2-ldap-server-2.18.0/configure 2009-07-13 14:59:10.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/configure 2009-07-31 09:52:41.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-ldap-server 2.17.20. +# Generated by GNU Autoconf 2.63 for yast2-ldap-server 2.18.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -745,8 +745,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ldap-server' PACKAGE_TARNAME='yast2-ldap-server' -PACKAGE_VERSION='2.17.20' -PACKAGE_STRING='yast2-ldap-server 2.17.20' +PACKAGE_VERSION='2.18.1' +PACKAGE_STRING='yast2-ldap-server 2.18.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1532,7 +1532,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.17.20 to adapt to many kinds of systems. +\`configure' configures yast2-ldap-server 2.18.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1604,7 +1604,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ldap-server 2.17.20:";; + short | recursive ) echo "Configuration of yast2-ldap-server 2.18.1:";; esac cat <<\_ACEOF @@ -1716,7 +1716,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ldap-server configure 2.17.20 +yast2-ldap-server configure 2.18.1 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1730,7 +1730,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.17.20, which was +It was created by yast2-ldap-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2710,7 +2710,7 @@ # Define the identity of the package. PACKAGE='yast2-ldap-server' - VERSION='2.17.20' + VERSION='2.18.1' cat >>confdefs.h <<_ACEOF @@ -2832,7 +2832,7 @@ -VERSION="2.17.20" +VERSION="2.18.1" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer@suse.de>" @@ -17566,7 +17566,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.17.20, which was +This file was extended by yast2-ldap-server $as_me 2.18.1, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -17629,7 +17629,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-ldap-server config.status 2.17.20 +yast2-ldap-server config.status 2.18.1 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-ldap-server-2.18.0/configure.in new/yast2-ldap-server-2.18.1/configure.in --- old/yast2-ldap-server-2.18.0/configure.in 2009-07-13 14:59:01.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/configure.in 2009-07-31 09:52:32.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2-ldap-server dnl -dnl -- This file is generated by y2autoconf 2.18.7 - 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-ldap-server, 2.17.20, http://bugs.opensuse.org/, yast2-ldap-server) +AC_INIT(yast2-ldap-server, 2.18.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.17.20" +VERSION="2.18.1" RPMNAME="yast2-ldap-server" MAINTAINER="Ralf Haferkamp <rhafer@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/doc/autodocs/Makefile.in new/yast2-ldap-server-2.18.1/doc/autodocs/Makefile.in --- old/yast2-ldap-server-2.18.0/doc/autodocs/Makefile.in 2009-07-13 14:59:11.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/doc/autodocs/Makefile.in 2009-07-31 09:52:43.000000000 +0200 @@ -18,7 +18,7 @@ # Makefile.am for YCP module .../doc/autodocs # -*- makefile -*- Automake include file -# $Id: autodocs-ycp.ami 57556 2009-06-15 13:33:12Z mvidner $ +# $Id: autodocs-ycp.ami 57644 2009-06-19 08:38:11Z mvidner $ # Builds source documentation for YCP sources # Uses ycpdoc @@ -27,6 +27,10 @@ # Optional - the default is $(srcdir)/../../src/*.ycp # AUTODOCS_PM: Files that the perl autodocs is built from # Optional - the default is $(srcdir)/../../src/*.pm +# AUTODOCS_SUBDIR: To install the result to $(docdir)/SUBDIR/autodocs +# Optional - the default is no subdir, $(docdir)/autodocs +# AUTODOCS_STRIP: Strip it from filenames. The remaining / are replaced by __ +# Optional - the default is $(srcdir)/../../src VPATH = @srcdir@ pkgdatadir = $(datadir)/@PACKAGE@ @@ -210,7 +214,7 @@ host_cpu = @host_cpu@ host_os = @host_os@ host_vendor = @host_vendor@ -htmldir = $(docdir)/autodocs +htmldir = $(docdir)/$(AUTODOCS_SUBDIR)/autodocs imagedir = @imagedir@ includedir = @includedir@ infodir = @infodir@ @@ -467,14 +471,15 @@ AUTODOCS_YCP ?= $(wildcard $(srcdir)/../../src/*.ycp) AUTODOCS_PM ?= $(wildcard $(srcdir)/../../src/*.pm) +AUTODOCS_STRIP ?= $(srcdir)/../../src index.html: $(AUTODOCS_YCP) $(AUTODOCS_PM) #including *.pm, for the index - ${YCPDOC} -d. $^ + ${YCPDOC} -d. -s$(AUTODOCS_STRIP) $(AUTODOCS_YCP) for i in $(AUTODOCS_PM); do \ - b=`basename $$i`; b=$${b%.pm}; \ + b=$${i##$(AUTODOCS_STRIP)}; b=$${b#/}; b=$${b//\//__}; b=$${b%.pm}; \ pod2html --title=$$b --infile=$$i --outfile=$$b.html; \ - echo "<a href='$$b.html'>$$b</a>" > $$b.mod.html; \ + echo "<a href='$$b.html'>$${b/__/::}</a>" > $$b.mod.html; \ done # Tell versions [3.59,3.63) of GNU make to not export all variables. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/src/LdapServer.pm new/yast2-ldap-server-2.18.1/src/LdapServer.pm --- old/yast2-ldap-server-2.18.0/src/LdapServer.pm 2008-12-05 11:39:09.000000000 +0100 +++ new/yast2-ldap-server-2.18.1/src/LdapServer.pm 2009-07-30 09:44:23.000000000 +0200 @@ -4,7 +4,7 @@ # Summary: LdapServer settings, input and output functions # Authors: Ralf Haferkamp <rhafer@suse.de>, Andreas Bauer <abauer@suse.de> # -# $Id: LdapServer.pm 53911 2008-12-05 10:39:09Z rhafer $ +# $Id: LdapServer.pm 58211 2009-07-30 07:44:43Z rhafer $ # # Representation of the configuration of ldap-server. # Input and output routines. @@ -535,6 +535,10 @@ my $ret = 1; if ( ! $usesBackConfig || ! $slapdConfChanged || $overwriteConfig ) { + if ( ! $self->ReadServiceEnabled() ) + { + return 1; + } $overwriteConfig = 0; my $progressItems = [ _("Writing Startup Configuration"), _("Cleaning up config directory"), @@ -595,6 +599,15 @@ y2milestone("using tempfile: ".$tmpfile ); my $ldif = SCR->Read('.ldapserver.configAsLdif' ); y2debug($ldif); + if ( ! $ldif ) + { + my $err = SCR->Error(".ldapserver"); + y2error("Creating LDIF for initial configuration failed"); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + # cleanup + SCR->Execute('.target.bash', "rm -f $tmpfile" ); + return 0; + } $rc = SCR->Write('.target.string', $tmpfile, $ldif ); if ( $rc ) { @@ -856,21 +869,41 @@ my $hash = shift; y2milestone("LdapServer::Import() : ". Data::Dumper->Dump([$hash])); - if ( ! keys( %$hash ) ) + if ( (! keys( %$hash )) || (! defined $hash->{'daemon'}) || + (! defined $hash->{'globals'}) || (! defined $hash->{'databases'}) ) { $usingDefaults = 1; $overwriteConfig = 0; $self->WriteServiceEnabled( 0 ); + y2milestone("Wrong/empty ldap-server profile"); + return 0; + } + + if ( defined $hash->{'daemon'}->{'serviceEnabled'} ) + { + $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); + } + else + { + $self->WriteServiceEnabled(0); + } + + if ( ! $self->ReadServiceEnabled() ) + { return 1; } + $usingDefaults = 0; $overwriteConfig = 1; - $self->WriteServiceEnabled( $hash->{'daemon'}->{'serviceEnabled'} ); - if ( ! $self->ReadServiceEnabled() ) + + if ( defined $hash->{'daemon'}->{'slp'} ) { - return 1; + $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); + } + else + { + $self->WriteSLPEnabled( 0 ); } - $self->WriteSLPEnabled( $hash->{'daemon'}->{'slp'} ); foreach my $listner (@{$hash->{'daemon'}->{'listners'} } ) { @@ -1108,7 +1141,7 @@ sub AutoPackages { # TODO FIXME: your code here... my %ret = ( - "install" => (), + "install" => ( "openldap2", "openldap2-client" ), "remove" => (), ); return \%ret; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ldap-server-2.18.0/src/agent/SlapdConfigAgent.cc new/yast2-ldap-server-2.18.1/src/agent/SlapdConfigAgent.cc --- old/yast2-ldap-server-2.18.0/src/agent/SlapdConfigAgent.cc 2009-07-13 14:41:05.000000000 +0200 +++ new/yast2-ldap-server-2.18.1/src/agent/SlapdConfigAgent.cc 2009-07-29 17:13:43.000000000 +0200 @@ -1583,6 +1583,10 @@ { y2milestone("ConfigToLdif"); std::ostringstream ldif; + if ( ! globals || ! schemaBase ) + { + throw std::runtime_error("Configuration not initialized. Can't create LDIF dump." ); + } ldif << globals->toLdif() << std::endl; ldif << schemaBase->toLdif() << std::endl; OlcSchemaList::const_iterator j; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org