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.1.7/src/daemon/rpm.c.orig 2013-09-10 14:11:13.000000000 +0200
12 +++ abrt-2.1.7/src/daemon/rpm.c 2013-09-27 19:07:08.004722755 +0200
13 @@ -62,7 +62,6 @@ void rpm_init()
16 /* Mirroring the order of deinit calls in rpm-4.11.1/lib/poptALL.c::rpmcliFini() */
21 @@ -104,13 +103,20 @@ int rpm_chk_fingerprint(const char* pkg)
22 const char *errmsg = NULL;
24 rpmts ts = rpmtsCreate();
25 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0);
26 - Header header = rpmdbNextIterator(iter);
27 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg, 0);
28 + Header header = rpmmiNext(iter);
33 - pgpsig = headerFormat(header, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &errmsg);
34 + pgpsig = headerSprintf(
36 + "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:"
37 + "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
42 if (!pgpsig && errmsg)
44 VERB1 log("cannot get siggpg:pgpsig. reason: %s", errmsg);
45 @@ -128,8 +134,8 @@ int rpm_chk_fingerprint(const char* pkg)
49 - rpmdbFreeIterator(iter);
51 + iter = rpmmiFree(iter);
56 @@ -167,8 +173,8 @@ bool CheckHash(const char* pPackage, con
60 - rpmdbFreeIterator(iter);
62 + iter = rpmmiFree(iter);
67 @@ -178,15 +184,15 @@ char* rpm_get_component(const char *file
71 - rpmdbMatchIterator iter;
74 + Header header = NULL;
77 /* This loop executes once (normally) or twice (if we detect chroot) */
80 iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, filename, 0);
81 - header = rpmdbNextIterator(iter);
82 + header = rpmmiNext(iter);
83 //log("%s: header('%s'):%p", __func__, filename, header);
86 @@ -199,17 +205,16 @@ char* rpm_get_component(const char *file
89 //log("%s: skipping '%s' pfx", __func__, rootdir_or_NULL);
90 - rpmdbFreeIterator(iter);
92 + iter = rpmmiFree(iter);
95 - if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0)
97 + rpmtsSetRootDir(ts, rootdir_or_NULL);
99 rootdir_or_NULL = NULL;
102 const char *errmsg = NULL;
103 - srpm = headerFormat(header, "%{SOURCERPM}", &errmsg);
104 + srpm = headerSprintf(header, "%{SOURCERPM}", NULL, NULL, &errmsg);
107 error_msg("cannot get srpm. reason: %s", errmsg);
108 @@ -220,9 +225,8 @@ char* rpm_get_component(const char *file
112 - rpmdbFreeIterator(iter);
115 + iter = rpmmiFree(iter);
116 + ts = rpmtsFree(ts);
120 @@ -230,7 +234,7 @@ char* rpm_get_component(const char *file
121 static inline int pkg_add_##name(Header header, struct pkg_envra *p) \
123 const char *errmsg = NULL; \
124 - p->p_##name = headerFormat(header, "%{"#name"}", &errmsg); \
125 + p->p_##name = headerSprintf(header, "%{"#name"}", NULL, NULL, &errmsg); \
126 if (p->p_##name || !errmsg) \
129 @@ -249,8 +253,8 @@ pkg_add_id(arch);
130 struct pkg_envra *rpm_get_package_nvr(const char *filename, const char *rootdir_or_NULL)
133 - rpmdbMatchIterator iter;
136 + Header header = NULL;
138 struct pkg_envra *p = NULL;
140 @@ -259,7 +263,7 @@ struct pkg_envra *rpm_get_package_nvr(co
143 iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, filename, 0);
144 - header = rpmdbNextIterator(iter);
145 + header = rpmmiNext(iter);
146 //log("%s: header('%s'):%p", __func__, filename, header);
149 @@ -272,11 +276,9 @@ struct pkg_envra *rpm_get_package_nvr(co
152 //log("%s: skipping '%s' pfx", __func__, rootdir_or_NULL);
153 - rpmdbFreeIterator(iter);
155 + iter = rpmmiFree(iter);
156 + ts = rpmtsFree(ts);
158 - if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0)
161 rootdir_or_NULL = NULL;
163 @@ -316,16 +318,15 @@ struct pkg_envra *rpm_get_package_nvr(co
165 p->p_nvr = xasprintf("%s-%s-%s", p->p_name, p->p_version, p->p_release);
167 - rpmdbFreeIterator(iter);
168 + iter = rpmmiFree(iter);
175 - rpmdbFreeIterator(iter);
178 + iter = rpmmiFree(iter);
179 + ts = rpmtsFree(ts);
183 --- abrt-2.0.8/src/daemon/rpm.h.0011~ 2011-12-21 13:20:12.000000000 +0100
184 +++ abrt-2.0.8/src/daemon/rpm.h 2012-03-11 21:28:01.051031573 +0100
189 -#include <rpm/rpmts.h>
190 -#include <rpm/rpmcli.h>
191 -#include <rpm/rpmdb.h>
192 -#include <rpm/rpmpgp.h>
200 --- abrt-2.0.15/src/plugins/bodhi.c~ 2012-10-05 08:30:34.000000000 +0200
201 +++ abrt-2.0.15/src/plugins/bodhi.c 2012-10-15 15:54:12.298943477 +0200
202 @@ -331,24 +331,23 @@
205 rpmts ts = rpmtsCreate();
206 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
207 - Header header = rpmdbNextIterator(iter);
208 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
209 + Header header = rpmmiNext(iter);
214 const char *errmsg = NULL;
215 - nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg);
216 + nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg);
219 error_msg("cannot get nvr. reason: %s", errmsg);
222 - rpmdbFreeIterator(iter);
224 + iter = rpmmiFree(iter);
225 + ts = rpmtsFree(ts);