diff --git a/db-5.3.28-cwd-db_config.patch b/db-5.3.28-cwd-db_config.patch new file mode 100644 index 0000000..652e962 --- /dev/null +++ b/db-5.3.28-cwd-db_config.patch @@ -0,0 +1,11 @@ +--- db-5.3.28/src/env/env_open.c.old 2017-06-26 10:32:11.011419981 +0200 ++++ db-5.3.28/src/env/env_open.c 2017-06-26 10:32:46.893721233 +0200 +@@ -473,7 +473,7 @@ + env->db_mode = mode == 0 ? DB_MODE_660 : mode; + + /* Read the DB_CONFIG file. */ +- if ((ret = __env_read_db_config(env)) != 0) ++ if (env->db_home != NULL && (ret = __env_read_db_config(env)) != 0) + return (ret); + + /* diff --git a/libdb.spec b/libdb.spec index 6a7bab4..4503983 100644 --- a/libdb.spec +++ b/libdb.spec @@ -40,6 +40,8 @@ Patch31: db-5.3.28-condition-variable-ppc.patch # downstream patch that adds a check for rpm transaction lock in order to be able to update libdb # FIXME: remove when able Patch32: db-5.3.28-rpm-lock-check.patch +# downstream patch to hotfix rhbz#1464033, sent upstream +Patch33: db-5.3.28-cwd-db_config.patch URL: http://www.oracle.com/database/berkeley-db/ License: BSD and LGPLv2 and Sleepycat @@ -235,6 +237,7 @@ popd %patch30 -p1 %patch31 -p1 %patch32 -p1 +%patch33 -p1 cd dist ./s_config @@ -446,6 +449,7 @@ rm -rf ${RPM_BUILD_ROOT} * Mon Jun 26 2017 Petr Kubat - 5.3.28-23 - Try looking at env lock via /proc/locks during env_attach (#1460003) - Check rpm's transaction lock via /proc/locks +- Do not access DB_CONFIG when db_home is not set (#1464033) * Tue Jun 13 2017 Petr Kubat - 5.3.28-23 - Reintroduce patches removed in 5.3.28-22