Hello community, here is the log from the commit of package openldap2 for openSUSE:Factory checked in at Thu Oct 7 21:59:08 CEST 2010. -------- --- openldap2/openldap2-client.changes 2010-10-01 23:59:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/openldap2/openldap2-client.changes 2010-10-07 21:53:22.114905000 +0200 @@ -1,0 +2,12 @@ +Tue Oct 5 14:39:46 UTC 2010 - rhafer@novell.com + +- Handle the libdb-4_5 -> libdb-4_8 Version update by opening the + Databases with DB_RECOVER if a version mismatch is detected. + +------------------------------------------------------------------- +Sun Oct 3 22:55:34 UTC 2010 - cristian.rodriguez@opensuse.org + +- Do not include Build date and time in binaries, this + avoids build-compare failures and unhelpful rebuilds/republishes + +------------------------------------------------------------------- openldap2.changes: same change calling whatdependson for head-i586 New: ---- 0007-No-Build-date-and-time-in-binaries.dif 0008-Recover-on-DB-version-change.dif ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openldap2-client.spec ++++++ --- /var/tmp/diff_new_pack.HyanS4/_old 2010-10-07 21:53:30.000000000 +0200 +++ /var/tmp/diff_new_pack.HyanS4/_new 2010-10-07 21:53:30.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: -libopenssl-devel -pwdutils openssl-devel %endif Version: 2.4.23 -Release: 2 +Release: 3 Url: http://www.openldap.org License: BSD3c(or similar) ; openldap 2.8 %if "%{name}" == "openldap2" @@ -59,6 +59,8 @@ Patch4: 0004-libldap-use-gethostbyname_r.dif Patch5: 0005-pie-compile.dif Patch6: 0006-assorted-fixes-for-back-config-DELETE-support.dif +Patch7: 0007-No-Build-date-and-time-in-binaries.dif +Patch8: 0008-Recover-on-DB-version-change.dif Patch100: openldap-2.3.37.dif Patch200: slapd_getaddrinfo_dupl.dif BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -193,6 +195,8 @@ %patch5 -p1 %endif %patch6 -p1 +%patch7 -p1 +%patch8 -p1 %if %suse_version == 1100 %patch200 -p1 %endif @@ -257,6 +261,7 @@ --enable-dynamic=no --enable-shared=no make depend make %{?jobs:-j%jobs} + %endif %endif openldap2.spec: same change ++++++ 0007-No-Build-date-and-time-in-binaries.dif ++++++
From 6a15b4e4d5ae00b11317443a0ed96a7e38692735 Mon Sep 17 00:00:00 2001 From: Cristian Rodriguez
Date: Tue, 5 Oct 2010 13:59:40 +0200 Subject: [PATCH 7/7] No Build date and time in binaries
This avoids build-compare failures and unhelpful rebuilds/republishes in the openSUSE buildservice. 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/mkversion b/build/mkversion index 22943d7..60e8381 100755 --- a/build/mkversion +++ b/build/mkversion @@ -50,7 +50,7 @@ if test $# != 1 ; then fi APPLICATION=$1 -WHOWHERE="$USER@`uname -n`:`pwd`" +WHOWHERE="opensuse-buildservice@opensuse.org" cat << __EOF__ /* This work is part of OpenLDAP Software http://www.openldap.org/. @@ -72,7 +72,7 @@ static const char copyright[] = "COPYING RESTRICTIONS APPLY\n"; $static $const char $SYMBOL[] = -"@(#) \$$PACKAGE: $APPLICATION $VERSION (" __DATE__ " " __TIME__ ") \$\n" +"@(#) \$$PACKAGE: $APPLICATION $VERSION \$\n" "\t$WHOWHERE\n"; __EOF__ -- 1.7.1 ++++++ 0008-Recover-on-DB-version-change.dif ++++++
From 62ea7479d3cfe72cb3780ac4ab9cf5942c408406 Mon Sep 17 00:00:00 2001 From: Ralf Haferkamp
Date: Tue, 5 Oct 2010 14:20:22 +0200 Subject: [PATCH 8/8] Recover on DB version change
If the libdb Version changed try to recover the database. Note: This will only succeed if only the format of transaction logs changed. 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/servers/slapd/back-bdb/init.c b/servers/slapd/back-bdb/init.c index 9bb1024..aa8cac3 100644 --- a/servers/slapd/back-bdb/init.c +++ b/servers/slapd/back-bdb/init.c @@ -330,6 +330,13 @@ shm_retry: rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome, flags | do_recover, bdb->bi_dbenv_mode ); + if ( rc == DB_VERSION_MISMATCH ) { + Debug( LDAP_DEBUG_ANY, + LDAP_XSTRING(bdb_db_open) ": bdb version change detected " + "trying to recover\n", 0, 0, 0 ); + rc = (bdb->bi_dbenv->open)( bdb->bi_dbenv, dbhome, + flags | DB_RECOVER, bdb->bi_dbenv_mode ); + } if ( rc ) { /* Regular open failed, probably a missing shm environment. * Start over, do a recovery. -- 1.7.1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org