libsolv: upgrade to version 0.6.31

Remove upstreamed patch:
        0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch

(From OE-Core rev: 89a1c8c2e6393ed1f5f667036845b752d5277beb)

Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Maxin B. John
2018-02-02 15:33:14 +02:00
committed by Richard Purdie
parent 561d0ce503
commit ee9a355d41
2 changed files with 1 additions and 37 deletions

View File

@@ -1,35 +0,0 @@
From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001
From: Ming Liu <liu.ming50@gmail.com>
Date: Sat, 30 Sep 2017 11:15:16 +0800
Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE
Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230]
We encountered 'corrupt rpm' issues when installing extreme big RPM
packages like the kernel-devsrc package of Yocto project.
It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test.
Signed-off-by: Ming Liu <liu.ming50@gmail.com>
---
ext/repo_rpmdb.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index c7000a9..7000835 100644
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -170,8 +170,8 @@
#define MAX_SIG_CNT 0x100000
#define MAX_SIG_DSIZE 0x100000
-#define MAX_HDR_CNT 0x100000
-#define MAX_HDR_DSIZE 0x2000000
+#define MAX_HDR_CNT 0x200000
+#define MAX_HDR_DSIZE 0x4000000
typedef struct rpmhead {
int cnt;
--
2.7.4

View File

@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
DEPENDS = "expat zlib rpm"
SRC_URI = "git://github.com/openSUSE/libsolv.git \
file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \
"
SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \
file://0002-Fixes-to-internal-fopencookie-implementation.patch \
"
SRCREV = "765be095eaeaef1b1d2a84f6a0e00d5abf677ae9"
SRCREV = "bef46d75f6d2537060114eea0f3a892e958ad5e0"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"