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.0.8/src/daemon/rpm.c.0011~ 2011-12-21 13:20:12.000000000 +0100
12 +++ abrt-2.0.8/src/daemon/rpm.c 2012-03-11 21:28:01.051031573 +0100
13 @@ -62,7 +62,6 @@ void rpm_init()
20 list_free_with_free(list_fingerprints);
21 @@ -97,13 +96,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 @@ -121,8 +127,8 @@ int rpm_chk_fingerprint(const char* pkg)
49 - rpmdbFreeIterator(iter);
51 + iter = rpmmiFree(iter);
56 @@ -160,8 +166,8 @@ bool CheckHash(const char* pPackage, con
60 - rpmdbFreeIterator(iter);
62 + iter = rpmmiFree(iter);
67 @@ -171,15 +177,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 @@ -192,17 +198,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 @@ -213,9 +218,8 @@ char* rpm_get_component(const char *file
112 - rpmdbFreeIterator(iter);
115 + iter = rpmmiFree(iter);
116 + ts = rpmtsFree(ts);
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 @@ -254,17 +258,17 @@ char* rpm_get_package_nvr(const char *fi
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;
141 /* This loop executes once (normally) or twice (if we detect chroot) */
144 iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, filename, 0);
145 - header = rpmdbNextIterator(iter);
146 + header = rpmmiNext(iter);
147 //log("%s: header('%s'):%p", __func__, filename, header);
150 @@ -285,11 +289,9 @@ char* rpm_get_package_nvr(const char *fi
153 //log("%s: skipping '%s' pfx", __func__, rootdir_or_NULL);
154 - rpmdbFreeIterator(iter);
156 + iter = rpmmiFree(iter);
157 + ts = rpmtsFree(ts);
159 - if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0)
162 rootdir_or_NULL = NULL;
168 - rpmdbFreeIterator(iter);
171 + iter = rpmmiFree(iter);
172 + ts = rpmtsFree(ts);
176 --- abrt-2.0.8/src/daemon/rpm.h.0011~ 2011-12-21 13:20:12.000000000 +0100
177 +++ abrt-2.0.8/src/daemon/rpm.h 2012-03-11 21:28:01.051031573 +0100
182 -#include <rpm/rpmts.h>
183 -#include <rpm/rpmcli.h>
184 -#include <rpm/rpmdb.h>
185 -#include <rpm/rpmpgp.h>
193 --- abrt-2.0.15/src/plugins/bodhi.c~ 2012-10-05 08:30:34.000000000 +0200
194 +++ abrt-2.0.15/src/plugins/bodhi.c 2012-10-15 15:54:12.298943477 +0200
195 @@ -331,24 +331,23 @@
198 rpmts ts = rpmtsCreate();
199 - rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
200 - Header header = rpmdbNextIterator(iter);
201 + rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
202 + Header header = rpmmiNext(iter);
207 const char *errmsg = NULL;
208 - nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg);
209 + nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg);
212 error_msg("cannot get nvr. reason: %s", errmsg);
215 - rpmdbFreeIterator(iter);
217 + iter = rpmmiFree(iter);
218 + ts = rpmtsFree(ts);