1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
|
--- appstream-glib-0.2.0/libappstream-builder/Makefile.am.orig 2014-06-19 10:09:35.000000000 +0200
+++ appstream-glib-0.2.0/libappstream-builder/Makefile.am 2014-06-21 22:26:16.105266525 +0200
@@ -66,6 +66,7 @@
libappstream_builder_la_LIBADD = \
$(AS_GLIB_LIBS) \
+ $(LIBARCHIVE_LIBS) \
$(RPM_LIBS) \
$(GLIB_LIBS)
@@ -76,6 +77,7 @@
-export-symbols-regex '^asb_.*'
libappstream_builder_la_CFLAGS = \
+ $(RPM_CFLAGS) \
$(WARNINGFLAGS_C)
if HAVE_INTROSPECTION
@@ -107,11 +109,6 @@
$(AS_GLIB_LIBS) \
libappstream-builder.la \
archive
-if HAVE_RPM
-AppStreamBuilder_1_0_gir_LIBS += \
- rpmio \
- rpm
-endif
AppStreamBuilder_1_0_gir_FILES = $(introspection_sources)
INTROSPECTION_GIRS += AppStreamBuilder-1.0.gir
--- appstream-glib-0.2.6/libappstream-builder/asb-package-rpm.c.orig 2014-09-01 15:57:32.000000000 +0200
+++ appstream-glib-0.2.6/libappstream-builder/asb-package-rpm.c 2014-09-04 16:55:26.028784594 +0200
@@ -33,7 +33,7 @@
#include <archive.h>
#include <archive_entry.h>
-#include <rpm/rpmlib.h>
+#include <rpm/rpm46compat.h>
#include <rpm/rpmts.h>
#include "as-cleanup.h"
@@ -239,6 +239,36 @@ asb_package_rpm_set_source (AsbPackage *
asb_package_set_source_pkgname (pkg, srcrpm);
}
+static uint64_t rpmtdGetNumber(rpmtd td)
+{
+ uint64_t val = 0;
+ int ix;
+ assert(td != NULL);
+ ix = (td->ix >= 0 ? td->ix : 0);
+
+ switch (td->type) {
+ case RPM_INT64_TYPE:
+ val = *((uint64_t *) td->data + ix);
+ break;
+ case RPM_INT32_TYPE:
+ val = *((uint32_t *) td->data + ix);
+ break;
+ case RPM_INT16_TYPE:
+ val = *((uint16_t *) td->data + ix);
+ break;
+ case RPM_INT8_TYPE:
+ case RPM_CHAR_TYPE:
+ val = *((uint8_t *) td->data + ix);
+ break;
+ default:
+ break;
+ }
+ return val;
+}
+
+#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
+#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
+
/**
* asb_package_rpm_ensure_simple:
**/
@@ -251,7 +281,7 @@ asb_package_rpm_ensure_simple (AsbPackag
rpmtd td;
/* get the simple stuff */
- td = rpmtdNew ();
+ td = malloc (sizeof (*td));
headerGet (priv->h, RPMTAG_NAME, td, HEADERGET_MINMEM);
asb_package_set_name (pkg, rpmtdGetString (td));
headerGet (priv->h, RPMTAG_VERSION, td, HEADERGET_MINMEM);
@@ -268,7 +298,7 @@ asb_package_rpm_ensure_simple (AsbPackag
asb_package_rpm_set_license (pkg, rpmtdGetString (td));
headerGet (priv->h, RPMTAG_SOURCERPM, td, HEADERGET_MINMEM);
asb_package_rpm_set_source (pkg, rpmtdGetString (td));
- rpmtdFree (td);
+ free (td);
return ret;
}
@@ -341,7 +371,7 @@ asb_package_rpm_ensure_releases (AsbPack
/* read out the file list */
for (i = 0; i < 3; i++)
- td[i] = rpmtdNew ();
+ td[i] = malloc (sizeof (*td[1]));
/* get the ChangeLog info */
headerGet (priv->h, RPMTAG_CHANGELOGTIME, td[0], HEADERGET_MINMEM);
headerGet (priv->h, RPMTAG_CHANGELOGNAME, td[1], HEADERGET_MINMEM);
@@ -356,7 +386,7 @@ asb_package_rpm_ensure_releases (AsbPack
}
for (i = 0; i < 3; i++) {
rpmtdFreeData (td[i]);
- rpmtdFree (td[i]);
+ free (td[i]);
}
return TRUE;
}
@@ -378,7 +408,7 @@ asb_package_rpm_ensure_deps (AsbPackage
_cleanup_strv_free_ gchar **deps = NULL;
/* read out the dep list */
- td = rpmtdNew ();
+ td = malloc (sizeof (*td));
rc = headerGet (priv->h, RPMTAG_REQUIRENAME, td, HEADERGET_MINMEM);
if (!rc) {
ret = FALSE;
@@ -406,7 +436,7 @@ asb_package_rpm_ensure_deps (AsbPackage
asb_package_set_deps (pkg, deps);
out:
rpmtdFreeData (td);
- rpmtdFree (td);
+ free (td);
return ret;
}
@@ -428,7 +458,7 @@ asb_package_rpm_ensure_filelists (AsbPac
/* read out the file list */
for (i = 0; i < 3; i++)
- td[i] = rpmtdNew ();
+ td[i] = malloc (sizeof (*td[i]));
rc = headerGet (priv->h, RPMTAG_DIRNAMES, td[0], HEADERGET_MINMEM);
if (rc)
rc = headerGet (priv->h, RPMTAG_BASENAMES, td[1], HEADERGET_MINMEM);
@@ -463,7 +493,7 @@ asb_package_rpm_ensure_filelists (AsbPac
out:
for (i = 0; i < 3; i++) {
rpmtdFreeData (td[i]);
- rpmtdFree (td[i]);
+ free (td[i]);
}
return ret;
}
|
