- update to rpm-4.16.1.3

* security fixes for CVE-2021-3421, CVE-2021-20271, CVE-2021-20266
  * fix bdb_ro failing to open database with missing secondary indexes
  * dropped: finddebuginfo-check-res-file.patch
  * dropped: empty_dbbackend.diff

OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=576

empty_dbbackend.diff

@@ -1,20 +0,0 @@
---- ./lib/backend/dbi.c.orig	2020-11-18 09:37:08.314743771 +0000
-+++ ./lib/backend/dbi.c	2020-11-18 09:42:34.025792074 +0000
-@@ -77,7 +77,7 @@ dbDetectBackend(rpmdb rdb)
- 	}
-     }
- 
--    if (!cfg) {
-+    if (!cfg && (rdb->db_flags & RPMDB_FLAG_REBUILD) != 0) {
- 	rpmlog(RPMLOG_WARNING, _("invalid %%_db_backend: %s\n"), db_backend);
- 	goto exit;
-     }
-@@ -97,7 +97,7 @@ dbDetectBackend(rpmdb rdb)
- 		rpmlog(RPMLOG_WARNING,
- 			_("Converting database from %s to %s backend\n"),
- 			ondisk->name, cfg->name);
--	    } else {
-+	    } else if (*db_backend) {
- 		rpmlog(RPMLOG_WARNING,
- 		    _("Found %s %s database while attempting %s backend: "
- 		    "using %s backend.\n"),

finddebuginfo-check-res-file.patch

@@ -1,25 +0,0 @@
-From a20edbb561f74ba608c0aa36be637e7245e596b5 Mon Sep 17 00:00:00 2001
-From: ggardet <guillaume.gardet@opensuse.org>
-Date: Fri, 9 Oct 2020 13:10:09 +0200
-Subject: [PATCH] Do not fail if there is no "$temp"/res.* file
-
-find-debuginfo is multi-threaded and rpm runs
-scripts usually with "-e" to abort on error.
-If the debug-splitting tool fails, that job will abort.
-But if you have X files that are problematic in the tree,
-and you have X or less jobs, find-debuginfo will abort
-as no single res.$number has been written.
-But if you have more than X jobs, the build will succeed,
-which makes the whole process random.
-This commit remove this randomness.
-
---- scripts/find-debuginfo.sh.orig
-+++ scripts/find-debuginfo.sh
-@@ -498,6 +498,7 @@ else
-     wait
-   )
-   for f in "$temp"/res.*; do
-+    test -f "$f" || continue
-     res=$(< "$f")
-     if [ "$res" !=  "0" ]; then
-       exit 1

python-rpm.spec

@@ -21,7 +21,7 @@
 %global with_python 1
 %{?!python_module:%define python_module() python-%{**} python3-%{**}}
 Name:           python-rpm
-Version:        4.16.0
+Version:        4.16.1.3
 Release:        0
 Summary:        Python Bindings for Manipulating RPM Packages
 License:        GPL-2.0-or-later

rpm-4.16.0.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:ca5974e9da2939afb422598818ef187385061889ba766166c4a3829c5ef8d411
-size 4341683

rpm-4.16.1.3.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:513dc7f972b6e7ccfc9fc7f9c01d5310cc56ee853892e4314fa2cad71478e21d
+size 4354652

rpm.changes

@@ -1,6 +1,11 @@
 -------------------------------------------------------------------
 Tue Mar 30 11:15:44 CEST 2021 - mls@suse.de
 
+- update to rpm-4.16.1.3
+  * security fixes for CVE-2021-3421, CVE-2021-20271, CVE-2021-20266
+  * fix bdb_ro failing to open database with missing secondary indexes
+  * dropped: finddebuginfo-check-res-file.patch
+  * dropped: empty_dbbackend.diff
 - require the exact version of librpmbuild in the rpm-build
   package [bnc#1180965]
 - reformat dwarf5.diff

rpm.spec

@@ -59,7 +59,7 @@ Requires:       /usr/bin/awk
 Summary:        The RPM Package Manager
 License:        GPL-2.0-or-later
 Group:          System/Packages
-Version:        4.16.0
+Version:        4.16.1.3
 Release:        0
 URL:            https://rpm.org/
 #Git-Clone:     https://github.com/rpm-software-management/rpm
@@ -125,8 +125,6 @@ Patch109:       pythondistdeps.diff
 Patch117:       findsupplements.diff
 Patch122:       db_conversion.diff
 Patch123:       nextiteratorheaderblob.diff
-Patch127:       finddebuginfo-check-res-file.patch
-Patch128:       empty_dbbackend.diff
 Patch129:       ndbglue.diff
 Patch130:       dwarf5.diff
 Patch131:       posttrans.diff
@@ -257,7 +255,7 @@ cp build-aux/config.guess build-aux/config.sub db/dist/
 %patch                   -P 93 -P 94                         -P 99
 %patch -P 100        -P 102 -P 103
 %patch -P 109                                           -P 117
-%patch -P 122 -P 123 -P 127 -P 128 -P 129 -P 130 -P 131
+%patch -P 122 -P 123 -P 129 -P 130 -P 131
 
 %ifarch aarch64 ppc64le riscv64
 %patch6464