commit 26a90c44a56ec35d27c18e24cf5e2c07168482b5 parent 66ebab34b32761416556864ff75fe49aaa805ac7 Author: Nihal Jere <nihal@nihaljere.xyz> Date: Thu, 14 Jan 2021 10:33:11 -0600 chromium: new package + depends Diffstat:
43 files changed, 898 insertions(+), 0 deletions(-)
diff --git a/README b/README @@ -0,0 +1,2 @@ +To build chromium, the pciutils package from this repo must be installed as it +include headers that the community version doesn't. Other than that, it should build just by running `kiss b chromium`. If it doesn't lmk or send me patches diff --git a/at-spi2-atk/build b/at-spi2-atk/build @@ -0,0 +1,10 @@ +#!/bin/sh -e + +export DESTDIR="$1" + +meson \ + --prefix=/usr \ + . output + +ninja -C output +ninja -C output install diff --git a/at-spi2-atk/checksums b/at-spi2-atk/checksums @@ -0,0 +1 @@ +cfa008a5af822b36ae6287f18182c40c91dd699c55faa38605881ed175ca464f diff --git a/at-spi2-atk/depends b/at-spi2-atk/depends @@ -0,0 +1 @@ +at-spi2-core diff --git a/at-spi2-atk/sources b/at-spi2-atk/sources @@ -0,0 +1 @@ +https://download.gnome.org/sources/at-spi2-atk/2.38/at-spi2-atk-2.38.0.tar.xz diff --git a/at-spi2-atk/version b/at-spi2-atk/version @@ -0,0 +1 @@ +2.38.0 1 diff --git a/at-spi2-core/build b/at-spi2-core/build @@ -0,0 +1,10 @@ +#!/bin/sh -e + +export DESTDIR="$1" + +meson \ + --prefix=/usr \ + . output + +ninja -C output +ninja -C output install diff --git a/at-spi2-core/checksums b/at-spi2-core/checksums @@ -0,0 +1 @@ +84e36c3fe66862133f5fe229772b76aa2526e10de5014a3778f2fa46ce550da5 diff --git a/at-spi2-core/depends b/at-spi2-core/depends @@ -0,0 +1,2 @@ +dbus +glib diff --git a/at-spi2-core/sources b/at-spi2-core/sources @@ -0,0 +1 @@ +https://download.gnome.org/sources/at-spi2-core/2.38/at-spi2-core-2.38.0.tar.xz diff --git a/at-spi2-core/version b/at-spi2-core/version @@ -0,0 +1 @@ +2.38.0 1 diff --git a/chromium/build b/chromium/build @@ -0,0 +1,63 @@ +#!/bin/sh + +for patch in patches/* +do + echo "Applying $patch" + patch -p1 < $patch +done + +mkdir -p third_party/node/linux/node-linux-x64/bin +ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/node + +use_system=" + ffmpeg + flac + fontconfig + freetype + harfbuzz-ng + libdrm + libevent + libjpeg + libpng + libwebp + libxml + libxslt + opus + " +for _lib in $use_system libjpeg_turbo; do + find . -type f -path "*third_party/$_lib/*" \ + \! -path "*third_party/$_lib/chromium/*" \ + \! -path "*third_party/$_lib/google/*" \ + \! -path './base/third_party/icu/*' \ + \! -path './third_party/libxml/*' \ + \! -path './third_party/pdfium/third_party/freetype/include/pstables.h' \ + \! -path './third_party/harfbuzz-ng/utils/hb_scoped.h' \ + \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ + -delete +done + +python2 build/linux/unbundle/replace_gn_files.py --system-libraries \ + $use_system +third_party/libaddressinput/chromium/tools/update-strings.py + +_c="is_clang=true + use_sysroot=false + treat_warnings_as_errors=false + fatal_linker_warnings=false + use_custom_libcxx=false + use_gold=false + use_allocator=\"none\" + use_allocator_shim=false + use_vaapi=true + use_cups=false + use_gnome_keyring=false + is_debug=false" + +CC="${CC:-clang}" CXX="${CXX:-clang++}" LD="${CXX:-clang++}" \ + python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c" + +AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \ + out/Release/gn gen out/Release --args="blink_symbol_level=0 clang_use_chrome_plugins=false custom_toolchain=\"//build/toolchain/linux/unbundle:default\" enable_hangout_services_extension=true enable_nacl_nonsfi=false enable_nacl=false enable_precompiled_headers=false fatal_linker_warnings=false ffmpeg_branding=\"Chrome\" fieldtrial_testing_like_official_build=true gold_path=\"/usr/bin/ld.gold\" host_toolchain=\"//build/toolchain/linux/unbundle:default\" icu_use_data_file=true is_clang=true is_component_build=false is_debug=false is_desktop_linux=true proprietary_codecs=false symbol_level=0 treat_warnings_as_errors=false use_allocator_shim=false use_allocator=\"none\" use_cups=false use_custom_libcxx=false use_gnome_keyring=false use_gold=false use_lld=false use_pulseaudio=false use_sysroot=false use_system_harfbuzz=true enable_js_type_check=false" --script-executable=python2 + +ninja -C out/Release chrome chrome_sandbox chromedriver +ninja -C out/Release install diff --git a/chromium/checksums b/chromium/checksums @@ -0,0 +1,19 @@ +147591d7fc21e1a173701d28bbf35baddb91e64dd96ec16d8eee9a5113403375 +ee796eb45ea477e1e831f9d46cf94dccd64fb3937d7689c7effd69df8ce8befa +7fc80f9a0ebc3cb39a5281215b5487b3ec4233717779dfcd245967531b755b80 +1d79e0e6c3f5ea9ca1bdd5633f22bd2f61d8ecfac3cf86c32e00da843e2a9c3e +f736a4e0f1c7628c04c8e6b47c81fcec2375f4740d02f57a04d5727b80391103 +540800a46b38b4842d269369a033470f5bea194e4cb40dfbff2c524947d29be3 +f7114ba54d1199f514aa5b2ea700a9e65c99439627abc90b65e2af76072cffbb +727c18d41bb3b6b005d18c751ba5a47a21518694cf5e5da6a12fdf88d74b33f6 +c75a4109d547747c70c73fc1a57b27f4f2162093071cd1f81f9acefb8dea4ee6 +85afc3b5d392c88d8485cae2971258bb668500e0c0c9267b75fbe4912bb2ff4d +eeb57289240dc93ca34bb1794b7aedc361991e3c4b6be368b7b317efc8de3294 +9931404a930233753321b70fb7f6948955ee40712846bed31a83504cac1799c6 +360cc923387a188af3a1cea57e544a05d1bee5b78c6f1cbfb4f0de8d839c386a +31db46fa6cff0188a34ff5233208ac3d55e7120ec9c1779d9985bcc9ec33226b +151da665d67613faf53e96c4244b341b2b910dce0f6c1d62036cc5a5a8894db1 +ae77727b4f1038f1b16db15c0a42a43aecaaa309d4a7dd4af735f1c504a3922b +beac2ecf61a3dd1a8d03174833f9707650539df0e25bdcf7a136fdb8b8c03451 +674012673c3c4aae896465e0bba999a10056879057daecda59603b5552cdac86 +468cf9b7da06737966d57c0ca1fa5286a9766ddee81e6be8f3b5dd6c0ae3dea4 diff --git a/chromium/depends b/chromium/depends @@ -0,0 +1,7 @@ +re2 +pciutils +at-spi2-atk +nodejs +krb5 +dbus +gperf diff --git a/chromium/patches/create-extra-view-redefinition.patch b/chromium/patches/create-extra-view-redefinition.patch @@ -0,0 +1,20 @@ +--- a/chrome/browser/ui/views/accessibility/invert_bubble_view.cc ++++ b/chrome/browser/ui/views/accessibility/invert_bubble_view.cc +@@ -47,7 +47,7 @@ + // Tag value used to uniquely identify the "learn more" (?) button. + constexpr int kLearnMoreButton = 100; + +-std::unique_ptr<views::View> CreateExtraView(views::ButtonListener* listener) { ++std::unique_ptr<views::View> CreateExtraViewInternal(views::ButtonListener* listener) { + auto learn_more = views::CreateVectorImageButtonWithNativeTheme( + listener, vector_icons::kHelpOutlineIcon); + learn_more->SetTooltipText(l10n_util::GetStringUTF16(IDS_LEARN_MORE)); +@@ -85,7 +85,7 @@ + browser_(browser) { + SetButtons(ui::DIALOG_BUTTON_OK); + SetButtonLabel(ui::DIALOG_BUTTON_OK, l10n_util::GetStringUTF16(IDS_DONE)); +- SetExtraView(::CreateExtraView(this)); ++ SetExtraView(::CreateExtraViewInternal(this)); + set_margins(gfx::Insets()); + chrome::RecordDialogCreation(chrome::DialogIdentifier::INVERT); + } diff --git a/chromium/patches/default-pthread-stacksize.patch b/chromium/patches/default-pthread-stacksize.patch @@ -0,0 +1,34 @@ +--- a/base/threading/platform_thread_linux.cc ++++ b/base/threading/platform_thread_linux.cc +@@ -186,7 +186,8 @@ + + size_t GetDefaultThreadStackSize(const pthread_attr_t& attributes) { + #if !defined(THREAD_SANITIZER) +- return 0; ++ // use 8mb like glibc to avoid running out of space ++ return (1 << 23); + #else + // ThreadSanitizer bloats the stack heavily. Evidence has been that the + // default stack size isn't enough for some browser tests. +--- a/chrome/app/shutdown_signal_handlers_posix.cc ++++ b/chrome/app/shutdown_signal_handlers_posix.cc +@@ -187,11 +187,19 @@ + g_shutdown_pipe_read_fd = pipefd[0]; + g_shutdown_pipe_write_fd = pipefd[1]; + #if !defined(ADDRESS_SANITIZER) ++# if defined(__GLIBC__) + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2; ++# else ++ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 2 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k ++# endif + #else ++# if defined(__GLIBC__) + // ASan instrumentation bloats the stack frames, so we need to increase the + // stack size to avoid hitting the guard page. + const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4; ++# else ++ const size_t kShutdownDetectorThreadStackSize = PTHREAD_STACK_MIN * 4 * 8; // match up musls 2k PTHREAD_STACK_MIN with glibcs 16k ++# endif + #endif + ShutdownDetector* detector = new ShutdownDetector( + g_shutdown_pipe_read_fd, std::move(shutdown_callback), task_runner); diff --git a/chromium/patches/disable-wayland.patch b/chromium/patches/disable-wayland.patch @@ -0,0 +1,10 @@ +--- a/ui/ozone/ozone.gni.orig 2021-01-11 10:40:05.842272939 -0600 ++++ b/ui/ozone/ozone.gni 2021-01-11 10:40:22.326273215 -0600 +@@ -71,7 +71,6 @@ + ozone_platform_x11 = true + } else if (is_desktop_linux) { + ozone_platform = "x11" +- ozone_platform_wayland = true + ozone_platform_x11 = true + } else if (is_win) { + ozone_platform = "windows" diff --git a/chromium/patches/explicit-python2.patch b/chromium/patches/explicit-python2.patch @@ -0,0 +1,10 @@ +diff --git a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py +index e369417cd..acf1719cd 100755 +--- a/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py ++++ b/third_party/dom_distiller_js/protoc_plugins/json_values_converter.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python2 + # Copyright 2016 The Chromium Authors. All rights reserved. + # Use of this source code is governed by a BSD-style license that can be + # found in the LICENSE file. diff --git a/chromium/patches/fix-random-bytes.patch b/chromium/patches/fix-random-bytes.patch @@ -0,0 +1,10 @@ +--- third_party/openscreen/src/util/crypto/random_bytes.h.orig 2021-01-11 11:30:23.757323464 -0600 ++++ third_party/openscreen/src/util/crypto/random_bytes.h 2021-01-11 11:30:41.988323769 -0600 +@@ -5,6 +5,7 @@ + #ifndef UTIL_CRYPTO_RANDOM_BYTES_H_ + #define UTIL_CRYPTO_RANDOM_BYTES_H_ + ++#include <stdint.h> + #include <array> + + namespace openscreen { diff --git a/chromium/patches/media-base.patch b/chromium/patches/media-base.patch @@ -0,0 +1,10 @@ +--- a/media/base/subsample_entry.h ++++ b/media/base/subsample_entry.h +@@ -9,6 +9,7 @@ + #include <stdint.h> + + #include <vector> ++#include <cstddef> + + #include "media/base/media_export.h" + diff --git a/chromium/patches/musl-crashpad.patch b/chromium/patches/musl-crashpad.patch @@ -0,0 +1,25 @@ +diff --git a/third_party/crashpad/crashpad/util/linux/ptracer.cc b/third_party/crashpad/crashpad/util/linux/ptracer.cc +index c6c9229..a5336b6 100644 +--- ./third_party/crashpad/crashpad/util/linux/ptracer.cc ++++ ./third_party/crashpad/crashpad/util/linux/ptracer.cc +@@ -26,6 +26,7 @@ + + #if defined(ARCH_CPU_X86_FAMILY) + #include <asm/ldt.h> ++#include <asm/ptrace-abi.h> + #endif + + namespace crashpad { +diff --git a/third_party/crashpad/crashpad/util/linux/thread_info.h b/third_party/crashpad/crashpad/util/linux/thread_info.h +index 5b55c24..08cec52 100644 +--- ./third_party/crashpad/crashpad/util/linux/thread_info.h ++++ ./third_party/crashpad/crashpad/util/linux/thread_info.h +@@ -273,7 +273,7 @@ union FloatContext { + "Size mismatch"); + #elif defined(ARCH_CPU_ARMEL) + static_assert(sizeof(f32_t::fpregs) == sizeof(user_fpregs), "Size mismatch"); +-#if !defined(__GLIBC__) ++#if defined(OS_ANDROID) + static_assert(sizeof(f32_t::vfp) == sizeof(user_vfp), "Size mismatch"); + #endif + #elif defined(ARCH_CPU_ARM64) diff --git a/chromium/patches/musl-fixes-breakpad.patch b/chromium/patches/musl-fixes-breakpad.patch @@ -0,0 +1,26 @@ +--- ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc ++++ ./third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc +@@ -490,7 +490,9 @@ + siginfo.si_code = SI_USER; + siginfo.si_pid = getpid(); + ucontext_t context; ++#if defined(__GLIBC__) + getcontext(&context); ++#endif + return HandleSignal(sig, &siginfo, &context); + } + +@@ -675,9 +677,13 @@ + sys_prctl(PR_SET_DUMPABLE, 1, 0, 0, 0); + + CrashContext context; ++#if defined(__GLIBC__) + int getcontext_result = getcontext(&context.context); + if (getcontext_result) + return false; ++#else ++ return false; ++#endif + + #if defined(__i386__) + // In CPUFillFromUContext in minidumpwriter.cc the stack pointer is retrieved diff --git a/chromium/patches/musl-fixes.patch b/chromium/patches/musl-fixes.patch @@ -0,0 +1,135 @@ +--- ./sandbox/linux/suid/process_util.h.orig ++++ ./sandbox/linux/suid/process_util.h +@@ -11,6 +11,14 @@ + #include <stdbool.h> + #include <sys/types.h> + ++// Some additional functions ++# define TEMP_FAILURE_RETRY(expression) \ ++ (__extension__ \ ++ ({ long int __result; \ ++ do __result = (long int) (expression); \ ++ while (__result == -1L && errno == EINTR); \ ++ __result; })) ++ + // This adjusts /proc/process/oom_score_adj so the Linux OOM killer + // will prefer certain process types over others. The range for the + // adjustment is [-1000, 1000], with [0, 1000] being user accessible. +diff --git a/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc b/chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +--- ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc ++++ ./chrome/browser/metrics/chrome_browser_main_extra_parts_metrics.cc +@@ -39,7 +39,9 @@ + #endif // defined(OS_ANDROID) && defined(__arm__) + + #if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(__GLIBC__) + #include <gnu/libc-version.h> ++#endif + + #include "base/linux_util.h" + #include "base/strings/string_split.h" +@@ -268,7 +270,7 @@ void RecordLinuxDistro() { + #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) + + void RecordLinuxGlibcVersion() { +-#if defined(OS_LINUX) && !defined(OS_CHROMEOS) ++#if defined(__GLIBC__) && !defined(OS_CHROMEOS) + base::Version version(gnu_get_libc_version()); + + UMALinuxGlibcVersion glibc_version_result = UMA_LINUX_GLIBC_NOT_PARSEABLE; +diff --git a/third_party/ots/include/opentype-sanitiser.h b/third_party/ots/include/opentype-sanitiser.h +--- ./third_party/ots/include/opentype-sanitiser.h ++++ ./third_party/ots/include/opentype-sanitiser.h +@@ -20,6 +20,7 @@ typedef unsigned __int64 uint64_t; + #define htonl(x) _byteswap_ulong (x) + #define htons(x) _byteswap_ushort (x) + #else ++#include <sys/types.h> + #include <arpa/inet.h> + #include <stdint.h> + #endif +--- ./base/logging.cc.orig ++++ ./base/logging.cc +@@ -545,8 +545,7 @@ + + LogMessage::~LogMessage() { + size_t stack_start = stream_.tellp(); +-#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \ +- !defined(OS_AIX) ++#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) + if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { + // Include a stack trace on a fatal, unless a debugger is attached. + base::debug::StackTrace trace; +--- ./third_party/blink/renderer/platform/wtf/stack_util.cc.orig ++++ ./third_party/blink/renderer/platform/wtf/stack_util.cc +@@ -28,7 +28,7 @@ + // FIXME: On Mac OSX and Linux, this method cannot estimate stack size + // correctly for the main thread. + +-#elif defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#elif defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ + defined(OS_FUCHSIA) + // pthread_getattr_np() can fail if the thread is not invoked by + // pthread_create() (e.g., the main thread of webkit_unit_tests). +@@ -96,7 +96,7 @@ + } + + void* GetStackStart() { +-#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ ++#if defined(OS_LINUX) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ + defined(OS_FUCHSIA) + pthread_attr_t attr; + int error; +--- ./net/dns/dns_config_service_posix.cc.orig ++++ ./net/dns/dns_config_service_posix.cc +@@ -152,7 +152,7 @@ + ConfigParsePosixResult result; + config->unhandled_options = false; + // TODO(fuchsia): Use res_ninit() when it's implemented on Fuchsia. +-#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) ++#if defined(OS_OPENBSD) || defined(OS_FUCHSIA) || defined(_GNU_SOURCE) + // Note: res_ninit in glibc always returns 0 and sets RES_INIT. + // res_init behaves the same way. + memset(&_res, 0, sizeof(_res)); +--- ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc.orig 2019-06-18 11:51:17.000000000 -0400 ++++ ./third_party/swiftshader/third_party/llvm-subzero/lib/Support/Unix/Signals.inc 2019-07-03 12:32:50.938758186 -0400 +@@ -25,7 +25,7 @@ + #include "llvm/Support/raw_ostream.h" + #include <algorithm> + #include <string> +-#if HAVE_EXECINFO_H ++#if HAVE_EXECINFO_H && defined(__GLIBC__) + # include <execinfo.h> // For backtrace(). + #endif + #if HAVE_SIGNAL_H +@@ -52,6 +52,7 @@ + #include <unwind.h> + #else + #undef HAVE__UNWIND_BACKTRACE ++#undef HAVE_BACKTRACE + #endif + #endif + +--- ./third_party/nasm/nasmlib/realpath.c.orig 2019-07-03 12:23:05.021949895 -0400 ++++ ./third_party/nasm/nasmlib/realpath.c 2019-07-03 12:24:24.246862665 -0400 +@@ -49,7 +49,7 @@ + + #include "nasmlib.h" + +-#ifdef HAVE_CANONICALIZE_FILE_NAME ++#if defined(__GLIBC__) + + /* + * GNU-specific, but avoids the realpath(..., NULL) +diff --git a/mojo/public/cpp/platform/named_platform_channel_posix.cc ./mojo/public/cpp/platform/named_platform_channel_posix.cc +index 9082ac4..cbedae6 100644 +--- a/mojo/public/cpp/platform/named_platform_channel_posix.cc ++++ ./mojo/public/cpp/platform/named_platform_channel_posix.cc +@@ -5,6 +5,7 @@ + #include "mojo/public/cpp/platform/named_platform_channel.h" + + #include <errno.h> ++#include <string.h> + #include <sys/socket.h> + #include <sys/un.h> + #include <unistd.h> diff --git a/chromium/patches/musl-hacks.patch b/chromium/patches/musl-hacks.patch @@ -0,0 +1,22 @@ +--- ./base/debug/stack_trace.cc ++++ ./base/debug/stack_trace.cc +@@ -233,7 +233,7 @@ + } + std::string StackTrace::ToStringWithPrefix(const char* prefix_string) const { + std::stringstream stream; +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + OutputToStreamWithPrefix(&stream, prefix_string); + #endif + return stream.str(); +--- ./net/socket/udp_socket_posix.cc ++++ ./net/socket/udp_socket_posix.cc +@@ -1152,7 +1152,7 @@ + msg_iov->push_back({const_cast<char*>(buffer->data()), buffer->length()}); + msgvec->reserve(buffers.size()); + for (size_t j = 0; j < buffers.size(); j++) +- msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, nullptr, 0, 0}, 0}); ++ msgvec->push_back({{nullptr, 0, &msg_iov[j], 1, 0, 0, 0}, 0}); + int result = HANDLE_EINTR(Sendmmsg(fd, &msgvec[0], buffers.size(), 0)); + SendResult send_result(0, 0, std::move(buffers)); + if (result < 0) { diff --git a/chromium/patches/musl-libc++.patch b/chromium/patches/musl-libc++.patch @@ -0,0 +1,51 @@ +--- ./buildtools/third_party/libc++/trunk/include/locale ++++ ./buildtools/third_party/libc++/trunk/include/locale +@@ -10,6 +10,15 @@ + #ifndef _LIBCPP_LOCALE + #define _LIBCPP_LOCALE + ++// musl doesn't define _l (with locale) variants of functions, as it only supports UTF-8. ++// we can simply make macros that will call the non-localated ones if we're using musl, or rather not-using something that has the _l ones. ++// couldn't find anything glibc #defines when it creates strtoull_l (that it doesn't undefine a few lines later), so let's test against glibc and glibc-likes. ++// almost all glibc-likes define __GNU_LIBRARY__ for compatibility ++#ifndef __GNU_LIBRARY__ ++#define strtoull_l(A, B, C, LOC) strtoull(A,B,C) ++#define strtoll_l(A, B, C, LOC) strtoll(A,B,C) ++#endif ++ + /* + locale synopsis + +--- ./buildtools/third_party/libc++/trunk/src/locale.cpp ++++ ./buildtools/third_party/libc++/trunk/src/locale.cpp +@@ -1019,11 +1019,11 @@ + return low; + } + +-#if defined(__EMSCRIPTEN__) ++// #if defined(__EMSCRIPTEN__) + extern "C" const unsigned short ** __ctype_b_loc(); + extern "C" const int ** __ctype_tolower_loc(); + extern "C" const int ** __ctype_toupper_loc(); +-#endif ++// #endif + + #ifdef _LIBCPP_PROVIDES_DEFAULT_RUNE_TABLE + const ctype<char>::mask* +@@ -1127,12 +1127,10 @@ + #elif defined(_AIX) + return (const unsigned int *)__lc_ctype_ptr->obj->mask; + #else +- // Platform not supported: abort so the person doing the port knows what to +- // fix +-# warning ctype<char>::classic_table() is not implemented +- printf("ctype<char>::classic_table() is not implemented\n"); +- abort(); +- return NULL; ++// not sure any other libc like this exists, but there is no way to differentiate musl as of right now ++// to be fair, with the change above, this should always work ++// also, #warning is a gcc extension ++ return (const unsigned long *)*__ctype_b_loc(); + #endif + } + #endif diff --git a/chromium/patches/musl-sandbox.patch b/chromium/patches/musl-sandbox.patch @@ -0,0 +1,176 @@ +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +index ff5a1c0..da56b9b 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc +@@ -139,21 +139,11 @@ namespace sandbox { + // present (as in newer versions of posix_spawn). + ResultExpr RestrictCloneToThreadsAndEPERMFork() { + const Arg<unsigned long> flags(0); +- +- // TODO(mdempsky): Extend DSL to support (flags & ~mask1) == mask2. +- const uint64_t kAndroidCloneMask = CLONE_VM | CLONE_FS | CLONE_FILES | +- CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM; +- const uint64_t kObsoleteAndroidCloneMask = kAndroidCloneMask | CLONE_DETACHED; +- +- const uint64_t kGlibcPthreadFlags = +- CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | CLONE_THREAD | +- CLONE_SYSVSEM | CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID; +- const BoolExpr glibc_test = flags == kGlibcPthreadFlags; +- +- const BoolExpr android_test = +- AnyOf(flags == kAndroidCloneMask, flags == kObsoleteAndroidCloneMask, +- flags == kGlibcPthreadFlags); ++ const int required = CLONE_VM | CLONE_FS | CLONE_FILES | CLONE_SIGHAND | ++ CLONE_THREAD | CLONE_SYSVSEM; ++ const int safe = CLONE_SETTLS | CLONE_PARENT_SETTID | CLONE_CHILD_CLEARTID | ++ CLONE_DETACHED; ++ const BoolExpr thread_clone_ok = (flags&~safe)==required; + + // The following two flags are the two important flags in any vfork-emulating + // clone call. EPERM any clone call that contains both of them. +@@ -163,7 +153,7 @@ ResultExpr RestrictCloneToThreadsAndEPERMFork() { + AnyOf((flags & (CLONE_VM | CLONE_THREAD)) == 0, + (flags & kImportantCloneVforkFlags) == kImportantCloneVforkFlags); + +- return If(IsAndroid() ? android_test : glibc_test, Allow()) ++ return If(thread_clone_ok, Allow()) + .ElseIf(is_fork_or_clone_vfork, Error(EPERM)) + .Else(CrashSIGSYSClone()); + } +diff --git a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +index d9d1882..0567557 100644 +--- a/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc ++++ ./sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc +@@ -392,6 +392,7 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) + case __NR_waitpid: + #endif ++ case __NR_set_tid_address: + return true; + case __NR_clone: // Should be parameter-restricted. + case __NR_setns: // Privileged. +@@ -404,7 +405,6 @@ bool SyscallSets::IsAllowedProcessStartOrDeath(int sysno) { + #if defined(__i386__) || defined(__x86_64__) || defined(__mips__) + case __NR_set_thread_area: + #endif +- case __NR_set_tid_address: + case __NR_unshare: + #if !defined(__mips__) && !defined(__aarch64__) + case __NR_vfork: +@@ -514,6 +514,8 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { + case __NR_mlock: + case __NR_munlock: + case __NR_munmap: ++ case __NR_mremap: ++ case __NR_membarrier: + return true; + case __NR_madvise: + case __NR_mincore: +@@ -531,7 +533,6 @@ bool SyscallSets::IsAllowedAddressSpaceAccess(int sysno) { + case __NR_modify_ldt: + #endif + case __NR_mprotect: +- case __NR_mremap: + case __NR_msync: + case __NR_munlockall: + case __NR_readahead: +diff --git a/sandbox/linux/system_headers/arm64_linux_syscalls.h ./sandbox/linux/system_headers/arm64_linux_syscalls.h +index 59d0eab..7ae7002 100644 +--- a/sandbox/linux/system_headers/arm64_linux_syscalls.h ++++ ./sandbox/linux/system_headers/arm64_linux_syscalls.h +@@ -1063,4 +1063,8 @@ + #define __NR_memfd_create 279 + #endif + ++#if !defined(__NR_membarrier) ++#define __NR_membarrier 283 ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_ARM64_LINUX_SYSCALLS_H_ +diff --git a/sandbox/linux/system_headers/arm_linux_syscalls.h ./sandbox/linux/system_headers/arm_linux_syscalls.h +index 1addd53..7843b5e 100644 +--- a/sandbox/linux/system_headers/arm_linux_syscalls.h ++++ ./sandbox/linux/system_headers/arm_linux_syscalls.h +@@ -1385,6 +1385,10 @@ + #define __NR_memfd_create (__NR_SYSCALL_BASE+385) + #endif + ++#if !defined(__NR_membarrier) ++#define __NR_membarrier (__NR_SYSCALL_BASE+389) ++#endif ++ + // ARM private syscalls. + #if !defined(__ARM_NR_BASE) + #define __ARM_NR_BASE (__NR_SYSCALL_BASE + 0xF0000) +diff --git a/sandbox/linux/system_headers/linux_syscalls.h ./sandbox/linux/system_headers/linux_syscalls.h +index 2b78a0c..b6fedb5 100644 +--- a/sandbox/linux/system_headers/linux_syscalls.h ++++ ./sandbox/linux/system_headers/linux_syscalls.h +@@ -10,6 +10,7 @@ + #define SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_ + + #include "build/build_config.h" ++#include <sys/syscall.h> + + #if defined(__x86_64__) + #include "sandbox/linux/system_headers/x86_64_linux_syscalls.h" +diff --git a/sandbox/linux/system_headers/mips64_linux_syscalls.h ./sandbox/linux/system_headers/mips64_linux_syscalls.h +index ec75815..5515270 100644 +--- a/sandbox/linux/system_headers/mips64_linux_syscalls.h ++++ ./sandbox/linux/system_headers/mips64_linux_syscalls.h +@@ -1271,4 +1271,8 @@ + #define __NR_memfd_create (__NR_Linux + 314) + #endif + ++#if !defined(__NR_membarrier) ++#define __NR_membarrier (__NR_Linux 318) ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS64_LINUX_SYSCALLS_H_ +diff --git a/sandbox/linux/system_headers/mips_linux_syscalls.h ./sandbox/linux/system_headers/mips_linux_syscalls.h +index ddbf97f..ad3d64b 100644 +--- a/sandbox/linux/system_headers/mips_linux_syscalls.h ++++ ./sandbox/linux/system_headers/mips_linux_syscalls.h +@@ -1433,4 +1433,8 @@ + #define __NR_memfd_create (__NR_Linux + 354) + #endif + ++#if !defined(__NR_membarrier) ++#define __NR_membarrier (__NR_Linux 358) ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_MIPS_LINUX_SYSCALLS_H_ +diff --git a/sandbox/linux/system_headers/x86_64_linux_syscalls.h ./sandbox/linux/system_headers/x86_64_linux_syscalls.h +index b0ae0a2..8b12029 100644 +--- a/sandbox/linux/system_headers/x86_64_linux_syscalls.h ++++ ./sandbox/linux/system_headers/x86_64_linux_syscalls.h +@@ -1350,5 +1350,9 @@ + #define __NR_rseq 334 + #endif + ++#if !defined(__NR_membarrier) ++#define __NR_membarrier 324 ++#endif ++ + #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ + +diff --git a/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc ./services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc +index a85c0ea..715aa1e 100644 +--- a/sandbox/policy/linux/bpf_renderer_policy_linux.cc ++++ ./sandbox/policy/linux/bpf_renderer_policy_linux.cc +@@ -93,11 +93,11 @@ + case __NR_sysinfo: + case __NR_times: + case __NR_uname: +- return Allow(); +- case __NR_sched_getaffinity: + case __NR_sched_getparam: + case __NR_sched_getscheduler: + case __NR_sched_setscheduler: ++ return Allow(); ++ case __NR_sched_getaffinity: + return RestrictSchedTarget(GetPolicyPid(), sysno); + case __NR_prlimit64: + // See crbug.com/662450 and setrlimit comment above. + diff --git a/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch b/chromium/patches/musl-v8-monotonic-pthread-cont_timedwait.patch @@ -0,0 +1,22 @@ +Use monotonic clock for pthread_cond_timedwait with musl too. + +--- ./v8/src/base/platform/condition-variable.cc ++++ ./v8/src/base/platform/condition-variable.cc +@@ -16,7 +16,7 @@ + + ConditionVariable::ConditionVariable() { + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + pthread_condattr_t attr; +@@ -92,7 +92,7 @@ + &native_handle_, &mutex->native_handle(), &ts); + #else + #if (V8_OS_FREEBSD || V8_OS_NETBSD || V8_OS_OPENBSD || \ +- (V8_OS_LINUX && V8_LIBC_GLIBC)) ++ V8_OS_LINUX) + // On Free/Net/OpenBSD and Linux with glibc we can change the time + // source for pthread_cond_timedwait() to use the monotonic clock. + result = clock_gettime(CLOCK_MONOTONIC, &ts); diff --git a/chromium/patches/nasm.patch b/chromium/patches/nasm.patch @@ -0,0 +1,11 @@ +--- ./third_party/nasm/config/config-linux.h ++++ ./third_party/nasm/config/config-linux.h +@@ -139,7 +139,7 @@ + #define HAVE_ACCESS 1 + + /* Define to 1 if you have the `canonicalize_file_name' function. */ +-#define HAVE_CANONICALIZE_FILE_NAME 1 ++// #define HAVE_CANONICALIZE_FILE_NAME 1 + + /* Define to 1 if you have the `cpu_to_le16' intrinsic function. */ + /* #undef HAVE_CPU_TO_LE16 */ diff --git a/chromium/patches/no-execinfo.patch b/chromium/patches/no-execinfo.patch @@ -0,0 +1,54 @@ +--- ./base/debug/stack_trace_posix.cc ++++ ./base/debug/stack_trace_posix.cc +@@ -27,7 +27,7 @@ + #if !defined(USE_SYMBOLIZE) + #include <cxxabi.h> + #endif +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + #include <execinfo.h> + #endif + +@@ -88,7 +88,7 @@ + // Note: code in this function is NOT async-signal safe (std::string uses + // malloc internally). + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + std::string::size_type search_from = 0; + while (search_from < text->size()) { + // Look for the start of a mangled symbol, from search_from. +@@ -135,7 +135,7 @@ + virtual ~BacktraceOutputHandler() = default; + }; + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + void OutputPointer(void* pointer, BacktraceOutputHandler* handler) { + // This should be more than enough to store a 64-bit number in hex: + // 16 hex digits + 1 for null-terminator. +@@ -834,7 +834,7 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + // Though the backtrace API man page does not list any possible negative + // return values, we take no chance. + return base::saturated_cast<size_t>(backtrace(trace, count)); +@@ -847,13 +847,13 @@ + // NOTE: This code MUST be async-signal safe (it's used by in-process + // stack dumping signal handler). NO malloc or stdio is allowed here. + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + PrintBacktraceOutputHandler handler; + ProcessBacktrace(trace_, count_, prefix_string, &handler); + #endif + } + +-#if !defined(__UCLIBC__) && !defined(_AIX) ++#if defined(__GLIBC__) && !defined(_AIX) + void StackTrace::OutputToStreamWithPrefix(std::ostream* os, + const char* prefix_string) const { + StreamBacktraceOutputHandler handler(os); diff --git a/chromium/patches/no-mallinfo.patch b/chromium/patches/no-mallinfo.patch @@ -0,0 +1,33 @@ +--- ./base/trace_event/malloc_dump_provider.cc ++++ ./base/trace_event/malloc_dump_provider.cc +@@ -132,7 +132,7 @@ + } + #elif defined(OS_FUCHSIA) + // TODO(fuchsia): Port, see https://crbug.com/706592. +-#else ++#elif defined(__GLIBC__) + struct mallinfo info = mallinfo(); + #if !defined(ADDRESS_SANITIZER) && !defined(THREAD_SANITIZER) + // Sanitizers override mallinfo. +--- ./base/process/process_metrics_posix.cc ++++ ./base/process/process_metrics_posix.cc +@@ -119,17 +119,16 @@ + malloc_statistics_t stats = {0}; + malloc_zone_statistics(nullptr, &stats); + return stats.size_in_use; +-#elif defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_ANDROID) ++#elif defined(__GLIBC__) || defined(OS_ANDROID) + struct mallinfo minfo = mallinfo(); + #if BUILDFLAG(USE_TCMALLOC) + return minfo.uordblks; + #else + return minfo.hblkhd + minfo.arena; + #endif +-#elif defined(OS_FUCHSIA) ++#endif + // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. + return 0; +-#endif + } + + } // namespace base diff --git a/chromium/patches/resolver.patch b/chromium/patches/resolver.patch @@ -0,0 +1,36 @@ +--- ./net/dns/dns_reloader.cc ++++ ./net/dns/dns_reloader.cc +@@ -4,8 +4,7 @@ + + #include "net/dns/dns_reloader.h" + +-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) && !defined(OS_FUCHSIA) ++#if defined(__GLIBC__) + + #include <resolv.h> + +--- ./net/dns/host_resolver_manager.cc ++++ ./net/dns/host_resolver_manager.cc +@@ -2779,8 +2779,7 @@ + NetworkChangeNotifier::AddConnectionTypeObserver(this); + if (system_dns_config_notifier_) + system_dns_config_notifier_->AddObserver(this); +-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) ++#if defined(__GLIBC__) + EnsureDnsReloaderInit(); + #endif + +--- ./net/dns/host_resolver_proc.cc ++++ ./net/dns/host_resolver_proc.cc +@@ -159,8 +159,7 @@ + base::ScopedBlockingCall scoped_blocking_call(FROM_HERE, + base::BlockingType::WILL_BLOCK); + +-#if defined(OS_POSIX) && !defined(OS_APPLE) && !defined(OS_OPENBSD) && \ +- !defined(OS_ANDROID) && !defined(OS_FUCHSIA) ++#if defined(__GLIBC__) + DnsReloaderMaybeReload(); + #endif + base::Optional<AddressInfo> ai; diff --git a/chromium/patches/swiftshader.patch b/chromium/patches/swiftshader.patch @@ -0,0 +1,33 @@ +--- ./third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h ++++ ./third_party/swiftshader/third_party/llvm-subzero/build/Linux/include/llvm/Config/config.h +@@ -14,7 +14,7 @@ + #define ENABLE_CRASH_OVERRIDES 1 + + /* Define to 1 if you have the `backtrace' function. */ +-#define HAVE_BACKTRACE 1 ++/* #define HAVE_BACKTRACE 1 */ + + /* Define to 1 if you have the <CrashReporterClient.h> header file. */ + /* #undef HAVE_CRASHREPORTERCLIENT_H */ +@@ -55,7 +55,7 @@ + #define HAVE_ERRNO_H 1 + + /* Define to 1 if you have the <execinfo.h> header file. */ +-#define HAVE_EXECINFO_H 1 ++/*#undef HAVE_EXECINFO_H 1 */ + + /* Define to 1 if you have the <fcntl.h> header file. */ + #define HAVE_FCNTL_H 1 +@@ -130,10 +130,10 @@ + /* #undef HAVE_MALLCTL */ + + /* Define to 1 if you have the `mallinfo' function. */ +-#define HAVE_MALLINFO 1 ++/* #undef HAVE_MALLINFO 1*/ + + /* Define to 1 if you have the <malloc.h> header file. */ +-#define HAVE_MALLOC_H 1 ++/* #undef HAVE_MALLOC_H 1 */ + + /* Define to 1 if you have the <malloc/malloc.h> header file. */ + /* #undef HAVE_MALLOC_MALLOC_H */ diff --git a/chromium/sources b/chromium/sources @@ -0,0 +1,19 @@ +https://commondatastorage.googleapis.com/chromium-browser-official/chromium-87.0.4280.141.tar.xz +patches/create-extra-view-redefinition.patch +patches/musl-fixes.patch +patches/musl-sandbox.patch +patches/musl-hacks.patch +patches/no-mallinfo.patch +patches/explicit-python2.patch +patches/nasm.patch +patches/musl-fixes-breakpad.patch +patches/default-pthread-stacksize.patch +patches/no-execinfo.patch +patches/fix-random-bytes.patch +patches/disable-wayland.patch +patches/musl-libc++.patch +patches/resolver.patch +patches/musl-crashpad.patch +patches/swiftshader.patch +patches/media-base.patch +patches/musl-v8-monotonic-pthread-cont_timedwait.patch diff --git a/chromium/version b/chromium/version @@ -0,0 +1 @@ +87.0.4280.141 1 diff --git a/krb5/build b/krb5/build @@ -0,0 +1,11 @@ +#!/bin/sh -e + +cd src + +./configure \ + --prefix=/usr \ + --sysconfdir=/etc \ + --disable-pkinit + +make +make DESTDIR="$1" install diff --git a/krb5/checksums b/krb5/checksums @@ -0,0 +1 @@ +e61783c292b5efd9afb45c555a80dd267ac67eebabca42185362bee6c4fbd719 diff --git a/krb5/sources b/krb5/sources @@ -0,0 +1 @@ +https://kerberos.org/dist/krb5/1.18/krb5-1.18.3.tar.gz diff --git a/krb5/version b/krb5/version @@ -0,0 +1 @@ +1.18.3 1 diff --git a/pciutils/build b/pciutils/build @@ -0,0 +1,20 @@ +#!/bin/sh -e + +mk() { + make \ + CC="${CC:-cc}" \ + OPT="$CFLAGS -fPIC" \ + ZLIB=yes \ + PREFIX=/usr \ + SBINDIR=/usr/bin \ + SHAREDIR=/usr/share/hwdata \ + "$@" +} + + +for shared in yes no; do ( + cd "$shared" + + mk SHARED="$shared" + mk SHARED="$shared" DESTDIR="$1" install install-pcilib install-lib +) done diff --git a/pciutils/checksums b/pciutils/checksums @@ -0,0 +1,2 @@ +2432e7a2e12000502d36cf769ab6e5a0cf4931e5050ccaf8b02984b2d3cb0948 pciutils-3.7.0.tar.gz +2432e7a2e12000502d36cf769ab6e5a0cf4931e5050ccaf8b02984b2d3cb0948 pciutils-3.7.0.tar.gz diff --git a/pciutils/depends b/pciutils/depends @@ -0,0 +1 @@ +zlib diff --git a/pciutils/sources b/pciutils/sources @@ -0,0 +1,2 @@ +https://www.kernel.org/pub/software/utils/pciutils/pciutils-3.7.0.tar.gz yes +https://www.kernel.org/pub/software/utils/pciutils/pciutils-3.7.0.tar.gz no diff --git a/pciutils/version b/pciutils/version @@ -0,0 +1 @@ +3.7.0 1