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.3/src/daemon/rpm.h.orig 2013-03-13 10:00:17.000000000 +0100
12 +++ abrt-2.1.3/src/daemon/rpm.h 2013-04-02 18:02:06.019396313 +0200
18 #include <rpm/rpmts.h>
19 #include <rpm/rpmcli.h>
20 #include <rpm/rpmdb.h>
21 --- abrt-2.1.6/src/daemon/rpm.c.orig 2013-07-23 10:10:03.000000000 +0200
22 +++ abrt-2.1.6/src/daemon/rpm.c 2013-09-04 20:54:27.219767437 +0200
23 @@ -62,7 +62,6 @@ void rpm_init()
26 /* Mirroring the order of deinit calls in rpm-4.11.1/lib/poptALL.c::rpmcliFini() */
31 @@ -110,7 +109,14 @@ int rpm_chk_fingerprint(const char* pkg)
35 - pgpsig = headerFormat(header, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &errmsg);
36 + pgpsig = headerSprintf(
38 + "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:"
39 + "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
44 if (!pgpsig && errmsg)
46 VERB1 log("cannot get siggpg:pgpsig. reason: %s", errmsg);
47 @@ -202,14 +208,13 @@ char* rpm_get_component(const char *file
48 rpmdbFreeIterator(iter);
51 - if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0)
53 + rpmtsSetRootDir(ts, rootdir_or_NULL);
55 rootdir_or_NULL = NULL;
58 const char *errmsg = NULL;
59 - srpm = headerFormat(header, "%{SOURCERPM}", &errmsg);
60 + srpm = headerSprintf(header, "%{SOURCERPM}", NULL, NULL, &errmsg);
63 error_msg("cannot get srpm. reason: %s", errmsg);
64 @@ -230,7 +235,7 @@ char* rpm_get_component(const char *file
65 static inline int pkg_add_##name(Header header, struct pkg_envra *p) \
67 const char *errmsg = NULL; \
68 - p->p_##name = headerFormat(header, "%{"#name"}", &errmsg); \
69 + p->p_##name = headerSprintf(header, "%{"#name"}", NULL, NULL, &errmsg); \
70 if (p->p_##name || !errmsg) \
73 @@ -275,8 +280,7 @@ struct pkg_envra *rpm_get_package_nvr(co
74 rpmdbFreeIterator(iter);
77 - if (rpmtsSetRootDir(ts, rootdir_or_NULL) != 0)
79 + rpmtsSetRootDir(ts, rootdir_or_NULL);
81 rootdir_or_NULL = NULL;
83 --- abrt-2.1.3/src/plugins/bodhi.c.orig 2013-03-13 10:00:17.000000000 +0100
84 +++ abrt-2.1.3/src/plugins/bodhi.c 2013-04-02 18:15:58.076045639 +0200
88 #include <json/json.h>
91 #include <rpm/rpmts.h>
92 #include <rpm/rpmcli.h>
93 #include <rpm/rpmdb.h>
94 @@ -338,7 +340,7 @@ static char *rpm_get_nvr_by_pkg_name(con
97 const char *errmsg = NULL;
98 - nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg);
99 + nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg);
102 error_msg("cannot get nvr. reason: %s", errmsg);
103 @@ -348,7 +350,6 @@ error: