diff --git a/0007-No-Build-date-and-time-in-binaries.dif b/0007-No-Build-date-and-time-in-binaries.dif deleted file mode 100644 index 19fcc27..0000000 --- a/0007-No-Build-date-and-time-in-binaries.dif +++ /dev/null @@ -1,35 +0,0 @@ -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 . -@@ -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 - diff --git a/0008-Recover-on-DB-version-change.dif b/0008-Recover-on-DB-version-change.dif deleted file mode 100644 index 8e7f4ec..0000000 --- a/0008-Recover-on-DB-version-change.dif +++ /dev/null @@ -1,31 +0,0 @@ -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 - diff --git a/openldap2-client.changes b/openldap2-client.changes index 4469b69..f16839f 100644 --- a/openldap2-client.changes +++ b/openldap2-client.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -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 - ------------------------------------------------------------------- Wed Sep 29 09:21:52 UTC 2010 - rhafer@novell.com diff --git a/openldap2-client.spec b/openldap2-client.spec index 4a6f56b..c6c0b73 100644 --- a/openldap2-client.spec +++ b/openldap2-client.spec @@ -1,5 +1,5 @@ # -# spec file for package openldap2 (Version 2.4.23) +# spec file for package openldap2-client (Version 2.4.23) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,7 +19,7 @@ %define run_test_suite 1 -Name: openldap2-client +Name: openldap2-client BuildRequires: cyrus-sasl-devel libopenssl-devel %if %sles_version == 9 || %sles_version == 10 BuildRequires: -libopenssl-devel -pwdutils openssl-devel @@ -59,8 +59,6 @@ Patch3: 0003-LDAPI-socket-location.dif 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 @@ -195,8 +193,6 @@ Authors: %patch5 -p1 %endif %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %if %suse_version == 1100 %patch200 -p1 %endif @@ -261,7 +257,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" --enable-dynamic=no --enable-shared=no make depend make %{?jobs:-j%jobs} - %endif %endif diff --git a/openldap2.changes b/openldap2.changes index 4469b69..f16839f 100644 --- a/openldap2.changes +++ b/openldap2.changes @@ -1,15 +1,3 @@ -------------------------------------------------------------------- -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 - ------------------------------------------------------------------- Wed Sep 29 09:21:52 UTC 2010 - rhafer@novell.com diff --git a/openldap2.spec b/openldap2.spec index 70e223e..5de3ad8 100644 --- a/openldap2.spec +++ b/openldap2.spec @@ -59,8 +59,6 @@ Patch3: 0003-LDAPI-socket-location.dif 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 @@ -195,8 +193,6 @@ Authors: %patch5 -p1 %endif %patch6 -p1 -%patch7 -p1 -%patch8 -p1 %if %suse_version == 1100 %patch200 -p1 %endif @@ -261,7 +257,6 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing -DLDAP_DEPRECATED" --enable-dynamic=no --enable-shared=no make depend make %{?jobs:-j%jobs} - %endif %endif