rpm/rpm-4.12.0-rpm2cpio-hack.patch

31 lines
833 B
Diff
Raw Normal View History

2022-10-25 10:48:12 +08:00
From 3b518bff7579647d2e9160e37dbbabc63c3d6792 Mon Sep 17 00:00:00 2001
From: licihua <licihua@huawei.com>
Date: Thu, 20 Oct 2022 20:28:48 +0800
Subject: [PATCH 02/22] rpm-4.12.0-rpm2cpio-hack
---
rpm2cpio.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
2019-09-30 11:16:24 -04:00
diff --git a/rpm2cpio.c b/rpm2cpio.c
2022-10-25 10:48:12 +08:00
index fcc3b30..5e650d5 100644
2019-09-30 11:16:24 -04:00
--- a/rpm2cpio.c
+++ b/rpm2cpio.c
2022-10-25 10:48:12 +08:00
@@ -94,7 +94,12 @@ int main(int argc, char *argv[])
2019-09-30 11:16:24 -04:00
exit(EXIT_FAILURE);
}
- rc = (ufdCopy(gzdi, fdo) == payload_size) ? EXIT_SUCCESS : EXIT_FAILURE;
+ /*
+ * XXX HACK for #1142949: should be equality test, but archive size
+ * short by cpio trailer size in packages built with rpm 4.12.0
+ * and its pre-releases.
+ */
+ rc = (ufdCopy(gzdi, fdo) >= payload_size) ? EXIT_SUCCESS : EXIT_FAILURE;
Fclose(fdo);
2022-10-25 10:48:12 +08:00
--
2.26.2