diff options
Diffstat (limited to 'meta/recipes-devtools/rpm/rpm')
-rw-r--r-- | meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch | 64 |
1 files changed, 64 insertions, 0 deletions
diff --git a/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch b/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch new file mode 100644 index 0000000000..410ae78c1b --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/0001-system.h-query.c-support-nosignature.patch | |||
@@ -0,0 +1,64 @@ | |||
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 | ||
5 | |||
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. | ||
10 | |||
11 | Upstream-Status: Submitting [Sent email to rpm-devel@rpm5.org] | ||
12 | |||
13 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
14 | --- | ||
15 | lib/query.c | 6 +++--- | ||
16 | system.h | 4 ++-- | ||
17 | 2 files changed, 5 insertions(+), 5 deletions(-) | ||
18 | |||
19 | diff --git a/lib/query.c b/lib/query.c | ||
20 | index 50a7453..b761d76 100644 | ||
21 | --- a/lib/query.c | ||
22 | +++ b/lib/query.c | ||
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); | ||
33 | } | ||
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); | ||
40 | } | ||
41 | - if (!QVA_ISSET(qva->qva_flags, HDRCHK)) { | ||
42 | + if (QVA_ISSET(qva->qva_flags, HDRCHK)) { | ||
43 | VSF_SET(vsflags, NOHDRCHK); | ||
44 | } | ||
45 | VSF_CLR(vsflags, NEEDPAYLOAD); /* XXX needed? */ | ||
46 | diff --git a/system.h b/system.h | ||
47 | index 2ff8906..ad4619a 100644 | ||
48 | --- a/system.h | ||
49 | +++ b/system.h | ||
50 | @@ -787,9 +787,9 @@ static inline const char *rcsid(const char *p) { \ | ||
51 | #define SUPPORT_I18NSTRING_TYPE 1 | ||
52 | |||
53 | /** | ||
54 | - * Eliminate signature/digest disablers. | ||
55 | + * Signature/digest disablers. | ||
56 | */ | ||
57 | -#undef SUPPORT_NOSIGNATURES | ||
58 | +#define SUPPORT_NOSIGNATURES 1 | ||
59 | |||
60 | /** | ||
61 | * Permit ar(1) payloads. Disabled while rpmio/iosm.c is under development. | ||
62 | -- | ||
63 | 2.9.0 | ||
64 | |||