summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-02-02 15:33:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-02-06 11:06:29 +0000
commitee9a355d416fa8a0d5871bb39c5d6190e0dc7204 (patch)
treef3dd58bec17990d998995b3b9bbcdf72476d4266 /meta
parent561d0ce5031429e78220f1d4e206829ad3a6cd1b (diff)
downloadpoky-ee9a355d416fa8a0d5871bb39c5d6190e0dc7204.tar.gz
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch35
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.6.31.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.6.29.bb)3
2 files changed, 1 insertions, 37 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
deleted file mode 100644
index 4a4e5cba25..0000000000
--- a/meta/recipes-extended/libsolv/libsolv/0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 1c4c935cb73ac1ccb9693df1a51ba218a22e8ca8 Mon Sep 17 00:00:00 2001
2From: Ming Liu <liu.ming50@gmail.com>
3Date: Sat, 30 Sep 2017 11:15:16 +0800
4Subject: [PATCH] repo_rpmdb.c: increase MAX_HDR_CNT and MAX_HDR_DSIZE
5
6Upstream-Status: Submitted [https://github.com/openSUSE/libsolv/pull/230]
7
8We encountered 'corrupt rpm' issues when installing extreme big RPM
9packages like the kernel-devsrc package of Yocto project.
10
11It can be fixed by increasing MAX_HDR_CNT and MAX_HDR_DSIZE per test.
12
13Signed-off-by: Ming Liu <liu.ming50@gmail.com>
14---
15 ext/repo_rpmdb.c | 4 ++--
16 1 file changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
19index 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--
342.7.4
35
diff --git a/meta/recipes-extended/libsolv/libsolv_0.6.29.bb b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb
index 78972e5fed..96c366b2c2 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.6.29.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.6.31.bb
@@ -8,13 +8,12 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
8DEPENDS = "expat zlib rpm" 8DEPENDS = "expat zlib rpm"
9 9
10SRC_URI = "git://github.com/openSUSE/libsolv.git \ 10SRC_URI = "git://github.com/openSUSE/libsolv.git \
11 file://0001-repo_rpmdb.c-increase-MAX_HDR_CNT-and-MAX_HDR_DSIZE.patch \
12 " 11 "
13SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \ 12SRC_URI_append_libc-musl = " file://0001-Add-fallback-fopencookie-implementation.patch \
14 file://0002-Fixes-to-internal-fopencookie-implementation.patch \ 13 file://0002-Fixes-to-internal-fopencookie-implementation.patch \
15 " 14 "
16 15
17SRCREV = "765be095eaeaef1b1d2a84f6a0e00d5abf677ae9" 16SRCREV = "bef46d75f6d2537060114eea0f3a892e958ad5e0"
18UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
19 18
20S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"