rpm/rpm-4.14.2.1-fix-rebuilddb-from-rpm-5.2.patch

25 lines
1.6 KiB
Diff

diff -Nru rpm-4.14.2.1.orig/lib/rpmtd.c rpm-4.14.2.1/lib/rpmtd.c
--- rpm-4.14.2.1.orig/lib/rpmtd.c 2018-09-13 14:52:02.227221535 +0200
+++ rpm-4.14.2.1/lib/rpmtd.c 2019-06-22 15:00:23.436132478 +0200
@@ -151,7 +151,7 @@
{
char *res = NULL;
- if (td != NULL && td->type == RPM_CHAR_TYPE) {
+ if (td != NULL && (td->type == RPM_CHAR_TYPE || td->type == RPM_INT8_TYPE)) {
int ix = (td->ix >= 0 ? td->ix : 0);
res = (char *) td->data + ix;
}
diff -Nru rpm-4.14.2.1.orig/lib/tagtbl.C rpm-4.14.2.1/lib/tagtbl.C
--- rpm-4.14.2.1.orig/lib/tagtbl.C 2018-10-18 12:14:57.563260243 +0200
+++ rpm-4.14.2.1/lib/tagtbl.C 2019-06-22 14:59:38.773819098 +0200
@@ -65,7 +65,7 @@
{ "RPMTAG_FILESIGNATURELENGTH", "Filesignaturelength", RPMTAG_FILESIGNATURELENGTH, RPM_INT32_TYPE, RPM_SCALAR_RETURN_TYPE, 0 },
{ "RPMTAG_FILESIGNATURES", "Filesignatures", RPMTAG_FILESIGNATURES, RPM_STRING_ARRAY_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
{ "RPMTAG_FILESIZES", "Filesizes", RPMTAG_FILESIZES, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
- { "RPMTAG_FILESTATES", "Filestates", RPMTAG_FILESTATES, RPM_CHAR_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
+ { "RPMTAG_FILESTATES", "Filestates", RPMTAG_FILESTATES, RPM_INT8_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
{ "RPMTAG_FILETRIGGERCONDS", "Filetriggerconds", RPMTAG_FILETRIGGERCONDS, RPM_STRING_ARRAY_TYPE, RPM_ARRAY_RETURN_TYPE, 1 },
{ "RPMTAG_FILETRIGGERFLAGS", "Filetriggerflags", RPMTAG_FILETRIGGERFLAGS, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },
{ "RPMTAG_FILETRIGGERINDEX", "Filetriggerindex", RPMTAG_FILETRIGGERINDEX, RPM_INT32_TYPE, RPM_ARRAY_RETURN_TYPE, 0 },