From ce8af503733b5661efa046cc7f5f68ee0dad75cc Mon Sep 17 00:00:00 2001

From: Michal Domonkos <mdomonko@redhat.com>

Date: Mon, 16 Aug 2021 18:21:02 +0200

Subject: [PATCH] Add support for RPMDBI_BASENAMES on file queries

There are legitimate reasons (such as rhbz#1940895 or the included test)

for wanting the former behavior where all file states were considered in

file queries prior to commit 9ad57bda4a82b9847826daa766b4421d877bb3d9,

so celebrate the tenth anniversary of that commit by adding a CLI switch

(a new package selector --path), as contemplated back then.

Update the man page for --file to reflect it's current behavior and make

--path that more obvious.

Resolves: rhbz#1940895

Combined with d1aebda01033bc8ba0d748b49f6fad9a5c0caa3f and backported

for 4.16.1.3.

---

 doc/rpm.8         |  9 ++++++--

 lib/poptQV.c      |  6 +++++-

 lib/query.c       |  7 +++++--

 lib/rpmcli.h      |  1 +

 tests/rpmquery.at | 52 +++++++++++++++++++++++++++++++++++++++++++++++

 5 files changed, 70 insertions(+), 5 deletions(-)

diff --git a/doc/rpm.8 b/doc/rpm.8

index 80055b675..ab7364cf6 100644

--- a/doc/rpm.8

+++ b/doc/rpm.8

@@ -57,7 +57,7 @@ rpm \- RPM Package Manager

 .PP

  [\fB\fIPACKAGE_NAME\fB\fR]

- [\fB-a,--all [\fISELECTOR\fR]\fR] [\fB-f,--file \fIFILE\fB\fR]

+ [\fB-a,--all [\fISELECTOR\fR]\fR] [\fB-f,--file \fIFILE\fB\fR] [\fB--path \fIPATH\fB\fR]

  [\fB-g,--group \fIGROUP\fB\fR] [\fB-p,--package \fIPACKAGE_FILE\fB\fR]

  [\fB--hdrid \fISHA1\fB\fR] [\fB--pkgid \fIMD5\fB\fR] [\fB--tid \fITID\fB\fR]

  [\fB--querybynumber \fIHDRNUM\fB\fR] [\fB--triggeredby \fIPACKAGE_NAME\fB\fR]

@@ -569,7 +569,7 @@ starts with "b".

 List duplicated packages.

 .TP

 \fB-f, --file \fIFILE\fB\fR

-Query package owning \fIFILE\fR.

+Query package owning installed \fIFILE\fR.

 .TP

 \fB--filecaps\fR

 List file names with POSIX1.e capabilities.

@@ -612,6 +612,11 @@ that will be expanded to paths that are substituted in place of

 the package manifest as additional \fIPACKAGE_FILE\fR

 arguments to the query.

 .TP

+\fB--path \fIPATH\fB\fR

+Query package(s) owning \fIPATH\fR, whether the file is installed or not.

+Multiple packages may own a \fIPATH\fR, but the file is only owned by the

+package installed last.

+.TP

 \fB--pkgid \fIMD5\fB\fR

 Query package that contains a given package identifier, i.e. the

 \fIMD5\fR digest of the combined header and

diff --git a/lib/poptQV.c b/lib/poptQV.c

index d9d1fad75..9b6101009 100644

--- a/lib/poptQV.c

+++ b/lib/poptQV.c

@@ -27,6 +27,7 @@ struct rpmQVKArguments_s rpmQVKArgs;

 #define POPT_WHATENHANCES	-1014

 #define POPT_WHATOBSOLETES	-1015

 #define POPT_WHATCONFLICTS	-1016

+#define POPT_QUERYBYPATH	-1017

 /* ========== Query/Verify/Signature source args */

 static void rpmQVSourceArgCallback( poptContext con,

@@ -58,6 +59,7 @@ static void rpmQVSourceArgCallback( poptContext con,

     case POPT_WHATSUPPLEMENTS: qva->qva_source |= RPMQV_WHATSUPPLEMENTS; break;

     case POPT_WHATENHANCES: qva->qva_source |= RPMQV_WHATENHANCES; break;

     case POPT_TRIGGEREDBY: qva->qva_source |= RPMQV_TRIGGEREDBY; break;

+    case POPT_QUERYBYPATH: qva->qva_source |= RPMQV_PATH_ALL; break;

     case POPT_QUERYBYPKGID: qva->qva_source |= RPMQV_PKGID; break;

     case POPT_QUERYBYHDRID: qva->qva_source |= RPMQV_HDRID; break;

     case POPT_QUERYBYTID: qva->qva_source |= RPMQV_TID; break;

@@ -80,7 +82,9 @@ struct poptOption rpmQVSourcePoptTable[] = {

  { "checksig", 'K', POPT_ARGFLAG_DOC_HIDDEN, NULL, 'K',

 	N_("rpm checksig mode"), NULL },

  { "file", 'f', 0, 0, 'f',

-	N_("query/verify package(s) owning file"), "FILE" },

+	N_("query/verify package(s) owning installed file"), "FILE" },

+ { "path", '\0', 0, 0, POPT_QUERYBYPATH,

+	N_("query/verify package(s) owning path, installed or not"), "PATH" },

  { "group", 'g', 0, 0, 'g',

 	N_("query/verify package(s) in group"), "GROUP" },

  { "package", 'p', 0, 0, 'p',

diff --git a/lib/query.c b/lib/query.c

index fdabe6e52..9a71f0dc5 100644

--- a/lib/query.c

+++ b/lib/query.c

@@ -445,6 +445,7 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar

 	}

 	/* fallthrough on absolute and relative paths */

     case RPMQV_PATH:

+    case RPMQV_PATH_ALL:

     {   char * fn;

 	for (s = arg; *s != '\0'; s++)

@@ -463,8 +464,10 @@ static rpmdbMatchIterator initQueryIterator(QVA_t qva, rpmts ts, const char * ar

 	    fn = xstrdup(arg);

 	(void) rpmCleanPath(fn);

-	/* XXX Add a switch to enable former BASENAMES behavior? */

-	mi = rpmtsInitIterator(ts, RPMDBI_INSTFILENAMES, fn, 0);

+	rpmDbiTagVal tag = RPMDBI_INSTFILENAMES;

+	if (qva->qva_source == RPMQV_PATH_ALL)

+	    tag = RPMDBI_BASENAMES;

+	mi = rpmtsInitIterator(ts, tag, fn, 0);

 	if (mi == NULL)

 	    mi = rpmtsInitIterator(ts, RPMDBI_PROVIDENAME, fn, 0);

diff --git a/lib/rpmcli.h b/lib/rpmcli.h

index 4886c2453..8ef992ff2 100644

--- a/lib/rpmcli.h

+++ b/lib/rpmcli.h

@@ -81,6 +81,7 @@ rpmcliFini(poptContext optCon);

 enum rpmQVSources_e {

     RPMQV_PACKAGE = 0,	/*!< ... from package name db search. */

     RPMQV_PATH,		/*!< ... from file path db search. */

+    RPMQV_PATH_ALL,	/*!< ... from file path db search (all states). */

     RPMQV_ALL,		/*!< ... from each installed package. */

     RPMQV_RPM, 		/*!< ... from reading binary rpm package. */

     RPMQV_GROUP,	/*!< ... from group db search. */

diff --git a/tests/rpmquery.at b/tests/rpmquery.at

index 9a4f1cb76..335d5ee0d 100644

--- a/tests/rpmquery.at

+++ b/tests/rpmquery.at

@@ -201,6 +201,58 @@ runroot rpm \

 AT_CLEANUP

+# ------------------------------

+# query a package by a file

+AT_SETUP([rpm -qf])

+AT_KEYWORDS([query])

+AT_CHECK([

+RPMDB_INIT

+runroot rpm \

+  --nodeps \

+  -i /data/RPMS/hello-1.0-1.i386.rpm

+runroot rpm \

+  -qf /usr/local/bin/hello

+],

+[0],

+[hello-1.0-1.i386

+],

+[])

+AT_CLEANUP

+

+AT_SETUP([rpm -qf on non-installed file])

+AT_KEYWORDS([query])

+AT_CHECK([

+RPMDB_INIT

+runroot rpm \

+  --nodeps \

+  --excludedocs \

+  -i /data/RPMS/hello-1.0-1.i386.rpm

+runroot rpm \

+  -qf /usr/share/doc/hello-1.0/FAQ

+],

+[1],

+[],

+[error: file /usr/share/doc/hello-1.0/FAQ: No such file or directory

+])

+AT_CLEANUP

+

+AT_SETUP([rpm -q --path on non-installed file])

+AT_KEYWORDS([query])

+AT_CHECK([

+RPMDB_INIT

+runroot rpm \

+  --nodeps \

+  --excludedocs \

+  -i /data/RPMS/hello-1.0-1.i386.rpm

+runroot rpm \

+  -q --path /usr/share/doc/hello-1.0/FAQ

+],

+[0],

+[hello-1.0-1.i386

+],

+[])

+AT_CLEANUP

+

 # ------------------------------

 AT_SETUP([integer array query])

 AT_KEYWORDS([query])

-- 

2.34.1