From a5221a1ba2bf8e2511f3a05d6fea0e8f6436d043 Mon Sep 17 00:00:00 2001 From: Mikhail Novosyolov Date: Sat, 27 Feb 2021 15:03:05 +0300 Subject: [PATCH] glibc in rosa2019.1 is not so new, that patch is not needed SIGSTKSZ is defined as a constant: [user@rosa2019 ~]$ grep -nHr SIGSTKSZ /usr/include /usr/include/asm/signal.h:89:#define MINSIGSTKSZ 2048 /usr/include/asm/signal.h:90:#define SIGSTKSZ 8192 /usr/include/asm-generic/signal.h:84:#if !defined MINSIGSTKSZ || !defined SIGSTKSZ /usr/include/asm-generic/signal.h:85:#define MINSIGSTKSZ 2048 /usr/include/asm-generic/signal.h:86:#define SIGSTKSZ 8192 /usr/include/bits/sigstack.h:27:#define MINSIGSTKSZ 2048 /usr/include/bits/sigstack.h:30:#define SIGSTKSZ 8192 /usr/include/elf.h:1229:#define AT_MINSIGSTKSZ 51 /* Stack needed for signal delivery [user@rosa2019 ~]$ --- ...8.0.4324.182-rawhide-gcc-std-max-fix.patch | 24 ------------------- chromium-browser-stable.spec | 5 ---- 2 files changed, 29 deletions(-) delete mode 100644 chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch diff --git a/chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch b/chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch deleted file mode 100644 index d63c00a..0000000 --- a/chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc ---- chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc.stdmaxfix 2021-02-17 13:16:27.120283969 -0500 -+++ chromium-88.0.4324.182/third_party/abseil-cpp/absl/debugging/failure_signal_handler.cc 2021-02-17 13:17:37.951617295 -0500 -@@ -135,7 +135,7 @@ static bool SetupAlternateStackOnce() { - #else - const size_t page_mask = sysconf(_SC_PAGESIZE) - 1; - #endif -- size_t stack_size = (std::max(SIGSTKSZ, 65536) + page_mask) & ~page_mask; -+ size_t stack_size = (std::max(SIGSTKSZ, static_cast(65536)) + page_mask) & ~page_mask; - #if defined(ABSL_HAVE_ADDRESS_SANITIZER) || \ - defined(ABSL_HAVE_MEMORY_SANITIZER) || defined(ABSL_HAVE_THREAD_SANITIZER) - // Account for sanitizer instrumentation requiring additional stack space. -diff -up chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ---- chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc.stdmaxfix 2021-02-17 14:39:04.556382532 -0500 -+++ chromium-88.0.4324.182/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc 2021-02-17 14:39:34.002519173 -0500 -@@ -138,7 +138,7 @@ void InstallAlternateStackLocked() { - // SIGSTKSZ may be too small to prevent the signal handlers from overrunning - // the alternative stack. Ensure that the size of the alternative stack is - // large enough. -- static const unsigned kSigStackSize = std::max(16384, SIGSTKSZ); -+ static const unsigned kSigStackSize = std::max(static_cast(16384), SIGSTKSZ); - - // Only set an alternative stack if there isn't already one, or if the current - // one is too small. diff --git a/chromium-browser-stable.spec b/chromium-browser-stable.spec index c111993..726a521 100644 --- a/chromium-browser-stable.spec +++ b/chromium-browser-stable.spec @@ -149,8 +149,6 @@ Patch639: wayland-strndup.patch # Fix sandbox code to properly handle the new way that glibc handles fstat in rosa2019.1+ # Thanks to Kevin Kofler for the fix (from Fedora) Patch640: chromium-88.0.4324.96-fstatfix.patch -# rosa2019.1's glibc defines SIGSTKSZ as a long instead of a constant (from Fedora) -Patch641: chromium-88.0.4324.182-rawhide-gcc-std-max-fix.patch # https://build.opensuse.org/package/view_file/openSUSE:Factory/chromium/build-with-pipewire-0.3.patch Patch642: build-with-pipewire-0.3.patch @@ -390,9 +388,6 @@ cp -f %{_gostsourcedir}/src/msspi/third_party/cprocsp/include/* third_party/bori %patch637 -p1 -b .fcntl %patch639 -p1 %patch640 -p1 -%if %{mdvver} >= 201910 -%patch641 -p1 -%endif %patch642 -p1 # fatal error: 'fuzzer/FuzzedDataProvider.h' file not found