diff --git a/0.7.20.tar.gz b/0.7.20.tar.gz deleted file mode 100644 index 050991f7912786ca68a3c6df30430a781c5141d1..0000000000000000000000000000000000000000 Binary files a/0.7.20.tar.gz and /dev/null differ diff --git a/0.7.22.tar.gz b/0.7.22.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..9a80bd01555fbd4c6ed870488449492b19004405 Binary files /dev/null and b/0.7.22.tar.gz differ diff --git a/Fix-segfault-on-conflict-resolution-when-using-bindi.patch b/Fix-segfault-on-conflict-resolution-when-using-bindi.patch deleted file mode 100644 index c1107356cf827277b75c61d3a01796040f8a69d8..0000000000000000000000000000000000000000 --- a/Fix-segfault-on-conflict-resolution-when-using-bindi.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2b5e6c28be7dffe1a3b5e90a35c5ee425c08aeb0 Mon Sep 17 00:00:00 2001 -From: niner -Date: Tue, 8 Feb 2022 18:10:54 +0100 -Subject: [PATCH] Fix segfault on conflict resolution when using bindings - -Solutionelement objects were created with a wrong solutionid (i.e. the -solution element id was used for the solutionid field). This led to invalid -array indexes when trying to read the extraflags which then escalated -into a segfault. Fix by setting solutionid correctly in the Solutionelement -constructor. ---- - bindings/solv.i | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bindings/solv.i b/bindings/solv.i -index 3a6bac46..1d35bf61 100644 ---- a/bindings/solv.i -+++ b/bindings/solv.i -@@ -3411,7 +3411,7 @@ returnself(matchsolvable) - e = solv_calloc(1, sizeof(*e)); - e->solv = solv; - e->problemid = problemid; -- e->solutionid = id; -+ e->solutionid = solutionid; - e->id = id; - e->type = type; - e->p = p; --- -2.27.0 - diff --git a/ensure-duplinvolvedmap_all-is-reset.patch b/ensure-duplinvolvedmap_all-is-reset.patch deleted file mode 100644 index 68b18386ae6ea4dee5945d5a821c7faa0050e730..0000000000000000000000000000000000000000 --- a/ensure-duplinvolvedmap_all-is-reset.patch +++ /dev/null @@ -1,30 +0,0 @@ -From dd6e977782816e330a8f60cf78ca3d12fead3b10 Mon Sep 17 00:00:00 2001 -From: Jon Turney -Date: Sun, 14 Aug 2022 18:45:20 +0100 -Subject: [PATCH] Ensure duplinvolvedmap_all is reset when a solver is reused - -Otherwise, if solver is used with a SOLVER_DISTUPGRADE job, then reused -without one, this will cause solver_addduprules() to be called, even -though needduprules is 0, which will crash trying to dereference -solv->dupmap, which is NULL because solver_createdupmaps() hasn't been -called. - -Conflict:NA -Reference:https://github.com/openSUSE/libsolv/commit/dd6e977782816e330a8f60cf78ca3d12fead3b10 - ---- - src/solver.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/solver.c b/src/solver.c -index 28341d6d3..e3779e232 100644 ---- a/src/solver.c -+++ b/src/solver.c -@@ -3533,6 +3533,7 @@ solver_solve(Solver *solv, Queue *job) - map_zerosize(&solv->bestupdatemap); - solv->fixmap_all = 0; - map_zerosize(&solv->fixmap); -+ solv->dupinvolvedmap_all = 0; - map_zerosize(&solv->dupmap); - map_zerosize(&solv->dupinvolvedmap); - solv->process_orphans = 0; diff --git a/libsolv.spec b/libsolv.spec index 29d82dddeca4b6fb65707bdda752640f11e4cae7..65be1645f41a180615d3f8191c9327a718658fa1 100644 --- a/libsolv.spec +++ b/libsolv.spec @@ -14,16 +14,14 @@ %bcond_without conda Name: libsolv -Version: 0.7.20 -Release: 3 +Version: 0.7.22 +Release: 1 Summary: Package dependency solver License: BSD URL: https://github.com/openSUSE/libsolv Source: https://github.com/openSUSE/libsolv/archive/refs/tags/%{version}.tar.gz -Patch0: Fix-segfault-on-conflict-resolution-when-using-bindi.patch -Patch1: Fix-memory-leak-when-using-testsolv-to-execute-cases.patch -Patch2: ensure-duplinvolvedmap_all-is-reset.patch +Patch0: Fix-memory-leak-when-using-testsolv-to-execute-cases.patch BuildRequires: cmake gcc-c++ ninja-build pkgconfig(rpm) zlib-devel BuildRequires: libxml2-devel xz-devel bzip2-devel @@ -56,7 +54,7 @@ Development files for %{name}. %package tools Summary: Package dependency solver tools Requires: %{name} = %{version}-%{release} -Requires: %{_bindir}/find +Requires: /usr/bin/find %description tools Package dependency solver tools. @@ -217,6 +215,12 @@ Python 3 version. %{_mandir}/man3/%{name}*.3* %changelog +* Tue Nov 8 2022 hanhuihui - 0.7.22-1 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:update libsolv to 0.7.22-1 + * Fri Oct 21 2022 hanhuihui - 0.7.20-3 - Type:bugfix - ID:NA