1 --- abrt-2.0.8/src/daemon/Makefile.am.0011~ 2011-12-15 13:39:13.000000000 +0100
2 +++ abrt-2.0.8/src/daemon/Makefile.am 2012-03-11 21:28:24.900043460 +0100
3 @@ -84,6 +84,7 @@ abrt_action_save_package_data_CPPFLAGS =
4 -I$(srcdir)/../include \
6 -DCONF_DIR=\"$(CONF_DIR)\" \
11 --- abrt-2.8.2/src/daemon/rpm.c.orig 2016-07-08 09:49:44.000000000 +0200
12 +++ abrt-2.8.2/src/daemon/rpm.c 2016-08-03 20:51:03.649708165 +0200
17 -#include <rpm/rpmts.h>
18 -#include <rpm/rpmcli.h>
19 -#include <rpm/rpmdb.h>
20 -#include <rpm/rpmpgp.h>
28 @@ -62,7 +62,6 @@ void rpm_init()
31 /* Mirroring the order of deinit calls in rpm-4.11.1/lib/poptALL.c::rpmcliFini() */
42 if (pgpPubkeyFingerprint(pkt, pklen, keyID) == 0)
44 if (pgpPubkeyKeyID(pkt, pklen, keyID) == 0)
45 @@ -119,13 +118,20 @@ char *rpm_get_fingerprint(const char *pk
46 const char *errmsg = NULL;
48 rpmts ts = rpmtsCreate();
49 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0);
50 - Header header = rpmdbNextIterator(iter);
51 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0);
52 + Header header = rpmmiNext(iter);
57 - pgpsig = headerFormat(header, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &errmsg);
58 + pgpsig = headerSprintf(
60 + "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:"
61 + "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
66 if (!pgpsig && errmsg)
68 log_notice("cannot get siggpg:pgpsig. reason: %s", errmsg);
69 @@ -138,8 +144,8 @@ char *rpm_get_fingerprint(const char *pk
73 - rpmdbFreeIterator(iter);
75 + iter = rpmmiFree(iter);
80 @@ -156,8 +162,8 @@ bool CheckHash(const char* pPackage, con
83 rpmts ts = rpmtsCreate();
84 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
85 - Header header = rpmdbNextIterator(iter);
86 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
87 + Header header = rpmmiNext(iter);
91 @@ -177,14 +183,14 @@ bool CheckHash(const char* pPackage, con
95 - rpmdbFreeIterator(iter);
97 + iter = rpmmiFree(iter);
104 -static int rpm_query_file(rpmts *ts, rpmdbMatchIterator *iter, Header *header,
105 +static int rpm_query_file(rpmts *ts, rpmmi *iter, Header *header,
106 const char *filename, const char *rootdir_or_NULL)
108 const char *queryname = filename;
109 @@ -191,11 +197,7 @@ static int rpm_query_file(rpmts *ts, rpm
113 - if (rpmtsSetRootDir(*ts, rootdir_or_NULL) != 0)
118 + rpmtsSetRootDir(*ts, rootdir_or_NULL);
120 unsigned len = strlen(rootdir_or_NULL);
121 /* remove 'chroot' prefix */
122 @@ -204,12 +206,12 @@ static int rpm_query_file(rpmts *ts, rpm
125 *iter = rpmtsInitIterator(*ts, RPMTAG_BASENAMES, queryname, 0);
126 - *header = rpmdbNextIterator(*iter);
127 + *header = rpmmiNext(*iter);
129 if (!(*header) && rootdir_or_NULL)
131 - rpmdbFreeIterator(*iter);
133 + *iter = rpmmiFree(*iter);
134 + *ts = rpmtsFree(*ts);
136 return rpm_query_file(ts, iter, header, filename, NULL);
138 @@ -222,8 +224,8 @@ char* rpm_get_component(const char *file
142 - rpmdbMatchIterator iter;
145 + Header header = NULL;
147 if (rpm_query_file(&ts, &iter, &header, filename, rootdir_or_NULL) < 0)
149 @@ -232,7 +234,7 @@ char* rpm_get_component(const char *file
152 const char *errmsg = NULL;
153 - srpm = headerFormat(header, "%{SOURCERPM}", &errmsg);
154 + srpm = headerSprintf(header, "%{SOURCERPM}", NULL, NULL, &errmsg);
157 error_msg("cannot get srpm. reason: %s", errmsg);
158 @@ -243,8 +245,8 @@ char* rpm_get_component(const char *file
162 - rpmdbFreeIterator(iter);
164 + iter = rpmmiFree(iter);
165 + ts = rpmtsFree(ts);
169 @@ -252,7 +254,7 @@ char* rpm_get_component(const char *file
170 static inline int pkg_add_##name(Header header, struct pkg_envra *p) \
172 const char *errmsg = NULL; \
173 - p->p_##name = headerFormat(header, "%{"#name"}", &errmsg); \
174 + p->p_##name = headerSprintf(header, "%{"#name"}", NULL, NULL, &errmsg); \
175 if (p->p_##name || !errmsg) \
178 @@ -272,8 +274,8 @@ pkg_add_id(vendor);
179 struct pkg_envra *rpm_get_package_nvr(const char *filename, const char *rootdir_or_NULL)
182 - rpmdbMatchIterator iter;
185 + Header header = NULL;
187 struct pkg_envra *p = NULL;
189 @@ -320,15 +322,15 @@ struct pkg_envra *rpm_get_package_nvr(co
191 p->p_nvr = xasprintf("%s-%s-%s", p->p_name, p->p_version, p->p_release);
193 - rpmdbFreeIterator(iter);
195 + iter = rpmmiFree(iter);
196 + ts = rpmtsFree(ts);
202 - rpmdbFreeIterator(iter);
204 + iter = rpmmiFree(iter);
205 + ts = rpmtsFree(ts);
209 --- abrt-2.0.15/src/plugins/bodhi.c~ 2012-10-05 08:30:34.000000000 +0200
210 +++ abrt-2.0.15/src/plugins/bodhi.c 2012-10-15 15:54:12.298943477 +0200
211 @@ -331,24 +331,23 @@
214 rpmts ts = rpmtsCreate();
215 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
216 - Header header = rpmdbNextIterator(iter);
217 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
218 + Header header = rpmmiNext(iter);
223 const char *errmsg = NULL;
224 - nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg);
225 + nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg);
228 error_msg("cannot get nvr. reason: %s", errmsg);
231 - rpmdbFreeIterator(iter);
233 + iter = rpmmiFree(iter);
234 + ts = rpmtsFree(ts);