1 From d8fcc3cbeec4defb5babde5bd09ea294dd3fd08b Mon Sep 17 00:00:00 2001
2 From: Robert Yang <liezhi.yang@windriver.com>
3 Date: Sun, 3 Jul 2016 19:01:59 -0700
4 Subject: [PATCH] system.h/query.c: support nosignature
6 * Define SUPPORT_NOSIGNATURES to 1 in system.h
7 * !QVA_ISSET(qva->qva_flags, SIGNATURE) -> QVA_ISSET(qva->qva_flags, SIGNATURE),
8 otherwise, when use --nosignature would read database and verify
9 signature, this is not expected.
11 Upstream-Status: Submitting [Sent email to rpm-devel@rpm5.org]
13 Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15 lib/query.c | 6 +++---
17 2 files changed, 5 insertions(+), 5 deletions(-)
19 diff --git a/lib/query.c b/lib/query.c
20 index 50a7453..b761d76 100644
23 @@ -954,19 +954,19 @@ JBJDEBUG((stderr, "--> %s(%p,%p,%p)\n", __FUNCTION__, ts, qva, argv));
24 vsflags = (rpmVSFlags) rpmExpandNumeric("%{?_vsflags_query}");
25 vsflags = (rpmVSFlags) 0; /* XXX FIXME: ignore default disablers. */
26 #if defined(SUPPORT_NOSIGNATURES)
27 - if (!QVA_ISSET(qva->qva_flags, DIGEST)) {
28 + if (QVA_ISSET(qva->qva_flags, DIGEST)) {
29 VSF_SET(vsflags, NOSHA1HEADER);
30 VSF_SET(vsflags, NOMD5HEADER);
31 VSF_SET(vsflags, NOSHA1);
32 VSF_SET(vsflags, NOMD5);
34 - if (!QVA_ISSET(qva->qva_flags, SIGNATURE)) {
35 + if (QVA_ISSET(qva->qva_flags, SIGNATURE)) {
36 VSF_SET(vsflags, NODSAHEADER);
37 VSF_SET(vsflags, NORSAHEADER);
38 VSF_SET(vsflags, NODSA);
39 VSF_SET(vsflags, NORSA);
41 - if (!QVA_ISSET(qva->qva_flags, HDRCHK)) {
42 + if (QVA_ISSET(qva->qva_flags, HDRCHK)) {
43 VSF_SET(vsflags, NOHDRCHK);
45 VSF_CLR(vsflags, NEEDPAYLOAD); /* XXX needed? */
46 diff --git a/system.h b/system.h
47 index 2ff8906..ad4619a 100644
50 @@ -787,9 +787,9 @@ static inline const char *rcsid(const char *p) { \
51 #define SUPPORT_I18NSTRING_TYPE 1
54 - * Eliminate signature/digest disablers.
55 + * Signature/digest disablers.
57 -#undef SUPPORT_NOSIGNATURES
58 +#define SUPPORT_NOSIGNATURES 1
61 * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development.