Rebase to rpm 4.16.1.3

BDB will segfault on multiple failed attempts of certain kind, something
unexpected fails when selinux says no. Stop on first failure instead.
On a related note, fix double rpmdb open failure from lazy keyring open
recursing back to the same lazy open.

.gitignore

@@ -40,3 +40,9 @@
 /rpm-4.15.90-git14971.tar.bz2
 /rpm-4.16.0-beta1.tar.bz2
 /rpm-4.16.0-beta3.tar.bz2
+/rpm-4.16.0-rc1.tar.bz2
+/rpm-4.16.0.tar.bz2
+/rpm-4.16.1.tar.bz2
+/rpm-4.16.1.1.tar.bz2
+/rpm-4.16.1.2.tar.bz2
+/rpm-4.16.1.3.tar.bz2

0001-Issue-deprecation-warning-when-creating-BDB-database.patch

@@ -0,0 +1,28 @@
+From 5a80033676f331de2b0979fe7be9557279b6bff3 Mon Sep 17 00:00:00 2001
+Message-Id: <5a80033676f331de2b0979fe7be9557279b6bff3.1603865959.git.pmatilai@redhat.com>
+From: Panu Matilainen <pmatilai@redhat.com>
+Date: Wed, 28 Oct 2020 08:14:55 +0200
+Subject: [PATCH] Issue deprecation warning when creating BDB databases
+
+---
+ lib/backend/db3.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/lib/backend/db3.c b/lib/backend/db3.c
+index 68cfa6fb2..cb31676e7 100644
+--- a/lib/backend/db3.c
++++ b/lib/backend/db3.c
+@@ -874,6 +874,10 @@ static int db3_dbiOpen(rpmdb rdb, rpmDbiTagVal rpmtag, dbiIndex * dbip, int flag
+ 		oflags &= ~DB_RDONLY;
+ 		dbtype = (rpmtag == RPMDBI_PACKAGES) ?  DB_HASH : DB_BTREE;
+ 		retry_open--;
++		if (rpmtag == RPMDBI_PACKAGES) {
++		    rpmlog(RPMLOG_WARNING,
++			    "using deprecated bdb database backend");
++		}
+ 	    } else {
+ 		retry_open = 0;
+ 	    }
+-- 
+2.28.0
+

0001-Revert-Improve-ARM-detection.patch

@@ -1,95 +0,0 @@
-From 2426c2a066e44f4d9a342585e76cdbdb0a8a2db1 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Wed, 23 Oct 2019 20:22:19 +0100
-Subject: [PATCH] Revert "Improve ARM detection"
-
-This reverts commit 8c3a7b8fa92b49a811fe36b60857b12f5d7db8a8.
-
-This is the final piece in fixing rhbz 1691430. It's a clean revert
-so let's do that for F-31 and we can discuss the details later.
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- lib/rpmrc.c | 37 +++++++++----------------------------
- 1 file changed, 9 insertions(+), 28 deletions(-)
-
-diff --git a/lib/rpmrc.c b/lib/rpmrc.c
-index 0806e1b07..cada3f788 100644
---- a/lib/rpmrc.c
-+++ b/lib/rpmrc.c
-@@ -82,7 +82,6 @@ struct rpmOption {
- static struct rpmat_s {
-     const char *platform;
-     uint64_t hwcap;
--    uint64_t hwcap2;
- } rpmat;
- 
- typedef struct defaultEntry_s {
-@@ -951,9 +950,6 @@ static int is_geode(void)
- 
- 
- #if defined(__linux__)
--#ifndef AT_HWCAP2 /* glibc < 2.18 */
--#define AT_HWCAP2 26
--#endif
- /**
-  * Populate rpmat structure with auxv values
-  */
-@@ -967,7 +963,6 @@ static void read_auxv(void)
- 	if (!rpmat.platform)
- 	    rpmat.platform = "";
- 	rpmat.hwcap = getauxval(AT_HWCAP);
--	rpmat.hwcap2 = getauxval(AT_HWCAP2);
- #else
- 	rpmat.platform = "";
- 	int fd = open("/proc/self/auxv", O_RDONLY);
-@@ -989,9 +984,6 @@ static void read_auxv(void)
-                     case AT_HWCAP:
-                         rpmat.hwcap = auxv.a_un.a_val;
-                         break;
--		    case AT_HWCAP2:
--			rpmat.hwcap2 = auxv.a_un.a_val;
--			break;
-                 }
- 	    }
- 	    close(fd);
-@@ -1225,27 +1217,16 @@ static void defaultMachine(rpmrcCtx ctx, const char ** arch, const char ** os)
- #	if !defined(HWCAP_ARM_VFPv3)
- #	    define HWCAP_ARM_VFPv3	(1 << 13)
- #	endif
--#	if !defined(HWCAP2_AES)
--#	    define HWCAP2_AES		(1 << 0)
--#	endif
--	/*
--	 * un.machine is armvXE, where X is version number and E is
--	 * endianness (b or l)
--	 */
--	if (rstreqn(un.machine, "armv", 4)) {
--		char endian = un.machine[strlen(un.machine)-1];
--		char *modifier = un.machine + 5;
--		/* keep armv7, armv8, armv9, armv10, ... */
--		while(risdigit(*modifier)) 
--			modifier++;
--		if (rpmat.hwcap & HWCAP_ARM_VFPv3)
--			*modifier++ = 'h';
--		if (rpmat.hwcap2 & HWCAP2_AES)
--			*modifier++ = 'c';
-+	if (rstreq(un.machine, "armv7l")) {
-+	    if (rpmat.hwcap & HWCAP_ARM_VFPv3) {
- 		if (rpmat.hwcap & HWCAP_ARM_NEON)
--			*modifier++ = 'n';
--		*modifier++ = endian;
--		*modifier++ = 0;
-+		    strcpy(un.machine, "armv7hnl");
-+		else
-+		    strcpy(un.machine, "armv7hl");
-+	    }
-+	} else if (rstreq(un.machine, "armv6l")) {
-+	    if (rpmat.hwcap & HWCAP_ARM_VFP)
-+		strcpy(un.machine, "armv6hl");
- 	}
- #	endif	/* arm*-linux */
- 
--- 
-2.23.0
-

rpm.spec

@@ -1,7 +1,14 @@
+
+# run internal testsuite?
+# fakechroot is severely broken beyond fedora 33, disable...
+%if 0%{fedora} > 33
+%bcond_with check
+%else
+%bcond_without check
+%endif
+
 # build against xz?
 %bcond_without xz
-# run internal testsuite?
-%bcond_without check
 # build with plugins?
 %bcond_without plugins
 # build with libarchive? (needed for rpm2archive)
@@ -23,9 +30,10 @@
 
 %define rpmhome /usr/lib/rpm
 
-%global rpmver 4.16.0
-%global snapver beta3
-%global rel 2
+%global rpmver 4.16.1.3
+#global snapver rc1
+%global rel 1
+%global sover 9
 
 %global srcver %{rpmver}%{?snapver:-%{snapver}}
 %global srcdir %{?snapver:testing}%{!?snapver:rpm-%(echo %{rpmver} | cut -d'.' -f1-2).x}
@@ -40,7 +48,7 @@
 Summary: The RPM package management system
 Name: rpm
 Version: %{rpmver}
-Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}.3
+Release: %{?snapver:0.%{snapver}.}%{rel}%{?dist}
 Url: http://www.rpm.org/
 Source0: http://ftp.rpm.org/releases/%{srcdir}/rpm-%{srcver}.tar.bz2
 %if %{with bdb} && %{with int_bdb}
@@ -57,6 +65,7 @@ Patch3: rpm-4.9.90-no-man-dirs.patch
 Patch5: rpm-4.12.0-rpm2cpio-hack.patch
 # https://github.com/rpm-software-management/rpm/pull/473
 Patch6: 0001-find-debuginfo.sh-decompress-DWARF-compressed-ELF-se.patch
+Patch7: 0001-Issue-deprecation-warning-when-creating-BDB-database.patch
 
 # Patches already upstream:
 
@@ -65,8 +74,6 @@ Patch906: rpm-4.7.1-geode-i686.patch
 # Probably to be upstreamed in slightly different form
 Patch907: rpm-4.15.x-ldflags.patch
 
-Patch912: 0001-Revert-Improve-ARM-detection.patch
-
 # Partially GPL/LGPL dual-licensed and some bits with BSD
 # SourceLicense: (GPLv2+ and LGPLv2+ with exceptions) and BSD
 License: GPLv2+
@@ -393,7 +400,9 @@ rm -f $RPM_BUILD_ROOT/%{_fileattrsdir}/{perl*,python*}
 
 %if %{with check}
 %check
-make check || (cat tests/rpmtests.log; exit 1)
+make check TESTSUITEFLAGS=-j%{_smp_build_ncpus} || (cat tests/rpmtests.log; exit 1)
+# rpm >= 4.16.0 testsuite leaves a read-only tree behind, clean it up
+make clean
 %endif
 
 # Handle rpmdb rebuild service on erasure of old to avoid ordering issues
@@ -467,8 +476,10 @@ fi
 %dir %{rpmhome}/fileattrs
 
 %files libs
-%{_libdir}/librpmio.so.*
-%{_libdir}/librpm.so.*
+%{_libdir}/librpmio.so.%{sover}
+%{_libdir}/librpm.so.%{sover}
+%{_libdir}/librpmio.so.%{sover}.*
+%{_libdir}/librpm.so.%{sover}.*
 %if %{with plugins}
 %dir %{_libdir}/rpm-plugins
 
@@ -499,10 +510,12 @@ fi
 %endif
 
 %files build-libs
-%{_libdir}/librpmbuild.so.*
+%{_libdir}/librpmbuild.so.%{sover}
+%{_libdir}/librpmbuild.so.%{sover}.*
 
 %files sign-libs
-%{_libdir}/librpmsign.so.*
+%{_libdir}/librpmsign.so.%{sover}
+%{_libdir}/librpmsign.so.%{sover}.*
 
 %files build
 %{_bindir}/rpmbuild
@@ -552,6 +565,40 @@ fi
 %doc doc/librpm/html/*
 
 %changelog
+* Mon Mar 22 2021 Panu Matilainen <pmatilai@redhat.com> - 4.16.1.3-1
+- Rebase to rpm 4.16.1.3 (http://rpm.org/wiki/Releases/4.16.1.3)
+
+* Wed Dec 16 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.1.2-1
+- Rebase to rpm 4.16.1.2 (http://rpm.org/wiki/Releases/4.16.1.2)
+- Add a spec safeguard for accidental soname bumps
+
+* Wed Dec 16 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.1.1-1
+- Rebase to rpm 4.16.1.1 (http://rpm.org/wiki/Releases/4.16.1.1)
+
+* Thu Dec 10 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.1-1
+- Rebase to rpm 4.16.1 (http://rpm.org/wiki/Releases/4.16.1)
+
+* Mon Nov 30 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-5
+- Only disable test-suite where it's actually broken
+
+* Mon Nov 30 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-4
+- Fix BDB crashing on failed open attempts (#1902395, #1898299, #1900407)
+- Fix unnecessary double failure on lazy keyring open
+
+* Wed Oct 28 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-3
+- Issue deprecation warning when creating BDB databases (#1787311)
+- Temporarily disable test-suite due to massive fakechroot breakage
+
+* Mon Oct 05 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-2
+- Clean up after test-suite which leaves a read-only tree behind
+
+* Wed Sep 30 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-1
+- Rebase to 4.16.0 final (https://rpm.org/wiki/Releases/4.16.0)
+
+* Mon Aug 31 2020 Panu Matilainen <pmatilai@redhat.com> - 4.16.0-0.rc1.1
+- Rebase to 4.16.0-rc1
+- Run test-suite in parallel
+
 * Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 4.16.0-0.beta3.2.3
 - Second attempt - Rebuilt for
   https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

sources

@@ -1 +1 @@
-SHA512 (rpm-4.16.0-beta3.tar.bz2) = 20efa638a7fe85b1b4d3d42fb07172c20a1f3c62024a29e4184b67a2d52ff3f94a186f178e9a5bfee9bf6c826a1023995d970b5c0ddaffe8b61fd2c888b44032
+SHA512 (rpm-4.16.1.3.tar.bz2) = 54e503b32dffaa73d6168f26a00220d9d9124082d8a1eb1ddf34ce32a482f07cb06ec654cf065fca1607cc37b13fa7d4fa9895553541d7cfddecf68c9eb96f2e