1 --- appstream-glib-0.2.0/libappstream-builder/Makefile.am.orig 2014-06-19 10:09:35.000000000 +0200
2 +++ appstream-glib-0.2.0/libappstream-builder/Makefile.am 2014-06-21 22:26:16.105266525 +0200
5 libappstream_builder_la_LIBADD = \
12 -export-symbols-regex '^asb_.*'
14 libappstream_builder_la_CFLAGS = \
21 libappstream-builder.la \
24 -AppStreamBuilder_1_0_gir_LIBS += \
28 AppStreamBuilder_1_0_gir_FILES = $(introspection_sources)
29 INTROSPECTION_GIRS += AppStreamBuilder-1.0.gir
31 --- appstream-glib-0.2.6/libappstream-builder/asb-package-rpm.c.orig 2014-09-01 15:57:32.000000000 +0200
32 +++ appstream-glib-0.2.6/libappstream-builder/asb-package-rpm.c 2014-09-04 16:55:26.028784594 +0200
35 #include <archive_entry.h>
37 -#include <rpm/rpmlib.h>
38 +#include <rpm/rpm46compat.h>
39 #include <rpm/rpmts.h>
41 #include "as-cleanup.h"
42 @@ -239,6 +239,36 @@ asb_package_rpm_set_source (AsbPackage *
43 asb_package_set_source_pkgname (pkg, srcrpm);
46 +static uint64_t rpmtdGetNumber(rpmtd td)
51 + ix = (td->ix >= 0 ? td->ix : 0);
54 + case RPM_INT64_TYPE:
55 + val = *((uint64_t *) td->data + ix);
57 + case RPM_INT32_TYPE:
58 + val = *((uint32_t *) td->data + ix);
60 + case RPM_INT16_TYPE:
61 + val = *((uint16_t *) td->data + ix);
65 + val = *((uint8_t *) td->data + ix);
73 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
74 +#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
77 * asb_package_rpm_ensure_simple:
79 @@ -251,7 +281,7 @@ asb_package_rpm_ensure_simple (AsbPackag
82 /* get the simple stuff */
84 + td = malloc (sizeof (*td));
85 headerGet (priv->h, RPMTAG_NAME, td, HEADERGET_MINMEM);
86 asb_package_set_name (pkg, rpmtdGetString (td));
87 headerGet (priv->h, RPMTAG_VERSION, td, HEADERGET_MINMEM);
88 @@ -268,7 +298,7 @@ asb_package_rpm_ensure_simple (AsbPackag
89 asb_package_rpm_set_license (pkg, rpmtdGetString (td));
90 headerGet (priv->h, RPMTAG_SOURCERPM, td, HEADERGET_MINMEM);
91 asb_package_rpm_set_source (pkg, rpmtdGetString (td));
97 @@ -341,7 +371,7 @@ asb_package_rpm_ensure_releases (AsbPack
99 /* read out the file list */
100 for (i = 0; i < 3; i++)
101 - td[i] = rpmtdNew ();
102 + td[i] = malloc (sizeof (*td[1]));
103 /* get the ChangeLog info */
104 headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
105 headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
106 @@ -356,7 +386,7 @@ asb_package_rpm_ensure_releases (AsbPack
108 for (i = 0; i < 3; i++) {
109 rpmtdFreeData (td[i]);
115 @@ -378,7 +408,7 @@ asb_package_rpm_ensure_deps (AsbPackage
116 _cleanup_strv_free_ gchar **deps = NULL;
118 /* read out the dep list */
120 + td = malloc (sizeof (*td));
121 rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
124 @@ -406,7 +436,7 @@ asb_package_rpm_ensure_deps (AsbPackage
125 asb_package_set_deps (pkg, deps);
133 @@ -428,7 +458,7 @@ asb_package_rpm_ensure_filelists (AsbPac
135 /* read out the file list */
136 for (i = 0; i < 3; i++)
137 - td[i] = rpmtdNew ();
138 + td[i] = malloc (sizeof (*td[i]));
139 rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
141 rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
142 @@ -463,7 +493,7 @@ asb_package_rpm_ensure_filelists (AsbPac
144 for (i = 0; i < 3; i++) {
145 rpmtdFreeData (td[i]);