diff options
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-extended/libsolv/libsolv_0.6.28.bb | 3 |
2 files changed, 37 insertions, 1 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch b/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch new file mode 100644 index 0000000000..4a4e5cba25 --- /dev/null +++ b/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Ming Liu <liu.ming50@gmail.com> | ||
| 3 | Date: Sat, 30 Sep 2017 11:15:16 +0800 | ||
| 4 | Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE | ||
| 5 | |||
| 6 | Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230] | ||
| 7 | |||
| 8 | We encountered 'corrupt rpm' issues when installing extreme big RPM | ||
| 9 | packages like the kernel-devsrc package of Yocto project. | ||
| 10 | |||
| 11 | It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test. | ||
| 12 | |||
| 13 | Signed-off-by: Ming Liu <liu.ming50@gmail.com> | ||
| 14 | --- | ||
| 15 | ext/repo_rpmdb.c | 4 ++-- | ||
| 16 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
| 17 | |||
| 18 | diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c | ||
| 19 | index c7000a9..7000835 100644 | ||
| 20 | --- a/ext/repo_rpmdb.c | ||
| 21 | +++ b/ext/repo_rpmdb.c | ||
| 22 | @@ -170,8 +170,8 @@ | ||
| 23 | #define MAX_SIG_CNT 0x100000 | ||
| 24 | #define MAX_SIG_DSIZE 0x100000 | ||
| 25 | |||
| 26 | -#define MAX_HDR_CNT 0x100000 | ||
| 27 | -#define MAX_HDR_DSIZE 0x2000000 | ||
| 28 | +#define MAX_HDR_CNT 0x200000 | ||
| 29 | +#define MAX_HDR_DSIZE 0x4000000 | ||
| 30 | |||
| 31 | typedef struct rpmhead { | ||
| 32 | int cnt; | ||
| 33 | -- | ||
| 34 | 2.7.4 | ||
| 35 | |||
diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.28.bb b/meta/recipes-extended/libsolv/libsolv_0.6.28.bb index 3a48f22b5f..6c8f7fc73b 100644 --- a/meta/recipes-extended/libsolv/libsolv_0.6.28.bb +++ b/meta/recipes-extended/libsolv/libsolv_0.6.28.bb | |||
| @@ -8,7 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8" | |||
| 8 | DEPENDS = "expat zlib rpm" | 8 | DEPENDS = "expat zlib rpm" |
| 9 | 9 | ||
| 10 | SRC_URI = "git://github.com/openSUSE/libsolv.git \ | 10 | SRC_URI = "git://github.com/openSUSE/libsolv.git \ |
| 11 | " | 11 | file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \ |
| 12 | " | ||
| 12 | SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ | 13 | SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ |
| 13 | file://0002-Fixes-to-internal-fopencookie-implementation.patch \ | 14 | file://0002-Fixes-to-internal-fopencookie-implementation.patch \ |
| 14 | " | 15 | " |
