From d262321cf4627db74592d91720b0ae045afab2d2 Mon Sep 17 00:00:00 2001 From: Zhao Hang Date: Wed, 19 Jul 2023 14:12:47 +0800 Subject: [PATCH 1/2] update to webkit2gtk3-2.38.5-1.0.1.5 Signed-off-by: Zhao Hang --- webkit2gtk3.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index 07e1fd3..b01a70b 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -8,7 +8,7 @@ Name: webkit2gtk3 Version: 2.38.5 -Release: 1%{anolis_release}%{?dist}.4 +Release: 1%{anolis_release}%{?dist}.5 Summary: GTK Web content engine library License: LGPLv2 @@ -203,6 +203,7 @@ pushd %{_target_platform} -GNinja \ -DPORT=GTK \ -DCMAKE_BUILD_TYPE=Release \ + -DENABLE_JIT=OFF \ -DENABLE_BUBBLEWRAP_SANDBOX=OFF \ -DUSE_SOUP2=ON \ -DENABLE_DOCUMENTATION=OFF \ @@ -283,6 +284,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Wed Jul 19 2023 Zhao Hang - 2.38.5-1.0.1.5 +- fix CVE-2023-32435 CVE-2023-32439 + * Mon Jun 05 2023 Liwei Ge - 2.38.5-1.0.1.4 - Sync loongsons patch webkitgtk-add-loongarch.patch (XueZhixin) -- Gitee From ef8be098b07c4d8a9f809d32a607700f4a420676 Mon Sep 17 00:00:00 2001 From: wxiat Date: Tue, 1 Aug 2023 09:51:12 +0800 Subject: [PATCH 2/2] add sw --- webkit2gtk3.spec | 6 +++++- webkitgtk-2.38.5-sw.patch | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 webkitgtk-2.38.5-sw.patch diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index b01a70b..90a23ab 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -1,4 +1,4 @@ -%define anolis_release .0.1 +%define anolis_release .0.2 ## NOTE: Lots of files in various subdirectories have the same name (such as ## "LICENSE") so this short macro allows us to distinguish them by using their ## directory names (from the source tree) as prefixes for the files. @@ -34,6 +34,7 @@ Patch3: CVE-2023-28205.patch Patch4: CVE-2023-32373.patch Patch1000: 0001-webkitgtk-add-loongarch.patch +Patch1001: webkitgtk-2.38.5-sw.patch BuildRequires: bison BuildRequires: cmake @@ -284,6 +285,9 @@ export NINJA_STATUS="[%f/%t][%e] " %{_datadir}/gir-1.0/JavaScriptCore-4.0.gir %changelog +* Tue Aug 1 2023 wxiat - 2.38.5-1.0.1.6 +- add sw arch + * Wed Jul 19 2023 Zhao Hang - 2.38.5-1.0.1.5 - fix CVE-2023-32435 CVE-2023-32439 diff --git a/webkitgtk-2.38.5-sw.patch b/webkitgtk-2.38.5-sw.patch new file mode 100644 index 0000000..bcbacae --- /dev/null +++ b/webkitgtk-2.38.5-sw.patch @@ -0,0 +1,12 @@ +diff -Nuar webkitgtk-2.38.5.org/Source/WTF/wtf/dtoa/utils.h webkitgtk-2.38.5.sw/Source/WTF/wtf/dtoa/utils.h +--- webkitgtk-2.38.5.org/Source/WTF/wtf/dtoa/utils.h 2023-08-01 09:38:00.733924143 +0800 ++++ webkitgtk-2.38.5.sw/Source/WTF/wtf/dtoa/utils.h 2023-08-01 09:41:23.992113721 +0800 +@@ -87,7 +87,7 @@ + defined(__powerpc__) || defined(__ppc__) || defined(__ppc64__) || \ + defined(_POWER) || defined(_ARCH_PPC) || defined(_ARCH_PPC64) || \ + defined(__sparc__) || defined(__sparc) || defined(__s390__) || \ +- defined(__SH4__) || defined(__alpha__) || defined(__loongarch64) || \ ++ defined(__SH4__) || defined(__alpha__) || defined(__sw_64__) || defined(__loongarch64) || \ + defined(_MIPS_ARCH_MIPS32R2) || \ + defined(__AARCH64EL__) || defined(__aarch64__) || defined(__AARCH64EB__) || \ + defined(__riscv) || \ -- Gitee