Attachment 861899 Details for Bug 1033154 – Patch for 1.3.2

[patch] Patch for 1.3.2

0001-Ticket-47615-Failed-to-compile-the-DS-389-1.3.2.3-ve.patch (text/plain), 2.71 KB, created by mreynolds on 2014-02-11 17:24:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: mreynolds

Created: 2014-02-11 17:24:07 UTC

Size: 2.71 KB

patch

obsolete

>From 0760e84d88145b1b7aee4905c1c7af4e25b80f5e Mon Sep 17 00:00:00 2001
>From: Mark Reynolds <mreynolds@redhat.com>
>Date: Mon, 10 Feb 2014 16:49:42 -0500
>Subject: [PATCH] Ticket 47615 - Failed to compile the DS 389 1.3.2.3 version against Berkeley DB 4.2 version
>
>Bug Description:  libdb 4.2 does not support the db->compact feature, which causes
>                  build failures.  The compact feature was only added to libdb 4.4
>
>Fix Description:  Use preprocessor comamnds to ioslate the compact code.
>
>https://fedorahosted.org/389/ticket/47615
>
>Reviewed by: ?
>---
> ldap/servers/plugins/replication/cl5_api.c |    2 ++
> ldap/servers/slapd/back-ldbm/dblayer.c     |    6 ++++++
> 2 files changed, 8 insertions(+), 0 deletions(-)
>
>diff --git a/ldap/servers/plugins/replication/cl5_api.c b/ldap/servers/plugins/replication/cl5_api.c
>index 980296e..85727f9 100644
>--- a/ldap/servers/plugins/replication/cl5_api.c
>+++ b/ldap/servers/plugins/replication/cl5_api.c
>@@ -3517,6 +3517,7 @@ static void _cl5DoTrimming (ReplicaId rid)
> static void
> _cl5CompactDBs()
> {
>+#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400
> 	int rc;
> 	Object *fileObj = NULL;
> 	CL5DBFile *dbFile = NULL;
>@@ -3573,6 +3574,7 @@ bail:
> 	}
> 	PR_Unlock (s_cl5Desc.dbTrim.lock);
> 
>+#endif
> 	return;
> }
> 
>diff --git a/ldap/servers/slapd/back-ldbm/dblayer.c b/ldap/servers/slapd/back-ldbm/dblayer.c
>index 9fae72b..cb0509f 100644
>--- a/ldap/servers/slapd/back-ldbm/dblayer.c
>+++ b/ldap/servers/slapd/back-ldbm/dblayer.c
>@@ -4672,7 +4672,9 @@ static int checkpoint_threadmain(void *param)
>     char **list = NULL;
>     char **listp = NULL;
>     struct dblayer_private_env *penv = NULL;
>+#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400
>     time_t time_of_last_comapctdb_completion = current_time();    /* seconds since epoch */
>+#endif
>     int compactdb_interval = 0;
>     back_txn txn;
> 
>@@ -4783,6 +4785,8 @@ static int checkpoint_threadmain(void *param)
>         }
>         /* find out which log files don't contain active txns */
>         DB_CHECKPOINT_LOCK(PR_TRUE, penv->dblayer_env_lock);
>+
>+#if 1000*DB_VERSION_MAJOR + 100*DB_VERSION_MINOR >= 4400
>         /* Compacting DB borrowing the timing of the log flush */
>         if ((compactdb_interval > 0) &&
>             (current_time() - time_of_last_comapctdb_completion > compactdb_interval)) {
>@@ -4826,6 +4830,8 @@ static int checkpoint_threadmain(void *param)
>             time_of_last_comapctdb_completion = current_time();    /* seconds since epoch */
>             compactdb_interval = priv->dblayer_compactdb_interval;
>         }
>+#endif
>+
>         rval = LOG_ARCHIVE(penv->dblayer_DB_ENV, &list,
>                            DB_ARCH_ABS, (void *)slapi_ch_malloc);
>         DB_CHECKPOINT_UNLOCK(PR_TRUE, penv->dblayer_env_lock);
>-- 
>1.7.1
>

Actions: View | Diff

Attachments on bug 1033154: 861899