7809d0
diff -up db-5.3.28/src/dbinc_auto/int_def.in.rpmlock db-5.3.28/src/dbinc_auto/int_def.in
7809d0
--- db-5.3.28/src/dbinc_auto/int_def.in.rpmlock	2017-06-26 15:09:17.883356255 +0200
7809d0
+++ db-5.3.28/src/dbinc_auto/int_def.in	2017-06-26 15:09:27.421170401 +0200
7809d0
@@ -1573,6 +1573,7 @@
7809d0
 #define	__os_posix_err __os_posix_err@DB_VERSION_UNIQUE_NAME@
7809d0
 #define	__os_fileid __os_fileid@DB_VERSION_UNIQUE_NAME@
7809d0
 #define	__check_lock_fn __check_lock_fn@DB_VERSION_UNIQUE_NAME@
7809d0
+#define	__rpm_lock_free __rpm_lock_free@DB_VERSION_UNIQUE_NAME@
7809d0
 #define	__os_fdlock __os_fdlock@DB_VERSION_UNIQUE_NAME@
7809d0
 #define	__os_fsync __os_fsync@DB_VERSION_UNIQUE_NAME@
7809d0
 #define	__os_getenv __os_getenv@DB_VERSION_UNIQUE_NAME@
7809d0
diff -up db-5.3.28/src/dbinc_auto/os_ext.h.rpmlock db-5.3.28/src/dbinc_auto/os_ext.h
7809d0
--- db-5.3.28/src/dbinc_auto/os_ext.h.rpmlock	2017-06-26 15:09:21.940277203 +0200
7809d0
+++ db-5.3.28/src/dbinc_auto/os_ext.h	2017-06-26 15:09:27.354171707 +0200
7809d0
@@ -42,6 +42,7 @@ char *__os_strerror __P((int, char *, si
7809d0
 int __os_posix_err __P((int));
7809d0
 int __os_fileid __P((ENV *, const char *, int, u_int8_t *));
7809d0
 int __check_lock_fn __P((char *, pid_t));
7809d0
+int __rpm_lock_free __P((ENV *));
7809d0
 int __os_fdlock __P((ENV *, DB_FH *, off_t, db_lockmode_t, int));
7809d0
 int __os_fsync __P((ENV *, DB_FH *));
7809d0
 int __os_getenv __P((ENV *, const char *, char **, size_t));
7809d0
diff -up db-5.3.28/src/env/env_region.c.rpmlock db-5.3.28/src/env/env_region.c
7809d0
--- db-5.3.28/src/env/env_region.c.rpmlock	2017-06-26 15:09:12.479461558 +0200
7809d0
+++ db-5.3.28/src/env/env_region.c	2017-06-26 15:09:12.481461519 +0200
7809d0
@@ -291,18 +291,23 @@ user_map_functions:
7809d0
 	if (create_ok &&
7809d0
 	    ret == DB_OLD_VERSION &&
7809d0
 	    ENV_PRIMARY_LOCK(env, DB_LOCK_WRITE, 1) == 0) {
7809d0
-		if (FLD_ISSET(dbenv->verbose, DB_VERB_RECOVERY))
7809d0
-			__db_msg(env, "Recreating idle environment");
7809d0
-		F_SET(infop, REGION_CREATE_OK);
7809d0
+		/* If the rpm transaction lock is taken we cannot safely rebuild */
7809d0
+        if (!__rpm_lock_free(env))
7809d0
+            ENV_PRIMARY_UNLOCK(env);
7809d0
+        else {
7809d0
+            if (FLD_ISSET(dbenv->verbose, DB_VERB_RECOVERY))
7809d0
+                __db_msg(env, "Recreating idle environment");
7809d0
+            F_SET(infop, REGION_CREATE_OK);
7809d0
 
7809d0
-		/*
7809d0
-		 * Detach from the environment region; we need to unmap it (and
7809d0
-		 * close any file handle) so that we don't leak memory or files.
7809d0
-		 */
7809d0
-		DB_ASSERT(env, infop->rp == NULL);
7809d0
-		infop->rp = &tregion;
7809d0
-		(void)__env_sys_detach(env, infop, 0);
7809d0
-		goto creation;
7809d0
+            /*
7809d0
+             * Detach from the environment region; we need to unmap it (and
7809d0
+             * close any file handle) so that we don't leak memory or files.
7809d0
+             */
7809d0
+            DB_ASSERT(env, infop->rp == NULL);
7809d0
+            infop->rp = &tregion;
7809d0
+            (void)__env_sys_detach(env, infop, 0);
7809d0
+            goto creation;
7809d0
+        }
7809d0
 	}
7809d0
 
7809d0
 	if (renv->majver != DB_VERSION_MAJOR ||
7809d0
diff -up db-5.3.28/src/os/os_flock.c.rpmlock db-5.3.28/src/os/os_flock.c
7809d0
--- db-5.3.28/src/os/os_flock.c.rpmlock	2017-06-26 15:09:12.480461538 +0200
7809d0
+++ db-5.3.28/src/os/os_flock.c	2017-06-26 15:09:12.481461519 +0200
7809d0
@@ -79,6 +79,35 @@ int __check_lock_fn(fn, pid)
7809d0
 }
7809d0
 
7809d0
 /*
7809d0
+ * __rpm_lock_free --
7809d0
+ * Try to look at a lock used by rpm to see if libdb is being
7809d0
+ * updated and it is safe to access its environment files.
7809d0
+ * PUBLIC: int __rpm_lock_free __P((ENV *));
7809d0
+ */
7809d0
+
7809d0
+#define RPM_PATH SHAREDSTATEDIR "/rpm"
7809d0
+#define RPMLOCK_PATH RPM_PATH "/.rpm.lock"
7809d0
+
7809d0
+int __rpm_lock_free(env)
7809d0
+    ENV *env;
7809d0
+{
7809d0
+    int ret;
7809d0
+
7809d0
+    /* No need to check the transaction lock if not in rpm */
7809d0
+    if (strstr(env->db_home, RPM_PATH) == NULL)
7809d0
+        return 1;
7809d0
+
7809d0
+    /* Assume it is safe to rebuild if the lock file does not exist */
7809d0
+    if (access(RPMLOCK_PATH, F_OK) && errno == ENOENT)
7809d0
+        return 1;
7809d0
+
7809d0
+    ret = __check_lock_fn(RPMLOCK_PATH, 0);
7809d0
+    /* __check_lock_fn can return -1 on failure - return 0 (taken) instead */
7809d0
+    return ret == -1 ? 0: ret;
7809d0
+
7809d0
+}
7809d0
+
7809d0
+/*
7809d0
  * __os_fdlock --
7809d0
  *	Acquire/release a lock on a byte in a file.
7809d0
  *