Add -data-race patch to fix segfault (bz 2157972).
Add -uninit patch to fix use of an uninitialized value.
This commit is contained in:
parent
6264c50021
commit
aca6b5306f
|
@ -0,0 +1,10 @@
|
||||||
|
--- z3-z3-4.11.2/src/solver/parallel_tactic.cpp.orig 2022-09-03 16:47:12.000000000 -0600
|
||||||
|
+++ z3-z3-4.11.2/src/solver/parallel_tactic.cpp 2023-01-08 21:39:29.169670155 -0700
|
||||||
|
@@ -460,6 +460,7 @@ private:
|
||||||
|
conquer->get_model(mdl);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
+ std::lock_guard<std::mutex> lock(m_mutex);
|
||||||
|
s.get_solver().get_model(mdl);
|
||||||
|
}
|
||||||
|
if (mdl) {
|
|
@ -0,0 +1,10 @@
|
||||||
|
--- z3-z3-4.11.2/src/sat/sat_lookahead.cpp.orig 2022-09-03 16:47:12.000000000 -0600
|
||||||
|
+++ z3-z3-4.11.2/src/sat/sat_lookahead.cpp 2023-01-06 15:09:19.198322817 -0700
|
||||||
|
@@ -1001,6 +1001,7 @@ namespace sat {
|
||||||
|
m_inconsistent = false;
|
||||||
|
m_qhead = 0;
|
||||||
|
m_bstamp_id = 0;
|
||||||
|
+ m_istamp_id = 0;
|
||||||
|
|
||||||
|
for (unsigned i = 0; i < m_num_vars; ++i) {
|
||||||
|
init_var(i);
|
14
z3.spec
14
z3.spec
|
@ -16,7 +16,7 @@
|
||||||
|
|
||||||
Name: z3
|
Name: z3
|
||||||
Version: 4.11.2
|
Version: 4.11.2
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Satisfiability Modulo Theories (SMT) solver
|
Summary: Satisfiability Modulo Theories (SMT) solver
|
||||||
|
|
||||||
License: MIT
|
License: MIT
|
||||||
|
@ -24,6 +24,10 @@ URL: https://github.com/Z3Prover/z3
|
||||||
Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz
|
Source0: https://github.com/Z3Prover/z3/archive/%{name}-%{version}.tar.gz
|
||||||
# Change the way python finds the shared object; see bz 1910923
|
# Change the way python finds the shared object; see bz 1910923
|
||||||
Patch0: %{name}-python.patch
|
Patch0: %{name}-python.patch
|
||||||
|
# Fix use of an uninitialized variable
|
||||||
|
Patch1: %{name}-uninit.patch
|
||||||
|
# Fix a data race that can cause a segfault; see bz 2157972
|
||||||
|
Patch2: %{name}-data-race.patch
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
|
@ -168,8 +172,8 @@ sed -e '/libz3java/s,\(System\.load\)Library("\(.*\)"),\1("%{_libdir}/z3/\2.so")
|
||||||
-i scripts/update_api.py
|
-i scripts/update_api.py
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export LANG="C.UTF-8"
|
export LANG=C.UTF-8
|
||||||
export PYTHON="%{python3}"
|
export PYTHON=%{python3}
|
||||||
|
|
||||||
%cmake -G Ninja \
|
%cmake -G Ninja \
|
||||||
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3 \
|
-DCMAKE_INSTALL_INCLUDEDIR=%{_includedir}/z3 \
|
||||||
|
@ -284,6 +288,10 @@ cd -
|
||||||
%{python3_sitelib}/z3/
|
%{python3_sitelib}/z3/
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Jan 8 2023 Jerry James <loganjerry@gmail.com> - 4.11.2-2
|
||||||
|
- Add -data-race patch to fix segfault (bz 2157972)
|
||||||
|
- Add -uninit patch to fix use of an uninitialized value
|
||||||
|
|
||||||
* Wed Dec 14 2022 Jerry James <loganjerry@gmail.com> - 4.11.2-1
|
* Wed Dec 14 2022 Jerry James <loganjerry@gmail.com> - 4.11.2-1
|
||||||
- Further clarify license of the doc subpackage (SPDX)
|
- Further clarify license of the doc subpackage (SPDX)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue