1 --- appstream-glib-0.6.9/libappstream-builder/asb-package-rpm.c.orig 2016-11-30 11:07:39.000000000 +0100
2 +++ appstream-glib-0.6.9/libappstream-builder/asb-package-rpm.c 2017-03-04 07:59:10.334045621 +0100
5 #include <archive_entry.h>
7 -#include <rpm/rpmlib.h>
8 +#include <rpm/rpm46compat.h>
11 #include "asb-package-rpm.h"
12 @@ -132,6 +132,36 @@ asb_package_rpm_set_source (AsbPackage *
13 asb_package_set_source_pkgname (pkg, srcrpm);
16 +static uint64_t rpmtdGetNumber(rpmtd td)
21 + ix = (td->ix >= 0 ? td->ix : 0);
24 + case RPM_INT64_TYPE:
25 + val = *((uint64_t *) td->data + ix);
27 + case RPM_INT32_TYPE:
28 + val = *((uint32_t *) td->data + ix);
30 + case RPM_INT16_TYPE:
31 + val = *((uint16_t *) td->data + ix);
35 + val = *((uint8_t *) td->data + ix);
43 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
44 +#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
47 asb_package_rpm_ensure_nevra (AsbPackage *pkg, GError **error)
49 @@ -139,7 +169,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
50 AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
54 + td = malloc (sizeof (*td));
55 headerGet (priv->h, RPMTAG_NAME, td, HEADERGET_MINMEM);
56 asb_package_set_name (pkg, rpmtdGetString (td));
57 headerGet (priv->h, RPMTAG_VERSION, td, HEADERGET_MINMEM);
58 @@ -150,7 +180,7 @@ asb_package_rpm_ensure_nevra (AsbPackage
59 asb_package_set_arch (pkg, rpmtdGetString (td));
60 headerGet (priv->h, RPMTAG_EPOCH, td, HEADERGET_MINMEM);
61 asb_package_set_epoch (pkg, (guint) rpmtdGetNumber (td));
67 @@ -161,10 +191,10 @@ asb_package_rpm_ensure_source (AsbPackag
68 AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
72 + td = malloc (sizeof (*td));
73 headerGet (priv->h, RPMTAG_SOURCERPM, td, HEADERGET_MINMEM);
74 asb_package_rpm_set_source (pkg, rpmtdGetString (td));
80 @@ -175,24 +205,28 @@ asb_package_rpm_ensure_url (AsbPackage *
81 AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
85 + td = malloc (sizeof (*td));
86 headerGet (priv->h, RPMTAG_URL, td, HEADERGET_MINMEM);
87 asb_package_set_url (pkg, rpmtdGetString (td));
94 asb_package_rpm_ensure_vcs (AsbPackage *pkg, GError **error)
97 AsbPackageRpm *pkg_rpm = ASB_PACKAGE_RPM (pkg);
98 AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
102 + td = malloc (sizeof (*td));
103 headerGet (priv->h, RPMTAG_VCS, td, HEADERGET_MINMEM);
104 asb_package_set_vcs (pkg, rpmtdGetString (td));
108 + asb_package_set_vcs (pkg, NULL);
113 @@ -203,10 +237,10 @@ asb_package_rpm_ensure_license (AsbPacka
114 AsbPackageRpmPrivate *priv = GET_PRIVATE (pkg_rpm);
118 + td = malloc (sizeof (*td));
119 headerGet (priv->h, RPMTAG_LICENSE, td, HEADERGET_MINMEM);
120 asb_package_rpm_set_license (pkg, rpmtdGetString (td));
126 @@ -277,7 +311,7 @@ asb_package_rpm_ensure_releases (AsbPack
128 /* read out the file list */
129 for (i = 0; i < 3; i++)
130 - td[i] = rpmtdNew ();
131 + td[i] = malloc (sizeof (*td[1]));
132 /* get the ChangeLog info */
133 headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
134 headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
135 @@ -292,7 +326,7 @@ asb_package_rpm_ensure_releases (AsbPack
137 for (i = 0; i < 3; i++) {
138 rpmtdFreeData (td[i]);
144 @@ -309,7 +343,7 @@ asb_package_rpm_ensure_deps (AsbPackage
147 /* read out the dep list */
149 + td = malloc (sizeof (*td));
150 rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
153 @@ -339,7 +373,7 @@ asb_package_rpm_ensure_deps (AsbPackage
162 @@ -362,7 +396,7 @@ asb_package_rpm_ensure_filelists (AsbPac
164 /* read out the file list */
165 for (i = 0; i < 3; i++)
166 - td[i] = rpmtdNew ();
167 + td[i] = malloc (sizeof (*td[i]));
168 rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
170 rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
171 @@ -397,7 +431,7 @@ asb_package_rpm_ensure_filelists (AsbPac
173 for (i = 0; i < 3; i++) {
174 rpmtdFreeData (td[i]);
180 --- appstream-glib-0.7.8/libappstream-builder/asb-package-rpm.c~ 2018-04-20 12:37:25.000000000 +0200
181 +++ appstream-glib-0.7.8/libappstream-builder/asb-package-rpm.c 2018-05-03 10:49:28.865283220 +0200
186 +#define _DEFAULT_SOURCE 1
190 #include <archive_entry.h>