update to rpm-4.9.0

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
This commit is contained in:
2011-05-16 16:07:44 +00:00
committed by Git OBS Bridge
parent 5d8f14209e
commit cebe6dd1a8
87 changed files with 1633 additions and 2481 deletions

View File

@@ -1,16 +1,14 @@
Always use DB_PRIVATE. Should probably be configured instead.
Always use DB_PRIVATE. Unfortunately no longer configurable
in the macros file.
Index: lib/backend/db3.c
===================================================================
--- lib/backend/db3.c.orig
+++ lib/backend/db3.c
@@ -804,6 +804,9 @@ static int db3open(rpmdb rpmdb, rpmTag r
*/
if (dbi->dbi_use_dbenv) {
--- lib/backend/db3.c.orig 2011-05-12 15:38:18.000000000 +0000
+++ lib/backend/db3.c 2011-05-12 15:38:41.000000000 +0000
@@ -119,7 +119,7 @@ static int db_init(rpmdb rdb, const char
int retry_open = 2;
struct _dbConfig * cfg = &rdb->cfg;
/* This is our setup, thou shall not have other setups before us */
- uint32_t eflags = (DB_CREATE|DB_INIT_MPOOL|DB_INIT_CDB);
+ uint32_t eflags = (DB_CREATE|DB_INIT_MPOOL|DB_INIT_CDB|DB_PRIVATE);
+ /* always use fcntl lock */
+ dbi->dbi_eflags |= DB_PRIVATE;
+
if (access(dbhome, W_OK) == -1) {
/* dbhome is unwritable, don't attempt DB_CREATE on DB->open ... */
if (rdb->db_dbenv != NULL) {
rdb->db_opens++;