folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Add macro _vsflags_query_rpmdb" 

This is too flimsy a mechanism for such a critical item as signature
checking: with the innocent- and unrelated looking commit
e3e5db7f39 in place,
'rpm -q foo.rpm' runs with NO signature checking whereas 'rpm -qp foo.rpm'
does signature check. Not sane behavior.

Also the commit is buggy to begin with, qva->qva_source is not a bitfield
so most queries would run with signature checking enabled still.
Revisit some day in a different form, maybe.

This reverts commit b30fca9eed.
This commit is contained in:
Panu Matilainen 2016-10-20 10:11:18 +03:00
parent d8bfe73257
commit 1d32a88181
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/query.c
View File

@ -594,14 +594,7 @@ int rpmcliQuery(rpmts ts, QVA_t qva, char * const * argv)
qva->qva_queryFormat = fmt;
}
if (!(qva->qva_source & RPMQV_RPM) &&
rpmExpandNumeric("%{?_vsflags_query_rpmdb:1}")) {
vsflags = rpmExpandNumeric("%{?_vsflags_query_rpmdb}");
} else {
vsflags = rpmExpandNumeric("%{?_vsflags_query}");
}
vsflags = rpmExpandNumeric("%{?_vsflags_query}");
if (rpmcliQueryFlags & VERIFY_DIGEST)
vsflags |= _RPMVSF_NODIGESTS;
if (rpmcliQueryFlags & VERIFY_SIGNATURE)

1
macros.in
View File

@ -664,7 +664,6 @@ package or when debugging this package.\
%_vsflags_erase %{__vsflags}
%_vsflags_install %{__vsflags}
%_vsflags_query %{__vsflags}
%_vsflags_query_rpmdb 0xf0f00
%_vsflags_rebuilddb 0xc0c00
%_vsflags_verify %{__vsflags}