From ad54ca8f13349f177fabdb61153af030ae59deef9e1e7347cdbc8a0833f2cd98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Schr=C3=B6der?= <mls@suse.com>
Date: Thu, 7 Jan 2021 15:29:47 +0000
Subject: [PATCH] update

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=568
---
 db_conversion.diff | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/db_conversion.diff b/db_conversion.diff
index e53d40c..970cfab 100644
--- a/db_conversion.diff
+++ b/db_conversion.diff
@@ -1,5 +1,5 @@
 --- ./lib/backend/bdb_ro.c.orig	2020-05-28 10:04:25.027136631 +0000
-+++ ./lib/backend/bdb_ro.c	2020-10-07 13:57:21.021813205 +0000
++++ ./lib/backend/bdb_ro.c	2021-01-07 15:24:08.866776792 +0000
 @@ -790,6 +790,7 @@ static unsigned int bdbro_pkgdbKey(dbiIn
  struct rpmdbOps_s bdbro_dbops = {
      .name       = "bdb_ro",
@@ -9,7 +9,7 @@
      .open       = bdbro_Open,
      .close      = bdbro_Close,
 --- ./lib/backend/dbi.c.orig	2020-08-31 09:14:07.991087349 +0000
-+++ ./lib/backend/dbi.c	2020-10-07 13:57:21.021813205 +0000
++++ ./lib/backend/dbi.c	2021-01-07 15:24:08.866776792 +0000
 @@ -119,11 +119,20 @@ exit:
      }
  
@@ -31,8 +31,8 @@
  const char * dbiName(dbiIndex dbi)
  {
      return dbi->dbi_file;
---- ./lib/backend/dbi.h.orig	2020-10-07 13:57:12.145839232 +0000
-+++ ./lib/backend/dbi.h	2020-10-07 13:57:21.021813205 +0000
+--- ./lib/backend/dbi.h.orig	2021-01-07 15:23:56.122812108 +0000
++++ ./lib/backend/dbi.h	2021-01-07 15:24:08.866776792 +0000
 @@ -11,6 +11,7 @@ enum rpmdbFlags {
      RPMDB_FLAG_REBUILD		= (1 << 1),
      RPMDB_FLAG_VERIFYONLY	= (1 << 2),
@@ -72,8 +72,26 @@
  
      int (*open)(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flags);
      int (*close)(dbiIndex dbi, unsigned int flags);
---- ./lib/rpmdb.c.orig	2020-10-07 13:57:12.145839232 +0000
-+++ ./lib/rpmdb.c	2020-10-07 13:57:37.609764566 +0000
+--- ./lib/backend/ndb/rpmpkg.c.orig	2021-01-07 15:24:37.266698082 +0000
++++ ./lib/backend/ndb/rpmpkg.c	2021-01-07 15:27:46.678173133 +0000
+@@ -1116,11 +1116,12 @@ static int rpmpkgPutInternal(rpmpkgdb pk
+     if (rpmpkgWriteBlob(pkgdb, pkgidx, blkoff, blkcnt, blob, blobl, pkgdb->generation)) {
+ 	return RPMRC_FAIL;
+     }
++    /* update nextpkgidx if needed */
++    if (pkgidx >= pkgdb->nextpkgidx) {
++	pkgdb->nextpkgidx = pkgidx + 1; 
++    }    
+     /* write slot */
+     slotno = oldslot ? oldslot->slotno : pkgdb->freeslot;
+-    if (!slotno) {
+-	return RPMRC_FAIL;
+-    }
+     if (rpmpkgWriteslot(pkgdb, slotno, pkgidx, blkoff, blkcnt)) {
+ 	free(pkgdb->slots);
+ 	pkgdb->slots = 0;
+--- ./lib/rpmdb.c.orig	2021-01-07 15:23:56.122812108 +0000
++++ ./lib/rpmdb.c	2021-01-07 15:24:08.866776792 +0000
 @@ -516,7 +516,13 @@ static int openDatabase(const char * pre
  	    rpmsqActivate(1);
  	}
@@ -141,7 +159,7 @@
  	goto exit;
      }
 --- ./lib/rpmdb_internal.h.orig	2020-05-28 10:04:25.037136686 +0000
-+++ ./lib/rpmdb_internal.h	2020-10-07 13:57:21.021813205 +0000
++++ ./lib/rpmdb_internal.h	2021-01-07 15:24:08.866776792 +0000
 @@ -25,6 +25,7 @@ extern "C" {
  
  enum rpmdbRebuildFlags_e {