Check inside --root when querying for files

backport-Check-inside-root-when-querying-for-files.patch

@@ -0,0 +1,38 @@
+From 3e820eaa4c8cb94a63338366cbf014dc5264eba2 Mon Sep 17 00:00:00 2001
+From: Florian Festi <ffesti@redhat.com>
+Date: Tue, 25 Jul 2023 12:08:42 +0200
+Subject: [PATCH] Check inside --root when querying for files
+
+rpm -qf checks if the argument actually exists if it can't be found in
+the rpmdb and gives different messages based on that.
+
+This was done without taking the root dir into account leading to wrong
+messages if the file only exists in the root dir but not outside.
+
+Resolves: #2576
+---
+ lib/query.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/lib/query.c b/lib/query.c
+index e816241b7..dc2dc910b 100644
+--- a/lib/query.c
++++ b/lib/query.c
+@@ -470,11 +470,13 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar
+ 
+ 	if (mi == NULL) {
+ 	    struct stat sb;
+-	    if (lstat(fn, &sb) != 0)
++	    char * full_fn = rpmGetPath(rpmtsRootDir(ts), fn, NULL);
++	    if (lstat(full_fn, &sb) != 0)
+ 		rpmlog(RPMLOG_ERR, _("file %s: %s\n"), fn, strerror(errno));
+ 	    else
+ 		rpmlog(RPMLOG_NOTICE,
+ 			_("file %s is not owned by any package\n"), fn);
++	    free(full_fn);
+ 	}
+ 
+ 	free(fn);
+-- 
+2.27.0
+

rpm.spec

@@ -1,6 +1,6 @@
 Name:          rpm
 Version:       4.15.1
-Release:       51
+Release:       52
 Summary:       RPM Package Manager
 License:       GPLv2+
 URL:           http://www.rpm.org/
@@ -208,6 +208,7 @@ Patch186: backport-Remove-obscure-check-for-package-build-time-from-reb.patch
 Patch187: backport-Fix-possible-null-pointer-reference-in-ndb.patch
 Patch188: backport-Fix-rpmDigestBundleFinal-and-Update-return-code-on-i.patch
 Patch189: backport-Actually-return-an-error-in-parseScript-if-parsing-f.patch
+Patch190: backport-Check-inside-root-when-querying-for-files.patch
 
 BuildRequires: gcc autoconf automake libtool make gawk popt-devel openssl-devel readline-devel libdb-devel
 BuildRequires: zlib-devel libzstd-devel xz-devel bzip2-devel libarchive-devel ima-evm-utils-devel
@@ -491,6 +492,9 @@ make check || (cat tests/rpmtests.log; exit 0)
 %{_mandir}/man1/gendiff.1*
 
 %changelog
+* Tue Aug 29 2023 renhongxun<renhongxun@h-partners.com> - 4.15.1-52
+- Check inside --root when querying for files
+
 * Wed Aug 02 2023 renhongxun<renhongxun@h-partners.com> - 4.15.1-51
 - backport some patches from upstream