From 25f2602619fbc3ba7005faeb7ff114f41c0f7a1df9f69c4bbaf5b32245b664de Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Sep 2021 06:37:40 +0000 Subject: [PATCH 1/2] Accepting request 920203 from home:mgorse:branches:GNOME:Factory - Update to version 2.32.4 OBS-URL: https://build.opensuse.org/request/show/920203 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=311 --- fix-lto.patch | 96 ------------------------------------- webkit2gtk3.changes | 8 ++++ webkit2gtk3.spec | 3 +- webkitgtk-2.32.3.tar.xz | 3 -- webkitgtk-2.32.3.tar.xz.asc | 6 --- webkitgtk-2.32.4.tar.xz | 3 ++ webkitgtk-2.32.4.tar.xz.asc | 6 +++ 7 files changed, 18 insertions(+), 107 deletions(-) delete mode 100644 fix-lto.patch delete mode 100644 webkitgtk-2.32.3.tar.xz delete mode 100644 webkitgtk-2.32.3.tar.xz.asc create mode 100644 webkitgtk-2.32.4.tar.xz create mode 100644 webkitgtk-2.32.4.tar.xz.asc diff --git a/fix-lto.patch b/fix-lto.patch deleted file mode 100644 index 3fa72bd..0000000 --- a/fix-lto.patch +++ /dev/null @@ -1,96 +0,0 @@ -From 2a6731b62bf3043d095cbb7dc5731d7764933bed Mon Sep 17 00:00:00 2001 -From: Michael Catanzaro -Date: Mon, 9 Aug 2021 10:53:05 +0000 -Subject: [PATCH] Adding missing REFERENCED_FROM_ASM annotations to facilitate - LTO https://bugs.webkit.org/show_bug.cgi?id=228865 - -Patch by Michael Catanzaro on 2021-08-09 -Reviewed by Yusuke Suzuki. - -When investigating why WebKitGTK fails to build with LTO (link-time optimization) enabled, -one of the GCC developers noticed that we are missing __attribute__ (("used")) on several -C++ functions declared in LLIntSlowPaths.h and WasmSlowPaths.h that are called only from -asm. Without this attribute, GCC assumes the functions are unused and drops them, then -linking fails because they really are used. - -* llint/LLIntSlowPaths.h: -* wasm/WasmSlowPaths.h: - -Canonical link: https://commits.webkit.org/240354@main -git-svn-id: https://svn.webkit.org/repository/webkit/trunk@280770 268f45cc-cd09-0410-ab3c-d52691b4dbfc ---- - Source/JavaScriptCore/ChangeLog | 16 ++++++++++++++++ - Source/JavaScriptCore/llint/LLIntSlowPaths.h | 20 ++++++++++---------- - Source/JavaScriptCore/wasm/WasmSlowPaths.h | 8 ++++---- - 3 files changed, 30 insertions(+), 14 deletions(-) - -diff --git a/Source/JavaScriptCore/llint/LLIntSlowPaths.h b/Source/JavaScriptCore/llint/LLIntSlowPaths.h -index fbfd53cc551f..e20a0dfc6b87 100644 ---- a/Source/JavaScriptCore/llint/LLIntSlowPaths.h -+++ b/Source/JavaScriptCore/llint/LLIntSlowPaths.h -@@ -36,15 +36,15 @@ struct ProtoCallFrame; - - namespace LLInt { - --extern "C" SlowPathReturnType llint_trace_operand(CallFrame*, const Instruction*, int fromWhere, int operand); --extern "C" SlowPathReturnType llint_trace_value(CallFrame*, const Instruction*, int fromWhere, VirtualRegister operand); --extern "C" void llint_write_barrier_slow(CallFrame*, JSCell*) WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_trace_operand(CallFrame*, const Instruction*, int fromWhere, int operand) REFERENCED_FROM_ASM; -+extern "C" SlowPathReturnType llint_trace_value(CallFrame*, const Instruction*, int fromWhere, VirtualRegister operand) REFERENCED_FROM_ASM; -+extern "C" void llint_write_barrier_slow(CallFrame*, JSCell*) REFERENCED_FROM_ASM WTF_INTERNAL; - - #define LLINT_SLOW_PATH_DECL(name) \ - extern "C" SlowPathReturnType llint_##name(CallFrame* callFrame, const Instruction* pc) - - #define LLINT_SLOW_PATH_HIDDEN_DECL(name) \ -- LLINT_SLOW_PATH_DECL(name) WTF_INTERNAL -+ LLINT_SLOW_PATH_DECL(name) REFERENCED_FROM_ASM WTF_INTERNAL - - LLINT_SLOW_PATH_HIDDEN_DECL(trace_prologue); - LLINT_SLOW_PATH_HIDDEN_DECL(trace_prologue_function_for_call); -@@ -149,13 +149,13 @@ LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_log_shadow_chicken_tail); - LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_super_sampler_begin); - LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_super_sampler_end); - LLINT_SLOW_PATH_HIDDEN_DECL(slow_path_out_of_line_jump_target); --extern "C" SlowPathReturnType llint_throw_stack_overflow_error(VM*, ProtoCallFrame*) WTF_INTERNAL; --extern "C" SlowPathReturnType llint_slow_path_checkpoint_osr_exit(CallFrame* callFrame, EncodedJSValue unused) WTF_INTERNAL; --extern "C" SlowPathReturnType llint_slow_path_checkpoint_osr_exit_from_inlined_call(CallFrame* callFrame, EncodedJSValue callResult) WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_throw_stack_overflow_error(VM*, ProtoCallFrame*) REFERENCED_FROM_ASM WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_slow_path_checkpoint_osr_exit(CallFrame* callFrame, EncodedJSValue unused) REFERENCED_FROM_ASM WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_slow_path_checkpoint_osr_exit_from_inlined_call(CallFrame* callFrame, EncodedJSValue callResult) REFERENCED_FROM_ASM WTF_INTERNAL; - #if ENABLE(C_LOOP) --extern "C" SlowPathReturnType llint_stack_check_at_vm_entry(VM*, Register*) WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_stack_check_at_vm_entry(VM*, Register*) REFERENCED_FROM_ASM WTF_INTERNAL; - #endif --extern "C" SlowPathReturnType llint_check_vm_entry_permission(VM*, ProtoCallFrame*) WTF_INTERNAL; --extern "C" NO_RETURN_DUE_TO_CRASH void llint_crash() WTF_INTERNAL; -+extern "C" SlowPathReturnType llint_check_vm_entry_permission(VM*, ProtoCallFrame*) REFERENCED_FROM_ASM WTF_INTERNAL; -+extern "C" NO_RETURN_DUE_TO_CRASH void llint_crash() REFERENCED_FROM_ASM WTF_INTERNAL; - - } } // namespace JSC::LLInt -diff --git a/Source/JavaScriptCore/wasm/WasmSlowPaths.h b/Source/JavaScriptCore/wasm/WasmSlowPaths.h -index 5b2b8f2895a1..7762118338a7 100644 ---- a/Source/JavaScriptCore/wasm/WasmSlowPaths.h -+++ b/Source/JavaScriptCore/wasm/WasmSlowPaths.h -@@ -47,7 +47,7 @@ namespace LLInt { - extern "C" SlowPathReturnType slow_path_wasm_##name(CallFrame* callFrame, const Instruction* pc, Wasm::Instance* instance) - - #define WASM_SLOW_PATH_HIDDEN_DECL(name) \ -- WASM_SLOW_PATH_DECL(name) WTF_INTERNAL -+ WASM_SLOW_PATH_DECL(name) REFERENCED_FROM_ASM WTF_INTERNAL - - #if ENABLE(WEBASSEMBLY_B3JIT) - WASM_SLOW_PATH_HIDDEN_DECL(prologue_osr); -@@ -84,9 +84,9 @@ WASM_SLOW_PATH_HIDDEN_DECL(memory_atomic_wait32); - WASM_SLOW_PATH_HIDDEN_DECL(memory_atomic_wait64); - WASM_SLOW_PATH_HIDDEN_DECL(memory_atomic_notify); - --extern "C" SlowPathReturnType slow_path_wasm_throw_exception(CallFrame*, const Instruction*, Wasm::Instance* instance, Wasm::ExceptionType) WTF_INTERNAL; --extern "C" SlowPathReturnType slow_path_wasm_popcount(const Instruction* pc, uint32_t) WTF_INTERNAL; --extern "C" SlowPathReturnType slow_path_wasm_popcountll(const Instruction* pc, uint64_t) WTF_INTERNAL; -+extern "C" SlowPathReturnType slow_path_wasm_throw_exception(CallFrame*, const Instruction*, Wasm::Instance* instance, Wasm::ExceptionType) REFERENCED_FROM_ASM WTF_INTERNAL; -+extern "C" SlowPathReturnType slow_path_wasm_popcount(const Instruction* pc, uint32_t) REFERENCED_FROM_ASM WTF_INTERNAL; -+extern "C" SlowPathReturnType slow_path_wasm_popcountll(const Instruction* pc, uint64_t) REFERENCED_FROM_ASM WTF_INTERNAL; - - } } // namespace JSC::LLInt - diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 0582dd5..965010e 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sun Sep 19 19:00:09 UTC 2021 - Michael Gorse + +- Update to version 2.32.4: + + Do not append .asc extension to downloaded text/plain files. + + Fix several crashes and rendering issues. +- Drop fix-lto.patch: fixed upstream. + ------------------------------------------------------------------- Tue Aug 10 12:10:02 UTC 2021 - Martin Liška diff --git a/webkit2gtk3.spec b/webkit2gtk3.spec index d4d4b2b..b3307e9 100644 --- a/webkit2gtk3.spec +++ b/webkit2gtk3.spec @@ -31,7 +31,7 @@ %define _gold_linker 0 %endif Name: webkit2gtk3 -Version: 2.32.3 +Version: 2.32.4 Release: 0 Summary: Library for rendering web content, GTK+ Port License: BSD-3-Clause AND LGPL-2.0-or-later @@ -44,7 +44,6 @@ Source99: webkit2gtk3.keyring # PATCH-FIX-OPENSUSE no-forced-sse.patch jengelh@iani.de -- cure execution of illegal instruction in i586 firefox. Patch0: no-forced-sse.patch -Patch1: fix-lto.patch BuildRequires: Mesa-libEGL-devel BuildRequires: Mesa-libGL-devel diff --git a/webkitgtk-2.32.3.tar.xz b/webkitgtk-2.32.3.tar.xz deleted file mode 100644 index b970abb..0000000 --- a/webkitgtk-2.32.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c1f496f5ac654efe4cef62fbd4f2fbeeef265a07c5e7419e5d2900bfeea52cbc -size 23323972 diff --git a/webkitgtk-2.32.3.tar.xz.asc b/webkitgtk-2.32.3.tar.xz.asc deleted file mode 100644 index ebe1989..0000000 --- a/webkitgtk-2.32.3.tar.xz.asc +++ /dev/null @@ -1,6 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYPqiRwAKCRDz0yLQ7EWC -w5R2AKC02Ps4OAdfYFAj7HnLkKqciDD+TwCfWfDGotwqJSzpc80qUF/qAosm9iM= -=3q32 ------END PGP SIGNATURE----- diff --git a/webkitgtk-2.32.4.tar.xz b/webkitgtk-2.32.4.tar.xz new file mode 100644 index 0000000..eee14e6 --- /dev/null +++ b/webkitgtk-2.32.4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00ce2d3f798d7bc5e9039d9059f0c3c974d51de38c8b716f00e94452a177d3fd +size 23327956 diff --git a/webkitgtk-2.32.4.tar.xz.asc b/webkitgtk-2.32.4.tar.xz.asc new file mode 100644 index 0000000..0a6e8f6 --- /dev/null +++ b/webkitgtk-2.32.4.tar.xz.asc @@ -0,0 +1,6 @@ +-----BEGIN PGP SIGNATURE----- + +iF0EABEDAB0WIQTX/PYc+aLeqzHYG9Pz0yLQ7EWCwwUCYURqiAAKCRDz0yLQ7EWC +w9+SAJwN6Q7lTZgc9lxWQL3B4lbRQRmG9QCgs2qAd3eR88c8sf8TYmRMIAYsOeg= +=DC0M +-----END PGP SIGNATURE----- From 81252b774b066b3eec1ce7e14c0fbb8d39da0270077abb5dced71a79916e6ef0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 22 Sep 2021 08:18:05 +0000 Subject: [PATCH 2/2] Accepting request 920661 from home:mgorse:branches:GNOME:Factory Tweak change log OBS-URL: https://build.opensuse.org/request/show/920661 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/webkit2gtk3?expand=0&rev=312 --- webkit2gtk3.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webkit2gtk3.changes b/webkit2gtk3.changes index 965010e..2d0d7e8 100644 --- a/webkit2gtk3.changes +++ b/webkit2gtk3.changes @@ -1,9 +1,10 @@ ------------------------------------------------------------------- Sun Sep 19 19:00:09 UTC 2021 - Michael Gorse -- Update to version 2.32.4: +- Update to version 2.32.4 (boo#1190701): + Do not append .asc extension to downloaded text/plain files. + Fix several crashes and rendering issues. + + Security fixes: CVE-2021-30858. - Drop fix-lto.patch: fixed upstream. -------------------------------------------------------------------