abrt-rpm5.patch

   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 \
   5      -I$(srcdir)/../lib \
   6      -DCONF_DIR=\"$(CONF_DIR)\" \
   7 +    $(RPM_CFLAGS) \
   8      $(GLIB_CFLAGS) \
   9      $(LIBREPORT_CFLAGS) \
  10      -D_GNU_SOURCE \
  11 --- abrt-2.4.0/src/daemon/rpm.c.orig    2015-02-19 12:53:14.000000000 +0100
  12 +++ abrt-2.4.0/src/daemon/rpm.c 2015-02-26 16:02:37.659278317 +0100
  13 @@ -62,7 +62,6 @@ void rpm_init()
  14  void rpm_destroy()
  15  {
  16      /* Mirroring the order of deinit calls in rpm-4.11.1/lib/poptALL.c::rpmcliFini() */
  17 -    rpmFreeCrypto();
  18      rpmFreeMacros(NULL);
  19      rpmFreeRpmrc();
  20
  21 @@ -104,13 +103,20 @@ int rpm_chk_fingerprint(const char* pkg)
  22      const char *errmsg = NULL;
  23
  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);
  29
  30      if (!header)
  31          goto error;
  32
  33 -    pgpsig = headerFormat(header, "%|SIGGPG?{%{SIGGPG:pgpsig}}:{%{SIGPGP:pgpsig}}|", &errmsg);
  34 +    pgpsig = headerSprintf(
  35 +               header,
  36 +               "%|DSAHEADER?{%{DSAHEADER:pgpsig}}:{%|RSAHEADER?{%{RSAHEADER:pgpsig}}:"
  37 +               "{%|SIGGPG?{%{SIGGPG:pgpsig}}:{%|SIGPGP?{%{SIGPGP:pgpsig}}:{(none)}|}|}|}|",
  38 +               NULL,
  39 +               NULL,
  40 +               &errmsg);
  41 +
  42      if (!pgpsig && errmsg)
  43      {
  44          log_notice("cannot get siggpg:pgpsig. reason: %s", errmsg);
  45 @@ -128,8 +134,8 @@ int rpm_chk_fingerprint(const char* pkg)
  46
  47  error:
  48      free(pgpsig);
  49 -    rpmdbFreeIterator(iter);
  50 -    rpmtsFree(ts);
  51 +    iter = rpmmiFree(iter);
  52 +    ts = rpmtsFree(ts);
  53      return ret;
  54  }
  55
  56 @@ -146,8 +152,8 @@ bool CheckHash(const char* pPackage, con
  57  {
  58      bool ret = true;
  59      rpmts ts = rpmtsCreate();
  60 -    rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
  61 -    Header header = rpmdbNextIterator(iter);
  62 +    rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
  63 +    Header header = rpmmiNext(iter);
  64      if (header == NULL)
  65          goto error;
  66
  67 @@ -167,13 +173,13 @@ bool CheckHash(const char* pPackage, con
  68      }
  69      rpmfiFree(fi);
  70  error:
  71 -    rpmdbFreeIterator(iter);
  72 -    rpmtsFree(ts);
  73 +    iter = rpmmiFree(iter);
  74 +    ts = rpmtsFree(ts);
  75      return ret;
  76  }
  77  */
  78
  79 -static int rpm_query_file(rpmts *ts, rpmdbMatchIterator *iter, Header *header,
  80 +static int rpm_query_file(rpmts *ts, rpmmi *iter, Header *header,
  81          const char *filename, const char *rootdir_or_NULL)
  82  {
  83      const char *queryname = filename;
  84 @@ -181,11 +187,7 @@ static int rpm_query_file(rpmts *ts, rpm
  85      *ts = rpmtsCreate();
  86      if (rootdir_or_NULL)
  87      {
  88 -        if (rpmtsSetRootDir(*ts, rootdir_or_NULL) != 0)
  89 -        {
  90 -            rpmtsFree(*ts);
  91 -            return -1;
  92 -        }
  93 +        rpmtsSetRootDir(*ts, rootdir_or_NULL);
  94
  95          unsigned len = strlen(rootdir_or_NULL);
  96          /* remove 'chroot' prefix */
  97 @@ -194,12 +196,12 @@ static int rpm_query_file(rpmts *ts, rpm
  98      }
  99
 100      *iter = rpmtsInitIterator(*ts, RPMTAG_BASENAMES, queryname, 0);
 101 -    *header = rpmdbNextIterator(*iter);
 102 +    *header = rpmmiNext(*iter);
 103
 104      if (!(*header) && rootdir_or_NULL)
 105      {
 106 -        rpmdbFreeIterator(*iter);
 107 -        rpmtsFree(*ts);
 108 +        *iter = rpmmiFree(*iter);
 109 +        *ts = rpmtsFree(*ts);
 110
 111          return rpm_query_file(ts, iter, header, filename, NULL);
 112      }
 113 @@ -212,8 +214,8 @@ char* rpm_get_component(const char *file
 114      char *ret = NULL;
 115      char *srpm = NULL;
 116      rpmts ts;
 117 -    rpmdbMatchIterator iter;
 118 -    Header header;
 119 +    rpmmi iter = NULL;
 120 +    Header header = NULL;
 121
 122      if (rpm_query_file(&ts, &iter, &header, filename, rootdir_or_NULL) < 0)
 123          return NULL;
 124 @@ -222,7 +224,7 @@ char* rpm_get_component(const char *file
 125          goto error;
 126
 127      const char *errmsg = NULL;
 128 -    srpm = headerFormat(header, "%{SOURCERPM}", &errmsg);
 129 +    srpm = headerSprintf(header, "%{SOURCERPM}", NULL, NULL, &errmsg);
 130      if (!srpm && errmsg)
 131      {
 132          error_msg("cannot get srpm. reason: %s", errmsg);
 133 @@ -233,8 +235,8 @@ char* rpm_get_component(const char *file
 134      free(srpm);
 135
 136   error:
 137 -    rpmdbFreeIterator(iter);
 138 -    rpmtsFree(ts);
 139 +    iter = rpmmiFree(iter);
 140 +    ts = rpmtsFree(ts);
 141      return ret;
 142  }
 143
 144 @@ -242,7 +244,7 @@ char* rpm_get_component(const char *file
 145      static inline int pkg_add_##name(Header header, struct pkg_envra *p) \
 146      {                                                                   \
 147          const char *errmsg = NULL;                                      \
 148 -        p->p_##name = headerFormat(header, "%{"#name"}", &errmsg);      \
 149 +        p->p_##name = headerSprintf(header, "%{"#name"}", NULL, NULL, &errmsg);      \
 150          if (p->p_##name || !errmsg)                                     \
 151              return 0;                                                   \
 152                                                                          \
 153 @@ -261,8 +263,8 @@ pkg_add_id(arch);
 154  struct pkg_envra *rpm_get_package_nvr(const char *filename, const char *rootdir_or_NULL)
 155  {
 156      rpmts ts;
 157 -    rpmdbMatchIterator iter;
 158 -    Header header;
 159 +    rpmmi iter = NULL;
 160 +    Header header = NULL;
 161
 162      struct pkg_envra *p = NULL;
 163
 164 @@ -305,15 +307,15 @@ struct pkg_envra *rpm_get_package_nvr(co
 165
 166      p->p_nvr = xasprintf("%s-%s-%s", p->p_name, p->p_version, p->p_release);
 167
 168 -    rpmdbFreeIterator(iter);
 169 -    rpmtsFree(ts);
 170 +    iter = rpmmiFree(iter);
 171 +    ts = rpmtsFree(ts);
 172      return p;
 173
 174   error:
 175      free_pkg_envra(p);
 176
 177 -    rpmdbFreeIterator(iter);
 178 -    rpmtsFree(ts);
 179 +    iter = rpmmiFree(iter);
 180 +    ts = rpmtsFree(ts);
 181      return NULL;
 182  }
 183
 184 --- abrt-2.0.8/src/daemon/rpm.h.0011~   2011-12-21 13:20:12.000000000 +0100
 185 +++ abrt-2.0.8/src/daemon/rpm.h 2012-03-11 21:28:01.051031573 +0100
 186 @@ -22,10 +22,10 @@
 187  #ifndef RPM_H_
 188  #define RPM_H_
 189
 190 -#include <rpm/rpmts.h>
 191 -#include <rpm/rpmcli.h>
 192 -#include <rpm/rpmdb.h>
 193 -#include <rpm/rpmpgp.h>
 194 +#include <rpmcli.h>
 195 +#include <rpmts.h>
 196 +#include <rpmdb.h>
 197 +#include <rpmio.h>
 198
 199  #ifdef __cplusplus
 200  extern "C" {
 201 --- abrt-2.0.15/src/plugins/bodhi.c~    2012-10-05 08:30:34.000000000 +0200
 202 +++ abrt-2.0.15/src/plugins/bodhi.c     2012-10-15 15:54:12.298943477 +0200
 203 @@ -331,24 +331,23 @@
 204      char *nvr = NULL;
 205
 206      rpmts ts = rpmtsCreate();
 207 -    rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
 208 -    Header header = rpmdbNextIterator(iter);
 209 +    rpmmi iter = rpmtsInitIterator(ts, RPMTAG_NAME, pkg_name, 0);
 210 +    Header header = rpmmiNext(iter);
 211
 212      if (!header)
 213          goto error;
 214
 215      const char *errmsg = NULL;
 216 -    nvr = headerFormat(header, "%{name}-%{version}-%{release}", &errmsg);
 217 +    nvr = headerSprintf(header, "%{name}-%{version}-%{release}", NULL, NULL, &errmsg);
 218
 219      if (!nvr && errmsg)
 220          error_msg("cannot get nvr. reason: %s", errmsg);
 221
 222  error:
 223 -    rpmdbFreeIterator(iter);
 224 -    rpmtsFree(ts);
 225 +    iter = rpmmiFree(iter);
 226 +    ts = rpmtsFree(ts);
 227
 228      rpmFreeRpmrc();
 229 -    rpmFreeCrypto();
 230      rpmFreeMacros(NULL);
 231
 232      return nvr;