Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit yast2-ldap-server
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Sat, 03 Mar 2007 14:32:15 +0100
  • Message-id: <20070303133215.AF0AB678182@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package yast2-ldap-server
checked in at Sat Mar 3 14:32:15 CET 2007.

--------
--- yast2-ldap-server/yast2-ldap-server.changes 2007-02-20 14:38:09.000000000 +0100
+++ /mounts/work_src_done/NOARCH/yast2-ldap-server/yast2-ldap-server.changes 2007-03-02 15:47:37.000000000 +0100
@@ -1,0 +2,9 @@
+Fri Mar 2 15:42:32 CET 2007 - rhafer@xxxxxxx
+
+- Fixes for Bug #250228:
+ * Don't write duplicate Database sections into AutoYaST profiles
+ * Leave out default Server Certificate Settings as long as CA-Management
+ does not export its settings
+- Version 2.15.3
+
+-------------------------------------------------------------------

Old:
----
yast2-ldap-server-2.15.2.tar.bz2

New:
----
yast2-ldap-server-2.15.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ldap-server.spec ++++++
--- /var/tmp/diff_new_pack.ph2403/_old 2007-03-03 14:32:08.000000000 +0100
+++ /var/tmp/diff_new_pack.ph2403/_new 2007-03-03 14:32:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package yast2-ldap-server (Version 2.15.2)
+# spec file for package yast2-ldap-server (Version 2.15.3)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
# norootforbuild

Name: yast2-ldap-server
-Version: 2.15.2
+Version: 2.15.3
Release: 1
License: GNU General Public License (GPL), X11/MIT
Group: System/YaST
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Source0: yast2-ldap-server-2.15.2.tar.bz2
+Source0: yast2-ldap-server-2.15.3.tar.bz2
prefix: /usr
BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools
Requires: yast2 perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools
@@ -34,7 +34,7 @@
Andreas Bauer <abauer@xxxxxxx>

%prep
-%setup -n yast2-ldap-server-2.15.2
+%setup -n yast2-ldap-server-2.15.3

%build
%{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,12 @@
%doc %{prefix}/share/doc/packages/yast2-ldap-server

%changelog
+* Fri Mar 02 2007 - rhafer@xxxxxxx
+- Fixes for Bug #250228:
+ * Don't write duplicate Database sections into AutoYaST profiles
+ * Leave out default Server Certificate Settings as long as CA-Management
+ does not export its settings
+- Version 2.15.3
* Tue Feb 20 2007 - mc@xxxxxxx
- version 2.15.2
- add krb5ACLHack

++++++ yast2-ldap-server-2.15.2.tar.bz2 -> yast2-ldap-server-2.15.3.tar.bz2 ++++++
++++ 6427 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.15.2/configure.in new/yast2-ldap-server-2.15.3/configure.in
--- old/yast2-ldap-server-2.15.2/configure.in 2007-02-20 14:34:28.000000000 +0100
+++ new/yast2-ldap-server-2.15.3/configure.in 2007-03-02 15:44:50.000000000 +0100
@@ -1,9 +1,9 @@
dnl configure.in for yast2-ldap-server
dnl
-dnl -- This file is generated by y2autoconf 2.14.0 - DO NOT EDIT! --
+dnl -- This file is generated by y2autoconf 2.13.18 - DO NOT EDIT! --
dnl (edit configure.in.in instead)

-AC_INIT(yast2-ldap-server, 2.15.2, http://bugs.opensuse.org/, yast2-ldap-server)
+AC_INIT(yast2-ldap-server, 2.15.3, http://bugs.opensuse.org/, yast2-ldap-server)
dnl Check for presence of file 'RPMNAME'
AC_CONFIG_SRCDIR([RPMNAME])

@@ -17,7 +17,7 @@
AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs

dnl Important YaST2 variables
-VERSION="2.15.2"
+VERSION="2.15.3"
RPMNAME="yast2-ldap-server"
MAINTAINER="Ralf Haferkamp <rhafer@xxxxxxx>"

@@ -110,8 +110,6 @@
AC_MSG_ERROR(xgettext is missing; please install gettext-devel.)
fi

-Y2DEVTOOLS_PREFIX=`pkg-config --print-errors --variable=prefix yast2-devtools`
-AC_SUBST(Y2DEVTOOLS_PREFIX)
devtools_ybindir=`pkg-config --print-errors --variable=ybindir yast2-devtools`
devtools_yast2dir=`pkg-config --print-errors --variable=yast2dir yast2-devtools`

@@ -144,9 +142,6 @@
if test "$YCPC" = "false"; then
AC_MSG_ERROR([ycpc is not installed])
fi
-AC_CHECK_FILE($devtools_yast2dir/data/testsuite/Makefile.testsuite, [], [
- AC_MSG_WARN([yast2-testsuite.rpm is not installed])
-])


AC_CONFIG_FILES(Makefile agents/Makefile
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.15.2/Makefile.am new/yast2-ldap-server-2.15.3/Makefile.am
--- old/yast2-ldap-server-2.15.2/Makefile.am 2007-02-20 14:34:28.000000000 +0100
+++ new/yast2-ldap-server-2.15.3/Makefile.am 2007-03-02 15:44:51.000000000 +0100
@@ -7,7 +7,8 @@
#

#where devtools are
-Y2TOOL = $(Y2DEVTOOLS_PREFIX)/bin/y2tool
+PREFIX := $(shell pkg-config --print-errors --variable=prefix yast2-devtools)
+Y2TOOL = $(PREFIX)/bin/y2tool

VERSION = $(shell cat $(srcdir)/VERSION)
RPMNAME = $(shell cat $(srcdir)/RPMNAME)
@@ -19,7 +20,7 @@
# do we do Makefile.am for devtools? It is a little special...
IS_DEVTOOLS = $(findstring yast2-devtools,$(RPMNAME))

-DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(Y2DEVTOOLS_PREFIX)/share/YaST2/data/devtools)
+DEVTOOLS_DIR = $(if $(IS_DEVTOOLS),$(srcdir)/devtools,$(PREFIX)/share/YaST2/data/devtools)
ALL_PACKAGES = $(DEVTOOLS_DIR)/admin/all-packages
LEGALESE_DIR = $(if $(HAS_YAST_LICENSE),$(DEVTOOLS_DIR)/admin/copyright/yast,$(DEVTOOLS_DIR)/admin/copyright/gpl)

@@ -33,7 +34,7 @@
AUTOMAKE_OPTIONS = foreign dist-bzip2
# where devtools instal m4 snippets
# argh, executed literally
-#ACLOCAL_AMFLAGS = -I $(Y2DEVTOOLS_PREFIX)/share/aclocal
+#ACLOCAL_AMFLAGS = -I $(PREFIX)/share/aclocal
ACLOCAL_AMFLAGS = -I `if test -d ./devtools/admin; then echo ./devtools/admin; else pkg-config --print-errors --variable=datadir yast2-devtools; fi`/aclocal

Makefile.am.common: $(DEVTOOLS_DIR)/admin/Makefile.am.common
@@ -66,7 +67,7 @@
# because the prerequisite is made here (not anymore!)
# and we don't want any paths in y2autoconf
# info '(autoconf)config.status Invocation'
-$(RPMNAME).pc: $(RPMNAME).pc.in config.status
+$(RPMNAME).pc: $(RPMNAME).pc.in
./config.status --file=$@:$<

if CREATE_PKGCONFIG_NOARCH
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.15.2/Makefile.am.common new/yast2-ldap-server-2.15.3/Makefile.am.common
--- old/yast2-ldap-server-2.15.2/Makefile.am.common 2007-02-20 14:34:28.000000000 +0100
+++ new/yast2-ldap-server-2.15.3/Makefile.am.common 2007-03-02 15:44:50.000000000 +0100
@@ -29,19 +29,7 @@

dist-hook: check-syntax

-CHECK_SYNTAX = true
check-syntax: $(client_DATA) $(ycpchook)
- @if test "$(client_DATA)"; then \
- if $(CHECK_SYNTAX); then \
- TO_CHECK="$(filter %.ycp,$^)"; \
- echo "Checking syntax of $${TO_CHECK}"; \
- if ! $(YCPC) -qE -M. -I. $(YCPCFLAGS) $${TO_CHECK}; then \
- echo "Failed. Disable by 'make ... CHECK_SYNTAX=false' at your own risk"; \
- exit 1; \
- fi; \
- else \
- echo "Syntax check disabled"; \
- fi; \
- fi
+ if test "$(client_DATA)"; then $(bindir)/ycpc -qE -M. -I. $(YCPCFLAGS) $(filter %.ycp,$^) || exit 1; fi

-include .dep
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.15.2/src/LdapServer.pm new/yast2-ldap-server-2.15.3/src/LdapServer.pm
--- old/yast2-ldap-server-2.15.2/src/LdapServer.pm 2007-02-20 14:29:20.000000000 +0100
+++ new/yast2-ldap-server-2.15.3/src/LdapServer.pm 2007-03-02 15:36:45.000000000 +0100
@@ -4,7 +4,7 @@
# Summary: LdapServer settings, input and output functions
# Authors: Andreas Bauer <abauer@xxxxxxx>
#
-# $Id: LdapServer.pm 35892 2007-02-06 10:47:33Z rhafer $
+# $Id: LdapServer.pm 36661 2007-03-02 14:36:44Z rhafer $
#
# Representation of the configuration of ldap-server.
# Input and output routines.
@@ -903,12 +903,14 @@
}
my @database_tmp_new = ();
foreach my $db (@$dbListNEW) {
- foreach my $key (keys %{$databaseNEW->{$db}}) {
- if (! defined $databaseNEW->{$db}->{$key} ) {
- delete $databaseNEW->{$db}->{$key};
+ if (! grep( /^$db$/, @$dbList) ){
+ foreach my $key (keys %{$databaseNEW->{$db}}) {
+ if (! defined $databaseNEW->{$db}->{$key} ) {
+ delete $databaseNEW->{$db}->{$key};
+ }
}
+ push @database_tmp_new, $databaseNEW->{$db};
}
- push @database_tmp_new, $databaseNEW->{$db};
}
if (scalar(@database_tmp_new) > 0) {
push @{$hash->{database}}, @database_tmp_new;
@@ -916,8 +918,10 @@
$hash->{allowList} = $allowList;
$hash->{loglevel} = $loglevel;
if($configureCommonServerCertificate) {
- $hash->{commonServerCertificateAvailable} = $commonServerCertificateAvailable;
- $hash->{configureCommonServerCertificate} = $configureCommonServerCertificate;
+#### CA-Management has no real support for AutoYaST-Cloning. So don't export
+# commonServerCert CA-Settings for now.
+# $hash->{commonServerCertificateAvailable} = $commonServerCertificateAvailable;
+# $hash->{configureCommonServerCertificate} = $configureCommonServerCertificate;
} elsif( ( scalar keys %$importCertificates ) > 0 ) {
$hash->{importCertificates} = $importCertificates;
} else {
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.15.2/VERSION new/yast2-ldap-server-2.15.3/VERSION
--- old/yast2-ldap-server-2.15.2/VERSION 2007-02-20 14:32:41.000000000 +0100
+++ new/yast2-ldap-server-2.15.3/VERSION 2007-03-02 15:42:23.000000000 +0100
@@ -1 +1 @@
-2.15.2
+2.15.3


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >
This Thread