summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOleksandr Kravchuk <open.source@oleksandr-kravchuk.com>2019-04-02 00:47:15 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-07 10:12:53 +0100
commitf3d8794b8a0438714e2e73b4b50fff9cc7eab953 (patch)
tree4ebfd99aff60407c826c536733000a914ff78455
parentab2be4385e3540cb169c6fa43adbd27622e950de (diff)
downloadpoky-f3d8794b8a0438714e2e73b4b50fff9cc7eab953.tar.gz
libsolv: update to 0.7.4
Removed patch has been upstreammed. (From OE-Core rev: 450af6cf5c38da1cb44fd57ac1da3d2d3f037544) Signed-off-by: Oleksandr Kravchuk <open.source@oleksandr-kravchuk.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/libsolv/libsolv/0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch33
-rw-r--r--meta/recipes-extended/libsolv/libsolv_0.7.4.bb (renamed from meta/recipes-extended/libsolv/libsolv_0.7.3.bb)4
2 files changed, 2 insertions, 35 deletions
diff --git a/meta/recipes-extended/libsolv/libsolv/0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch b/meta/recipes-extended/libsolv/libsolv/0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch
deleted file mode 100644
index 139613a0ad..0000000000
--- a/meta/recipes-extended/libsolv/libsolv/0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 19d7cc87adba92d31d5fafdf7db00920d24a96a6 Mon Sep 17 00:00:00 2001
2From: Alejandro del Castillo <alejandro.delcastillo@ni.com>
3Date: Wed, 6 Feb 2019 13:24:04 -0600
4Subject: [PATCH] solver_solve: only disfavor recommends if there are any
5
6In a repo that have pkg 'a' and 'b' available, and 'b' is disfavored,
7but 'a' doesn't recommend 'b', libsolv segfaults on
8solver_addrecommendsrules, since solv->recommendsruleq is null. Only
9call solver_addrecommendsrules if there are recommends rules.
10
11Signed-off-by: Alejandro del Castillo <alejandro.delcastillo@ni.com>
12
13Upstream-Status: Accepted
14---
15 src/solver.c | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/src/solver.c b/src/solver.c
19index a80090d19..ad78327a8 100644
20--- a/src/solver.c
21+++ b/src/solver.c
22@@ -3920,7 +3920,7 @@ solver_solve(Solver *solv, Queue *job)
23 else
24 solv->yumobsrules = solv->yumobsrules_end = solv->nrules;
25
26- if (solv->havedisfavored && solv->strongrecommends)
27+ if (solv->havedisfavored && solv->strongrecommends && solv->recommendsruleq)
28 solver_addrecommendsrules(solv);
29 else
30 solv->recommendsrules = solv->recommendsrules_end = solv->nrules;
31--
322.20.1
33
diff --git a/meta/recipes-extended/libsolv/libsolv_0.7.3.bb b/meta/recipes-extended/libsolv/libsolv_0.7.4.bb
index 70c8dbc2e3..b8653adc01 100644
--- a/meta/recipes-extended/libsolv/libsolv_0.7.3.bb
+++ b/meta/recipes-extended/libsolv/libsolv_0.7.4.bb
@@ -8,11 +8,11 @@ LIC_FILES_CHKSUM = "file://LICENSE.BSD;md5=62272bd11c97396d4aaf1c41bc11f7d8"
8DEPENDS = "expat zlib" 8DEPENDS = "expat zlib"
9 9
10SRC_URI = "git://github.com/openSUSE/libsolv.git \ 10SRC_URI = "git://github.com/openSUSE/libsolv.git \
11 file://0001-solver_solve-only-disfavor-recommends-if-there-are-a.patch \
12 file://0001-build-use-GNUInstallDirs.patch \ 11 file://0001-build-use-GNUInstallDirs.patch \
13" 12"
14 13
15SRCREV = "dc7d0f1c3113f2c8217563166906bef3eb5d1ee1" 14SRCREV = "51fc3b1214aa9677e972712fa1ce6916e438751f"
15
16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
17 17
18S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"