From ee0ec416be7714f370ca7f0e4a5213df4e1c600e Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Sun, 28 Mar 2021 15:09:46 +0000 Subject: [PATCH] Reorganize repo --- .gitignore | 1 - browsers/chromium/APKBUILD | 370 -- browsers/qt5-qtwebengine/APKBUILD | 136 - browsers/qt5-qtwebengine/musl-hacks.patch | 13 - browsers/qt5-qtwebengine/musl-sandbox.patch | 162 - browsers/qt5-qtwebengine/nasm.patch | 13 - .../qt5-qtwebengine/qt-musl-crashpad.patch | 13 - .../qt-musl-dispatch_to_musl.patch | 103 - .../qt5-qtwebengine/qt-musl-elf-arm.patch | 13 - .../qt5-qtwebengine/qt-musl-execinfo.patch | 108 - .../qt5-qtwebengine/qt-musl-fpstate.patch | 48 - .../qt5-qtwebengine/qt-musl-mallinfo.patch | 43 - browsers/qt5-qtwebengine/qt-musl-off_t.patch | 10 - .../qt-musl-pread-pwrite.patch | 20 - .../qt5-qtwebengine/qt-musl-pvalloc.patch | 14 - .../qt5-qtwebengine/qt-musl-resolve.patch | 61 - .../qt5-qtwebengine/qt-musl-siginfo_t.patch | 18 - .../qt5-qtwebengine/qt-musl-stackstart.patch | 22 - .../qt-musl-sysreg-for__WORDSIZE.patch | 14 - .../qt-musl-thread-stacksize.patch | 26 - .../qt5-qtwebengine/remove-glibc-check.patch | 18 - .../sandbox-sched_getparam.patch | 24 - browsers/qt5-qtwebengine/yasm-nls.patch | 13 - downloaders/youtube-dlc/APKBUILD | 43 - ...util-clean-up-unused-FF_SYMVER-macro.patch | 55 - ...8cca6e51db0f19928c12d0348deaa17137b3.patch | 83 - media/ffmpeg/APKBUILD | 194 - media/gst-plugins-good/APKBUILD | 83 - media/qt5-qtmultimedia/APKBUILD | 41 - misc-tools/abuild/0001-fix-initd-checks.patch | 19 - misc-tools/abuild/0002-buildbase-opt.patch | 43 - misc-tools/abuild/APKBUILD | 87 - misc-tools/abuild/abuild.pre-install | 5 - misc-tools/abuild/abuild.pre-upgrade | 1 - ...initfs-add-optional-support-for-pigz.patch | 46 - misc-tools/mkinitfs/0002-file-embed.patch | 28 - misc-tools/mkinitfs/0003-include-libs.patch | 7 - misc-tools/mkinitfs/APKBUILD | 34 - misc-tools/mkinitfs/mkinitfs.post-install | 8 - misc-tools/mkinitfs/mkinitfs.post-upgrade | 1 - misc-tools/mkinitfs/mkinitfs.pre-upgrade | 13 - misc-tools/mkinitfs/mkinitfs.trigger | 33 - openrc/uircd-openrc/APKBUILD | 24 - openrc/uircd-openrc/confd | 19 - openrc/uircd-openrc/initd | 30 - orphan/flexget/APKBUILD | 59 + orphan/hydrus/APKBUILD | 48 + orphan/hydrus/client-bin | 2 + .../0001-remove-config-import-build.patch | 16 + orphan/pleroma/APKBUILD | 35 + {games => orphan}/spigot-mc/APKBUILD | 6 +- {games => orphan}/spigot-mc/spigot.initd | 0 .../telegram-desktop/APKBUILD | 16 +- orphan/telegram-desktop/fix-tgcalls.patch | 28 + .../link-webrtc-to-libjpeg.patch | 11 + orphan/telegram-desktop/remove-calls.patch | 150 + .../telegram-desktop/remove-glibc.patch | 0 .../telegram-desktop/small-sizes.patch | 0 own/uirc/APKBUILD | 36 - own/uircd/APKBUILD | 36 - own/uircd/uircd.initd | 13 - stable/minetest-mineclone2/APKBUILD | 23 + {media => stable}/paperview/APKBUILD | 0 suckless/dwm-mobile/APKBUILD | 39 - suckless/svkbd-mobile/APKBUILD | 26 - .../multimc/01-patch-jar-path.patch | 0 {games => testing}/multimc/APKBUILD | 0 {communication => testing}/mumble/APKBUILD | 0 .../mumble/murmur.initd | 0 .../mumble/murmur.pre-install | 0 {communication => testing}/neomutt/APKBUILD | 0 unstable/ungoogled-chromium/APKBUILD | 446 ++ .../ungoogled-chromium}/aarch64-fixes.patch | 0 ...le-accelerated-video-decode-on-Linux.patch | 0 .../ungoogled-chromium}/chromium-launcher.sh | 0 .../chromium-size_t-defined.patch | 0 .../chromium-use-alpine-target.patch | 0 .../ungoogled-chromium}/chromium.conf | 0 .../ungoogled-chromium}/chromium.desktop | 0 .../create-extra-view-redefinition.patch | 0 .../default-pthread-stacksize.patch | 0 .../ungoogled-chromium}/elf-arm.patch | 0 ...-end-iterator-usage-in-CookieMonster.patch | 0 .../ungoogled-chromium}/gcc-arm.patch | 0 .../gcc-fno-delete-null-pointer-checks.patch | 0 .../ungoogled-chromium}/google-api.keys | 0 .../ungoogled-chromium}/media-base.patch | 0 .../ungoogled-chromium}/musl-crashpad.patch | 0 .../musl-fixes-breakpad.patch | 0 .../ungoogled-chromium}/musl-fixes.patch | 0 .../ungoogled-chromium}/musl-hacks.patch | 0 .../ungoogled-chromium}/musl-libc++.patch | 0 .../ungoogled-chromium}/musl-sandbox.patch | 0 ...-v8-monotonic-pthread-cont_timedwait.patch | 0 .../ungoogled-chromium}/nasm.patch | 0 .../ungoogled-chromium}/no-execinfo.patch | 0 .../ungoogled-chromium}/no-mallinfo.patch | 0 ...k-to-the-i965-driver-if-we-re-on-iHD.patch | 0 ...move-dead-reloc-in-nonalloc-LD-flags.patch | 0 .../ungoogled-chromium}/resolver.patch | 0 .../ungoogled-chromium}/swiftshader.patch | 0 .../0001-fix-var-undefined.patch | 23 + .../0002-dont-use-zip-analyzer.patch | 25 + .../disable-fetching-field-trials.patch | 80 + ...move-dead-reloc-in-nonalloc-LD-flags.patch | 33 + .../core/debian/disable/unrar.patch | 85 + ...01-fix-building-without-safebrowsing.patch | 1188 ++++ ...03-disable-autofill-download-manager.patch | 97 + .../0005-disable-default-extensions.patch | 112 + .../0007-disable-web-resource-service.patch | 48 + .../0009-disable-google-ipv6-probes.patch | 16 + .../0015-disable-update-pings.patch | 11 + .../0017-disable-new-avatar-menu.patch | 11 + .../core/inox-patchset/0021-disable-rlz.patch | 12 + ...refixes-to-possibly-evil-connections.patch | 819 +++ ..._browsing-disable-incident-reporting.patch | 75 + ...sable-reporting-of-safebrowsing-over.patch | 108 + .../ungoogled-chromium/block-requests.patch | 75 + .../block-trk-and-subdomains.patch | 247 + .../disable-crash-reporter.patch | 43 + .../disable-domain-reliability.patch | 685 +++ .../disable-fonts-googleapis-references.patch | 107 + .../ungoogled-chromium/disable-gaia.patch | 71 + .../core/ungoogled-chromium/disable-gcm.patch | 65 + .../disable-google-host-detection.patch | 607 ++ .../disable-mei-preload.patch | 25 + .../disable-network-time-tracker.patch | 16 + .../disable-profile-avatar-downloading.patch | 14 + .../ungoogled-chromium/disable-signin.patch | 27 + .../disable-untraceable-urls.patch | 102 + .../disable-webrtc-log-uploader.patch | 114 + .../disable-webstore-urls.patch | 189 + ...-building-without-enabling-reporting.patch | 24 + ...ix-building-without-one-click-signin.patch | 43 + .../fix-building-without-safebrowsing.patch | 1408 +++++ .../fix-learn-doubleclick-hsts.patch | 13 + .../remove-unused-preferences-fields.patch | 4981 +++++++++++++++++ ...e-google-search-engine-with-nosearch.patch | 29 + .../toggle-translation-via-switch.patch | 111 + .../use-local-devtools-files.patch | 110 + ...g-flags-client-rects-and-measuretext.patch | 325 ++ ...ngerprinting-canvas-image-data-noise.patch | 325 ++ .../flag-max-connections-per-host.patch | 164 + .../extra/debian/disable/android.patch | 14 + .../debian/disable/device-notifications.patch | 16 + .../extra/debian/disable/fuzzers.patch | 38 + .../debian/disable/google-api-warning.patch | 16 + .../extra/debian/disable/welcome-page.patch | 15 + .../debian/fixes/connection-message.patch | 15 + .../extra/debian/gn/parallel.patch | 28 + .../0006-modify-default-prefs.patch | 207 + .../0008-restore-classic-ntp.patch | 54 + .../0011-add-duckduckgo-search-engine.patch | 1051 ++++ .../0013-disable-missing-key-warning.patch | 10 + .../0016-chromium-sandbox-pie.patch | 15 + .../0018-disable-first-run-behaviour.patch | 11 + .../0019-disable-battery-status-service.patch | 102 + .../Remove-EV-certificates.patch | 43 + ...ble-profile-auto-import-on-first-run.patch | 20 + ...rce-text-x-suse-ymp-to-be-downloaded.patch | 21 + ...e-default-key-length-for-newly-gener.patch | 23 + ...mpt-for-download-directory-by-defaul.patch | 40 + .../prefs-only-keep-cookies-until-exit.patch | 21 + .../updater-disable-auto-update.patch | 27 + .../add-components-ungoogled.patch | 67 + .../add-flag-for-bookmark-bar-ntp.patch | 51 + ...g-for-omnibox-autocomplete-filtering.patch | 109 + .../add-flag-for-pdf-plugin-name.patch | 411 ++ ...dd-flag-for-search-engine-collection.patch | 155 + ...d-flag-to-close-window-with-last-tab.patch | 48 + ...g-to-configure-extension-downloading.patch | 123 + .../add-flag-to-disable-beforeunload.patch | 22 + ...add-flag-to-force-punycode-hostnames.patch | 39 + .../add-flag-to-hide-crashed-bubble.patch | 15 + .../add-flag-to-scroll-tabs.patch | 91 + .../add-flag-to-show-avatar-button.patch | 69 + .../add-flag-to-stack-tabs.patch | 35 + .../add-ipv6-probing-option.patch | 47 + .../add-suggestions-url-field.patch | 458 ++ .../disable-dial-repeating-discovery.patch | 25 + .../disable-download-quarantine.patch | 227 + .../disable-formatting-in-omnibox.patch | 27 + .../disable-intranet-redirect-detector.patch | 16 + .../disable-webgl-renderer-info.patch | 24 + ...ble-default-prefetch-privacy-changes.patch | 13 + .../enable-menu-on-reload-button.patch | 13 + .../enable-page-saving-on-more-pages.patch | 79 + .../enable-paste-and-go-new-tab-button.patch | 32 + ...g-without-mdns-and-service-discovery.patch | 42 + .../ungoogled-chromium/popups-to-tabs.patch | 13 + ...e-disable-setuid-sandbox-as-bad-flag.patch | 12 + .../remove-uneeded-ui.patch | 161 + .../extra/ungoogled-chromium/searx.patch | 898 +++ ...roto-fix-underflow-in-Fp1616ToDouble.patch | 0 .../caskd/dmenu}/APKBUILD | 2 +- {suckless => user/caskd}/dwm-desktop/APKBUILD | 2 +- .../caskd}/misc-scripts/APKBUILD | 11 +- .../caskd/slock}/APKBUILD | 2 +- .../caskd}/slstatus-desktop/APKBUILD | 8 +- .../st-patched => user/caskd/st}/APKBUILD | 2 +- 200 files changed, 18612 insertions(+), 2337 deletions(-) delete mode 100644 browsers/chromium/APKBUILD delete mode 100644 browsers/qt5-qtwebengine/APKBUILD delete mode 100644 browsers/qt5-qtwebengine/musl-hacks.patch delete mode 100644 browsers/qt5-qtwebengine/musl-sandbox.patch delete mode 100644 browsers/qt5-qtwebengine/nasm.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-crashpad.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-elf-arm.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-execinfo.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-fpstate.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-mallinfo.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-off_t.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-pread-pwrite.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-pvalloc.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-resolve.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-siginfo_t.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-stackstart.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch delete mode 100644 browsers/qt5-qtwebengine/qt-musl-thread-stacksize.patch delete mode 100644 browsers/qt5-qtwebengine/remove-glibc-check.patch delete mode 100644 browsers/qt5-qtwebengine/sandbox-sched_getparam.patch delete mode 100644 browsers/qt5-qtwebengine/yasm-nls.patch delete mode 100644 downloaders/youtube-dlc/APKBUILD delete mode 100644 media/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch delete mode 100644 media/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch delete mode 100644 media/ffmpeg/APKBUILD delete mode 100644 media/gst-plugins-good/APKBUILD delete mode 100644 media/qt5-qtmultimedia/APKBUILD delete mode 100644 misc-tools/abuild/0001-fix-initd-checks.patch delete mode 100644 misc-tools/abuild/0002-buildbase-opt.patch delete mode 100644 misc-tools/abuild/APKBUILD delete mode 100644 misc-tools/abuild/abuild.pre-install delete mode 120000 misc-tools/abuild/abuild.pre-upgrade delete mode 100644 misc-tools/mkinitfs/0001-mkinitfs-add-optional-support-for-pigz.patch delete mode 100644 misc-tools/mkinitfs/0002-file-embed.patch delete mode 100644 misc-tools/mkinitfs/0003-include-libs.patch delete mode 100644 misc-tools/mkinitfs/APKBUILD delete mode 100644 misc-tools/mkinitfs/mkinitfs.post-install delete mode 120000 misc-tools/mkinitfs/mkinitfs.post-upgrade delete mode 100644 misc-tools/mkinitfs/mkinitfs.pre-upgrade delete mode 100644 misc-tools/mkinitfs/mkinitfs.trigger delete mode 100644 openrc/uircd-openrc/APKBUILD delete mode 100644 openrc/uircd-openrc/confd delete mode 100755 openrc/uircd-openrc/initd create mode 100644 orphan/flexget/APKBUILD create mode 100644 orphan/hydrus/APKBUILD create mode 100644 orphan/hydrus/client-bin create mode 100644 orphan/pleroma/0001-remove-config-import-build.patch create mode 100644 orphan/pleroma/APKBUILD rename {games => orphan}/spigot-mc/APKBUILD (83%) rename {games => orphan}/spigot-mc/spigot.initd (100%) rename {communication => orphan}/telegram-desktop/APKBUILD (75%) create mode 100644 orphan/telegram-desktop/fix-tgcalls.patch create mode 100644 orphan/telegram-desktop/link-webrtc-to-libjpeg.patch create mode 100644 orphan/telegram-desktop/remove-calls.patch rename {communication => orphan}/telegram-desktop/remove-glibc.patch (100%) rename {communication => orphan}/telegram-desktop/small-sizes.patch (100%) delete mode 100644 own/uirc/APKBUILD delete mode 100644 own/uircd/APKBUILD delete mode 100644 own/uircd/uircd.initd create mode 100644 stable/minetest-mineclone2/APKBUILD rename {media => stable}/paperview/APKBUILD (100%) delete mode 100644 suckless/dwm-mobile/APKBUILD delete mode 100644 suckless/svkbd-mobile/APKBUILD rename {games => testing}/multimc/01-patch-jar-path.patch (100%) rename {games => testing}/multimc/APKBUILD (100%) rename {communication => testing}/mumble/APKBUILD (100%) rename {communication => testing}/mumble/murmur.initd (100%) rename {communication => testing}/mumble/murmur.pre-install (100%) rename {communication => testing}/neomutt/APKBUILD (100%) create mode 100644 unstable/ungoogled-chromium/APKBUILD rename {browsers/chromium => unstable/ungoogled-chromium}/aarch64-fixes.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/check-for-enable-accelerated-video-decode-on-Linux.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/chromium-launcher.sh (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/chromium-size_t-defined.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/chromium-use-alpine-target.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/chromium.conf (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/chromium.desktop (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/create-extra-view-redefinition.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/default-pthread-stacksize.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/elf-arm.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/fix-invalid-end-iterator-usage-in-CookieMonster.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/gcc-arm.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/gcc-fno-delete-null-pointer-checks.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/google-api.keys (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/media-base.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-crashpad.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-fixes-breakpad.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-fixes.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-hacks.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-libc++.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-sandbox.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/musl-v8-monotonic-pthread-cont_timedwait.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/nasm.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/no-execinfo.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/no-mallinfo.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/remove-dead-reloc-in-nonalloc-LD-flags.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/resolver.patch (100%) rename {browsers/chromium => unstable/ungoogled-chromium}/swiftshader.patch (100%) create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/0001-fix-var-undefined.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/debian/disable/unrar.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-gaia.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-gcm.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-google-host-detection.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-mei-preload.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-network-time-tracker.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-signin.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-untraceable-urls.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-webstore-urls.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/toggle-translation-via-switch.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/use-local-devtools-files.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/bromite/flag-max-connections-per-host.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/disable/android.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/disable/device-notifications.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/disable/fuzzers.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/disable/google-api-warning.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/disable/welcome-page.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/fixes/connection-message.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/debian/gn/parallel.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0006-modify-default-prefs.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0008-restore-classic-ntp.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0013-disable-missing-key-warning.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/inox-patchset/0019-disable-battery-status-service.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/Remove-EV-certificates.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/iridium-browser/updater-disable-auto-update.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-components-ungoogled.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/add-suggestions-url-field.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/disable-download-quarantine.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/popups-to-tabs.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/remove-uneeded-ui.patch create mode 100644 unstable/ungoogled-chromium/ungoogled-chromium-patches/extra/ungoogled-chromium/searx.patch rename {browsers/chromium => unstable/ungoogled-chromium}/xproto-fix-underflow-in-Fp1616ToDouble.patch (100%) rename {suckless/dmenu-patched => user/caskd/dmenu}/APKBUILD (97%) rename {suckless => user/caskd}/dwm-desktop/APKBUILD (97%) rename {misc-tools => user/caskd}/misc-scripts/APKBUILD (69%) rename {suckless/slock-patched => user/caskd/slock}/APKBUILD (97%) rename {suckless => user/caskd}/slstatus-desktop/APKBUILD (72%) rename {suckless/st-patched => user/caskd/st}/APKBUILD (98%) diff --git a/.gitignore b/.gitignore index 64b6dbb..19d6603 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -repo/ src/ pkg/ .rootbld-repositories diff --git a/browsers/chromium/APKBUILD b/browsers/chromium/APKBUILD deleted file mode 100644 index 96ed95c..0000000 --- a/browsers/chromium/APKBUILD +++ /dev/null @@ -1,370 +0,0 @@ -# Contributor: Carlo Landmeter -# Maintainer: Natanael Copa -pkgname=chromium -pkgver=86.0.4240.111 -pkgrel=0 -pkgdesc="Chromium web browser" -url="https://www.chromium.org/Home" -arch="x86_64 aarch64" # x86: ./v8_context_snapshot_generator segfaults - # armv7: /usr/bin/ld: final link failed: memory exhausted when linking chrome -license="BSD-3-Clause" -depends="xdg-utils" -makedepends=" - alsa-lib-dev - pulseaudio-dev - bash - binutils-gold - bison flex - bsd-compat-headers - bzip2-dev - cairo-dev - clang-dev - cups-dev - dbus-glib-dev - elfutils-dev - eudev-dev - ffmpeg-dev - findutils - flac-dev - freetype-dev - gnutls-dev - gperf - gtk+3.0-dev - gzip - harfbuzz-dev - hunspell-dev - hwids-usb - jpeg-dev - jsoncpp-dev - krb5-dev - libbsd-dev - libcap-dev - libevent-dev - libexif-dev - libgcrypt-dev - libgnome-keyring-dev - libjpeg-turbo-dev - libpng-dev - libusb-dev - libva-dev - libwebp-dev - libxcomposite-dev - libxcursor-dev - libxinerama-dev - libxml2-dev - libxrandr-dev - libxscrnsaver-dev - libxslt-dev - linux-headers - mesa-dev - minizip-dev - ninja - nodejs - nss-dev - openjdk8 - opus-dev - pciutils-dev - perl - python2 - re2-dev - snappy-dev - speex-dev - sqlite-dev - xcb-proto - xdg-utils - zlib-dev - py2-setuptools - " -# explicit depends for --headless -depends="eudev-libs ttf-opensans" -options="suid" -subpackages="$pkgname-chromedriver" -source="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz - pstables-2.8.h::https://git.savannah.gnu.org/cgit/freetype/freetype2.git/plain/src/psnames/pstables.h?h=VER-2-8 - chromium-launcher.sh - chromium.conf - chromium.desktop - google-api.keys - - default-pthread-stacksize.patch - musl-fixes.patch - musl-fixes-breakpad.patch - musl-hacks.patch - musl-libc++.patch - musl-sandbox.patch - no-execinfo.patch - no-mallinfo.patch - resolver.patch - swiftshader.patch - create-extra-view-redefinition.patch - - chromium-use-alpine-target.patch - media-base.patch - musl-crashpad.patch - musl-v8-monotonic-pthread-cont_timedwait.patch - nasm.patch - - gcc-fno-delete-null-pointer-checks.patch - gcc-arm.patch - aarch64-fixes.patch - elf-arm.patch - - chromium-size_t-defined.patch - check-for-enable-accelerated-video-decode-on-Linux.patch - fix-invalid-end-iterator-usage-in-CookieMonster.patch - only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch - remove-dead-reloc-in-nonalloc-LD-flags.patch - xproto-fix-underflow-in-Fp1616ToDouble.patch - " - -# secfixes: -# 83.0.4103.116-r0: -# - CVE-2020-6505 -# - CVE-2020-6506 -# - CVE-2020-6507 -# - CVE-2020-6509 -# 72.0.3626.121-r0: -# - CVE-2019-5786 - -if [ -n "$DEBUG" ]; then - _buildtype=Debug - _is_debug=true -else - _buildtype=Release - _is_debug=false -fi - -prepare() { - patch_args="-p0" - default_prepare - - # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion - touch chrome/test/data/webui/i18n_process_css_test.html - # Use the file at run time instead of effectively compiling it in - sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \ - -i services/device/public/cpp/usb/BUILD.gn - - mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ - - # reusable system library settings - local use_system=" - ffmpeg - flac - fontconfig - freetype - harfbuzz-ng - libdrm - libevent - libjpeg - libpng - libwebp - libxml - libxslt - opus - re2 - snappy - " - for _lib in $use_system libjpeg_turbo; do - msg "Removing buildscripts for system provided $_lib" - 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 - - msg "Replacing gn files" - python2 build/linux/unbundle/replace_gn_files.py --system-libraries \ - $use_system - third_party/libaddressinput/chromium/tools/update-strings.py - -} - -_gn_flags() { - echo $* -} - -build() { - ############################################################## - # Please dont use these keys outside of Alpine Linux project # - # You can create your own at: # - # http://www.chromium.org/developers/how-tos/api-keys # - ############################################################## - eval "$(base64 -d < $srcdir/google-api.keys)" - - msg "Bootstrapping GN" - local _c=$(_gn_flags 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 \ - ) - -# AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \ - CC="${CC:-clang}" CXX="${CXX:-clang++}" LD="${CXX:-clang++}" \ - python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c" - - msg "Configuring build" - _c=$(_gn_flags \ - blink_symbol_level=0 \ - clang_use_chrome_plugins=false \ - closure_compile=true \ - 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\" \ - google_api_key=\"$_google_api_key\" \ - google_default_client_id=\"$_google_default_client_id\" \ - google_default_client_secret=\"$_google_default_client_secret\" \ - host_toolchain=\"//build/toolchain/linux/unbundle:default\" \ - icu_use_data_file=true \ - is_clang=true \ - is_component_build=false \ - is_debug=$_is_debug \ - is_desktop_linux=true \ - linux_use_bundled_binutils=false \ - proprietary_codecs=true \ - symbol_level=0 \ - treat_warnings_as_errors=false \ - use_allocator_shim=false \ - use_allocator=\"none\" \ - use_cups=true \ - use_custom_libcxx=false \ - use_gnome_keyring=false \ - use_gold=false \ - use_lld=false \ - use_pulseaudio=true \ - use_sysroot=false \ - use_system_harfbuzz=true \ - ) - - AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \ - out/Release/gn gen out/$_buildtype --args="$_c $_ca" - - # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2 - ln -sf /usr/lib/python3.*/site-packages/xcbgen . - export PYTHONPATH="$PWD" - - msg "Ninja turtles GO!" - - # build mksnapshot - ninja -j ${JOBS} -C out/$_buildtype mksnapshot - ninja -j ${JOBS} -C out/$_buildtype v8_context_snapshot_generator - - if [ "$CARCH" = "x86" ]; then - # x86 only - dependency issues compiling obj/chrome/browser/devtools/devtools/cast_handler.o - ninja -j ${JOBS} -C out/$_buildtype obj/chrome/common/media_router/mojom/media_router__generator.stamp - fi - - # final link needs lots of file descriptors - ulimit -n 2048 - - # finish rest of the build - ninja -j ${JOBS} -C out/$_buildtype chrome chrome_sandbox chromedriver -} - -package() { - cd out/$_buildtype - local bin pak - for bin in chrome chromedriver *.bin; do - install -Dm755 $bin "$pkgdir"/usr/lib/$pkgname/$bin - done - - install -Dm755 swiftshader/libEGL.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libEGL.so - install -Dm755 swiftshader/libGLESv2.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libGLESv2.so - - install -Dm4755 chrome_sandbox "$pkgdir"/usr/lib/$pkgname/chrome-sandbox - install -m644 icudtl.dat "$pkgdir"/usr/lib/$pkgname/icudtl.dat - - install -Dm755 xdg-mime "$pkgdir"/usr/lib/$pkgname/xdg-mime - install -Dm755 xdg-settings "$pkgdir"/usr/lib/$pkgname/xdg-settings - - for pak in *.pak; do - install -Dm644 $pak "$pkgdir"/usr/lib/$pkgname/$pak - done - - install -Dm755 "$srcdir"/chromium-launcher.sh \ - "$pkgdir"/usr/lib/$pkgname/chromium-launcher.sh - - cp -a locales "$pkgdir"/usr/lib/$pkgname/ - cp -a MEIPreload "$pkgdir"/usr/lib/$pkgname/ - - # It is important that we name the target "chromium-browser", - # xdg-utils expect it; bug #355517. - mkdir -p "$pkgdir"/usr/bin - cd "$pkgdir"/usr/bin - ln -sf /usr/lib/$pkgname/chromium-launcher.sh chromium-browser - ln -sf /usr/lib/$pkgname/chromedriver "$pkgdir"/usr/bin/ - - install -Dm644 "$srcdir"/chromium.conf \ - "$pkgdir"/etc/chromium/chromium.conf - - install -Dm644 "$srcdir"/chromium.desktop \ - "$pkgdir"/usr/share/applications/chromium.desktop - - cd "$builddir" - for size in 24 48 64 128 256; do - install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png" - done - - for size in 16 32; do - install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ - "$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png" - done -} - -chromedriver() { - pkgdesc="WebDriver driver for the Chromium Browser" - mkdir -p "$subpkgdir"/usr/lib/$pkgname "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/lib/$pkgname/chromedriver \ - "$subpkgdir"/usr/lib/$pkgname/ - mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin -} - -sha512sums="809bcab82c44976f109f0db0ce0470f88893a0999596b057e82675093f8fa0fc0badae4431a9160b4e94ae09219fa01914cad4b3143cebc530c71d420e7add54 chromium-86.0.4240.111.tar.xz -a3bb959c65944ae2fb765725cedcffd743a58bc0c2cd1f1999d15fe79801d00f3474b08b4ed7b48859ed921eb57093d0ad09d90f201d729ed9b8a419a591ed29 pstables-2.8.h -b9a810416dd7a8ffc3a5ced85ad9acebda1665bd08a57eec7b189698cc5f74d2c3fd69044e20fcb83297a43214b2772a1312b2c6122ea0eb716abacf39524d60 chromium-launcher.sh -f6d962b9e4c22dd42183df3db5d3202dab33eccecafb1bf63ca678147289581262db1e5e64cbe8f9c212beefb0a6717bb8d311e497f56b55fe95b8bab2db493f chromium.conf -e182c998a43d22d1c76a86c561619afd1fca8c2be668265ad5e2f81a3806f7a154272cc027a2f8b370fb69446892c69e5967a4be76082325c14245ee7915234c chromium.desktop -2d8237a940ea691bd10b08315429677a587f7ef9692a0cca53bfd066eae82998a6c71f402a8669e9de39f94d7f3280745d1628ea6eac5d76ca7116844d4e0dac google-api.keys -b726ef2ecfe7d471e60d67de1e05847d214df6093b41bb2055652a9028327af19a8b10e7175467240f4dfec9e3ae97a6c4666bfd2cd6cb436c54656a085653ae default-pthread-stacksize.patch -4620f7515717eb185339af1f52f40e5c6ccd15b9162986517eb5cf3cbaf29740134f520997e2a1337ea51fd69dc0354b297f6cc4d1555ed546ffdc1dbcb51f5c musl-fixes.patch -e8675aff9fccd8b58cc839ef1d9e0e022d66aa94f72baa72e7acf92ceb2691f6a7907cc60ec3a87f894efdd639a3dec7fe702c97d446fcdea99452caec57e002 musl-fixes-breakpad.patch -ddacc7ab0374eaa110a392c9d0912c250eb102f060cac284b170902fa9358f8670cbe26676582208d1291662058761e31795ebac75115b38a1e3ad8681895b38 musl-hacks.patch -919f13a2cd65673f267321cf95c5410e65bc5264d6704d0791b25d39111282bedb425bd9824dde3b67422cfb874c86a9383ded686e39cfd4aac239edaf41cfc8 musl-libc++.patch -ef43fa90b05e2407b6daa822193121cdeef6ee9068175572f0928f156f186be9c77539dfa06863adfaa25afd498ec1b5081f9e476543616f9472b9033fd921dc musl-sandbox.patch -129ec746fd951ee6d0bf0b4389b7c988523870507de1f92f5706f4eb49039d4a49ed30e92b0634e3ae521fc3e129adc1c6edc7435922fc91658d8c087520c707 no-execinfo.patch -06d6b4c466fa48f2d22c338e20458d8fa50bbbf744468f41bc3c1892e739002b1fbc5c133a37252cec4ff4f804847add6b9c0cc1f84fb276939471c09e467fb6 no-mallinfo.patch -f60c89076bbc458e2e38d9dad26027f9604179fd59e0c2b988a86340b9ef78a4c346c84ac3e7e4e70badaff69d71edf49d7b9030e5fadb96afde4f977a98c412 resolver.patch -f4265df7532625070c51ac43466e3e0f21e696f90c3b6040ef62a21defa7666203ff8219d9c9a5bebc011024aff300fbcbd941cebd0df59c4bc068d8f290221e swiftshader.patch -5b88c065819a44684ceea87239320f8120cfde0dc2f6dd739a007488dea6608c11584c56f3876a062641c9ca6fa82f43877c547ad470766aec31f5151bb2bdc1 create-extra-view-redefinition.patch -cf9970ef403ff7a68bf08c0ba5e681eec459fcb1afb6859e5a80f4874f1b9a656377b4540eeb5208ddec570efa206f147e32718c687fa29ca3acc4fde6e8cbe8 chromium-use-alpine-target.patch -599f5ef338b5797e04436bdc88921c31365d2dea2613d40053be6e774f654e2889efb0c0bd55c2c5044a6805510fbc337da555971169a75d584fac93e18256ac media-base.patch -2e5a83826239849d096aead033eb519338b84e6fbbf58abfcd7cfe40d0b3070b66bcc825ec84406484d73d1a333f1b9d23a8ab44987ab5c8b187076c84cd668b musl-crashpad.patch -556cc2ba28184a75745f13c673605327f5be590be179eb3f941dc0abded854a814e5da1432a28fb8d4dcdcd66ffd4c94ee1a8824d2cd93b632f48e9310dbc3fa musl-v8-monotonic-pthread-cont_timedwait.patch -7957aae04e8ef3badbc98c982ba1acb1b9ef5e665440116c704512f11554d7b64ba3643b7ff7d00476a6686324033b0cf762deb78ce798619226380953b9dc9c nasm.patch -56a357668c0928bc488ccec8f53fd37fccbaefe0a185ceaf067c8c39e0fae3d2b61ca010ccabc785bec0f2e86b19f37cebb3ac344225aa8d7651c822e48c6064 gcc-fno-delete-null-pointer-checks.patch -ad4ddc25df7aa1de2038b7adb86d27679ecdb7e3e16c0eec994e947a08c41504b6fb41166f7868ff5f58ce8191c78800cbb91d259c864840fa5af1d7ba5d43a1 gcc-arm.patch -cc67d2a77910663e5a1ad5f66606ee2544867aa1fef25e1a1bc355a8db765d5928edb72f158e6a2ece4195c9b62b875dcdcab4e4055e7611edab405e8cfd658e aarch64-fixes.patch -9b1441fe42421ef9ead86a5143bf997d989bd53a8969cdfdf4e0c45f847efc8c1d127e15fb05e2ef5dbefbb228cbdc2849404d74997ca56265599e12e5efd6e4 elf-arm.patch -17ed804782df7161e58cb1c125b2cdee22a63008a240da6d3409a7b7a356dc4bd5971aa61217b7aefcfa130e3e12a753bc0fe96882cde842917cf5d6df46083f chromium-size_t-defined.patch -6bda2c9d622a77d50832b56c36239a2d79eb8dce7825e9cf99b82132d0a6e58ba23e253ec1a71cf6600111afe4c0917d26ba54ab1b6d7ceea5d57bb8e5f8e4c1 check-for-enable-accelerated-video-decode-on-Linux.patch -a239bb09ea79875d821a53f8769ef19997c60012dc474139a21f6818a031e77fe16aed6dee9fb8b9fd9411bbaf9901f674de480012badae51ff17e9bea35fd70 fix-invalid-end-iterator-usage-in-CookieMonster.patch -a8088aea5e27723b34bec232406a743f93cf4ebcaa7b48bda1669d8a8fbc3083eec4d3921c2ab1e002eb443f74205c7f1e73cd0bb303fa20f0f1a1f255dcbdcb only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch -862fbd405a06e570891d84634a3aff943f0eb1458308211d7ac98d84a9f57c779deba7e91e4b1efbbce15a8b14734dc86ed625165bf3ce8d31ef67d26ba7cecf remove-dead-reloc-in-nonalloc-LD-flags.patch -b425d6ab3da04b6a8d32303d1c39feb9c1be813fac9b38eb53fd5d020ff08b4b3e247897d5b5c5dac3a7a213c5d3eaf3ea2342c97d22089f2c623e28a124f00d xproto-fix-underflow-in-Fp1616ToDouble.patch" diff --git a/browsers/qt5-qtwebengine/APKBUILD b/browsers/qt5-qtwebengine/APKBUILD deleted file mode 100644 index ac7ff7c..0000000 --- a/browsers/qt5-qtwebengine/APKBUILD +++ /dev/null @@ -1,136 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Bart Ribbers -pkgname=qt5-qtwebengine -pkgver=5.15.2 -pkgrel=1 -pkgdesc="Qt5 - QtWebEngine components" -url="https://www.qt.io/developers/" -# ppc64le and s390x are not supported -# mips is also not supported -# armhf blocked by qt5-qtdeclarative -arch="aarch64 armv7 x86 x86_64" -license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -depends_dev=" - ffmpeg-dev - glib-dev - gst-plugins-base-dev - gstreamer-dev - icu-dev - libxcomposite-dev - libxext-dev - libxkbcommon-dev - libxrender-dev - libxslt-dev - mesa-dev - ninja - " -makedepends="$depends_dev - alsa-lib-dev - pulseaudio-dev - bison - bsd-compat-headers - flex - fontconfig-dev - gperf - gzip - harfbuzz-dev - jsoncpp-dev - libevent-dev - libjpeg-turbo-dev - libpng-dev - libsrtp-dev - libvpx-dev - libwebp-dev - libxcursor-dev - libxi-dev - libxml2 - libxrandr-dev - libxslt - libxtst-dev - linux-headers - nss-dev - opus-dev - pcre-dev - protobuf-dev - qt5-qtbase-dev - qt5-qtdeclarative-dev - qt5-qtwebchannel-dev - re2-dev - ruby - snappy-dev - sqlite-dev - yasm-dev - zlib-dev - python2 - " -subpackages="$pkgname-dev $pkgname-dbg" - -case $pkgver in - *_beta*|*_rc*) _rel=development_releases;; - *) _rel=official_releases;; -esac - -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtwebengine-everywhere-src-$pkgver.tar.xz - qt-musl-dispatch_to_musl.patch - qt-musl-execinfo.patch - qt-musl-mallinfo.patch - qt-musl-off_t.patch - qt-musl-pvalloc.patch - qt-musl-resolve.patch - qt-musl-siginfo_t.patch - qt-musl-fpstate.patch - qt-musl-pread-pwrite.patch - qt-musl-sysreg-for__WORDSIZE.patch - qt-musl-stackstart.patch - qt-musl-thread-stacksize.patch - qt-musl-elf-arm.patch - qt-musl-crashpad.patch - musl-sandbox.patch - yasm-nls.patch - nasm.patch - musl-hacks.patch - sandbox-sched_getparam.patch - remove-glibc-check.patch - static-pulseaudio-link.patch - " -builddir="$srcdir/qtwebengine-everywhere-src-$pkgver" - -build() { - qmake-qt5 QMAKE_EXTRA_ARGS+="-system-ffmpeg -system-opus -system-webp -pulseaudio -proprietary-codecs" - make -j$JOBS -} - -package() { - make install INSTALL_ROOT="$pkgdir" - sed -i -e 's:-L/home[^ ]\+::g' "$pkgdir"/usr/lib/pkgconfig/*.pc - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname -} - -sha512sums="de64c30819f5e2f8620c853ff22b2f9717641477aef4432a552a72d1d67ed62ed61572afee6de3f2c9f32dee28f4f786ffd63fc465aa42c0ae1e87ea28341756 qtwebengine-everywhere-src-5.15.2.tar.xz -5ecbf435062b8565322dd1cbd0cbdb44f3daef264ab677fe22fe8cb400d4bb22281cc607ea419c7362c483312482632ed41bd67130413188425ef6e0ae184f07 qt-musl-dispatch_to_musl.patch -7084a07386fb9f66fbfeadac53869c0f386cea98dbb29787f030635bc8cd116b7459acafbe06540f1aef79d8a69817520ad18bcb9ac24954dd70773ef083537e qt-musl-execinfo.patch -7f580b37907aeba8327c4eb1e46fd261ad78d93f1dd32991dfb373a7f75fb4dceb3d9302e3781c62f447e72c4edab0f7a7f4223d12dd98ec5e87e49f3f38a38a qt-musl-mallinfo.patch -7eba28eb015f1a7e5cf70e9354fcd647b69f4e7c061b889a8c0d55f4a94a033f95d0252f9baebf13c3d501438074a05d547eef2c8cf898dc2c87cec3b60e76e0 qt-musl-off_t.patch -ac563e0c444a6d3214ff7465cad2c701692cfa90408c57243d3ae9459937c36e88acd57335bb90da85157e03865faaf17d61a767483b00ed8f3580ebf8a2fbb5 qt-musl-pvalloc.patch -8d95e4fcb463b5d2053c9538e66150ec9a3acddd7815cc34c8cd6fa115e49f1d602c4f1fc73f5e507a932c918e36c9c3d1386476dca91c5fc422906d0d88f610 qt-musl-resolve.patch -2fead16e7d7379b622da0e3172905444d9d72d1a53ff080327a3d59f60541c5c076d9b58f110b039da8c9ebc3b5efec53af118e1172efd01886ff9ac2b730d5f qt-musl-siginfo_t.patch -059f22a594a046d552a33b17d811c50b645c4be11a49ed3b29a32ce38d501fd07c1e15a4e1075c46f984c850bf88aecb357e4310a62b30494ea25297055f05c8 qt-musl-fpstate.patch -b1f7823d0bdd14dbcb4dbd72ab2d16460d343722d2601921a50f8912ce580a632e0d7b01d7fea6f27ff5014a1f21595c6d8d4500b995bcc6db38cbd10ac4aa96 qt-musl-pread-pwrite.patch -987b9b35d04317e22ae2cce382e776f3309fc7fd4588e408cd6bed846f47620d01e2b9958cb60c84b8f6f496de6544a21ba399ba8b8f107b73df179794740092 qt-musl-sysreg-for__WORDSIZE.patch -7dc3e9995596adef65cd96f650eb7ee13d52cabfe6353f04eeb5b8a5776e7e0585ffc2a0a31deea6924352ee9a5a8e03ac37432b558c6a46f3dc457b4283392a qt-musl-stackstart.patch -b37fbc4df03c82123f94982039defa12d9bb8c885c9dcf8fff556b5f9cc58182fa471f970cc3a5e2d5dbe964855f591b474366b6a8926d94ae6a78e883811c1a qt-musl-thread-stacksize.patch -d38e73a0424a104682c8cd94de32e506abf38f0ace34935eb33d66c732af30e6b22c0faec8cf698424a4391d965338ed6646325c9b9862a0c0be2faeaa169071 qt-musl-elf-arm.patch -173c401e1a0daa7a1471880807e4fb0a74fc338a0f306dc067147878c29e7bb94cae43c37fe2bf21dd7a7ffd2d739697fd21d10c059ce647df01d8236612cc68 qt-musl-crashpad.patch -dec69ea8dd9cfa2973264ec405092d364513bbd47303a94c128d873a3de7294760340f3ad31753e6bddd42e98c547312e070b49a062f693b2e19aa01d772063a musl-sandbox.patch -f6b1941e40f44b675ab554166e3cd8d3272b23f48571b4949b3af7b8e1c642ee84fe0ee26dd2457fc3bf20e9924cddb411e293b7a8a103029ee196587371a1e2 yasm-nls.patch -9add958caa0d6acb2866d3927aadfa6b378c92d62463f1b3d65ae1e5400915d89388ac54beb30c4d4d42d2901ee28f404d8574b771854556f6a75698301870eb nasm.patch -b99eaa4a0b06ab1cb461fc4bfc7416c779ba1e847614b96f08de97a137a09577ea642813e5e3235167ccc5180c6ffcc06ebf2a61e3b4c210de9dee765e0e7404 musl-hacks.patch -dbe606be93377f094c6a1ab0358ae042f3e7aff95c635b07ebc04aa3173f7221a478fd544e8347152a4ca125a837d6da774929423868d5c9d5bd6165bdd1ba6d sandbox-sched_getparam.patch -7153ce7372fed73dccb676079bc5af37f56be113f42ee64ed48cd7997dc2a4aa287523f36f0b8d3c717f1c4ad7f796843850b86a2dce50de5f0ade6a47785bee remove-glibc-check.patch -12539c0dde32f532d9534a9430417b5d8521b272403a8fcbc1472f58853ef160da2ce2f1577dfa383c5461acdb961d9735345a789bec04e02966fc24d169c95e static-pulseaudio-link.patch" diff --git a/browsers/qt5-qtwebengine/musl-hacks.patch b/browsers/qt5-qtwebengine/musl-hacks.patch deleted file mode 100644 index ee82b48..0000000 --- a/browsers/qt5-qtwebengine/musl-hacks.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc -index dbc8c5aaf..077bbde33 100644 ---- a/src/3rdparty/chromium/net/socket/udp_socket_posix.cc -+++ b/src/3rdparty/chromium/net/socket/udp_socket_posix.cc -@@ -1191,7 +1191,7 @@ SendResult UDPSocketPosixSender::InternalSendmmsgBuffers( - msg_iov->push_back({const_cast(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/browsers/qt5-qtwebengine/musl-sandbox.patch b/browsers/qt5-qtwebengine/musl-sandbox.patch deleted file mode 100644 index d28b0f1..0000000 --- a/browsers/qt5-qtwebengine/musl-sandbox.patch +++ /dev/null @@ -1,162 +0,0 @@ -diff --git a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -index 348ab6e8c..2eac6ef82 100644 ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc -+++ b/src/3rdparty/chromium/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 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/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc b/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -index 6e2bd4fee..9f9e4ad8a 100644 ---- a/src/3rdparty/chromium/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc -+++ b/src/3rdparty/chromium/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/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h -index 59d0eab8e..7ae700213 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm64_linux_syscalls.h -+++ b/src/3rdparty/chromium/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/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -index 1addd5384..d8811ce87 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/arm_linux_syscalls.h -@@ -1385,6 +1385,11 @@ - #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/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h -index ec75815a8..612fcfaa9 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips64_linux_syscalls.h -+++ b/src/3rdparty/chromium/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/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h -index ddbf97f3d..1742acd4c 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/mips_linux_syscalls.h -+++ b/src/3rdparty/chromium/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/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -index a6afc62d9..6ab7740de 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_32_linux_syscalls.h -@@ -1422,5 +1422,10 @@ - #define __NR_memfd_create 356 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 375 -+#endif -+ -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_32_LINUX_SYSCALLS_H_ - -diff --git a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -index 349504aee..6a6d4756f 100644 ---- a/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -+++ b/src/3rdparty/chromium/sandbox/linux/system_headers/x86_64_linux_syscalls.h -@@ -1290,5 +1290,10 @@ - #define __NR_memfd_create 319 - #endif - -+#if !defined(__NR_membarrier) -+#define __NR_membarrier 324 -+#endif -+ -+ - #endif // SANDBOX_LINUX_SYSTEM_HEADERS_X86_64_LINUX_SYSCALLS_H_ - diff --git a/browsers/qt5-qtwebengine/nasm.patch b/browsers/qt5-qtwebengine/nasm.patch deleted file mode 100644 index 05e7307..0000000 --- a/browsers/qt5-qtwebengine/nasm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h -index 7eb7c20ff..3bdc2eb39 100644 ---- a/src/3rdparty/chromium/third_party/nasm/config/config-linux.h -+++ b/src/3rdparty/chromium/third_party/nasm/config/config-linux.h -@@ -117,7 +117,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/browsers/qt5-qtwebengine/qt-musl-crashpad.patch b/browsers/qt5-qtwebengine/qt-musl-crashpad.patch deleted file mode 100644 index 0dd9789..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-crashpad.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h b/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h -index 5b55c24..08cec52 100644 ---- a/src/3rdparty/chromium/third_party/crashpad/crashpad/util/linux/thread_info.h -+++ b/src/3rdparty/chromium/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/browsers/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch b/browsers/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch deleted file mode 100644 index 1258d4f..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-dispatch_to_musl.patch +++ /dev/null @@ -1,103 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc -+++ qtwebengine/src/3rdparty/chromium/base/allocator/allocator_shim_default_dispatch_to_glibc.cc -@@ -6,6 +6,7 @@ - - #include - -+#if defined(__GLIBC__) - // This translation unit defines a default dispatch for the allocator shim which - // routes allocations to libc functions. - // The code here is strongly inspired from tcmalloc's libc_override_glibc.h. -@@ -73,3 +74,92 @@ const AllocatorDispatch AllocatorDispatch::default_dispatch = { - nullptr, /* free_definite_size_function */ - nullptr, /* next */ - }; -+ -+#else // defined(__GLIBC__) -+ -+#include -+ -+extern "C" { -+// Declare function pointers to the memory functions -+typedef void* (*t_libc_malloc)(size_t size); -+typedef void* (*t_libc_calloc)(size_t n, size_t size); -+typedef void* (*t_libc_realloc)(void* address, size_t size); -+typedef void* (*t_libc_memalign)(size_t alignment, size_t size); -+typedef void (*t_libc_free)(void* ptr); -+typedef size_t (*t_libc_malloc_usable_size)(void* ptr); -+ -+// Static instances of pointers to libc.so dl symbols -+static t_libc_malloc libc_malloc = NULL; -+static t_libc_calloc libc_calloc = NULL; -+static t_libc_realloc libc_realloc = NULL; -+static t_libc_memalign libc_memalign = NULL; -+static t_libc_free libc_free = NULL; -+static t_libc_malloc_usable_size libc_malloc_usable_size = NULL; -+ -+// resolve the symbols in libc.so -+void musl_libc_memory_init(void) -+{ -+ libc_malloc = (t_libc_malloc) dlsym(RTLD_NEXT, "malloc"); -+ libc_calloc = (t_libc_calloc) dlsym(RTLD_NEXT, "calloc"); -+ libc_realloc = (t_libc_realloc) dlsym(RTLD_NEXT, "realloc"); -+ libc_memalign = (t_libc_memalign) dlsym(RTLD_NEXT, "memalign"); -+ libc_free = (t_libc_free) dlsym(RTLD_NEXT, "free"); -+ libc_malloc_usable_size = (t_libc_malloc_usable_size) dlsym(RTLD_NEXT, "malloc_usable_size"); -+} -+} // extern "C" -+ -+namespace { -+ -+using base::allocator::AllocatorDispatch; -+ -+void* MuslMalloc(const AllocatorDispatch*, size_t size, void* context) { -+ if (!libc_malloc) -+ musl_libc_memory_init(); -+ return (*libc_malloc)(size); -+} -+ -+void* MuslCalloc(const AllocatorDispatch*, size_t n, size_t size, void* context) { -+ if (!libc_calloc) -+ musl_libc_memory_init(); -+ return (*libc_calloc)(n, size); -+} -+ -+void* MuslRealloc(const AllocatorDispatch*, void* address, size_t size, void* context) { -+ if (!libc_realloc) -+ musl_libc_memory_init(); -+ return (*libc_realloc)(address, size); -+} -+ -+void* MuslMemalign(const AllocatorDispatch*, size_t alignment, size_t size, void* context) { -+ if (!libc_memalign) -+ musl_libc_memory_init(); -+ return (*libc_memalign)(alignment, size); -+} -+ -+void MuslFree(const AllocatorDispatch*, void* address, void* context) { -+ if (!libc_free) -+ musl_libc_memory_init(); -+ (*libc_free)(address); -+} -+ -+size_t MuslGetSizeEstimate(const AllocatorDispatch*, void* address, void* context) { -+ // TODO(siggi, primiano): malloc_usable_size may need redirection in the -+ // presence of interposing shims that divert allocations. -+ if (!libc_malloc_usable_size) -+ musl_libc_memory_init(); -+ return (*libc_malloc_usable_size)(address); -+} -+ -+} // namespace -+ -+const AllocatorDispatch AllocatorDispatch::default_dispatch = { -+ &MuslMalloc, /* alloc_function */ -+ &MuslCalloc, /* alloc_zero_initialized_function */ -+ &MuslMemalign, /* alloc_aligned_function */ -+ &MuslRealloc, /* realloc_function */ -+ &MuslFree, /* free_function */ -+ &MuslGetSizeEstimate, /* get_size_estimate_function */ -+ nullptr, /* next */ -+}; -+ -+#endif diff --git a/browsers/qt5-qtwebengine/qt-musl-elf-arm.patch b/browsers/qt5-qtwebengine/qt-musl-elf-arm.patch deleted file mode 100644 index 314f1c8..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-elf-arm.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/v8/src/base/cpu.cc b/src/3rdparty/chromium/v8/src/base/cpu.cc -index 4f4ac2b..c32239b 100644 ---- a/src/3rdparty/chromium/v8/src/base/cpu.cc -+++ b/src/3rdparty/chromium/v8/src/base/cpu.cc -@@ -17,7 +17,7 @@ extern "C" char** environ; - #if V8_OS_QNX - #include // cpuinfo - #endif --#if (V8_OS_LINUX && V8_HOST_ARCH_PPC) || V8_OS_ANDROID -+#if (V8_OS_LINUX && (V8_HOST_ARCH_PPC || V8_HOST_ARCH_ARM)) || V8_OS_ANDROID - #include - #endif - #if V8_OS_AIX diff --git a/browsers/qt5-qtwebengine/qt-musl-execinfo.patch b/browsers/qt5-qtwebengine/qt-musl-execinfo.patch deleted file mode 100644 index 7082f51..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-execinfo.patch +++ /dev/null @@ -1,108 +0,0 @@ -diff --git a/src/3rdparty/chromium/base/debug/stack_trace.cc b/src/3rdparty/chromium/base/debug/stack_trace.cc -index d8ca822d9..f6f3d9c69 100644 ---- a/src/3rdparty/chromium/base/debug/stack_trace.cc -+++ b/src/3rdparty/chromium/base/debug/stack_trace.cc -@@ -233,14 +233,14 @@ std::string StackTrace::ToString() const { - } - 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(); - } - - std::ostream& operator<<(std::ostream& os, const StackTrace& s) { --#if !defined(__UCLIBC__) & !defined(_AIX) -+#if defined(__GLIBC__) & !defined(_AIX) - s.OutputToStream(&os); - #else - os << "StackTrace::OutputToStream not implemented."; -diff --git a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -index f4ddf9c1e..aef993613 100644 ---- a/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -+++ b/src/3rdparty/chromium/base/debug/stack_trace_posix.cc -@@ -27,7 +27,7 @@ - #if !defined(USE_SYMBOLIZE) - #include - #endif --#if !defined(__UCLIBC__) && !defined(_AIX) -+#if defined(__GLIBC__) && !defined(_AIX) - #include - #endif - -@@ -88,7 +88,7 @@ void DemangleSymbols(std::string* text) { - // 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. -@@ -123,7 +123,7 @@ void DemangleSymbols(std::string* text) { - search_from = mangled_start + 2; - } - } --#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // defined(__GLIBC__) && !defined(_AIX) - } - #endif // !defined(USE_SYMBOLIZE) - -@@ -135,7 +135,7 @@ class BacktraceOutputHandler { - 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. -@@ -218,7 +218,7 @@ void ProcessBacktrace(void* const* trace, - } - #endif // defined(USE_SYMBOLIZE) - } --#endif // !defined(__UCLIBC__) && !defined(_AIX) -+#endif // defined(__GLIBC__) && !defined(_AIX) - - void PrintToStderr(const char* output) { - // NOTE: This code MUST be async-signal safe (it's used by in-process -@@ -834,7 +834,7 @@ size_t CollectStackTrace(void** trace, size_t count) { - // 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(backtrace(trace, count)); -@@ -847,13 +847,13 @@ void StackTrace::PrintWithPrefix(const char* prefix_string) const { - // 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/src/3rdparty/chromium/base/logging.cc b/src/3rdparty/chromium/base/logging.cc -index 4c4bfa6af..0ca5c2159 100644 ---- a/src/3rdparty/chromium/base/logging.cc -+++ b/src/3rdparty/chromium/base/logging.cc -@@ -618,7 +618,7 @@ LogMessage::LogMessage(const char* file, int line, LogSeverity severity, - - LogMessage::~LogMessage() { - size_t stack_start = stream_.tellp(); --#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && !defined(__UCLIBC__) && \ -+#if !defined(OFFICIAL_BUILD) && !defined(OS_NACL) && defined(__GLIBC__) && \ - !defined(OS_AIX) - if (severity_ == LOG_FATAL && !base::debug::BeingDebugged()) { - // Include a stack trace on a fatal, unless a debugger is attached. diff --git a/browsers/qt5-qtwebengine/qt-musl-fpstate.patch b/browsers/qt5-qtwebengine/qt-musl-fpstate.patch deleted file mode 100644 index 42fe157..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-fpstate.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -index 052ce37..95b0fb4 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc -@@ -49,7 +49,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - } - - void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fp) { -+ const struct _fpstate* fp) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_X86_FULL | -@@ -97,7 +97,7 @@ uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) { - } - - void UContextReader::FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fpregs) { -+ const struct _fpstate* fpregs) { - const greg_t* regs = uc->uc_mcontext.gregs; - - out->context_flags = MD_CONTEXT_AMD64_FULL; -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -index f830618..f3dde1f 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h -@@ -50,7 +50,7 @@ struct UContextReader { - // info: the collection of register structures. - #if defined(__i386__) || defined(__x86_64) - static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, -- const struct _libc_fpstate* fp); -+ const struct _fpstate* fp); - #elif defined(__aarch64__) - static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc, - const struct fpsimd_context* fpregs); -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -index d1dc331..d1cc562 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h -@@ -48,7 +48,7 @@ class ExceptionHandler; - #if defined(__aarch64__) - typedef struct fpsimd_context fpstate_t; - #elif !defined(__ARM_EABI__) && !defined(__mips__) --typedef struct _libc_fpstate fpstate_t; -+typedef struct _fpstate fpstate_t; - #endif - - // These entries store a list of memory regions that the client wants included diff --git a/browsers/qt5-qtwebengine/qt-musl-mallinfo.patch b/browsers/qt5-qtwebengine/qt-musl-mallinfo.patch deleted file mode 100644 index 1518370..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-mallinfo.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/src/3rdparty/chromium/base/process/process_metrics_posix.cc b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -index 044bd8d24..0f2526a3d 100644 ---- a/src/3rdparty/chromium/base/process/process_metrics_posix.cc -+++ b/src/3rdparty/chromium/base/process/process_metrics_posix.cc -@@ -110,14 +110,14 @@ size_t ProcessMetrics::GetMallocUsage() { - malloc_statistics_t stats = {0}; - malloc_zone_statistics(nullptr, &stats); - return stats.size_in_use; --#elif defined(OS_LINUX) || defined(OS_ANDROID) -+#elif (defined(OS_LINUX) && 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) -+#else //if defined(OS_FUCHSIA) // also musl doesn't do this. - // TODO(fuchsia): Not currently exposed. https://crbug.com/735087. - return 0; - #endif -diff --git a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -index 7e42cfc20..5086b5c8a 100644 ---- a/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -+++ b/src/3rdparty/chromium/base/trace_event/malloc_dump_provider.cc -@@ -132,7 +132,7 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - } - #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. -@@ -147,6 +147,8 @@ bool MallocDumpProvider::OnMemoryDump(const MemoryDumpArgs& args, - - // Total allocated space is given by |uordblks|. - allocated_objects_size = info.uordblks; -+#else -+ // musl libc does not support mallinfo() - #endif - - MemoryAllocatorDump* outer_dump = pmd->CreateAllocatorDump("malloc"); diff --git a/browsers/qt5-qtwebengine/qt-musl-off_t.patch b/browsers/qt5-qtwebengine/qt-musl-off_t.patch deleted file mode 100644 index 52db3b9..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-off_t.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-05-26 14:58:54.000000000 +0200 -+++ qtwebengine/src/3rdparty/chromium/third_party/ots/include/opentype-sanitiser.h 2016-10-01 14:31:30.885000000 +0200 -@@ -21,6 +21,7 @@ - #define htons(x) _byteswap_ushort (x) - #else - #include -+#include - #include - #endif - diff --git a/browsers/qt5-qtwebengine/qt-musl-pread-pwrite.patch b/browsers/qt5-qtwebengine/qt-musl-pread-pwrite.patch deleted file mode 100644 index c5dcfd8..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-pread-pwrite.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h -index 5d9c2e8..e81e7b4 100644 ---- a/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h -+++ b/src/3rdparty/chromium/third_party/lss/linux_syscall_support.h -@@ -1794,6 +1794,15 @@ struct kernel_statfs { - /* End of s390/s390x definitions */ - #endif - -+#ifndef __GLIBC__ -+ /* For Musl libc pread/pread is the same as pread64/pwrite64 */ -+#ifndef __NR_pread -+#define __NR_pread __NR_pread64 -+#endif -+#ifndef __NR_pwrite -+#define __NR_pwrite __NR_pwrite64 -+#endif -+#endif /* ifndef __GLIBC__ */ - - /* After forking, we must make sure to only call system calls. */ - #if defined(__BOUNDED_POINTERS__) diff --git a/browsers/qt5-qtwebengine/qt-musl-pvalloc.patch b/browsers/qt5-qtwebengine/qt-musl-pvalloc.patch deleted file mode 100644 index d5caf38..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-pvalloc.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- qtwebengine/src/core/api/qtbug-61521.cpp 2017-11-29 09:42:29.000000000 +0100 -+++ qtwebengine/src/core/api/qtbug-61521.cpp 2018-01-28 06:49:29.454175725 +0100 -@@ -111,7 +111,11 @@ - } - - SHIM_HIDDEN void* ShimPvalloc(size_t size) { -+#if defined(__GLIBC__) - return pvalloc(size); -+#else -+ return valloc((size+4095)&~4095); -+#endif - } - - SHIM_HIDDEN int ShimPosixMemalign(void** r, size_t a, size_t s) { diff --git a/browsers/qt5-qtwebengine/qt-musl-resolve.patch b/browsers/qt5-qtwebengine/qt-musl-resolve.patch deleted file mode 100644 index a481e50..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-resolve.patch +++ /dev/null @@ -1,61 +0,0 @@ ---- qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-11-07 15:46:18.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_reloader.cc 2016-12-20 03:33:11.749059656 +0100 -@@ -9,6 +9,10 @@ - - #include - -+#if !defined(__GLIBC__) -+#include "resolv_compat.h" -+#endif -+ - #include "base/lazy_instance.h" - #include "base/logging.h" - #include "base/macros.h" ---- qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-11-07 15:46:18.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/net/dns/dns_config_service_posix.cc 2016-12-20 03:40:07.671953098 +0100 -@@ -6,6 +6,10 @@ - - #include - -+#if !defined(__GLIBC__) -+#include "resolv_compat.h" -+#endif -+ - #include "base/bind.h" - #include "base/files/file.h" - #include "base/files/file_path.h" -diff --git a/src/3rdparty/chromium/net/dns/resolv_compat.h b/src/3rdparty/chromium/net/dns/resolv_compat.h -new file mode 100644 -index 0000000..4f0e852 ---- /dev/null -+++ b/src/3rdparty/chromium/net/dns/resolv_compat.h -@@ -0,0 +1,29 @@ -+#if !defined(__GLIBC__) -+/*************************************************************************** -+ * resolv_compat.h -+ * -+ * Mimick GLIBC's res_ninit() and res_nclose() for musl libc -+ * Note: res_init() is actually deprecated according to -+ * http://docs.oracle.com/cd/E36784_01/html/E36875/res-nclose-3resolv.html -+ **************************************************************************/ -+#include -+ -+static inline int res_ninit(res_state statp) -+{ -+ int rc = res_init(); -+ if (statp != &_res) { -+ memcpy(statp, &_res, sizeof(*statp)); -+ } -+ return rc; -+} -+ -+static inline int res_nclose(res_state statp) -+{ -+ if (!statp) -+ return -1; -+ if (statp != &_res) { -+ memset(statp, 0, sizeof(*statp)); -+ } -+ return 0; -+} -+#endif diff --git a/browsers/qt5-qtwebengine/qt-musl-siginfo_t.patch b/browsers/qt5-qtwebengine/qt-musl-siginfo_t.patch deleted file mode 100644 index fe760be..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-siginfo_t.patch +++ /dev/null @@ -1,18 +0,0 @@ -There's a subtle difference in the internal name of siginfo_t fields -between glibc and musl. The structure itself is equivalent, so it -should suffice to add a macro to rename the field. - ---- qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-02-17 05:57:43.000000000 +0100 -+++ qtwebengine/src/3rdparty/chromium/sandbox/linux/seccomp-bpf/trap.cc 2015-06-03 08:20:25.032716427 +0200 -@@ -22,6 +22,11 @@ - #include "sandbox/linux/services/android_ucontext.h" - #endif - -+// musl libc defines siginfo_t __si_fields instead of _sifields -+#if !defined(__GLIBC__) -+#define _sifields __si_fields -+#endif -+ - namespace { - - const int kCapacityIncrement = 20; diff --git a/browsers/qt5-qtwebengine/qt-musl-stackstart.patch b/browsers/qt5-qtwebengine/qt-musl-stackstart.patch deleted file mode 100644 index 1286c74..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-stackstart.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -index 10f1c0d..8e86a2e 100644 ---- a/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -+++ b/src/3rdparty/chromium/third_party/blink/renderer/platform/wtf/stack_util.cc -@@ -28,7 +28,7 @@ size_t GetUnderestimatedStackSize() { - // FIXME: On Mac OSX and Linux, this method cannot estimate stack size - // correctly for the main thread. - --#if defined(__GLIBC__) || defined(OS_ANDROID) || defined(OS_FREEBSD) || \ -+#if 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 @@ size_t GetUnderestimatedStackSize() { - } - - 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; diff --git a/browsers/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch b/browsers/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch deleted file mode 100644 index a8b74e4..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-sysreg-for__WORDSIZE.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -index d03c7a8..d43fda0 100644 ---- a/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -+++ b/src/3rdparty/chromium/third_party/breakpad/breakpad/src/common/linux/elf_core_dump.h -@@ -36,6 +36,9 @@ - #include - #include - #include -+#ifndef __GLIBC__ -+#include -+#endif - - #include "common/memory_range.h" - diff --git a/browsers/qt5-qtwebengine/qt-musl-thread-stacksize.patch b/browsers/qt5-qtwebengine/qt-musl-thread-stacksize.patch deleted file mode 100644 index a5c59fe..0000000 --- a/browsers/qt5-qtwebengine/qt-musl-thread-stacksize.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc -index 02bf49b..05ee182 100644 ---- a/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc -+++ b/src/3rdparty/chromium/ppapi/utility/threading/simple_thread.cc -@@ -13,7 +13,7 @@ namespace pp { - namespace { - - // Use 2MB default stack size for Native Client, otherwise use system default. --#if defined(__native_client__) -+#if defined(__native_client__) || !defined(__GLIBC__) - const size_t kDefaultStackSize = 2 * 1024 * 1024; - #else - const size_t kDefaultStackSize = 0; -diff --git a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc -index cf7f3ec..e06a5ce 100644 ---- a/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc -+++ b/src/3rdparty/chromium/v8/src/base/platform/platform-posix.cc -@@ -761,7 +761,7 @@ void Thread::Start() { - #if V8_OS_MACOSX - // Default on Mac OS X is 512kB -- bump up to 1MB - stack_size = 1 * 1024 * 1024; --#elif V8_OS_AIX -+#elif V8_OS_AIX || !defined(__GLIBC__) - // Default on AIX is 96kB -- bump up to 2MB - stack_size = 2 * 1024 * 1024; - #endif diff --git a/browsers/qt5-qtwebengine/remove-glibc-check.patch b/browsers/qt5-qtwebengine/remove-glibc-check.patch deleted file mode 100644 index ba10c3b..0000000 --- a/browsers/qt5-qtwebengine/remove-glibc-check.patch +++ /dev/null @@ -1,18 +0,0 @@ -Qt checks if glibc is available and if not disables large part of Qt5WebEngine and thus cripples functionality. -However these parts work fine with Musl so there is no need to disable them. -Just remove the check so it builds again. Since 5.15.1 is the last version of Qt to be released with this build system it'll be obsolete with Qt6 and there is no real point in fixing this upstream. - -diff --git a/src/buildtools/configure.json b/src/buildtools/configure.json -index 1ca6214a..3783c223 100644 ---- a/src/buildtools/configure.json -+++ b/src/buildtools/configure.json -@@ -375,8 +375,7 @@ - && features.webengine-python2 - && (!config.sanitizer || features.webengine-sanitizer) - && (!config.linux || features.pkg-config) -- && (!config.linux || features.webengine-host-pkg-config) -- && (!config.linux || features.webengine-system-glibc) -+ && (!config.linux || features.webengine-host-pkg-config) - && (!config.linux || features.webengine-system-khr) - && (!config.linux || features.webengine-system-nss) - && (!config.linux || features.webengine-system-dbus) diff --git a/browsers/qt5-qtwebengine/sandbox-sched_getparam.patch b/browsers/qt5-qtwebengine/sandbox-sched_getparam.patch deleted file mode 100644 index 15c33a5..0000000 --- a/browsers/qt5-qtwebengine/sandbox-sched_getparam.patch +++ /dev/null @@ -1,24 +0,0 @@ -Allow SYS_sched_getparam and SYS_sched_getscheduler -musl uses them for pthread_getschedparam() - -source: https://git.alpinelinux.org/aports/commit/community/chromium?id=54af9f8ac24f52d382c5758e2445bf0206eff40e - ---- qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc 2019-11-12 20:48:20.013724661 +0100 -+++ qtwebengine/src/3rdparty/chromium/services/service_manager/sandbox/linux/bpf_renderer_policy_linux.cc.patched 2019-11-12 20:58:57.330695676 +0100 -@@ -93,10 +93,16 @@ - case __NR_sysinfo: - case __NR_times: - case __NR_uname: -+#if !defined(__GLIBC__) -+ case __NR_sched_getparam: -+ case __NR_sched_getscheduler: -+#endif - return Allow(); - case __NR_sched_getaffinity: -+#if defined(__GLIBC__) - case __NR_sched_getparam: - case __NR_sched_getscheduler: -+#endif - case __NR_sched_setscheduler: - return sandbox::RestrictSchedTarget(GetPolicyPid(), sysno); - case __NR_prlimit64: diff --git a/browsers/qt5-qtwebengine/yasm-nls.patch b/browsers/qt5-qtwebengine/yasm-nls.patch deleted file mode 100644 index 6b412ab..0000000 --- a/browsers/qt5-qtwebengine/yasm-nls.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h b/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h -index 9e36539..f588083 100644 ---- a/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h -+++ b/src/3rdparty/chromium/third_party/yasm/source/config/linux/config.h -@@ -5,7 +5,7 @@ - #define CPP_PROG "gcc -E" - - /* */ --#define ENABLE_NLS 1 -+/* #undef ENABLE_NLS 1 */ - - /* Define to 1 if you have the `abort' function. */ - #define HAVE_ABORT 1 diff --git a/downloaders/youtube-dlc/APKBUILD b/downloaders/youtube-dlc/APKBUILD deleted file mode 100644 index ef58da9..0000000 --- a/downloaders/youtube-dlc/APKBUILD +++ /dev/null @@ -1,43 +0,0 @@ -# Contributor: Peter Bui -# Contributor: Sören Tempel -# Contributor: Timo Teräs -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=youtube-dlc -pkgver=2020.11.10 -pkgrel=0 -pkgdesc="Command-line program to download videos from YouTube" -url="https://youtube-dl.org/" -arch="noarch" -license="Unlicense" -depends="python3 py3-setuptools" -checkdepends="py3-flake8 py3-nose" -subpackages="$pkgname-doc - $pkgname-bash-completion - $pkgname-fish-completion" -source="yt-dlc-$pkgver.tar.gz::https://github.com/blackjack4494/yt-dlc/archive/$pkgver.tar.gz" -provides="youtube-dl" -builddir="$srcdir/yt-dlc-$pkgver" - -prepare() { - default_prepare - sed -i \ - -e 's|etc/bash_completion.d|share/bash-completion/completions|' \ - -e 's|etc/fish/completions|share/fish/completions|' \ - setup.py -} - -build() { - python3 setup.py build -} - -check() { - PYTHON=/usr/bin/python3 make offlinetest -} - -package() { - python3 setup.py install --prefix=/usr --root="$pkgdir" - ln -s youtube-dlc "$pkgdir"/usr/bin/youtube-dl -} - -sha512sums="5b732c421861ca5913fc712aa41a8dea428061b85d5fc6ea4c557d0c37b5a734eeec5490cd19bbe1c43ef48bba211969008c82677f9ff44fabfb08762b2ae185 yt-dlc-2020.11.10.tar.gz" diff --git a/media/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch b/media/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch deleted file mode 100644 index 9cc6fdf..0000000 --- a/media/ffmpeg/0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch +++ /dev/null @@ -1,55 +0,0 @@ -From ab11be0becb90542f10d5713659b559842c53af2 Mon Sep 17 00:00:00 2001 -From: Natanael Copa -Date: Tue, 29 Mar 2016 15:15:17 +0200 -Subject: [PATCH] libavutil: clean up unused FF_SYMVER macro - -There is nothing using it since commit d63443b9 (lavc: drop the -av_fast_{re,m}alloc compatibility wrappers). - -Signed-off-by: Natanael Copa ---- - libavutil/internal.h | 28 ---------------------------- - 1 file changed, 28 deletions(-) - -diff --git a/libavutil/internal.h b/libavutil/internal.h -index 61784b5..69d63d5 100644 ---- a/libavutil/internal.h -+++ b/libavutil/internal.h -@@ -187,34 +187,6 @@ - #endif - - /** -- * Define a function with only the non-default version specified. -- * -- * On systems with ELF shared libraries, all symbols exported from -- * FFmpeg libraries are tagged with the name and major version of the -- * library to which they belong. If a function is moved from one -- * library to another, a wrapper must be retained in the original -- * location to preserve binary compatibility. -- * -- * Functions defined with this macro will never be used to resolve -- * symbols by the build-time linker. -- * -- * @param type return type of function -- * @param name name of function -- * @param args argument list of function -- * @param ver version tag to assign function -- */ --#if HAVE_SYMVER_ASM_LABEL --# define FF_SYMVER(type, name, args, ver) \ -- type ff_##name args __asm__ (EXTERN_PREFIX #name "@" ver); \ -- type ff_##name args --#elif HAVE_SYMVER_GNU_ASM --# define FF_SYMVER(type, name, args, ver) \ -- __asm__ (".symver ff_" #name "," EXTERN_PREFIX #name "@" ver); \ -- type ff_##name args; \ -- type ff_##name args --#endif -- --/** - * Return NULL if a threading library has not been enabled. - * Used to disable threading functions in AVCodec definitions - * when not needed. --- -2.7.4 - diff --git a/media/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch b/media/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch deleted file mode 100644 index 86f5588..0000000 --- a/media/ffmpeg/3e098cca6e51db0f19928c12d0348deaa17137b3.patch +++ /dev/null @@ -1,83 +0,0 @@ -Upstream: Yes, https://github.com/FFmpeg/FFmpeg/commit/3e098cca6e51db0f19928c12d0348deaa17137b3 -From 3e098cca6e51db0f19928c12d0348deaa17137b3 Mon Sep 17 00:00:00 2001 -From: Lynne -Date: Tue, 7 Jul 2020 16:01:58 +0100 -Subject: [PATCH] aarch64/yuv2rgb_neon: fix return value - -We return 0 for this particular architecture but should instead be -returning the number of lines. -Fixes users who check the return value matches what they expect. ---- - libswscale/aarch64/swscale_unscaled.c | 31 ++++++++++++--------------- - libswscale/aarch64/yuv2rgb_neon.S | 2 ++ - 2 files changed, 16 insertions(+), 17 deletions(-) - -diff --git a/libswscale/aarch64/swscale_unscaled.c b/libswscale/aarch64/swscale_unscaled.c -index 551daad9e353..c7a2a1037df8 100644 ---- a/libswscale/aarch64/swscale_unscaled.c -+++ b/libswscale/aarch64/swscale_unscaled.c -@@ -42,15 +42,14 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], \ -- src[1], srcStride[1], \ -- src[2], srcStride[2], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], \ -+ src[1], srcStride[1], \ -+ src[2], srcStride[2], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_YUVX_TO_ALL_RGBX_FUNCS(yuvx) \ -@@ -76,14 +75,12 @@ static int ifmt##_to_##ofmt##_neon_wrapper(SwsContext *c, const uint8_t *src[], - uint8_t *dst[], int dstStride[]) { \ - const int16_t yuv2rgb_table[] = { YUV_TO_RGB_TABLE }; \ - \ -- ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -- dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -- src[0], srcStride[0], src[1], srcStride[1], \ -- yuv2rgb_table, \ -- c->yuv2rgb_y_offset >> 6, \ -- c->yuv2rgb_y_coeff); \ -- \ -- return 0; \ -+ return ff_##ifmt##_to_##ofmt##_neon(c->srcW, srcSliceH, \ -+ dst[0] + srcSliceY * dstStride[0], dstStride[0], \ -+ src[0], srcStride[0], src[1], srcStride[1], \ -+ yuv2rgb_table, \ -+ c->yuv2rgb_y_offset >> 6, \ -+ c->yuv2rgb_y_coeff); \ - } \ - - #define DECLARE_FF_NVX_TO_ALL_RGBX_FUNCS(nvx) \ -diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S -index b7446aa10511..f4b220fb608e 100644 ---- a/libswscale/aarch64/yuv2rgb_neon.S -+++ b/libswscale/aarch64/yuv2rgb_neon.S -@@ -142,6 +142,7 @@ - .macro declare_func ifmt ofmt - function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - load_args_\ifmt -+ mov w9, w1 - 1: - mov w8, w0 // w8 = width - 2: -@@ -193,6 +194,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 - increment_\ifmt - subs w1, w1, #1 // height -= 1 - b.gt 1b -+ mov w0, w9 - ret - endfunc - .endm diff --git a/media/ffmpeg/APKBUILD b/media/ffmpeg/APKBUILD deleted file mode 100644 index ba137cb..0000000 --- a/media/ffmpeg/APKBUILD +++ /dev/null @@ -1,194 +0,0 @@ -# Contributor: Sergei Lukin -# Contributor: Łukasz Jendrysik -# Contributor: Jakub Skrzypnik -# Contributor: Alex Denes -# Maintainer: Natanael Copa -pkgname=ffmpeg -pkgver=4.3.1 -pkgrel=0 -pkgdesc="Complete and free Internet live audio and video broadcasting solution for Linux/Unix" -url="https://ffmpeg.org/" -arch="all" -license="GPL-2.0-or-later AND LGPL-2.1-or-later" -options="!check" # tests/data/hls-lists.append.m3u8 fails -subpackages="$pkgname-dev $pkgname-doc $pkgname-libs" -makedepends=" - alsa-lib-dev - coreutils - bzip2-dev - gnutls-dev - imlib2-dev - lame-dev - libass-dev - libssh-dev - libtheora-dev - libva-dev - libvdpau-dev - libvorbis-dev - libvpx-dev - libxfixes-dev - opus-dev - perl-dev - pulseaudio-dev - sdl2-dev - v4l-utils-dev - x264-dev - x265-dev - xvidcore-dev - yasm - zlib-dev - dav1d-dev - vidstab-dev - vulkan-loader-dev - " -checkdepends="rsync" -source="https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz - 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch - 3e098cca6e51db0f19928c12d0348deaa17137b3.patch - " - -# secfixes: -# 4.3.1-r0: -# - CVE-2020-14212 -# 4.3-r0: -# - CVE-2020-13904 -# - CVE-2020-12284 -# 4.2.1-r0: -# - CVE-2019-15942 -# 4.2-r0: -# - CVE-2019-17539 -# - CVE-2019-17542 -# 4.1.4-r0: -# - CVE-2019-12730 -# 4.1.3-r0: -# - CVE-2019-9718 -# - CVE-2019-9721 -# - CVE-2019-11338 -# - CVE-2019-11339 -# 4.1.1-r0: -# - CVE-2019-1000016 -# 4.1-r0: -# - CVE-2018-13305 -# - CVE-2018-15822 -# 4.0.2-r0: -# - CVE-2018-13301 -# - CVE-2018-13303 -# - CVE-2018-13304 -# - CVE-2018-1999010 -# - CVE-2018-1999011 -# - CVE-2018-1999012 -# - CVE-2018-1999013 -# - CVE-2018-1999014 -# - CVE-2018-1999015 -# 4.0.1-r0: -# - CVE-2018-12459 -# - CVE-2018-12460 -# 4.0.0-r0: -# - CVE-2018-6912 -# - CVE-2018-7757 -# - CVE-2018-9841 -# 3.4.4-r0: -# - CVE-2018-14395 -# 3.4.3-r0: -# - CVE-2018-7557 -# - CVE-2018-7751 -# - CVE-2018-10001 -# - CVE-2018-12458 -# - CVE-2018-13300 -# - CVE-2018-13302 -# - CVE-2018-14394 -# 3.3.4-r0: -# - CVE-2017-14054 -# - CVE-2017-14055 -# - CVE-2017-14056 -# - CVE-2017-14057 -# - CVE-2017-14058 -# - CVE-2017-14059 -# - CVE-2017-14169 -# - CVE-2017-14170 -# - CVE-2017-14171 -# - CVE-2017-14222 -# - CVE-2017-14223 -# - CVE-2017-14225 - -# add support for AV1 codec for all archies except armhf and armv7 -# as aom is not available on them -_aom=""; - -case "$CARCH" in - x86|x86_64|aarch64|ppc64le|s390x ) - _aom="--enable-libaom"; makedepends="$makedepends aom-dev" ;; -esac - -build() { - local _dbg="--disable-debug" - local _asm="" - [ -n "$DEBUG" ] && _dbg="--enable-debug" - - case "$CARCH" in - x86) _asm="--disable-asm" ;; - mips*) _asm="--disable-asm --disable-inline-asm --disable-mipsdsp --disable-mipsdspr2 --disable-msa --disable-msa2 --disable-mipsfpu --disable-mips64r6 --disable-mips64r2" ;; - esac - - ./configure \ - --prefix=/usr \ - --enable-avresample \ - --enable-avfilter \ - --enable-gnutls \ - --enable-gpl \ - --enable-libass \ - --enable-libmp3lame \ - --enable-libvorbis \ - --enable-libvpx \ - --enable-libxvid \ - --enable-libx264 \ - --enable-libx265 \ - --enable-libtheora \ - --enable-libv4l2 \ - --enable-libdav1d \ - --enable-postproc \ - --enable-pic \ - --enable-pthreads \ - --enable-shared \ - --enable-libxcb \ - --enable-libssh \ - --enable-libpulse \ - --enable-libvidstab \ - --disable-stripping \ - --disable-static \ - --disable-librtmp \ - --enable-vaapi \ - --enable-vdpau \ - --enable-libopus \ - --enable-vulkan \ - $_asm $_aom $_dbg - make - ${CC:-gcc} -o tools/qt-faststart $CFLAGS tools/qt-faststart.c - make doc/ffmpeg.1 doc/ffplay.1 -} - -# https://ffmpeg.org/fate.html -check() { - ./configure \ - --samples=fate-suite/ - make fate-rsync - make fate-list - make fate -} - -package() { - make DESTDIR="$pkgdir" install install-man - install -D -m755 tools/qt-faststart "$pkgdir/usr/bin/qt-faststart" -# strip --strip-debug "$pkgdir"/usr/lib/*.a -} - -libs() { - pkgdesc="Libraries for ffmpeg" - replaces="ffmpeg" - mkdir -p "$subpkgdir"/usr - mv "$pkgdir"/usr/lib "$subpkgdir"/usr -} - -sha512sums="64e1052c45145e27726e43d4fe49c9a92058e55562d34fd3b3adf54d3506e6bd680f016b748828215e1bfc8ce19aa85b6f7e4eb05fafe21479118a4ad528a81f ffmpeg-4.3.1.tar.xz -1047a23eda51b576ac200d5106a1cd318d1d5291643b3a69e025c0a7b6f3dbc9f6eb0e1e6faa231b7e38c8dd4e49a54f7431f87a93664da35825cc2e9e8aedf4 0001-libavutil-clean-up-unused-FF_SYMVER-macro.patch -7151e98829c215619b82e27fdff98b9a0d6a778f499170f3688e111a8bf7b2cc8895f09aa49bcb812ba5b5f06dd0243ebc79c31af246420f7d0869859b4a0241 3e098cca6e51db0f19928c12d0348deaa17137b3.patch" diff --git a/media/gst-plugins-good/APKBUILD b/media/gst-plugins-good/APKBUILD deleted file mode 100644 index 59625da..0000000 --- a/media/gst-plugins-good/APKBUILD +++ /dev/null @@ -1,83 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Natanael Copa -pkgname=gst-plugins-good -pkgver=1.16.2 -pkgrel=5 -pkgdesc="GStreamer streaming media framework good plug-ins" -url="https://gstreamer.freedesktop.org" -arch="all" -license="GPL-2.0-or-later LGPL-2.0-or-later" -subpackages="$pkgname-lang $pkgname-gtk" -replaces="gst-plugins-good1" -makedepends="cairo-dev flac-dev gdk-pixbuf-dev glib-dev gst-plugins-base-dev - gstreamer-dev gtk+3.0-dev jack-dev lame-dev libavc1394-dev libcaca-dev - libdv-dev libgudev-dev libice-dev libiec61883-dev libjpeg-turbo-dev - libogg-dev libpng-dev libshout-dev libsm-dev libsoup-dev libvpx-dev - libxdamage-dev libxext-dev libxv-dev linux-headers meson mpg123-dev - orc-compiler orc-dev taglib-dev v4l-utils-dev wavpack-dev zlib-dev - pulseaudio-dev" -ldpath="/usr/lib/gstreamer-1.0" -source="https://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-$pkgver.tar.xz" -options="!check" # elements/souphttpsrc fails - -case "$CARCH" in - armhf) ;; - *) - makedepends="$makedepends qt5-qtdeclarative-dev qt5-qtx11extras-dev" - subpackages="$subpackages $pkgname-qt" - ;; -esac - -# secfixes: -# 1.10.4-r0: -# - CVE-2017-5840 -# - CVE-2017-5841 -# - CVE-2017-5845 -# - CVE-2016-9634 -# - CVE-2016-9635 -# - CVE-2016-9636 -# - CVE-2016-9808 -# - CVE-2016-10198 -# - CVE-2016-10199 - -build() { - abuild-meson \ - -Dpackage-origin="https://alpinelinux.org" \ - -Dpackage-name="GStreamer good plug-ins (Alpine Linux)" \ - . output - meson compile ${JOBS:+-j ${JOBS}} -C output -} - -check() { - make check -} - -package() { - export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 - DESTDIR="$pkgdir" meson install --no-rebuild -C output -} - -_mv() { - mkdir -p "$subpkgdir"/"$ldpath" - mv "$1" "$subpkgdir"/"$ldpath" -} - -qt() { - pkgdesc="Gstreamer Qt plug-in" - find "$pkgdir" -type f | while read -r i; do - if ldd $i 2>/dev/null | grep -q "libQt"; then - _mv "$i" - fi - done -} - -gtk() { - pkgdesc="Gstreamer gtk-3 plug-in" - find "$pkgdir" -type f | while read -r i; do - if ldd $i 2>/dev/null | grep -q "libgtk-3"; then - _mv "$i" - fi - done -} - -sha512sums="ab0dfd51af3ea345db466618547c35c78b5f08e725096b66074a5a7e0a83ca25ac51d2d915b7a8c07b70f8e4c9fc65d51c1851f147a5a5a71fbca58e1eb5ffd4 gst-plugins-good-1.16.2.tar.xz" diff --git a/media/qt5-qtmultimedia/APKBUILD b/media/qt5-qtmultimedia/APKBUILD deleted file mode 100644 index eff3a5d..0000000 --- a/media/qt5-qtmultimedia/APKBUILD +++ /dev/null @@ -1,41 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Bart Ribbers -pkgname=qt5-qtmultimedia -pkgver=5.15.1 -pkgrel=0 -pkgdesc="Qt5 - Multimedia support" -url="https://www.qt.io/developers/" -arch="all !armhf" # armhf blocked by qt5-qtdeclarative -license="LGPL-2.1-only AND LGPL-3.0-only AND GPL-3.0-only AND Qt-GPL-exception-1.0" -makedepends="qt5-qtbase-dev qt5-qtdeclarative-dev libxv-dev pulseaudio-dev - gstreamer-dev gst-plugins-base-dev gst-plugins-bad-dev" -subpackages="$pkgname-dev" -builddir="$srcdir/qtmultimedia-everywhere-src-$pkgver" - -case $pkgver in - *_beta*|*_rc*) _rel=development_releases;; - *) _rel=official_releases;; -esac - -source="https://download.qt.io/$_rel/qt/${pkgver%.*}/$pkgver/submodules/qtmultimedia-everywhere-src-$pkgver.tar.xz" - -build() { - qmake-qt5 - make -} - -check() { - make check -} -package() { - make INSTALL_ROOT="$pkgdir" install - - # Drop QMAKE_PRL_BUILD_DIR because reference the build dir - find "$pkgdir/usr/lib" -type f -name '*.prl' \ - -exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \; - - install -d "$pkgdir"/usr/share/licenses - ln -s /usr/share/licenses/qt5-base "$pkgdir"/usr/share/licenses/$pkgname -} - -sha512sums="9c063dc481c91a94ba151fa96166d04a83e1cdcdb66c5fa80c038bd973c87b928c3d90d1c8add7c3ec29c4dc7dceff9e8cf288ce980f95d199f37e90593104d9 qtmultimedia-everywhere-src-5.15.1.tar.xz" diff --git a/misc-tools/abuild/0001-fix-initd-checks.patch b/misc-tools/abuild/0001-fix-initd-checks.patch deleted file mode 100644 index 4510bc7..0000000 --- a/misc-tools/abuild/0001-fix-initd-checks.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/abuild.in b/abuild.in -index d600e92..923c60f 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -458,7 +458,13 @@ initdcheck() { - local i line - for i in $source; do - case $i in -- *.initd) line=$(head -n 1 "$srcdir"/$i);; -+ *.initd) -+ if is_remote "$i"; then -+ line=$(head -n 1 "$srcdir"/"$(filename_from_uri $i)") -+ else -+ line=$(head -n 1 "$srcdir"/$i) -+ fi -+ ;; - *) continue ;; - esac - diff --git a/misc-tools/abuild/0002-buildbase-opt.patch b/misc-tools/abuild/0002-buildbase-opt.patch deleted file mode 100644 index f915ce9..0000000 --- a/misc-tools/abuild/0002-buildbase-opt.patch +++ /dev/null @@ -1,43 +0,0 @@ -diff --git a/abuild.in b/abuild.in -index d600e92..74b3ae5 100644 ---- a/abuild.in -+++ b/abuild.in -@@ -2200,15 +2199,17 @@ builddeps() { - [ -n "$nodeps" ] && return 0 - - msg "Analyzing dependencies..." -- case "$BOOTSTRAP" in -- no*) BUILD_BASE="";; -- *) if cross_creating || cross_compiling; then -- BUILD_BASE="build-base-$CTARGET_ARCH" -- else -- BUILD_BASE="build-base" -- fi -- esac -- calcdeps "$BUILD_BASE" -+ if ! options_has "!buildbase"; then -+ case "$BOOTSTRAP" in -+ no*) BUILD_BASE="";; -+ *) if cross_creating || cross_compiling; then -+ BUILD_BASE="build-base-$CTARGET_ARCH" -+ else -+ BUILD_BASE="build-base" -+ fi -+ esac -+ calcdeps "$BUILD_BASE" -+ fi - - # find which deps are missing - local mbd mhd missing -@@ -2337,9 +2338,10 @@ rootbld() { - echo "$REPODEST/$repo" - ) < "$repo_template" > "$BUILD_ROOT/etc/apk/repositories" - -+ options_has "!buildbase" || builddeps="$builddeps build-base" - calcdeps - $SUDO_APK add --initdb --root "$BUILD_ROOT" --update \ -- abuild alpine-base build-base git $hostdeps $builddeps \ -+ abuild alpine-base git $hostdeps $builddeps \ - ${USE_CCACHE:+ccache} - - local bwrap_opts="" diff --git a/misc-tools/abuild/APKBUILD b/misc-tools/abuild/APKBUILD deleted file mode 100644 index ecfc1c1..0000000 --- a/misc-tools/abuild/APKBUILD +++ /dev/null @@ -1,87 +0,0 @@ -# Maintainer: Natanael Copa -pkgname=abuild -pkgver=3.7.0_rc1 -_ver=${pkgver%_git*} -pkgrel=1 -pkgdesc="Script to build Alpine Packages" -url="https://git.alpinelinux.org/cgit/abuild/" -arch="all" -license="GPL-2.0-only" -depends="fakeroot scanelf openssl apk-tools>=2.0.7-r1 libc-utils - attr tar pkgconf patch lzip" -if [ "$CBUILD" = "$CHOST" ]; then - depends="$depends curl" -fi -makedepends_build="pkgconfig" -makedepends_host="openssl-dev zlib-dev" -makedepends="$makedepends_host $makedepends_build" -checkdepends="bats" -install="$pkgname.pre-install $pkgname.pre-upgrade" -subpackages=" - apkbuild-cpan:cpan:noarch - apkbuild-gem-resolver:gems:noarch - apkbuild-pypi:pypi:noarch - abuild-rootbld:_rootbld:noarch - $pkgname-doc - " -options="suid" -pkggroups="abuild" -source="https://git.alpinelinux.org/abuild/snapshot/abuild-$pkgver.tar.xz - 0001-fix-initd-checks.patch - " -builddir="$srcdir"/abuild-$pkgver - -prepare() { - default_prepare - - sed -i -e "/^CHOST=/s/=.*/=$CHOST/" abuild.conf -} - -build() { - make VERSION="$pkgver-r$pkgrel" -} - -check() { - make check -} - -package() { - make install VERSION="$pkgver-r$pkgrel" DESTDIR="$pkgdir" - - install -m 644 abuild.conf "$pkgdir"/etc/abuild.conf - install -d -m 775 -g abuild "$pkgdir"/var/cache/distfiles -} - -cpan() { - pkgdesc="Script to generate perl APKBUILD from CPAN" - depends="perl perl-libwww perl-json perl-module-build perl-module-build-tiny - perl-lwp-protocol-https" - - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/apkbuild-cpan "$subpkgdir"/usr/bin/ -} - -gems() { - pkgdesc="APKBUILD dependency resolver for RubyGems" - depends="ruby ruby-augeas" - - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/apkbuild-gem-resolver "$subpkgdir"/usr/bin/ -} - -pypi() { - pkgdesc="Script to generate python3 APKBUILD from PYPI" - depends="perl perl-libwww perl-json perl-module-build-tiny perl-lwp-protocol-https" - - mkdir -p "$subpkgdir"/usr/bin - mv "$pkgdir"/usr/bin/apkbuild-pypi "$subpkgdir"/usr/bin/ -} - -_rootbld() { - pkgdesc="Build packages in chroot" - depends="abuild bubblewrap gettext git" - mkdir -p "$subpkgdir" -} - -sha512sums="ff0b7fd5e65b41185c0ec452703ecbcd73d409de75ffa14677ea9ed77919bc70347d53e42c6a3c6b569e260d2fb8bde495b151d9cf42adb097fe6b0764362248 abuild-3.7.0_rc1.tar.xz -e19ce813d78a71621534f00745ce77050efe622954bf813bc251d892b8927c0ba08c5c8e77ffb18a8d647d2638698d94cf8fdb60a929c0713458f9b3e06ea3cf 0001-fix-initd-checks.patch" diff --git a/misc-tools/abuild/abuild.pre-install b/misc-tools/abuild/abuild.pre-install deleted file mode 100644 index fd3d39a..0000000 --- a/misc-tools/abuild/abuild.pre-install +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -addgroup -S abuild 2>/dev/null - -exit 0 diff --git a/misc-tools/abuild/abuild.pre-upgrade b/misc-tools/abuild/abuild.pre-upgrade deleted file mode 120000 index 99e4a21..0000000 --- a/misc-tools/abuild/abuild.pre-upgrade +++ /dev/null @@ -1 +0,0 @@ -abuild.pre-install \ No newline at end of file diff --git a/misc-tools/mkinitfs/0001-mkinitfs-add-optional-support-for-pigz.patch b/misc-tools/mkinitfs/0001-mkinitfs-add-optional-support-for-pigz.patch deleted file mode 100644 index 9f73cf7..0000000 --- a/misc-tools/mkinitfs/0001-mkinitfs-add-optional-support-for-pigz.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 59204d36985de5ba2444d5f3e0d50a119287ec51 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?S=C3=B6ren=20Tempel?= -Date: Sat, 25 Jan 2020 12:04:32 +0100 -Subject: [PATCH] mkinitfs: add optional support for pigz - -pigz(1) is a parallel gzip implementation. As such, it significantly -faster than gzip(1). This patch uses pigz(1) instead of gzip(1), -if it is installed, otherwise it just falls back to gzip(1). This is -similar to the current pigz support in abuild. - -Without this patch: - - $ time mkinitfs - ==> initramfs: creating /boot/initramfs-lts - real 0m 38.19s - user 0m 35.47s - sys 0m 0.49s - -With this patch applied and pigz installed: - - ==> initramfs: creating /boot/initramfs-lts - real 0m 13.24s - user 0m 38.30s - sys 0m 0.56s - -This change was discussed on IRC with _ikke_ and mps. ---- - mkinitfs.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mkinitfs.in b/mkinitfs.in -index 9bd95f9..9676fce 100755 ---- a/mkinitfs.in -+++ b/mkinitfs.in -@@ -278,7 +278,7 @@ if [ -z "$list_sources" ] && [ -z "$quiet" ]; then - fi - - case "$initfscomp" in -- gzip) comp="gzip -9" ;; -+ gzip) comp="$(command -v pigz 2>/dev/null || echo gzip) -9" ;; - xz) cmd_exists xz; comp="xz -C crc32 -T 0" ;; - *) echo "Initramfs compression \"$initfscomp\" not supported!"; exit 1 ;; - esac --- -2.26.2 - diff --git a/misc-tools/mkinitfs/0002-file-embed.patch b/misc-tools/mkinitfs/0002-file-embed.patch deleted file mode 100644 index 92f2da7..0000000 --- a/misc-tools/mkinitfs/0002-file-embed.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff --git a/mkinitfs.in b/mkinitfs.in -index 9676fce..318c2f9 100755 ---- a/mkinitfs.in -+++ b/mkinitfs.in -@@ -147,6 +147,15 @@ initfs_apk_keys() { - cp "${basedir}etc/apk/keys/"* "$tmpdir"/etc/apk/keys/ - } - -+initfs_custom_files() { -+ for file in "$custom_files"; do -+ if [ -f "$basedir"/$file ]; then -+ mkdir -p "$tmpdir"/${file%/*} -+ cp "$basedir"/$file "$tmpdir"/$file -+ fi -+ done -+} -+ - initfs_cpio() { - if [ -n "$list_sources" ]; then - (cd "$tmpdir" && find . | sort) -@@ -287,6 +296,7 @@ initfs_base \ - && initfs_kmods \ - && initfs_firmware \ - && initfs_apk_keys \ -+ && initfs_custom_files \ - && initfs_cpio - rc=$? - diff --git a/misc-tools/mkinitfs/0003-include-libs.patch b/misc-tools/mkinitfs/0003-include-libs.patch deleted file mode 100644 index 7b00141..0000000 --- a/misc-tools/mkinitfs/0003-include-libs.patch +++ /dev/null @@ -1,7 +0,0 @@ -diff --git a/features.d/cryptsetup.files b/features.d/cryptsetup.files -index 902ce33..6ab9c19 100644 ---- a/features.d/cryptsetup.files -+++ b/features.d/cryptsetup.files -@@ -1 +1,2 @@ - /sbin/cryptsetup -+/usr/lib/libgcc_s.so.1 diff --git a/misc-tools/mkinitfs/APKBUILD b/misc-tools/mkinitfs/APKBUILD deleted file mode 100644 index 02c8110..0000000 --- a/misc-tools/mkinitfs/APKBUILD +++ /dev/null @@ -1,34 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Natanael Copa -pkgname=mkinitfs -pkgver=3.4.5 -_ver=${pkgver%_git*} -pkgrel=3 -pkgdesc="Tool to generate initramfs images for Alpine" -url="https://git.alpinelinux.org/cgit/mkinitfs" -arch="all" -license="GPL-2.0-only" -# currently we do not ship any testsuite -options="!check" -makedepends_host="busybox kmod-dev util-linux-dev cryptsetup-dev linux-headers" -makedepends="$makedepends_host" -depends="busybox>=1.28.2-r1 apk-tools>=2.9.1 lddtree>=1.25 kmod" -subpackages="$pkgname-doc" -install="$pkgname.pre-upgrade $pkgname.post-install $pkgname.post-upgrade" -triggers="$pkgname.trigger=/usr/share/kernel/*" -source="https://dev.alpinelinux.org/archive/mkinitfs/mkinitfs-$_ver.tar.xz - 0001-mkinitfs-add-optional-support-for-pigz.patch - 0002-file-embed.patch - " - -build() { - make VERSION=$pkgver-r$pkgrel -} - -package() { - make install DESTDIR="$pkgdir" -} - -sha512sums="e12f603dd9a51c0afbafeca7b4a061733514c4cf509b1dd61cc37c94e6102e5b3439d7a0379e1e4179aeaff13a382dab985c9737812e52803f038c1b2bb97cf8 mkinitfs-3.4.5.tar.xz -50411c3cddbfc49837d750620c57393dc8dfa7beb91f02816345fd66c8068b12d9aef266e50fd7cdc2b3b5fa81f477cbfaed00a2b264055cfd34b61ceb03e63a 0001-mkinitfs-add-optional-support-for-pigz.patch -83f6b283866da668b407d22e6fb7cceffec265e44daf5099e6cf83258176a9458265376d4dcc5d83f6f00992eceacd0284a8ad10f7651835749a603553d00810 0002-file-embed.patch" diff --git a/misc-tools/mkinitfs/mkinitfs.post-install b/misc-tools/mkinitfs/mkinitfs.post-install deleted file mode 100644 index a2a404b..0000000 --- a/misc-tools/mkinitfs/mkinitfs.post-install +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -# safety. if nlplug-findfs is missing in the initramfs image we may end up -# with an unbootable system. - -if ! grep -q -w /sbin/nlplug-findfs /etc/mkinitfs/features.d/base.files; then - echo "/sbin/nlplug-findfs" >> /etc/mkinitfs/features.d/base.files -fi diff --git a/misc-tools/mkinitfs/mkinitfs.post-upgrade b/misc-tools/mkinitfs/mkinitfs.post-upgrade deleted file mode 120000 index 78caf2e..0000000 --- a/misc-tools/mkinitfs/mkinitfs.post-upgrade +++ /dev/null @@ -1 +0,0 @@ -mkinitfs.post-install \ No newline at end of file diff --git a/misc-tools/mkinitfs/mkinitfs.pre-upgrade b/misc-tools/mkinitfs/mkinitfs.pre-upgrade deleted file mode 100644 index 0ece527..0000000 --- a/misc-tools/mkinitfs/mkinitfs.pre-upgrade +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -mkdir -p /etc/mkinitfs/features.d -for i in files modules; do - for j in /etc/mkinitfs/$i.d/*; do - [ -e "$j" ] || continue - case "$j" in - *.apk-new) continue;; - esac - mv $j /etc/mkinitfs/features.d/${j##*/}.$i - done -done -exit 0 diff --git a/misc-tools/mkinitfs/mkinitfs.trigger b/misc-tools/mkinitfs/mkinitfs.trigger deleted file mode 100644 index a31c28e..0000000 --- a/misc-tools/mkinitfs/mkinitfs.trigger +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -for i in "$@"; do - # get last element in path - flavor=${i##*/} - if ! [ -f "$i"/kernel.release ]; then - # kernel was uninstalled - rm -f $( readlink -f /boot/initramfs-$flavor ) \ - /boot/initramfs-$flavor /boot/vmlinuz-$flavor \ - /boot/$flavor /boot/$flavor.gz /$flavor /$flavor.gz - continue - fi - abi_release=$(cat "$i"/kernel.release) - initfs=initramfs-$flavor - mkinitfs -o /boot/$initfs $abi_release -done - -# extlinux will use path relative partition, so if /boot is on a -# separate partition we want /boot/ resolve to / -if ! [ -e /boot/boot ]; then - ln -sf . /boot/boot 2>/dev/null # silence error in case of FAT -fi - -# cleanup unused initramfs -for i in /boot/initramfs-[0-9]*; do - [ -f $i ] || continue - if ! [ -f /boot/vmlinuz-${i#/boot/initramfs-} ]; then - rm "$i" - fi -done - -sync -exit 0 diff --git a/openrc/uircd-openrc/APKBUILD b/openrc/uircd-openrc/APKBUILD deleted file mode 100644 index 07a624d..0000000 --- a/openrc/uircd-openrc/APKBUILD +++ /dev/null @@ -1,24 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=uircd-openrc -pkgver=1 -pkgrel=0 -pkgdesc="uIRCd service files" -url="https://git.redxen.eu/RedXen" -arch="noarch" -license="none" -depends="openrc" -options="!check" -source=" - initd - confd -" -builddir="$srcdir" - -package() { - install -Dm755 initd "$pkgdir"/etc/init.d/uircd - install -Dm644 confd "$pkgdir"/etc/conf.d/uircd -} - -sha512sums="ac39df79bc4a10a09146a9dbd1532ce86f90533e8db47dd57cab454878150c2966c1e47160cb1dcbfaef23a461923d1686818a9ef8751507911e2682b2d2c2c2 initd -af5f1348e304849dab9287b1094bf1514923933e87d49b497a0bbe2c6e1c2fa82692a15536d9c57dfb027e34927befa096879f12a1d712c26198ce1eb4851632 confd" diff --git a/openrc/uircd-openrc/confd b/openrc/uircd-openrc/confd deleted file mode 100644 index b64156e..0000000 --- a/openrc/uircd-openrc/confd +++ /dev/null @@ -1,19 +0,0 @@ -command_user=caskd -error_log="/home/${command_user}/IRC/daemon.log" -uircd_verbosity=3 -uircd_quitmsg="Now on the move." -uircd_logpath="/home/${command_user}/IRC" -uircd_connections=" - caskd@localhost/7203,#testingrounds,#idletown,#programming - caskd@41.157.98.109/9006,#general,#programming - caskd@localhost/7205,#pinephone,#pine64 - caskd@localhost/7206,#alpine-linux,#C - caskd@mbrserver.com,#general - caskd@irc.quakenet.org,#xonotic - caskd@localhost/7208 - caskd@localhost/7204,#unix - caskd@localhost/7207,#alpine-linux,#pleroma - caskd@localhost/7201,#cyberpunk,#cyberia,#2f30,#radio - caskd@localhost/7209,#lokinet - caskd@localhost/7202,#hackint,#nerdberg,#freifunk -" diff --git a/openrc/uircd-openrc/initd b/openrc/uircd-openrc/initd deleted file mode 100755 index f08395a..0000000 --- a/openrc/uircd-openrc/initd +++ /dev/null @@ -1,30 +0,0 @@ -#!/sbin/openrc-run - -description="microIRC daemon" -supervisor=supervise-daemon -command="/usr/local/bin/uircd" -command_args="" -pidfile="/run/${RC_SVCNAME}.pid" -command_background=true -uircd_logpath="${uircd_logpath:-/home/${command_user}/IRC}" - -depend() { - need networking - want stunnel.irc -} - -optional_arg() { - if [ -n "$2" ]; then - command_args="$command_args $1 '$2'" - fi -} - -start_pre() { - optional_arg "-V" "$uircd_verbosity" - checkpath --directory --owner $command_user "$uircd_logpath" - command_args="$command_args -l '$uircd_logpath'" - optional_arg "-m" "$uircd_quitmsg" - for i in $uircd_connections; do - command_args="$command_args -c '$i'" - done -} diff --git a/orphan/flexget/APKBUILD b/orphan/flexget/APKBUILD new file mode 100644 index 0000000..fe82c73 --- /dev/null +++ b/orphan/flexget/APKBUILD @@ -0,0 +1,59 @@ +# Contributor: Alex Denes +# Maintainer: +pkgname=flexget +pkgver=3.1.93 +pkgrel=0 +pkgdesc="Downloading or content processing automatition from different sources" +url="http://www.flexget.com/" +arch="noarch" +license="MIT" +depends=" + python3 + py3-feedparser + py3-sqlalchemy + py3-yaml + py3-beautifulsoup4 + py3-html5lib + py3-pyrss2gen +# py3-pynzb +# py3-rpyc + py3-jinja2 + py3-requests + py3-dateutil + py3-jsonschema + py3-guessit + py3-rebulk +# py3-apscheduler + py3-terminaltables +# py3-colorclass +# py3-loguru + py3-cherrypy + py3-flask + py3-flask-restful +# py3-flask-restx +# py3-flask-compress + py3-flask-login +# py3-flask-cors + py3-parsing +# py3-zxcvbn + py3-progressbar + py3-more-itertools +" +makedepends=" + py3-setuptools +" +options="!check" +source=" + $pkgname-$pkgver.zip::https://github.com/Flexget/Flexget/archive/v$pkgver.zip +" +builddir="$srcdir/Flexget-$pkgver" + +build() { + python3 setup.py build +} + +package() { + python3 setup.py install --root="$pkgdir"/ --prefix=/usr --optimize=1 +} + +sha512sums="de2dc8bbcdeeb6d2fb19f73b30b1f88398c8b7e9b430be1b957fc0941b6c13e5dd81a39e0d45b33f0296d0a22d6db50d1cea9e61138e4f262b22758811f20158 flexget-3.1.93.zip" diff --git a/orphan/hydrus/APKBUILD b/orphan/hydrus/APKBUILD new file mode 100644 index 0000000..b2385a6 --- /dev/null +++ b/orphan/hydrus/APKBUILD @@ -0,0 +1,48 @@ +# Contributor: Alex Denes +# Maintainer: +pkgname=hydrus +pkgver=429 +pkgrel=0 +pkgdesc="Danbooru-like image tagging and searching system for the desktop" +url="http://hydrusnetwork.github.io/hydrus/" +arch="noarch" +license="WTFPL" +depends=" + python3 + opencv + hdf5 + py3-beautifulsoup4 + py3-yaml + py3-lz4 + py3-numpy + py3-twisted + py3-pillow + py3-pysocks + py3-psutil + py3-html5lib + py3-requests + py3-mpv +" +makedepends="" +source=" + $pkgname-$pkgver.tar.gz::https://github.com/hydrusnetwork/hydrus/archive/v$pkgver.tar.gz + client-bin +" +options="!check" +builddir="$srcdir/hydrus-$pkgver" + +build() { + python3 -OO -m compileall -fq . +} + +package() { + mkdir -p "$pkgdir"/usr/lib/hydrus/bin + + cp -r help hydrus static client.pyw server.py "$pkgdir"/usr/lib/hydrus + ln -s /usr/bin/ffmpeg "$pkgdir"/usr/lib/hydrus/bin/ffmpeg + + install -Dm755 "$srcdir"/client-bin "$pkgdir"/usr/bin/hydrus-client +} + +sha512sums="3213ddfa62319cd82a067b7d63f32e631a476bff01aad3f2bb7ef21348fc61254e648a63bcfd6ecace8efcc8c5892518cbc43246527ecace991ff18f307cc4c2 hydrus-429.tar.gz +e52105dcf6d769a4c451d20510d6f4a740db0b78cae67d86323b3448c1a3df861bb177bf5c8a52b7f02bd2240357de403fd3f32ddfdef77231013f5128af39ba client-bin" diff --git a/orphan/hydrus/client-bin b/orphan/hydrus/client-bin new file mode 100644 index 0000000..1f0ae49 --- /dev/null +++ b/orphan/hydrus/client-bin @@ -0,0 +1,2 @@ +#!/bin/sh +exec python3 -OO /usr/lib/hydrus/client.pyw "$@" diff --git a/orphan/pleroma/0001-remove-config-import-build.patch b/orphan/pleroma/0001-remove-config-import-build.patch new file mode 100644 index 0000000..140826a --- /dev/null +++ b/orphan/pleroma/0001-remove-config-import-build.patch @@ -0,0 +1,16 @@ +--- a/config/prod.exs ++++ b/config/prod.exs +@@ -1,4 +1,4 @@ +-use Mix.Config ++import Config + + # For production, we often load configuration from external + # sources, such as your system environment. For this reason, +@@ -63,7 +63,3 @@ + + # Finally import the config/prod.secret.exs + # which should be versioned separately. +-import_config "prod.secret.exs" +- +-if File.exists?("./config/prod.exported_from_db.secret.exs"), +- do: import_config("prod.exported_from_db.secret.exs") diff --git a/orphan/pleroma/APKBUILD b/orphan/pleroma/APKBUILD new file mode 100644 index 0000000..bbc4cea --- /dev/null +++ b/orphan/pleroma/APKBUILD @@ -0,0 +1,35 @@ +# Contributor: Alex Denes +# Maintainer: +pkgname=pleroma +pkgver=2.2.1 +pkgrel=0 +pkgdesc="Pleroma is a free, federated social networking server built on open protocols" +url="https://pleroma.social/" +arch="all" +license="AGPL-3.0-only AND CC-BY-SA-4.0 AND CC-BY-4.0" +depends="/bin/sh" +makedepends="cmake git file-dev elixir" +options="net" +source=" + https://git.pleroma.social/pleroma/pleroma/-/archive/v$pkgver/pleroma-v$pkgver.tar.gz + 0001-remove-config-import-build.patch +" +builddir="$srcdir/pleroma-v$pkgver" + +build() { + export MIX_ENV=prod + mix local.rebar --force + mix local.hex --force + mix deps.get + mix release --path buildout + chmod +x buildout/bin/pleroma + rm -rf buildout/installation # Fuck this +} + +package() { + mkdir -p "$pkgdir" + mv buildout "$pkgdir"/pleroma +} + +sha512sums="de10c3bb4968f6ce424f115aee4543cc5046fbc2e3dbea8918e6dcad7e32a1006a3b1d2080872ca35a86f7953e94a261f881817c34807775cd912424cf1bd3a4 pleroma-v2.2.1.tar.gz +b0d16fa8b6e975f0a298104b93d0794f247ea8837c23de6381cc87f28cda5d86c9e12036e2cd8cb0a75c96f078db0693540d996786dfaab8ed9bb006aefd45f4 0001-remove-config-import-build.patch" diff --git a/games/spigot-mc/APKBUILD b/orphan/spigot-mc/APKBUILD similarity index 83% rename from games/spigot-mc/APKBUILD rename to orphan/spigot-mc/APKBUILD index de76014..9687c5d 100644 --- a/games/spigot-mc/APKBUILD +++ b/orphan/spigot-mc/APKBUILD @@ -1,9 +1,9 @@ # Contributor: Alex Denes -# Maintainer: Alex Denes +# Maintainer: pkgname=spigot pkgver=1.16.5 pkgrel=0 -_buildno=124 +_buildno=126 pkgdesc="Spigot server implementation" url="https://www.spigotmc.org/wiki/buildtools/#linux" arch="noarch" @@ -32,5 +32,5 @@ package() { install -Dm644 "$builddir"/spigot-$pkgver.jar "$pkgdir"/usr/lib/spigot/spigot-$pkgver.jar } -sha512sums="f4898dff44e77495453aafd597c311989fbe812721e82ee52be2b6856b91f933f5b3ec75137b90923231dc2f9f68b84efca507fde4b9a22368f2ea9324323cb8 spigot-BuildTools-124.jar +sha512sums="92fe99a967d3899cd7415c867128d755ab23dfd2cbb945806db52013c21105e694ec30ddd9e1599bd7b47101ceb2b5a73f8034f4ce09e1d9b97d29af9183e82a spigot-BuildTools-126.jar d9ae3a5c28ba56d5e90ad3bee0fa8745aba85de0849d86b2d5cbd371e5386733e65b535147559e026d847af64b09c04da6d120f18a09d581281422754b3a1f8d spigot.initd" diff --git a/games/spigot-mc/spigot.initd b/orphan/spigot-mc/spigot.initd similarity index 100% rename from games/spigot-mc/spigot.initd rename to orphan/spigot-mc/spigot.initd diff --git a/communication/telegram-desktop/APKBUILD b/orphan/telegram-desktop/APKBUILD similarity index 75% rename from communication/telegram-desktop/APKBUILD rename to orphan/telegram-desktop/APKBUILD index 0430a63..15c39dc 100644 --- a/communication/telegram-desktop/APKBUILD +++ b/orphan/telegram-desktop/APKBUILD @@ -1,7 +1,7 @@ # Contributor: Leo # Maintainer: pkgname=telegram-desktop -pkgver=2.5.1 +pkgver=2.6.1 pkgrel=0 pkgdesc="Telegram Desktop messaging app" options="!check" # Requires Catch2 to be packaged. @@ -34,9 +34,9 @@ makedepends=" qtchooser qt5-qtbase-dev qt5-qtsvg-dev + qt5-qtlottie-dev range-v3-dev tl-expected - tg_owt-dev xcb-util-keysyms-dev xxhash-dev xz-dev @@ -47,8 +47,7 @@ source=" https://github.com/telegramdesktop/tdesktop/releases/download/v$pkgver/tdesktop-$pkgver-full.tar.gz remove-glibc.patch small-sizes.patch - link-webrtc-to-libjpeg.patch - fix-tgcalls.patch + remove-calls.patch " builddir="$srcdir/tdesktop-$pkgver-full" @@ -66,14 +65,12 @@ build() { -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON \ -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=ON \ -DDESKTOP_APP_DISABLE_WAYLAND_INTEGRATION=ON \ + -DDESKTOP_APP_DISABLE_GTK_INTEGRATION=ON \ -DDESKTOP_APP_DISABLE_AUTOUPDATE=ON \ -DDESKTOP_APP_USE_PACKAGED=ON \ -DDESKTOP_APP_USE_PACKAGED_FONTS=ON \ - -DDESKTOP_APP_USE_PACKAGED_GSL=OFF \ - -DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF \ -DDESKTOP_APP_SPECIAL_TARGET="" \ -DTDESKTOP_LAUNCHER_BASENAME=telegram-desktop \ - -DTDESKTOP_DISABLE_GTK_INTEGRATION=ON \ $CMAKE_CROSSOPTS . make -C build } @@ -82,8 +79,7 @@ package() { DESTDIR="$pkgdir" make -C build install } -sha512sums="c906c76e44f5c6926bdc00143cbb1ac718633395a390c8a3e40fde9c4bfa42ba2e92cf0ac4c20434168d0548981f2fddefd019b942411ff4552a0f441336c0e1 tdesktop-2.5.1-full.tar.gz +sha512sums="92506477ee1778f7528d8b914406cbf04abf1941d4f1a5d61b75dbf393df2184da1f4f83bbc343e221a539c7a01d3e3b3fe5286453d2bf1863b75ea922b70d5a tdesktop-2.6.1-full.tar.gz b276001d1616cb5dbacbcd18510d0bd4b9d9f7b7a895b05fb6329866f5bdb7b69f536f7d7914436c8ea975c4f7951a2bb3efd9209c38df115b1d85e0ed099b04 remove-glibc.patch 3d1b8e6f870fc780f9ae8bc6a67eb676a5c5f686dc79e84cd6d64cb3cfafb1be626d0cc3960ffc67cecca21568764a0137c7303a89045fa59f91ba4eb5d8caed small-sizes.patch -ff6afe7a7de018a92abc6bd1004eada82f81d1daec25a5816d969773b44b2f0b94bef4351c50200d94d18fda24b4aa1396ae3513a9b6d467d5e8900fc44c8e23 link-webrtc-to-libjpeg.patch -cec87f2277ea552df71b80521b07cc469a410584a226ee56bd7e99bce230c85abc2cd12c7ee53f541b815cac1f766e310893248283c38be2a7a1f206be45691c fix-tgcalls.patch" +11c57af7d3e9651ea76019c4cd8c6416c792fd5288ffd4e2d9357c81256a95c0e1b0a8c9fdad2d062a143f8d251695024693cbc1c8dcd0387d6858b706fda217 remove-calls.patch" diff --git a/orphan/telegram-desktop/fix-tgcalls.patch b/orphan/telegram-desktop/fix-tgcalls.patch new file mode 100644 index 0000000..cfc17a6 --- /dev/null +++ b/orphan/telegram-desktop/fix-tgcalls.patch @@ -0,0 +1,28 @@ +--- a/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceImpl.cpp ++++ b/Telegram/ThirdParty/tgcalls/tgcalls/group/GroupInstanceImpl.cpp +@@ -569,7 +569,7 @@ + virtual void OnInterestingUsage(int usage_pattern) override { + } + +- virtual void OnErrorDemuxingPacket(uint32_t ssrc) override { ++ virtual void OnErrorDemuxingPacket(uint32_t ssrc) { + _onMissingSsrc(ssrc); + } + }; +@@ -1207,16 +1207,6 @@ + apm->ApplyConfig(audioConfig); + + mediaDeps.audio_processing = apm; +- +- mediaDeps.onUnknownAudioSsrc = [weak](uint32_t ssrc) { +- getMediaThread()->PostTask(RTC_FROM_HERE, [weak, ssrc](){ +- auto strong = weak.lock(); +- if (!strong) { +- return; +- } +- strong->onMissingSsrc(ssrc); +- }); +- }; + + dependencies.media_engine = cricket::CreateMediaEngine(std::move(mediaDeps)); + dependencies.call_factory = webrtc::CreateCallFactory(); diff --git a/orphan/telegram-desktop/link-webrtc-to-libjpeg.patch b/orphan/telegram-desktop/link-webrtc-to-libjpeg.patch new file mode 100644 index 0000000..1f03003 --- /dev/null +++ b/orphan/telegram-desktop/link-webrtc-to-libjpeg.patch @@ -0,0 +1,11 @@ +--- a/cmake/external/webrtc/CMakeLists.txt ++++ b/cmake/external/webrtc/CMakeLists.txt +@@ -9,7 +9,7 @@ + + if (DESKTOP_APP_USE_PACKAGED) + find_package(tg_owt REQUIRED) +- target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt) ++ target_link_libraries(external_webrtc INTERFACE tg_owt::tg_owt INTERFACE jpeg) + else() + set(webrtc_loc ${libs_loc}/tg_owt/src) + set(webrtc_build_loc ${libs_loc}/tg_owt/out/$) diff --git a/orphan/telegram-desktop/remove-calls.patch b/orphan/telegram-desktop/remove-calls.patch new file mode 100644 index 0000000..505d636 --- /dev/null +++ b/orphan/telegram-desktop/remove-calls.patch @@ -0,0 +1,150 @@ +--- a/Telegram/CMakeLists.txt ++++ b/Telegram/CMakeLists.txt +@@ -18,7 +18,7 @@ endif() + add_subdirectory(lib_storage) + add_subdirectory(lib_lottie) + add_subdirectory(lib_qr) +-add_subdirectory(lib_webrtc) ++#add_subdirectory(lib_webrtc) + add_subdirectory(codegen) + + get_filename_component(src_loc SourceFiles REALPATH) +@@ -26,8 +26,8 @@ get_filename_component(res_loc Resources REALPATH) + + include(cmake/telegram_options.cmake) + include(cmake/lib_ffmpeg.cmake) +-include(cmake/lib_tgvoip.cmake) +-include(cmake/lib_tgcalls.cmake) ++#include(cmake/lib_tgvoip.cmake) ++#include(cmake/lib_tgcalls.cmake) + include(cmake/td_export.cmake) + include(cmake/td_mtproto.cmake) + include(cmake/td_lang.cmake) +@@ -39,15 +39,15 @@ set_target_properties(Telegram PROPERTIES AUTOMOC ON AUTORCC ON) + + target_link_libraries(Telegram + PRIVATE +- tdesktop::lib_tgcalls_legacy +- tdesktop::lib_tgcalls +- tdesktop::lib_tgvoip ++# tdesktop::lib_tgcalls_legacy ++# tdesktop::lib_tgcalls ++# tdesktop::lib_tgvoip + tdesktop::td_export + tdesktop::td_mtproto + tdesktop::td_lang + tdesktop::td_scheme + tdesktop::td_ui +- desktop-app::lib_webrtc ++# desktop-app::lib_webrtc + desktop-app::lib_base + desktop-app::lib_crl + desktop-app::lib_ui +@@ -258,35 +258,35 @@ PRIVATE + boxes/url_auth_box.h + boxes/username_box.cpp + boxes/username_box.h +- calls/calls_box_controller.cpp +- calls/calls_box_controller.h +- calls/calls_call.cpp +- calls/calls_call.h +- calls/calls_group_call.cpp +- calls/calls_group_call.h +- calls/calls_group_common.h +- calls/calls_group_members.cpp +- calls/calls_group_members.h +- calls/calls_group_panel.cpp +- calls/calls_group_panel.h +- calls/calls_group_settings.cpp +- calls/calls_group_settings.h +- calls/calls_emoji_fingerprint.cpp +- calls/calls_emoji_fingerprint.h +- calls/calls_instance.cpp +- calls/calls_instance.h +- calls/calls_panel.cpp +- calls/calls_panel.h +- calls/calls_signal_bars.cpp +- calls/calls_signal_bars.h +- calls/calls_top_bar.cpp +- calls/calls_top_bar.h +- calls/calls_userpic.cpp +- calls/calls_userpic.h +- calls/calls_video_bubble.cpp +- calls/calls_video_bubble.h +- calls/calls_volume_item.cpp +- calls/calls_volume_item.h ++# calls/calls_box_controller.cpp ++# calls/calls_box_controller.h ++# calls/calls_call.cpp ++# calls/calls_call.h ++# calls/calls_group_call.cpp ++# calls/calls_group_call.h ++# calls/calls_group_common.h ++# calls/calls_group_members.cpp ++# calls/calls_group_members.h ++# calls/calls_group_panel.cpp ++# calls/calls_group_panel.h ++# calls/calls_group_settings.cpp ++# calls/calls_group_settings.h ++# calls/calls_emoji_fingerprint.cpp ++# calls/calls_emoji_fingerprint.h ++# calls/calls_instance.cpp ++# calls/calls_instance.h ++# calls/calls_panel.cpp ++# calls/calls_panel.h ++# calls/calls_signal_bars.cpp ++# calls/calls_signal_bars.h ++# calls/calls_top_bar.cpp ++# calls/calls_top_bar.h ++# calls/calls_userpic.cpp ++# calls/calls_userpic.h ++# calls/calls_video_bubble.cpp ++# calls/calls_video_bubble.h ++# calls/calls_volume_item.cpp ++# calls/calls_volume_item.h + chat_helpers/bot_keyboard.cpp + chat_helpers/bot_keyboard.h + chat_helpers/emoji_keywords.cpp +@@ -922,8 +922,8 @@ PRIVATE + settings/settings_advanced.h + settings/settings_chat.cpp + settings/settings_chat.h +- settings/settings_calls.cpp +- settings/settings_calls.h ++# settings/settings_calls.cpp ++# settings/settings_calls.h + settings/settings_codes.cpp + settings/settings_codes.h + settings/settings_common.cpp +--- a/cmake/external/CMakeLists.txt ++++ b/cmake/external/CMakeLists.txt +@@ -63,7 +63,7 @@ if (LINUX AND NOT DESKTOP_APP_DISABLE_DBUS_INTEGRATION) + endif() + add_checked_subdirectory(ton) + add_checked_subdirectory(variant) +-add_checked_subdirectory(webrtc) ++#add_checked_subdirectory(webrtc) + if (LINUX AND NOT DESKTOP_APP_DISABLE_X11_INTEGRATION) + add_checked_subdirectory(xcb) + endif() +--- a/Telegram/SourceFiles/core/core_settings.cpp ++++ b/Telegram/SourceFiles/core/core_settings.cpp +@@ -13,7 +13,6 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include "window/themes/window_theme.h" + #include "window/section_widget.h" + #include "base/platform/base_platform_info.h" +-#include "webrtc/webrtc_create_adm.h" + #include "facades.h" + + namespace Core { +@@ -497,10 +496,6 @@ void Settings::setTabbedReplacedWithInfo(bool enabled) { + } + } + +-Webrtc::Backend Settings::callAudioBackend() const { +- return Webrtc::Backend::OpenAL; +-} +- + void Settings::setDialogsWidthRatio(float64 ratio) { + _dialogsWidthRatio = ratio; + } diff --git a/communication/telegram-desktop/remove-glibc.patch b/orphan/telegram-desktop/remove-glibc.patch similarity index 100% rename from communication/telegram-desktop/remove-glibc.patch rename to orphan/telegram-desktop/remove-glibc.patch diff --git a/communication/telegram-desktop/small-sizes.patch b/orphan/telegram-desktop/small-sizes.patch similarity index 100% rename from communication/telegram-desktop/small-sizes.patch rename to orphan/telegram-desktop/small-sizes.patch diff --git a/own/uirc/APKBUILD b/own/uirc/APKBUILD deleted file mode 100644 index eb0d444..0000000 --- a/own/uirc/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=uirc -pkgver=2021.01.04 -pkgrel=0 -pkgdesc="Simple and lightweight IRC protocol helper" -url="https://git.redxen.eu/caskd/uIRC" -arch="all" -license="GPL-3.0-only" -makedepends="cmake" -subpackages="$pkgname-dev" -source=" - $pkgname-$pkgver.tar.gz::https://git.redxen.eu/caskd/uIRC/archive/$pkgver.tar.gz -" -builddir="$srcdir/uirc" - -build() { - cmake -B build \ - -DBUILD_SHARED_LIBS=True \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_INSTALL_LIBDIR=lib \ - -DBUILD_TESTS=ON \ - ${CMAKE_CROSSOPTS} . - make -C build -} - -check() { - make -C build test -} - -package() { - DESTDIR="$pkgdir" make -C build install -} - -sha512sums="225d0bd963c722be4e73bfc12069e0387ef1828f3cdeb971dc34e3519028eaac5e0f01e40e869572cda338cbb591f4700a8982631a60b6a1873ba7ec59973952 uirc-2021.01.04.tar.gz" diff --git a/own/uircd/APKBUILD b/own/uircd/APKBUILD deleted file mode 100644 index c298cde..0000000 --- a/own/uircd/APKBUILD +++ /dev/null @@ -1,36 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=uircd -pkgver=2021.01.09 -pkgrel=2 -pkgdesc="High performance IRC bouncer based on uIRC" -url="https://git.redxen.eu/caskd/uIRCd" -arch="all" -license="GPL-3.0-only" -makedepends="uirc-dev libconfig-dev cmake" -subpackages="$pkgname-openrc" -source=" - $pkgname-$pkgver.tar.gz::https://git.redxen.eu/caskd/uIRCd/archive/$pkgver.tar.gz - uircd.initd - 0001-test.patch -" -builddir="$srcdir/uircd" -options="!check" # No test suite - -build() { - # CODE_ANAYZER is off until warning is fixed - cmake -B build \ - -DCMAKE_BUILD_TYPE=None \ - -DCMAKE_INSTALL_PREFIX=/usr \ - ${CMAKE_CROSSOPTS} . - make -C build -} - -package() { - DESTDIR="$pkgdir" make -C build install - install -Dm755 "$srcdir"/uircd.initd "$pkgdir"/etc/init.d/uircd -} - -sha512sums="1d44ee30565be0bb80a024d7696a459c2eebc2f9058275520c48c49b8b07fddaa99a20ec956e6906b2ebe35de0ae235cc46693b06fe9b45407b800b1c63a34c6 uircd-2021.01.09.tar.gz -c6b02b9f324797ff49669624ea8a4db74f4469f3661b3f55ccce98b0b84fed4d6de45dd4954127ad7b8740dbdbba93e2ee3817c43ad327b8518240e37e5c82ed uircd.initd -755c8a314aa78faa7d70988049ec8b2136f6fdfa33a995cdcaf4ad661fe537f9995d5c1c45d7b60c451cfc38b8c59c2e2dddf1f623fdbf742499697600b99575 0001-test.patch" diff --git a/own/uircd/uircd.initd b/own/uircd/uircd.initd deleted file mode 100644 index b4fbff0..0000000 --- a/own/uircd/uircd.initd +++ /dev/null @@ -1,13 +0,0 @@ -#!/sbin/openrc-run - -description="microIRC daemon" -supervisor=supervise-daemon -command="/usr/bin/uircd" -command_args="${UIRCD_ARGS:--C $uircd_config}" -pidfile="/run/${RC_SVCNAME}.pid" -command_background=true - -depend() { - want stunnel.irc - after stunnel.irc firewall -} diff --git a/stable/minetest-mineclone2/APKBUILD b/stable/minetest-mineclone2/APKBUILD new file mode 100644 index 0000000..2328b18 --- /dev/null +++ b/stable/minetest-mineclone2/APKBUILD @@ -0,0 +1,23 @@ +# Contributor: Alex Denes +# Maintainer: Alex Denes +_game=mineclone2 +pkgname="minetest-$_game" +pkgver=0.71.0 +pkgrel=0 +pkgdesc="Voxel-based sandbox game for Minetest" +url="https://git.minetest.land/MineClone2/MineClone2" +arch="noarch" +license="GPL-3.0-or-later" +depends="minetest-common" +source=" + $pkgname-$pkgver.tar.gz::https://git.minetest.land/MineClone2/MineClone2/archive/$pkgver.tar.gz +" +options="!check" +builddir="$srcdir" + +package() { + mkdir -p "$pkgdir/usr/share/minetest/games" + mv "$_game" "$pkgdir/usr/share/minetest/games/$_game" +} + +sha512sums="7a602fefa151a975ee1fa0f18db6ef46955e4fb9ef763748620ba3779b83656eb2bfa7851d5454cf843d00a464f6b494a21dd66d7c7a1a3af441d87bf14aefd5 minetest-mineclone2-0.71.0.tar.gz" diff --git a/media/paperview/APKBUILD b/stable/paperview/APKBUILD similarity index 100% rename from media/paperview/APKBUILD rename to stable/paperview/APKBUILD diff --git a/suckless/dwm-mobile/APKBUILD b/suckless/dwm-mobile/APKBUILD deleted file mode 100644 index 5ce7604..0000000 --- a/suckless/dwm-mobile/APKBUILD +++ /dev/null @@ -1,39 +0,0 @@ -# Contributor: Gaber Ayoubi -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=dwm-mobile -pkgver=6.2 -pkgrel=0 -provides="dwm" -_commit="b2dff3f769efb7947350e0b7f93bf3eef202044d" -pkgdesc="dwm - dynamic window manager (with caskd's patches)" -url="https://dwm.suckless.org" -arch="all" -options="!check" -license="MIT/X" -depends="dmenu st misc-scripts imagemagick pulsemixer nnn xdg-utils" -makedepends="libxft-dev libx11-dev libxinerama-dev" -subpackages="$pkgname-doc" -source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/caskd/dwm/archive/$_commit.tar.gz" -builddir="$srcdir/dwm" - -prepare() { - default_prepare - sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \ - -e '/LDFLAGS/{s/=/+=/}' \ - "$builddir"/config.mk -} - -build() { - make X11INC=/usr/include/X11 \ - X11LIB=/usr/lib/X11 \ - FREETYPEINC=/usr/include/freetype2 \ - -C "$builddir" -} - -package() { - make PREFIX=/usr DESTDIR="$pkgdir" \ - -C "$builddir" install -} - -sha512sums="dfedd0f0e36acb6d4a1e492d1938ccb3af936331f874fb346cd8dc8bc9360c3928b720542303e0e5c093a1576100934eaf5d922af5903e1afce295a57c07c7b3 dwm-mobile-6.2-b2dff3f769efb7947350e0b7f93bf3eef202044d.tar.gz" diff --git a/suckless/svkbd-mobile/APKBUILD b/suckless/svkbd-mobile/APKBUILD deleted file mode 100644 index 99d9423..0000000 --- a/suckless/svkbd-mobile/APKBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Alex Denes -# Maintainer: Alex Denes -pkgname=svkbd-patched -pkgver=0.2.1 -pkgrel=0 -provides="svkbd" -_commit="a8ea266a79cb2414f06598205db8b229c474ac8f" -pkgdesc="Simple virtual keyboard for X, ships with an international mobile-optimised layout" -url="https://tools.suckless.org/x/svkbd/" -arch="all" -license="MIT" -subpackages="$pkgname-doc" -options="!check" # has no tests -makedepends="fontconfig-dev freetype-dev libx11-dev libxtst-dev libxft-dev libxinerama-dev" -source="$pkgname-$pkgver-$_commit.tar.gz::https://git.redxen.eu/pinephone-mods/svkbd/archive/$_commit.tar.gz" -builddir="$srcdir/svkbd" - -build() { - make -} - -package() { - make PREFIX=/usr DESTDIR="$pkgdir" install -} - -sha512sums="e70d57d2a4a87de1482c6cc3e5dbe903ed3f00d8095f5dfb77f38736a89cf84b972a0dba1039a9f4663a55c071da8e4f904ea48964745ec8c49c57656c84eb90 svkbd-patched-0.2.1-a8ea266a79cb2414f06598205db8b229c474ac8f.tar.gz" diff --git a/games/multimc/01-patch-jar-path.patch b/testing/multimc/01-patch-jar-path.patch similarity index 100% rename from games/multimc/01-patch-jar-path.patch rename to testing/multimc/01-patch-jar-path.patch diff --git a/games/multimc/APKBUILD b/testing/multimc/APKBUILD similarity index 100% rename from games/multimc/APKBUILD rename to testing/multimc/APKBUILD diff --git a/communication/mumble/APKBUILD b/testing/mumble/APKBUILD similarity index 100% rename from communication/mumble/APKBUILD rename to testing/mumble/APKBUILD diff --git a/communication/mumble/murmur.initd b/testing/mumble/murmur.initd similarity index 100% rename from communication/mumble/murmur.initd rename to testing/mumble/murmur.initd diff --git a/communication/mumble/murmur.pre-install b/testing/mumble/murmur.pre-install similarity index 100% rename from communication/mumble/murmur.pre-install rename to testing/mumble/murmur.pre-install diff --git a/communication/neomutt/APKBUILD b/testing/neomutt/APKBUILD similarity index 100% rename from communication/neomutt/APKBUILD rename to testing/neomutt/APKBUILD diff --git a/unstable/ungoogled-chromium/APKBUILD b/unstable/ungoogled-chromium/APKBUILD new file mode 100644 index 0000000..b8fcb18 --- /dev/null +++ b/unstable/ungoogled-chromium/APKBUILD @@ -0,0 +1,446 @@ +# Contributor: Carlo Landmeter +# Contributor: Natanael Copa +# Contributor: Alex Denes +# Maintainer: Alex Denes +pkgname=ungoogled-chromium +pkgver=87.0.4280.88 +pkgrel=0 +_patchrel=1 +pkgdesc="Chromium web browser with ungoogled-chromium patches" +url="https://github.com/Eloston/ungoogled-chromium" +arch="x86_64 aarch64" # x86: ./v8_context_snapshot_generator segfaults + # armv7: /usr/bin/ld: final link failed: memory exhausted when linking chrome +license="BSD-3-Clause" +depends="xdg-utils" +makedepends=" + alsa-lib-dev + pulseaudio-dev + bash + binutils-gold + bison flex + bsd-compat-headers + bzip2-dev + cairo-dev + clang-dev + cups-dev + dbus-glib-dev + elfutils-dev + eudev-dev + ffmpeg-dev + findutils + flac-dev + freetype-dev + gnutls-dev + gperf + gtk+3.0-dev + gzip + harfbuzz-dev + hunspell-dev + hwids-usb + jpeg-dev + jsoncpp-dev + krb5-dev + libbsd-dev + libcap-dev + libevent-dev + libexif-dev + libgcrypt-dev + libgnome-keyring-dev + libjpeg-turbo-dev + libpng-dev + libusb-dev + libva-dev + libwebp-dev + libxcomposite-dev + libxcursor-dev + libxinerama-dev + libxml2-dev + libxrandr-dev + libxscrnsaver-dev + libxslt-dev + linux-headers + mesa-dev + minizip-dev + ninja + nodejs + nss-dev + openjdk8 + opus-dev + pciutils-dev + perl + python2 + re2-dev + snappy-dev + speex-dev + sqlite-dev + xcb-proto + xdg-utils + zlib-dev + py2-setuptools + " +# explicit depends for --headless +depends="eudev-libs ttf-opensans" +options="suid" +subpackages="$pkgname-chromedriver" +builddir="$srcdir"/"chromium-$pkgver" +source="https://commondatastorage.googleapis.com/chromium-browser-official/chromium-$pkgver.tar.xz + https://github.com/Eloston/ungoogled-chromium/archive/$pkgver-$_patchrel.tar.gz + pstables-2.8.h::https://git.savannah.gnu.org/cgit/freetype/freetype2.git/plain/src/psnames/pstables.h?h=VER-2-8 + chromium-launcher.sh + chromium.conf + chromium.desktop + google-api.keys + + default-pthread-stacksize.patch + musl-fixes.patch + musl-fixes-breakpad.patch + musl-hacks.patch + musl-libc++.patch + musl-sandbox.patch + no-execinfo.patch + no-mallinfo.patch + resolver.patch + swiftshader.patch + create-extra-view-redefinition.patch + + chromium-use-alpine-target.patch + media-base.patch + musl-crashpad.patch + musl-v8-monotonic-pthread-cont_timedwait.patch + nasm.patch + + gcc-fno-delete-null-pointer-checks.patch + gcc-arm.patch + aarch64-fixes.patch + elf-arm.patch + + chromium-size_t-defined.patch + check-for-enable-accelerated-video-decode-on-Linux.patch + fix-invalid-end-iterator-usage-in-CookieMonster.patch + only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch + xproto-fix-underflow-in-Fp1616ToDouble.patch + + ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch + ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch + ungoogled-chromium-patches/core/debian/disable/unrar.patch + + ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch + ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch + ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch + ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch + ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch + ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch + ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch + ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch + + ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch + ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch + ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch + + ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch + ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-gaia.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-gcm.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-google-host-detection.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-mei-preload.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-network-time-tracker.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-profile-avatar-downloading.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-signin.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-untraceable-urls.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-webrtc-log-uploader.patch + ungoogled-chromium-patches/core/ungoogled-chromium/disable-webstore-urls.patch + ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-enabling-reporting.patch + ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-one-click-signin.patch + ungoogled-chromium-patches/core/ungoogled-chromium/fix-building-without-safebrowsing.patch + ungoogled-chromium-patches/core/ungoogled-chromium/fix-learn-doubleclick-hsts.patch + ungoogled-chromium-patches/core/ungoogled-chromium/remove-unused-preferences-fields.patch + ungoogled-chromium-patches/core/ungoogled-chromium/replace-google-search-engine-with-nosearch.patch + ungoogled-chromium-patches/core/ungoogled-chromium/toggle-translation-via-switch.patch + ungoogled-chromium-patches/core/ungoogled-chromium/use-local-devtools-files.patch + + ungoogled-chromium-patches/extra/debian/disable/android.patch + ungoogled-chromium-patches/extra/debian/disable/device-notifications.patch + ungoogled-chromium-patches/extra/debian/disable/fuzzers.patch + ungoogled-chromium-patches/extra/debian/disable/google-api-warning.patch + ungoogled-chromium-patches/extra/debian/disable/welcome-page.patch + ungoogled-chromium-patches/extra/debian/fixes/connection-message.patch + ungoogled-chromium-patches/extra/debian/gn/parallel.patch + + ungoogled-chromium-patches/extra/inox-patchset/0006-modify-default-prefs.patch + ungoogled-chromium-patches/extra/inox-patchset/0008-restore-classic-ntp.patch + ungoogled-chromium-patches/extra/inox-patchset/0011-add-duckduckgo-search-engine.patch + ungoogled-chromium-patches/extra/inox-patchset/0013-disable-missing-key-warning.patch + ungoogled-chromium-patches/extra/inox-patchset/0016-chromium-sandbox-pie.patch + ungoogled-chromium-patches/extra/inox-patchset/0018-disable-first-run-behaviour.patch + ungoogled-chromium-patches/extra/inox-patchset/0019-disable-battery-status-service.patch + + ungoogled-chromium-patches/extra/iridium-browser/Remove-EV-certificates.patch + ungoogled-chromium-patches/extra/iridium-browser/browser-disable-profile-auto-import-on-first-run.patch + ungoogled-chromium-patches/extra/iridium-browser/mime_util-force-text-x-suse-ymp-to-be-downloaded.patch + ungoogled-chromium-patches/extra/iridium-browser/net-cert-increase-default-key-length-for-newly-gener.patch + ungoogled-chromium-patches/extra/iridium-browser/prefs-always-prompt-for-download-directory-by-defaul.patch + ungoogled-chromium-patches/extra/iridium-browser/prefs-only-keep-cookies-until-exit.patch + ungoogled-chromium-patches/extra/iridium-browser/updater-disable-auto-update.patch + + ungoogled-chromium-patches/extra/ungoogled-chromium/add-components-ungoogled.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-bookmark-bar-ntp.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-stack-tabs.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-search-engine-collection.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-force-punycode-hostnames.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-pdf-plugin-name.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-for-omnibox-autocomplete-filtering.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-close-window-with-last-tab.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-configure-extension-downloading.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-disable-beforeunload.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-hide-crashed-bubble.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-scroll-tabs.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-flag-to-show-avatar-button.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-ipv6-probing-option.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/add-suggestions-url-field.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/disable-dial-repeating-discovery.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/disable-download-quarantine.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/disable-formatting-in-omnibox.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/disable-intranet-redirect-detector.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/disable-webgl-renderer-info.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/enable-default-prefetch-privacy-changes.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/enable-menu-on-reload-button.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/enable-page-saving-on-more-pages.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/enable-paste-and-go-new-tab-button.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/fix-building-without-mdns-and-service-discovery.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/popups-to-tabs.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/remove-disable-setuid-sandbox-as-bad-flag.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/remove-uneeded-ui.patch + ungoogled-chromium-patches/extra/ungoogled-chromium/searx.patch + + ungoogled-chromium-patches/extra/bromite/fingerprinting-flags-client-rects-and-measuretext.patch + ungoogled-chromium-patches/extra/bromite/flag-fingerprinting-canvas-image-data-noise.patch + ungoogled-chromium-patches/extra/bromite/flag-max-connections-per-host.patch + + ungoogled-chromium-patches/0001-fix-var-undefined.patch + ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch + " + +# secfixes: +# 83.0.4103.116-r0: +# - CVE-2020-6505 +# - CVE-2020-6506 +# - CVE-2020-6507 +# - CVE-2020-6509 +# 72.0.3626.121-r0: +# - CVE-2019-5786 + +if [ -n "$DEBUG" ]; then + _buildtype=Debug + _is_debug=true +else + _buildtype=Release + _is_debug=false +fi + +prepare() { + patch_args="-p0" + default_prepare + msg "Pruning binaries" + "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/utils/prune_binaries.py ./ "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/pruning.list + msg "Apply domain substitution" + "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/utils/domain_substitution.py apply -r "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/domain_regex.list -f "$srcdir"/"ungoogled-chromium-$pkgver-$_patchrel"/domain_substitution.list -c domainsubcache.tar.gz ./ + + # https://groups.google.com/a/chromium.org/d/topic/chromium-packagers/9JX1N2nf4PU/discussion + touch chrome/test/data/webui/i18n_process_css_test.html + # Use the file at run time instead of effectively compiling it in + sed 's|//third_party/usb_ids/usb.ids|/usr/share/hwdata/usb.ids|g' \ + -i services/device/public/cpp/usb/BUILD.gn + + mkdir -p third_party/node/linux/node-linux-x64/bin + ln -s /usr/bin/node third_party/node/linux/node-linux-x64/bin/ + + # reusable system library settings + local use_system=" + ffmpeg + flac + fontconfig + freetype + harfbuzz-ng + libdrm + libevent + libjpeg + libpng + libwebp + libxml + libxslt + opus + re2 + snappy + " + for _lib in $use_system libjpeg_turbo; do + msg "Removing buildscripts for system provided $_lib" + 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 + + msg "Replacing gn files" + python2 build/linux/unbundle/replace_gn_files.py --system-libraries \ + $use_system + third_party/libaddressinput/chromium/tools/update-strings.py + +} + +_gn_flags() { + echo $* +} + +build() { + ############################################################## + # Please dont use these keys outside of Alpine Linux project # + # You can create your own at: # + # http://www.chromium.org/developers/how-tos/api-keys # + ############################################################## + msg "Bootstrapping GN" + local _c=$(_gn_flags 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 \ + ) + +# AR="ar" CC="${CC:-gcc}" CXX="${CXX:-g++}" LD="${CXX:-g++}" \ + CC="${CC:-clang}" CXX="${CXX:-clang++}" LD="${CXX:-clang++}" \ + python2 tools/gn/bootstrap/bootstrap.py -s -v --gn-gen-args "$_c" + + msg "Configuring build" + _c=$(_gn_flags \ + blink_symbol_level=0 \ + clang_use_chrome_plugins=false \ + enable_js_type_check=false \ + custom_toolchain=\"//build/toolchain/linux/unbundle:default\" \ + 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=$_is_debug \ + is_desktop_linux=true \ + safe_browsing_mode=0 \ + enable_one_click_signin=false \ + enable_reading_list=false \ + enable_remoting=false \ + enable_reporting=false \ + use_official_google_api_keys=false \ + proprietary_codecs=true \ + symbol_level=0 \ + treat_warnings_as_errors=false \ + use_allocator_shim=false \ + use_allocator=\"none\" \ + use_cups=true \ + use_custom_libcxx=false \ + use_gnome_keyring=false \ + use_gold=false \ + use_lld=false \ + use_pulseaudio=true \ + use_sysroot=false \ + use_system_harfbuzz=true \ + ) + + AR="ar" CC="clang" CXX="clang++" LD="clang++" NM=/usr/bin/nm \ + out/Release/gn gen out/$_buildtype --args="$_c $_ca" + + # Make xcbgen available to ui/gfx/x/gen_xproto.py running under Python 2 + ln -sf /usr/lib/python3.*/site-packages/xcbgen . + export PYTHONPATH="$PWD" + + msg "Ninja turtles GO!" + + # build mksnapshot + ninja -j ${JOBS} -C out/$_buildtype mksnapshot + ninja -j ${JOBS} -C out/$_buildtype v8_context_snapshot_generator + + if [ "$CARCH" = "x86" ]; then + # x86 only - dependency issues compiling obj/chrome/browser/devtools/devtools/cast_handler.o + ninja -j ${JOBS} -C out/$_buildtype obj/chrome/common/media_router/mojom/media_router__generator.stamp + fi + + # final link needs lots of file descriptors + ulimit -n 2048 + + # finish rest of the build + ninja -j ${JOBS} -C out/$_buildtype chrome chrome_sandbox chromedriver +} + +package() { + cd out/$_buildtype + local bin pak + for bin in chrome chromedriver *.bin; do + install -Dm755 $bin "$pkgdir"/usr/lib/$pkgname/$bin + done + + install -Dm755 swiftshader/libEGL.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libEGL.so + install -Dm755 swiftshader/libGLESv2.so "$pkgdir"/usr/lib/$pkgname/swiftshader/libGLESv2.so + + install -Dm4755 chrome_sandbox "$pkgdir"/usr/lib/$pkgname/chrome-sandbox + install -m644 icudtl.dat "$pkgdir"/usr/lib/$pkgname/icudtl.dat + + install -Dm755 xdg-mime "$pkgdir"/usr/lib/$pkgname/xdg-mime + install -Dm755 xdg-settings "$pkgdir"/usr/lib/$pkgname/xdg-settings + + for pak in *.pak; do + install -Dm644 $pak "$pkgdir"/usr/lib/$pkgname/$pak + done + + install -Dm755 "$srcdir"/chromium-launcher.sh \ + "$pkgdir"/usr/lib/$pkgname/chromium-launcher.sh + + cp -a locales "$pkgdir"/usr/lib/$pkgname/ + + # It is important that we name the target "chromium-browser", + # xdg-utils expect it; bug #355517. + mkdir -p "$pkgdir"/usr/bin + cd "$pkgdir"/usr/bin + ln -sf /usr/lib/$pkgname/chromium-launcher.sh chromium-browser + ln -sf /usr/lib/$pkgname/chromedriver "$pkgdir"/usr/bin/ + + install -Dm644 "$srcdir"/chromium.conf \ + "$pkgdir"/etc/chromium/chromium.conf + + install -Dm644 "$srcdir"/chromium.desktop \ + "$pkgdir"/usr/share/applications/chromium.desktop + + cd "$builddir" + for size in 24 48 64 128 256; do + install -Dm644 "chrome/app/theme/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png" + done + + for size in 16 32; do + install -Dm644 "chrome/app/theme/default_100_percent/chromium/product_logo_$size.png" \ + "$pkgdir/usr/share/icons/hicolor/"$size"x"$size"/apps/chromium.png" + done +} + +chromedriver() { + pkgdesc="WebDriver driver for the Chromium Browser" + mkdir -p "$subpkgdir"/usr/lib/$pkgname "$subpkgdir"/usr/bin + mv "$pkgdir"/usr/lib/$pkgname/chromedriver \ + "$subpkgdir"/usr/lib/$pkgname/ + mv "$pkgdir"/usr/bin/chromedriver "$subpkgdir"/usr/bin +} + diff --git a/browsers/chromium/aarch64-fixes.patch b/unstable/ungoogled-chromium/aarch64-fixes.patch similarity index 100% rename from browsers/chromium/aarch64-fixes.patch rename to unstable/ungoogled-chromium/aarch64-fixes.patch diff --git a/browsers/chromium/check-for-enable-accelerated-video-decode-on-Linux.patch b/unstable/ungoogled-chromium/check-for-enable-accelerated-video-decode-on-Linux.patch similarity index 100% rename from browsers/chromium/check-for-enable-accelerated-video-decode-on-Linux.patch rename to unstable/ungoogled-chromium/check-for-enable-accelerated-video-decode-on-Linux.patch diff --git a/browsers/chromium/chromium-launcher.sh b/unstable/ungoogled-chromium/chromium-launcher.sh similarity index 100% rename from browsers/chromium/chromium-launcher.sh rename to unstable/ungoogled-chromium/chromium-launcher.sh diff --git a/browsers/chromium/chromium-size_t-defined.patch b/unstable/ungoogled-chromium/chromium-size_t-defined.patch similarity index 100% rename from browsers/chromium/chromium-size_t-defined.patch rename to unstable/ungoogled-chromium/chromium-size_t-defined.patch diff --git a/browsers/chromium/chromium-use-alpine-target.patch b/unstable/ungoogled-chromium/chromium-use-alpine-target.patch similarity index 100% rename from browsers/chromium/chromium-use-alpine-target.patch rename to unstable/ungoogled-chromium/chromium-use-alpine-target.patch diff --git a/browsers/chromium/chromium.conf b/unstable/ungoogled-chromium/chromium.conf similarity index 100% rename from browsers/chromium/chromium.conf rename to unstable/ungoogled-chromium/chromium.conf diff --git a/browsers/chromium/chromium.desktop b/unstable/ungoogled-chromium/chromium.desktop similarity index 100% rename from browsers/chromium/chromium.desktop rename to unstable/ungoogled-chromium/chromium.desktop diff --git a/browsers/chromium/create-extra-view-redefinition.patch b/unstable/ungoogled-chromium/create-extra-view-redefinition.patch similarity index 100% rename from browsers/chromium/create-extra-view-redefinition.patch rename to unstable/ungoogled-chromium/create-extra-view-redefinition.patch diff --git a/browsers/chromium/default-pthread-stacksize.patch b/unstable/ungoogled-chromium/default-pthread-stacksize.patch similarity index 100% rename from browsers/chromium/default-pthread-stacksize.patch rename to unstable/ungoogled-chromium/default-pthread-stacksize.patch diff --git a/browsers/chromium/elf-arm.patch b/unstable/ungoogled-chromium/elf-arm.patch similarity index 100% rename from browsers/chromium/elf-arm.patch rename to unstable/ungoogled-chromium/elf-arm.patch diff --git a/browsers/chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch b/unstable/ungoogled-chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch similarity index 100% rename from browsers/chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch rename to unstable/ungoogled-chromium/fix-invalid-end-iterator-usage-in-CookieMonster.patch diff --git a/browsers/chromium/gcc-arm.patch b/unstable/ungoogled-chromium/gcc-arm.patch similarity index 100% rename from browsers/chromium/gcc-arm.patch rename to unstable/ungoogled-chromium/gcc-arm.patch diff --git a/browsers/chromium/gcc-fno-delete-null-pointer-checks.patch b/unstable/ungoogled-chromium/gcc-fno-delete-null-pointer-checks.patch similarity index 100% rename from browsers/chromium/gcc-fno-delete-null-pointer-checks.patch rename to unstable/ungoogled-chromium/gcc-fno-delete-null-pointer-checks.patch diff --git a/browsers/chromium/google-api.keys b/unstable/ungoogled-chromium/google-api.keys similarity index 100% rename from browsers/chromium/google-api.keys rename to unstable/ungoogled-chromium/google-api.keys diff --git a/browsers/chromium/media-base.patch b/unstable/ungoogled-chromium/media-base.patch similarity index 100% rename from browsers/chromium/media-base.patch rename to unstable/ungoogled-chromium/media-base.patch diff --git a/browsers/chromium/musl-crashpad.patch b/unstable/ungoogled-chromium/musl-crashpad.patch similarity index 100% rename from browsers/chromium/musl-crashpad.patch rename to unstable/ungoogled-chromium/musl-crashpad.patch diff --git a/browsers/chromium/musl-fixes-breakpad.patch b/unstable/ungoogled-chromium/musl-fixes-breakpad.patch similarity index 100% rename from browsers/chromium/musl-fixes-breakpad.patch rename to unstable/ungoogled-chromium/musl-fixes-breakpad.patch diff --git a/browsers/chromium/musl-fixes.patch b/unstable/ungoogled-chromium/musl-fixes.patch similarity index 100% rename from browsers/chromium/musl-fixes.patch rename to unstable/ungoogled-chromium/musl-fixes.patch diff --git a/browsers/chromium/musl-hacks.patch b/unstable/ungoogled-chromium/musl-hacks.patch similarity index 100% rename from browsers/chromium/musl-hacks.patch rename to unstable/ungoogled-chromium/musl-hacks.patch diff --git a/browsers/chromium/musl-libc++.patch b/unstable/ungoogled-chromium/musl-libc++.patch similarity index 100% rename from browsers/chromium/musl-libc++.patch rename to unstable/ungoogled-chromium/musl-libc++.patch diff --git a/browsers/chromium/musl-sandbox.patch b/unstable/ungoogled-chromium/musl-sandbox.patch similarity index 100% rename from browsers/chromium/musl-sandbox.patch rename to unstable/ungoogled-chromium/musl-sandbox.patch diff --git a/browsers/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch b/unstable/ungoogled-chromium/musl-v8-monotonic-pthread-cont_timedwait.patch similarity index 100% rename from browsers/chromium/musl-v8-monotonic-pthread-cont_timedwait.patch rename to unstable/ungoogled-chromium/musl-v8-monotonic-pthread-cont_timedwait.patch diff --git a/browsers/chromium/nasm.patch b/unstable/ungoogled-chromium/nasm.patch similarity index 100% rename from browsers/chromium/nasm.patch rename to unstable/ungoogled-chromium/nasm.patch diff --git a/browsers/chromium/no-execinfo.patch b/unstable/ungoogled-chromium/no-execinfo.patch similarity index 100% rename from browsers/chromium/no-execinfo.patch rename to unstable/ungoogled-chromium/no-execinfo.patch diff --git a/browsers/chromium/no-mallinfo.patch b/unstable/ungoogled-chromium/no-mallinfo.patch similarity index 100% rename from browsers/chromium/no-mallinfo.patch rename to unstable/ungoogled-chromium/no-mallinfo.patch diff --git a/browsers/chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch b/unstable/ungoogled-chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch similarity index 100% rename from browsers/chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch rename to unstable/ungoogled-chromium/only-fall-back-to-the-i965-driver-if-we-re-on-iHD.patch diff --git a/browsers/chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch b/unstable/ungoogled-chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch similarity index 100% rename from browsers/chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch rename to unstable/ungoogled-chromium/remove-dead-reloc-in-nonalloc-LD-flags.patch diff --git a/browsers/chromium/resolver.patch b/unstable/ungoogled-chromium/resolver.patch similarity index 100% rename from browsers/chromium/resolver.patch rename to unstable/ungoogled-chromium/resolver.patch diff --git a/browsers/chromium/swiftshader.patch b/unstable/ungoogled-chromium/swiftshader.patch similarity index 100% rename from browsers/chromium/swiftshader.patch rename to unstable/ungoogled-chromium/swiftshader.patch diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/0001-fix-var-undefined.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/0001-fix-var-undefined.patch new file mode 100644 index 0000000..957224f --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/0001-fix-var-undefined.patch @@ -0,0 +1,23 @@ +--- chrome/browser/safe_browsing/BUILD.gn ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -6,8 +6,10 @@ + import("//extensions/buildflags/buildflags.gni") + + static_library("safe_browsing") { ++ sources = [] ++ deps = [] + if (false) { +- sources = [ ++ sources += [ + "chrome_controller_client.cc", + "chrome_controller_client.h", + "safe_browsing_tab_observer.cc", +@@ -16,7 +18,7 @@ + "url_checker_delegate_impl.h", + ] + +- deps = [ ++ deps += [ + "//chrome/app:generated_resources", + "//chrome/common", + "//chrome/common:constants", diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch new file mode 100644 index 0000000..b7bd8ee --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/0002-dont-use-zip-analyzer.patch @@ -0,0 +1,25 @@ +--- chrome/services/file_util/BUILD.gn ++++ chrome/services/file_util/BUILD.gn +@@ -13,9 +13,6 @@ + + deps = [ + "//base", +- "//chrome/common/safe_browsing", +- "//chrome/common/safe_browsing:archive_analyzer_results", +- "//chrome/common/safe_browsing:rar_analyzer", + "//components/safe_browsing:buildflags", + "//mojo/public/cpp/bindings", + ] +@@ -37,12 +34,5 @@ + + if (is_mac) { + deps += [ "//chrome/utility/safe_browsing/mac" ] +- } +- +- if (safe_browsing_mode == 1) { +- sources += [ +- "safe_archive_analyzer.cc", +- "safe_archive_analyzer.h", +- ] + } + } diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch new file mode 100644 index 0000000..008b7ef --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/bromite/disable-fetching-field-trials.patch @@ -0,0 +1,80 @@ +# NOTE: Modified to remove usage of compiler #if macros +From: csagan5 <32685696+csagan5@users.noreply.github.com> +Date: Sun, 8 Jul 2018 18:16:34 +0200 +Subject: Disable fetching of all field trials + +--- + .../src/org/chromium/chrome/browser/ChromeFeatureList.java | 12 +++--------- + components/variations/service/variations_service.cc | 4 ++++ + 2 files changed, 7 insertions(+), 9 deletions(-) + +--- chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java ++++ chrome/browser/flags/android/java/src/org/chromium/chrome/browser/flags/ChromeFeatureList.java +@@ -122,9 +122,7 @@ public abstract class ChromeFeatureList + * the specified parameter does not exist. + */ + public static String getFieldTrialParamByFeature(String featureName, String paramName) { +- if (FeatureList.hasTestFeatures()) return ""; +- assert FeatureList.isInitialized(); +- return ChromeFeatureListJni.get().getFieldTrialParamByFeature(featureName, paramName); ++ return ""; + } + + /** +@@ -141,10 +139,7 @@ public abstract class ChromeFeatureList + */ + public static int getFieldTrialParamByFeatureAsInt( + String featureName, String paramName, int defaultValue) { +- if (FeatureList.hasTestFeatures()) return defaultValue; +- assert FeatureList.isInitialized(); +- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsInt( +- featureName, paramName, defaultValue); ++ return defaultValue; + } + + /** +@@ -161,10 +156,7 @@ public abstract class ChromeFeatureList + */ + public static double getFieldTrialParamByFeatureAsDouble( + String featureName, String paramName, double defaultValue) { +- if (FeatureList.hasTestFeatures()) return defaultValue; +- assert FeatureList.isInitialized(); +- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsDouble( +- featureName, paramName, defaultValue); ++ return defaultValue; + } + + /** +@@ -181,10 +173,7 @@ public abstract class ChromeFeatureList + */ + public static boolean getFieldTrialParamByFeatureAsBoolean( + String featureName, String paramName, boolean defaultValue) { +- if (FeatureList.hasTestFeatures()) return defaultValue; +- assert FeatureList.isInitialized(); +- return ChromeFeatureListJni.get().getFieldTrialParamByFeatureAsBoolean( +- featureName, paramName, defaultValue); ++ return defaultValue; + } + + /** Alphabetical: */ +--- components/variations/service/variations_service.cc ++++ components/variations/service/variations_service.cc +@@ -236,17 +236,7 @@ bool GetInstanceManipulations(const net: + // Variations seed fetching is only enabled in official Chrome builds, if a URL + // is specified on the command line, and for testing. + bool IsFetchingEnabled() { +-#if !BUILDFLAG(GOOGLE_CHROME_BRANDING) +- if (!base::CommandLine::ForCurrentProcess()->HasSwitch( +- switches::kVariationsServerURL) && +- !g_should_fetch_for_testing) { +- DVLOG(1) +- << "Not performing repeated fetching in unofficial build without --" +- << switches::kVariationsServerURL << " specified."; +- return false; +- } +-#endif +- return true; ++ return false; + } + + std::unique_ptr MaybeImportFirstRunSeed( diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch new file mode 100644 index 0000000..92b3cb6 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/chromium-upstream/remove-dead-reloc-in-nonalloc-LD-flags.patch @@ -0,0 +1,33 @@ +From 74b0cb5b86f7d7f8f7c1172d85b09096bef147b7 Mon Sep 17 00:00:00 2001 +From: Daniel Nicoara +Date: Thu, 24 Sep 2020 02:34:24 +0000 +Subject: [PATCH] Remove dead-reloc-in-nonalloc LD flags + +Breakpad change landed. Revert workaround. + +Bug: 1105559 +Test: components/crash/content/tools/generate_breakpad_symbols.py --build-dir=out/andrd --binary=out/andrd/lib.unstripped/libcontent_shell_content_view.so --symbols-dir=/tmp/foo --platform=android +Change-Id: I519534002898a97b15a57b9b87ac78ef3f216dee +Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2427349 +Commit-Queue: Nico Weber +Reviewed-by: Nico Weber +Cr-Commit-Position: refs/heads/master@{#810066} +--- + +--- build/config/compiler/BUILD.gn ++++ build/config/compiler/BUILD.gn +@@ -399,14 +399,6 @@ config("compiler") { + "-Wl,--as-needed", + ] + } +- if (use_lld && !is_chromeos_device) { +- # TODO(thakis): Fix dump_syms to not need this and then remove it, +- # https://crbug.com/1105559 +- ldflags += [ +- "-Wl,-z,dead-reloc-in-nonalloc=*=0", +- "-Wl,-z,dead-reloc-in-nonalloc=.debug_ranges=1", +- ] +- } + } + + # Linux-specific compiler flags setup. diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/debian/disable/unrar.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/debian/disable/unrar.patch new file mode 100644 index 0000000..8325283 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/debian/disable/unrar.patch @@ -0,0 +1,85 @@ +description: disable support for safe browsing inspection of rar files +author: Michael Gilbert +bug: http://bugs.debian.org/914487 + +--- chrome/browser/safe_browsing/download_protection/file_analyzer.cc ++++ chrome/browser/safe_browsing/download_protection/file_analyzer.cc +@@ -90,7 +90,7 @@ void FileAnalyzer::Start(const base::Fil + if (inspection_type == DownloadFileType::ZIP) { + StartExtractZipFeatures(); + } else if (inspection_type == DownloadFileType::RAR) { +- StartExtractRarFeatures(); ++ LOG(WARNING) << "Safebrowser inspection of rar files is disabled in this build"; + #if defined(OS_MAC) + } else if (inspection_type == DownloadFileType::DMG) { + StartExtractDmgFeatures(); +--- chrome/common/safe_browsing/BUILD.gn ++++ chrome/common/safe_browsing/BUILD.gn +@@ -43,39 +43,6 @@ if (safe_browsing_mode == 1) { + public_deps = [ "//components/safe_browsing/core:csd_proto" ] + } + +- source_set("rar_analyzer") { +- sources = [ +- "rar_analyzer.cc", +- "rar_analyzer.h", +- ] +- +- deps = [ +- ":archive_analyzer_results", +- ":download_type_util", +- "//base", +- "//base:i18n", +- "//components/safe_browsing/core:features", +- "//components/safe_browsing/core:file_type_policies", +- "//third_party/unrar:unrar", +- ] +- +- defines = [ +- "_FILE_OFFSET_BITS=64", +- "LARGEFILE_SOURCE", +- "RAR_SMP", +- "SILENT", +- +- # The following is set to disable certain macro definitions in the unrar +- # source code. +- "CHROMIUM_UNRAR", +- +- # Disables exceptions in unrar, replaces them with process termination. +- "UNRAR_NO_EXCEPTIONS", +- ] +- +- public_deps = [ "//components/safe_browsing/core:csd_proto" ] +- } +- + source_set("disk_image_type_sniffer_mac") { + sources = [ + "disk_image_type_sniffer_mac.cc", +@@ -138,7 +105,6 @@ source_set("safe_browsing") { + ":archive_analyzer_results", + ":binary_feature_extractor", + ":download_type_util", +- ":rar_analyzer", + "//components/safe_browsing/core:features", + ] + +--- chrome/services/file_util/safe_archive_analyzer.cc ++++ chrome/services/file_util/safe_archive_analyzer.cc +@@ -7,7 +7,6 @@ + #include "base/macros.h" + #include "build/build_config.h" + #include "chrome/common/safe_browsing/archive_analyzer_results.h" +-#include "chrome/common/safe_browsing/rar_analyzer.h" + #include "chrome/common/safe_browsing/zip_analyzer.h" + + #if defined(OS_MAC) +@@ -47,8 +46,7 @@ void SafeArchiveAnalyzer::AnalyzeRarFile + AnalyzeRarFileCallback callback) { + DCHECK(rar_file.IsValid()); + ++ LOG(FATAL) << "AnalyzeRarFile is disabled in this build"; + safe_browsing::ArchiveAnalyzerResults results; +- safe_browsing::rar_analyzer::AnalyzeRarFile( +- std::move(rar_file), std::move(temporary_file), &results); + std::move(callback).Run(results); + } diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch new file mode 100644 index 0000000..d06e2aa --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0001-fix-building-without-safebrowsing.patch @@ -0,0 +1,1188 @@ +--- chrome/browser/BUILD.gn ++++ chrome/browser/BUILD.gn +@@ -3177,8 +3177,6 @@ static_library("browser") { + "download/download_commands.h", + "download/download_crx_util.cc", + "download/download_crx_util.h", +- "download/download_danger_prompt.cc", +- "download/download_danger_prompt.h", + "download/download_dir_policy_handler.cc", + "download/download_dir_policy_handler.h", + "download/download_dir_util.cc", +--- chrome/browser/browser_process.h ++++ chrome/browser/browser_process.h +@@ -46,10 +46,6 @@ class NetworkQualityTracker; + class SharedURLLoaderFactory; + } + +-namespace safe_browsing { +-class SafeBrowsingService; +-} +- + namespace subresource_filter { + class RulesetService; + } +@@ -211,9 +207,6 @@ class BrowserProcess { + // on this platform (or this is a unit test). + virtual StatusTray* status_tray() = 0; + +- // Returns the SafeBrowsing service. +- virtual safe_browsing::SafeBrowsingService* safe_browsing_service() = 0; +- + // Returns the service providing versioned storage for rules used by the Safe + // Browsing subresource filter. + virtual subresource_filter::RulesetService* +--- chrome/browser/browser_process_impl.cc ++++ chrome/browser/browser_process_impl.cc +@@ -69,7 +69,6 @@ + #include "chrome/browser/printing/print_preview_dialog_controller.h" + #include "chrome/browser/profiles/profile_manager.h" + #include "chrome/browser/resource_coordinator/resource_coordinator_parts.h" +-#include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "chrome/browser/shell_integration.h" + #include "chrome/browser/site_isolation/prefs_observer.h" + #include "chrome/browser/ssl/secure_origin_prefs_observer.h" +@@ -373,8 +372,6 @@ void BrowserProcessImpl::StartTearDown() + + metrics_services_manager_.reset(); + intranet_redirect_detector_.reset(); +- if (safe_browsing_service_.get()) +- safe_browsing_service()->ShutDown(); + network_time_tracker_.reset(); + #if BUILDFLAG(ENABLE_PLUGINS) + plugins_resource_service_.reset(); +@@ -981,14 +978,6 @@ StatusTray* BrowserProcessImpl::status_t + return status_tray_.get(); + } + +-safe_browsing::SafeBrowsingService* +-BrowserProcessImpl::safe_browsing_service() { +- DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +- if (!created_safe_browsing_service_) +- CreateSafeBrowsingService(); +- return safe_browsing_service_.get(); +-} +- + subresource_filter::RulesetService* + BrowserProcessImpl::subresource_filter_ruleset_service() { + DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); +@@ -1248,26 +1237,6 @@ void BrowserProcessImpl::CreateBackgroun + #endif + } + +-void BrowserProcessImpl::CreateSafeBrowsingService() { +- DCHECK(!safe_browsing_service_); +- // Set this flag to true so that we don't retry indefinitely to +- // create the service class if there was an error. +- created_safe_browsing_service_ = true; +- +- // The factory can be overridden in tests. +- if (!safe_browsing::SafeBrowsingServiceInterface::HasFactory()) { +- safe_browsing::SafeBrowsingServiceInterface::RegisterFactory( +- safe_browsing::GetSafeBrowsingServiceFactory()); +- } +- +- // TODO(crbug/925153): Port consumers of the |safe_browsing_service_| to use +- // the interface in components/safe_browsing, and remove this cast. +- safe_browsing_service_ = static_cast( +- safe_browsing::SafeBrowsingServiceInterface::CreateSafeBrowsingService()); +- if (safe_browsing_service_) +- safe_browsing_service_->Initialize(); +-} +- + void BrowserProcessImpl::CreateSubresourceFilterRulesetService() { + DCHECK(!subresource_filter_ruleset_service_); + created_subresource_filter_ruleset_service_ = true; +--- chrome/browser/browser_process_impl.h ++++ chrome/browser/browser_process_impl.h +@@ -167,7 +167,6 @@ class BrowserProcessImpl : public Browse + void set_background_mode_manager_for_test( + std::unique_ptr manager) override; + StatusTray* status_tray() override; +- safe_browsing::SafeBrowsingService* safe_browsing_service() override; + subresource_filter::RulesetService* subresource_filter_ruleset_service() + override; + federated_learning::FlocBlocklistService* floc_blocklist_service() override; +@@ -312,9 +311,6 @@ class BrowserProcessImpl : public Browse + std::unique_ptr background_mode_manager_; + #endif + +- bool created_safe_browsing_service_ = false; +- scoped_refptr safe_browsing_service_; +- + bool created_subresource_filter_ruleset_service_ = false; + std::unique_ptr + subresource_filter_ruleset_service_; +--- chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc ++++ chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc +@@ -65,7 +65,6 @@ + #include "chrome/browser/previews/previews_service.h" + #include "chrome/browser/previews/previews_service_factory.h" + #include "chrome/browser/profiles/profile.h" +-#include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "chrome/browser/translate/chrome_translate_client.h" + #include "chrome/browser/ui/find_bar/find_bar_state.h" + #include "chrome/browser/ui/find_bar/find_bar_state_factory.h" +@@ -701,36 +700,6 @@ void ChromeBrowsingDataRemoverDelegate:: + ContentSettingsType::CLIENT_HINTS, base::Time(), base::Time::Max(), + website_settings_filter); + +- // Clear the safebrowsing cookies only if time period is for "all time". It +- // doesn't make sense to apply the time period of deleting in the last X +- // hours/days to the safebrowsing cookies since they aren't the result of +- // any user action. +- if (IsForAllTime()) { +- safe_browsing::SafeBrowsingService* sb_service = +- g_browser_process->safe_browsing_service(); +- if (sb_service) { +- mojo::Remote cookie_manager; +- sb_service->GetNetworkContext(profile_)->GetCookieManager( +- cookie_manager.BindNewPipeAndPassReceiver()); +- +- network::mojom::CookieManager* manager_ptr = cookie_manager.get(); +- +- network::mojom::CookieDeletionFilterPtr deletion_filter = +- filter_builder->BuildCookieDeletionFilter(); +- if (!delete_begin_.is_null()) +- deletion_filter->created_after_time = delete_begin_; +- if (!delete_end_.is_null()) +- deletion_filter->created_before_time = delete_end_; +- +- manager_ptr->DeleteCookies( +- std::move(deletion_filter), +- base::BindOnce( +- &OnClearedCookies, +- CreateTaskCompletionClosure(TracingDataType::kCookies), +- std::move(cookie_manager))); +- } +- } +- + if (filter_builder->GetMode() == + BrowsingDataFilterBuilder::Mode::kPreserve) { + MediaDeviceIDSalt::Reset(profile_->GetPrefs()); +--- chrome/browser/chrome_content_browser_client.cc ++++ chrome/browser/chrome_content_browser_client.cc +@@ -873,30 +873,6 @@ void SetApplicationLocaleOnIOThread(cons + GetIOThreadApplicationLocale() = locale; + } + +-// An implementation of the SSLCertReporter interface used by +-// SSLErrorHandler. Uses CertificateReportingService to send reports. The +-// service handles queueing and re-sending of failed reports. Each certificate +-// error creates a new instance of this class. +-class CertificateReportingServiceCertReporter : public SSLCertReporter { +- public: +- explicit CertificateReportingServiceCertReporter( +- content::WebContents* web_contents) +- : service_(CertificateReportingServiceFactory::GetForBrowserContext( +- web_contents->GetBrowserContext())) {} +- ~CertificateReportingServiceCertReporter() override {} +- +- // SSLCertReporter implementation +- void ReportInvalidCertificateChain( +- const std::string& serialized_report) override { +- service_->Send(serialized_report); +- } +- +- private: +- CertificateReportingService* service_; +- +- DISALLOW_COPY_AND_ASSIGN(CertificateReportingServiceCertReporter); +-}; +- + #if BUILDFLAG(ENABLE_EXTENSIONS) + + AppLoadedInTabSource ClassifyAppLoadedInTabSource( +@@ -1414,7 +1390,6 @@ void ChromeContentBrowserClient::PostAft + InitNetworkContextsParentDirectory(); + + DCHECK_CURRENTLY_ON(BrowserThread::UI); +- safe_browsing_service_ = g_browser_process->safe_browsing_service(); + } + + bool ChromeContentBrowserClient::IsBrowserStartupComplete() { +@@ -4077,7 +4052,7 @@ ChromeContentBrowserClient::CreateThrott + base::BindRepeating(&MaybeTriggerSecurityInterstitialShownEvent)); + throttles.push_back(std::make_unique( + handle, +- std::make_unique(web_contents), ++ nullptr, + base::BindOnce(&HandleSSLErrorWrapper), base::BindOnce(&IsInHostedApp))); + + throttles.push_back(std::make_unique(handle)); +@@ -4095,9 +4070,6 @@ ChromeContentBrowserClient::CreateThrott + + #endif + +- throttles.push_back( +- std::make_unique(handle)); +- + if (base::FeatureList::IsEnabled(safe_browsing::kDelayedWarnings)) { + throttles.push_back( + std::make_unique( +--- chrome/browser/component_updater/file_type_policies_component_installer.cc ++++ chrome/browser/component_updater/file_type_policies_component_installer.cc +@@ -39,20 +39,6 @@ const uint8_t kFileTypePoliciesPublicKey + const char kFileTypePoliciesManifestName[] = "File Type Policies"; + + void LoadFileTypesFromDisk(const base::FilePath& pb_path) { +- if (pb_path.empty()) +- return; +- +- VLOG(1) << "Reading Download File Types from file: " << pb_path.value(); +- std::string binary_pb; +- if (!base::ReadFileToString(pb_path, &binary_pb)) { +- // The file won't exist on new installations, so this is not always an +- // error. +- VLOG(1) << "Failed reading from " << pb_path.value(); +- return; +- } +- +- safe_browsing::FileTypePolicies::GetInstance()->PopulateFromDynamicUpdate( +- binary_pb); + } + + } // namespace +--- chrome/browser/download/chrome_download_manager_delegate.cc ++++ chrome/browser/download/chrome_download_manager_delegate.cc +@@ -372,13 +372,6 @@ ChromeDownloadManagerDelegate::~ChromeDo + + void ChromeDownloadManagerDelegate::SetDownloadManager(DownloadManager* dm) { + download_manager_ = dm; +- +- safe_browsing::SafeBrowsingService* sb_service = +- g_browser_process->safe_browsing_service(); +- if (sb_service && !profile_->IsOffTheRecord()) { +- // Include this download manager in the set monitored by safe browsing. +- sb_service->AddDownloadManager(dm); +- } + } + + #if defined(OS_ANDROID) +@@ -715,16 +708,6 @@ void ChromeDownloadManagerDelegate::Choo + + void ChromeDownloadManagerDelegate::SanitizeSavePackageResourceName( + base::FilePath* filename) { +- safe_browsing::FileTypePolicies* file_type_policies = +- safe_browsing::FileTypePolicies::GetInstance(); +- +- if (file_type_policies->GetFileDangerLevel(*filename) == +- safe_browsing::DownloadFileType::NOT_DANGEROUS) +- return; +- +- base::FilePath default_filename = base::FilePath::FromUTF8Unsafe( +- l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME)); +- *filename = filename->AddExtension(default_filename.BaseName().value()); + } + + void ChromeDownloadManagerDelegate::SanitizeDownloadParameters( +--- chrome/browser/download/download_item_model.cc ++++ chrome/browser/download/download_item_model.cc +@@ -81,7 +81,7 @@ class DownloadItemModelData : public bas + + // Danger level of the file determined based on the file type and whether + // there was a user action associated with the download. +- DownloadFileType::DangerLevel danger_level_; ++ safe_browsing::DownloadFileType::DangerLevel danger_level_; + + // Whether the download is currently being revived. + bool is_being_revived_; +@@ -118,7 +118,7 @@ DownloadItemModelData::DownloadItemModel + : should_show_in_shelf_(true), + was_ui_notified_(false), + should_prefer_opening_in_browser_(false), +- danger_level_(DownloadFileType::NOT_DANGEROUS), ++ danger_level_(safe_browsing::DownloadFileType::NOT_DANGEROUS), + is_being_revived_(false) {} + + } // namespace +@@ -372,13 +372,13 @@ void DownloadItemModel::SetShouldPreferO + data->should_prefer_opening_in_browser_ = preference; + } + +-DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { ++safe_browsing::DownloadFileType::DangerLevel DownloadItemModel::GetDangerLevel() const { + const DownloadItemModelData* data = DownloadItemModelData::Get(download_); +- return data ? data->danger_level_ : DownloadFileType::NOT_DANGEROUS; ++ return data ? data->danger_level_ : safe_browsing::DownloadFileType::NOT_DANGEROUS; + } + + void DownloadItemModel::SetDangerLevel( +- DownloadFileType::DangerLevel danger_level) { ++ safe_browsing::DownloadFileType::DangerLevel danger_level) { + DownloadItemModelData* data = DownloadItemModelData::GetOrCreate(download_); + data->danger_level_ = danger_level; + } +@@ -539,9 +539,6 @@ bool DownloadItemModel::IsCommandEnabled + // filename. Don't base an "Always open" decision based on it. Also + // exclude extensions. + return download_->CanOpenDownload() && +- safe_browsing::FileTypePolicies::GetInstance() +- ->IsAllowedToOpenAutomatically( +- download_->GetTargetFilePath()) && + !download_crx_util::IsExtensionDownload(*download_); + case DownloadCommands::PAUSE: + return !download_->IsSavePackageDownload() && +--- chrome/browser/download/download_prefs.cc ++++ chrome/browser/download/download_prefs.cc +@@ -265,14 +265,7 @@ DownloadPrefs::DownloadPrefs(Profile* pr + base::FilePath::StringType(1, base::FilePath::kExtensionSeparator) + + extension); + +- // Note that the list of file types that are not allowed to open +- // automatically can change in the future. When the list is tightened, it is +- // expected that some entries in the users' auto open list will get dropped +- // permanently as a result. +- if (FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( +- filename_with_extension)) { +- auto_open_by_user_.insert(extension); +- } ++ auto_open_by_user_.insert(extension); + } + } + +@@ -461,10 +454,6 @@ bool DownloadPrefs::IsAutoOpenByPolicy(c + bool DownloadPrefs::EnableAutoOpenByUserBasedOnExtension( + const base::FilePath& file_name) { + base::FilePath::StringType extension = file_name.Extension(); +- if (!FileTypePolicies::GetInstance()->IsAllowedToOpenAutomatically( +- file_name)) { +- return false; +- } + + DCHECK(extension[0] == base::FilePath::kExtensionSeparator); + extension.erase(0, 1); +--- chrome/browser/download/download_target_determiner.cc ++++ chrome/browser/download/download_target_determiner.cc +@@ -292,13 +292,6 @@ base::FilePath DownloadTargetDeterminer: + download_->GetURL(), download_->GetContentDisposition(), referrer_charset, + suggested_filename, sniffed_mime_type, default_filename); + +- // We don't replace the file extension if safe browsing consider the file +- // extension to be unsafe. Just let safe browsing scan the generated file. +- if (safe_browsing::FileTypePolicies::GetInstance()->IsCheckedBinaryFile( +- generated_filename)) { +- return generated_filename; +- } +- + // If no mime type or explicitly specified a name, don't replace file + // extension. + if (sniffed_mime_type.empty() || !suggested_filename.empty()) +@@ -1090,29 +1083,7 @@ DownloadFileType::DangerLevel DownloadTa + download_->HasUserGesture()) + return DownloadFileType::NOT_DANGEROUS; + +- DownloadFileType::DangerLevel danger_level = +- safe_browsing::FileTypePolicies::GetInstance()->GetFileDangerLevel( +- virtual_path_.BaseName()); +- +- // A danger level of ALLOW_ON_USER_GESTURE is used to label potentially +- // dangerous file types that have a high frequency of legitimate use. We would +- // like to avoid prompting for the legitimate cases as much as possible. To +- // that end, we consider a download to be legitimate if one of the following +- // is true, and avoid prompting: +- // +- // * The user navigated to the download URL via the omnibox (either by typing +- // the URL, pasting it, or using search). +- // +- // * The navigation that initiated the download has a user gesture associated +- // with it AND the user the user is familiar with the referring origin. A +- // user is considered familiar with a referring origin if a visit for a page +- // from the same origin was recorded on the previous day or earlier. +- if (danger_level == DownloadFileType::ALLOW_ON_USER_GESTURE && +- ((download_->GetTransitionType() & +- ui::PAGE_TRANSITION_FROM_ADDRESS_BAR) != 0 || +- (download_->HasUserGesture() && visits == VISITED_REFERRER))) +- return DownloadFileType::NOT_DANGEROUS; +- return danger_level; ++ return DownloadFileType::NOT_DANGEROUS; + } + + void DownloadTargetDeterminer::OnDownloadDestroyed( +--- chrome/browser/extensions/api/downloads/downloads_api.cc ++++ chrome/browser/extensions/api/downloads/downloads_api.cc +@@ -38,7 +38,6 @@ + #include "chrome/browser/browser_process.h" + #include "chrome/browser/download/download_core_service.h" + #include "chrome/browser/download/download_core_service_factory.h" +-#include "chrome/browser/download/download_danger_prompt.h" + #include "chrome/browser/download/download_file_icon_extractor.h" + #include "chrome/browser/download/download_open_prompt.h" + #include "chrome/browser/download/download_prefs.h" +@@ -1331,9 +1330,6 @@ DownloadsAcceptDangerFunction::Downloads + + DownloadsAcceptDangerFunction::~DownloadsAcceptDangerFunction() {} + +-DownloadsAcceptDangerFunction::OnPromptCreatedCallback* +- DownloadsAcceptDangerFunction::on_prompt_created_ = NULL; +- + ExtensionFunction::ResponseAction DownloadsAcceptDangerFunction::Run() { + std::unique_ptr params( + downloads::AcceptDanger::Params::Create(*args_)); +@@ -1371,43 +1367,7 @@ void DownloadsAcceptDangerFunction::Prom + return; + } + RecordApiFunctions(DOWNLOADS_FUNCTION_ACCEPT_DANGER); +- // DownloadDangerPrompt displays a modal dialog using native widgets that the +- // user must either accept or cancel. It cannot be scripted. +- DownloadDangerPrompt* prompt = DownloadDangerPrompt::Create( +- download_item, +- web_contents, +- true, +- base::Bind(&DownloadsAcceptDangerFunction::DangerPromptCallback, +- this, download_id)); +- // DownloadDangerPrompt deletes itself +- if (on_prompt_created_ && !on_prompt_created_->is_null()) +- on_prompt_created_->Run(prompt); +- // Function finishes in DangerPromptCallback(). +-} +- +-void DownloadsAcceptDangerFunction::DangerPromptCallback( +- int download_id, DownloadDangerPrompt::Action action) { +- DCHECK_CURRENTLY_ON(BrowserThread::UI); +- DownloadItem* download_item = GetDownload( +- browser_context(), include_incognito_information(), download_id); +- std::string error; +- if (InvalidId(download_item, &error) || +- Fault(download_item->GetState() != DownloadItem::IN_PROGRESS, +- download_extension_errors::kNotInProgress, &error)) { +- Respond(Error(std::move(error))); +- return; +- } +- switch (action) { +- case DownloadDangerPrompt::ACCEPT: +- download_item->ValidateDangerousDownload(); +- break; +- case DownloadDangerPrompt::CANCEL: +- download_item->Remove(); +- break; +- case DownloadDangerPrompt::DISMISS: +- break; +- } +- Respond(NoArguments()); ++ download_item->ValidateDangerousDownload(); + } + + DownloadsShowFunction::DownloadsShowFunction() {} +--- chrome/browser/extensions/api/downloads/downloads_api.h ++++ chrome/browser/extensions/api/downloads/downloads_api.h +@@ -13,7 +13,6 @@ + #include "base/macros.h" + #include "base/scoped_observer.h" + #include "base/time/time.h" +-#include "chrome/browser/download/download_danger_prompt.h" + #include "chrome/common/extensions/api/downloads.h" + #include "components/download/content/public/all_download_item_notifier.h" + #include "components/download/public/common/download_path_reservation_tracker.h" +@@ -187,25 +186,16 @@ class DownloadsRemoveFileFunction : publ + + class DownloadsAcceptDangerFunction : public ExtensionFunction { + public: +- typedef base::Callback OnPromptCreatedCallback; +- static void OnPromptCreatedForTesting( +- OnPromptCreatedCallback* callback) { +- on_prompt_created_ = callback; +- } +- + DECLARE_EXTENSION_FUNCTION("downloads.acceptDanger", DOWNLOADS_ACCEPTDANGER) + DownloadsAcceptDangerFunction(); + ResponseAction Run() override; + + protected: + ~DownloadsAcceptDangerFunction() override; +- void DangerPromptCallback(int download_id, +- DownloadDangerPrompt::Action action); + + private: + void PromptOrWait(int download_id, int retries); + +- static OnPromptCreatedCallback* on_prompt_created_; + DISALLOW_COPY_AND_ASSIGN(DownloadsAcceptDangerFunction); + }; + +--- chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc ++++ chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc +@@ -52,37 +52,7 @@ SafeBrowsingPrivateGetReferrerChainFunct + base::StringPrintf("Could not find tab with id %d.", params->tab_id))); + } + +- Profile* profile = Profile::FromBrowserContext(browser_context()); +- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) +- return RespondNow(NoArguments()); +- +- scoped_refptr +- navigation_observer_manager = g_browser_process->safe_browsing_service() +- ->navigation_observer_manager(); +- +- safe_browsing::ReferrerChain referrer_chain; +- SafeBrowsingNavigationObserverManager::AttributionResult result = +- navigation_observer_manager->IdentifyReferrerChainByWebContents( +- contents, kReferrerUserGestureLimit, &referrer_chain); +- +- // If the referrer chain is incomplete we'll append the most recent +- // navigations to referrer chain for diagnostic purposes. This only happens if +- // the user is not in incognito mode and has opted into extended reporting or +- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0. +- int recent_navigations_to_collect = +- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend( +- *profile, result); +- if (recent_navigations_to_collect > 0) { +- navigation_observer_manager->AppendRecentNavigations( +- recent_navigations_to_collect, &referrer_chain); +- } +- + std::vector referrer_entries; +- referrer_entries.reserve(referrer_chain.size()); +- for (const auto& entry : referrer_chain) { +- referrer_entries.emplace_back( +- safe_browsing_util::ReferrerToReferrerChainEntry(entry)); +- } + return RespondNow(ArgumentList( + api::safe_browsing_private::GetReferrerChain::Results::Create( + referrer_entries))); +--- chrome/browser/extensions/api/webstore_private/webstore_private_api.cc ++++ chrome/browser/extensions/api/webstore_private/webstore_private_api.cc +@@ -1035,51 +1035,9 @@ WebstorePrivateGetReferrerChainFunction: + + ExtensionFunction::ResponseAction + WebstorePrivateGetReferrerChainFunction::Run() { +- Profile* profile = chrome_details_.GetProfile(); +- if (!SafeBrowsingNavigationObserverManager::IsEnabledAndReady(profile)) +- return RespondNow(ArgumentList( +- api::webstore_private::GetReferrerChain::Results::Create(""))); +- +- content::WebContents* web_contents = GetSenderWebContents(); +- if (!web_contents) { +- return RespondNow(ErrorWithArguments( +- api::webstore_private::GetReferrerChain::Results::Create(""), +- kWebstoreUserCancelledError)); +- } +- +- scoped_refptr +- navigation_observer_manager = g_browser_process->safe_browsing_service() +- ->navigation_observer_manager(); +- +- safe_browsing::ReferrerChain referrer_chain; +- SafeBrowsingNavigationObserverManager::AttributionResult result = +- navigation_observer_manager->IdentifyReferrerChainByWebContents( +- web_contents, kExtensionReferrerUserGestureLimit, &referrer_chain); +- +- // If the referrer chain is incomplete we'll append the most recent +- // navigations to referrer chain for diagnostic purposes. This only happens if +- // the user is not in incognito mode and has opted into extended reporting or +- // Scout reporting. Otherwise, |CountOfRecentNavigationsToAppend| returns 0. +- int recent_navigations_to_collect = +- SafeBrowsingNavigationObserverManager::CountOfRecentNavigationsToAppend( +- *profile, result); +- if (recent_navigations_to_collect > 0) { +- navigation_observer_manager->AppendRecentNavigations( +- recent_navigations_to_collect, &referrer_chain); +- } +- +- safe_browsing::ExtensionWebStoreInstallRequest request; +- request.mutable_referrer_chain()->Swap(&referrer_chain); +- request.mutable_referrer_chain_options()->set_recent_navigations_to_collect( +- recent_navigations_to_collect); +- +- std::string serialized_referrer_proto = request.SerializeAsString(); +- // Base64 encode the proto to avoid issues with base::Value rejecting strings +- // which are not valid UTF8. +- base::Base64Encode(serialized_referrer_proto, &serialized_referrer_proto); + return RespondNow( + ArgumentList(api::webstore_private::GetReferrerChain::Results::Create( +- serialized_referrer_proto))); ++ ""))); + } + + WebstorePrivateGetExtensionStatusFunction:: +--- chrome/browser/extensions/blocklist_state_fetcher.cc ++++ chrome/browser/extensions/blocklist_state_fetcher.cc +@@ -32,33 +32,8 @@ BlocklistStateFetcher::~BlocklistStateFe + void BlocklistStateFetcher::Request(const std::string& id, + const RequestCallback& callback) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); +- if (!safe_browsing_config_) { +- if (g_browser_process && g_browser_process->safe_browsing_service()) { +- SetSafeBrowsingConfig( +- g_browser_process->safe_browsing_service()->GetV4ProtocolConfig()); +- } else { +- base::ThreadTaskRunnerHandle::Get()->PostTask( +- FROM_HERE, base::BindOnce(callback, BLOCKLISTED_UNKNOWN)); +- return; +- } +- } +- +- bool request_already_sent = base::Contains(callbacks_, id); +- callbacks_.insert(std::make_pair(id, callback)); +- if (request_already_sent) +- return; +- +- if (g_browser_process && g_browser_process->safe_browsing_service()) { +- if (base::FeatureList::IsEnabled( +- safe_browsing::kSafeBrowsingRemoveCookies)) { +- url_loader_factory_ = g_browser_process->shared_url_loader_factory(); +- } else { +- url_loader_factory_ = +- g_browser_process->safe_browsing_service()->GetURLLoaderFactory(); +- } +- } +- +- SendRequest(id); ++ base::ThreadTaskRunnerHandle::Get()->PostTask( ++ FROM_HERE, base::BindOnce(callback, BLOCKLISTED_UNKNOWN)); + } + + void BlocklistStateFetcher::SendRequest(const std::string& id) { +@@ -69,8 +44,7 @@ void BlocklistStateFetcher::SendRequest( + std::string request_str; + request.SerializeToString(&request_str); + +- GURL request_url = GURL(safe_browsing::GetReportUrl( +- *safe_browsing_config_, "clientreport/crx-list-info")); ++ GURL request_url = GURL(); + net::NetworkTrafficAnnotationTag traffic_annotation = + net::DefineNetworkTrafficAnnotation("extension_blacklist", R"( + semantics { +@@ -120,12 +94,6 @@ void BlocklistStateFetcher::SendRequest( + base::Unretained(this), fetcher)); + } + +-void BlocklistStateFetcher::SetSafeBrowsingConfig( +- const safe_browsing::V4ProtocolConfig& config) { +- safe_browsing_config_ = +- std::make_unique(config); +-} +- + void BlocklistStateFetcher::OnURLLoaderComplete( + network::SimpleURLLoader* url_loader, + std::unique_ptr response_body) { +--- chrome/browser/extensions/blocklist_state_fetcher.h ++++ chrome/browser/extensions/blocklist_state_fetcher.h +@@ -34,8 +34,6 @@ class BlocklistStateFetcher { + + virtual void Request(const std::string& id, const RequestCallback& callback); + +- void SetSafeBrowsingConfig(const safe_browsing::V4ProtocolConfig& config); +- + protected: + void OnURLLoaderComplete(network::SimpleURLLoader* url_loader, + std::unique_ptr response_body); +@@ -54,7 +52,6 @@ class BlocklistStateFetcher { + + void SendRequest(const std::string& id); + +- std::unique_ptr safe_browsing_config_; + scoped_refptr url_loader_factory_; + + // SimpleURLLoader -> (owned loader, extension id). +--- chrome/browser/metrics/chrome_metrics_service_client.cc ++++ chrome/browser/metrics/chrome_metrics_service_client.cc +@@ -755,9 +755,6 @@ void ChromeMetricsServiceClient::Registe + metrics_service_->RegisterMetricsProvider( + std::make_unique()); + +- metrics_service_->RegisterMetricsProvider( +- std::make_unique()); +- + #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) + metrics_service_->RegisterMetricsProvider( + std::make_unique()); +--- chrome/browser/net/trial_comparison_cert_verifier_controller.cc ++++ chrome/browser/net/trial_comparison_cert_verifier_controller.cc +@@ -131,9 +131,6 @@ void TrialComparisonCertVerifierControll + std::string serialized_report; + if (!report.Serialize(&serialized_report)) + return; +- +- CertificateReportingServiceFactory::GetForBrowserContext(profile_)->Send( +- serialized_report); + } + + // static +--- chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc ++++ chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc +@@ -242,7 +242,6 @@ void ChromeBrowserMainExtraPartsProfiles + #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) + CaptivePortalServiceFactory::GetInstance(); + #endif +- CertificateReportingServiceFactory::GetInstance(); + ChromeBrowsingDataRemoverDelegateFactory::GetInstance(); + ChromeSigninClientFactory::GetInstance(); + ClientHintsFactory::GetInstance(); +--- chrome/browser/profiles/profile_impl.cc ++++ chrome/browser/profiles/profile_impl.cc +@@ -94,7 +94,6 @@ + #include "chrome/browser/profiles/profile_metrics.h" + #include "chrome/browser/push_messaging/push_messaging_service_factory.h" + #include "chrome/browser/push_messaging/push_messaging_service_impl.h" +-#include "chrome/browser/safe_browsing/safe_browsing_service.h" + #include "chrome/browser/sharing/sharing_service_factory.h" + #include "chrome/browser/signin/identity_manager_factory.h" + #include "chrome/browser/signin/signin_ui_util.h" +@@ -591,17 +590,6 @@ void ProfileImpl::LoadPrefsForNormalStar + + mojo::PendingRemote + pref_validation_delegate; +- scoped_refptr safe_browsing_service( +- g_browser_process->safe_browsing_service()); +- if (safe_browsing_service.get()) { +- auto pref_validation_delegate_impl = +- safe_browsing_service->CreatePreferenceValidationDelegate(this); +- if (pref_validation_delegate_impl) { +- mojo::MakeSelfOwnedReceiver( +- std::move(pref_validation_delegate_impl), +- pref_validation_delegate.InitWithNewPipeAndPassReceiver()); +- } +- } + + prefs_ = + CreatePrefService(pref_registry_, CreateExtensionPrefStore(this, false), +--- chrome/browser/profiles/profiles_state.cc ++++ chrome/browser/profiles/profiles_state.cc +@@ -219,9 +219,6 @@ void RemoveBrowsingDataForProfile(const + // The BrowsingDataRemover relies on many objects that aren't created in unit + // tests. Previously this code would depend on content::ResourceDispatcherHost + // but that's gone, so do a similar hack for now. +- if (!g_browser_process->safe_browsing_service()) +- return; +- + Profile* profile = g_browser_process->profile_manager()->GetProfileByPath( + profile_path); + if (!profile) +--- chrome/browser/safe_browsing/BUILD.gn ++++ chrome/browser/safe_browsing/BUILD.gn +@@ -6,6 +6,7 @@ import("//components/safe_browsing/build + import("//extensions/buildflags/buildflags.gni") + + static_library("safe_browsing") { ++ if (false) { + sources = [ + "chrome_controller_client.cc", + "chrome_controller_client.h", +@@ -62,6 +63,7 @@ static_library("safe_browsing") { + ] + deps += [ "//extensions/browser" ] + } ++ } + + if (safe_browsing_mode != 0) { + # "Safe Browsing Basic" files used for safe browsing in full mode +--- chrome/browser/ssl/security_state_tab_helper.cc ++++ chrome/browser/ssl/security_state_tab_helper.cc +@@ -274,92 +274,6 @@ bool SecurityStateTabHelper::UsedPolicyI + + security_state::MaliciousContentStatus + SecurityStateTabHelper::GetMaliciousContentStatus() const { +- content::NavigationEntry* entry = +- web_contents()->GetController().GetVisibleEntry(); +- if (!entry) +- return security_state::MALICIOUS_CONTENT_STATUS_NONE; +- safe_browsing::SafeBrowsingService* sb_service = +- g_browser_process->safe_browsing_service(); +- if (!sb_service) +- return security_state::MALICIOUS_CONTENT_STATUS_NONE; +- scoped_refptr sb_ui_manager = sb_service->ui_manager(); +- safe_browsing::SBThreatType threat_type; +- if (sb_ui_manager->IsUrlWhitelistedOrPendingForWebContents( +- entry->GetURL(), false, entry, web_contents(), false, &threat_type)) { +- switch (threat_type) { +- case safe_browsing::SB_THREAT_TYPE_UNUSED: +- case safe_browsing::SB_THREAT_TYPE_SAFE: +- case safe_browsing::SB_THREAT_TYPE_URL_PHISHING: +- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING: +- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; +- case safe_browsing::SB_THREAT_TYPE_URL_MALWARE: +- case safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE: +- return security_state::MALICIOUS_CONTENT_STATUS_MALWARE; +- case safe_browsing::SB_THREAT_TYPE_URL_UNWANTED: +- return security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE; +- case safe_browsing::SB_THREAT_TYPE_SAVED_PASSWORD_REUSE: +-#if BUILDFLAG(FULL_SAFE_BROWSING) +- return security_state::MALICIOUS_CONTENT_STATUS_SAVED_PASSWORD_REUSE; +-#endif +- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_SYNC_PASSWORD_REUSE: +-#if BUILDFLAG(FULL_SAFE_BROWSING) +- if (safe_browsing::ChromePasswordProtectionService:: +- ShouldShowPasswordReusePageInfoBubble( +- web_contents(), PasswordType::PRIMARY_ACCOUNT_PASSWORD)) { +- return security_state:: +- MALICIOUS_CONTENT_STATUS_SIGNED_IN_SYNC_PASSWORD_REUSE; +- } +- // If user has already changed Gaia password, returns the regular +- // social engineering content status. +- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; +-#endif +- case safe_browsing::SB_THREAT_TYPE_SIGNED_IN_NON_SYNC_PASSWORD_REUSE: +-#if BUILDFLAG(FULL_SAFE_BROWSING) +- if (safe_browsing::ChromePasswordProtectionService:: +- ShouldShowPasswordReusePageInfoBubble( +- web_contents(), PasswordType::OTHER_GAIA_PASSWORD)) { +- return security_state:: +- MALICIOUS_CONTENT_STATUS_SIGNED_IN_NON_SYNC_PASSWORD_REUSE; +- } +- // If user has already changed Gaia password, returns the regular +- // social engineering content status. +- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; +-#endif +- case safe_browsing::SB_THREAT_TYPE_ENTERPRISE_PASSWORD_REUSE: +-#if BUILDFLAG(FULL_SAFE_BROWSING) +- if (safe_browsing::ChromePasswordProtectionService:: +- ShouldShowPasswordReusePageInfoBubble( +- web_contents(), PasswordType::ENTERPRISE_PASSWORD)) { +- return security_state:: +- MALICIOUS_CONTENT_STATUS_ENTERPRISE_PASSWORD_REUSE; +- } +- // If user has already changed Gaia password, returns the regular +- // social engineering content status. +- return security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING; +-#endif +- case safe_browsing::SB_THREAT_TYPE_BILLING: +- return security_state::MALICIOUS_CONTENT_STATUS_BILLING; +- case safe_browsing:: +- DEPRECATED_SB_THREAT_TYPE_URL_PASSWORD_PROTECTION_PHISHING: +- case safe_browsing::SB_THREAT_TYPE_URL_BINARY_MALWARE: +- case safe_browsing::SB_THREAT_TYPE_EXTENSION: +- case safe_browsing::SB_THREAT_TYPE_BLACKLISTED_RESOURCE: +- case safe_browsing::SB_THREAT_TYPE_API_ABUSE: +- case safe_browsing::SB_THREAT_TYPE_SUBRESOURCE_FILTER: +- case safe_browsing::SB_THREAT_TYPE_CSD_WHITELIST: +- case safe_browsing::SB_THREAT_TYPE_AD_SAMPLE: +- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_POPUP: +- case safe_browsing::SB_THREAT_TYPE_BLOCKED_AD_REDIRECT: +- case safe_browsing::SB_THREAT_TYPE_SUSPICIOUS_SITE: +- case safe_browsing::SB_THREAT_TYPE_APK_DOWNLOAD: +- case safe_browsing::SB_THREAT_TYPE_HIGH_CONFIDENCE_ALLOWLIST: +- // These threat types are not currently associated with +- // interstitials, and thus resources with these threat types are +- // not ever whitelisted or pending whitelisting. +- NOTREACHED(); +- break; +- } +- } + return security_state::MALICIOUS_CONTENT_STATUS_NONE; + } + +--- chrome/browser/subresource_filter/chrome_subresource_filter_client.cc ++++ chrome/browser/subresource_filter/chrome_subresource_filter_client.cc +@@ -69,18 +69,6 @@ void ChromeSubresourceFilterClient::DidS + void ChromeSubresourceFilterClient::MaybeAppendNavigationThrottles( + content::NavigationHandle* navigation_handle, + std::vector>* throttles) { +- safe_browsing::SafeBrowsingService* safe_browsing_service = +- g_browser_process->safe_browsing_service(); +- if (navigation_handle->IsInMainFrame() && safe_browsing_service) { +- throttles->push_back( +- std::make_unique( +- navigation_handle, this, content::GetIOThreadTaskRunner({}), +- safe_browsing_service->database_manager())); +- } +- +- throttle_manager_->MaybeAppendNavigationThrottles(navigation_handle, +- throttles); + } + + void ChromeSubresourceFilterClient::OnReloadRequested() { +--- chrome/browser/ui/BUILD.gn ++++ chrome/browser/ui/BUILD.gn +@@ -3383,7 +3383,6 @@ static_library("ui") { + "views/device_chooser_content_view.h", + "views/devtools_process_observer.cc", + "views/devtools_process_observer.h", +- "views/download/download_danger_prompt_views.cc", + "views/download/download_in_progress_dialog_view.cc", + "views/download/download_in_progress_dialog_view.h", + "views/download/download_item_view.cc", +--- chrome/browser/ui/tab_helpers.cc ++++ chrome/browser/ui/tab_helpers.cc +@@ -307,10 +307,6 @@ void TabHelpers::AttachTabHelpers(WebCon + resource_coordinator::ResourceCoordinatorTabHelper::CreateForWebContents( + web_contents); + ResourceLoadingHintsWebContentsObserver::CreateForWebContents(web_contents); +- safe_browsing::SafeBrowsingNavigationObserver::MaybeCreateForWebContents( +- web_contents); +- safe_browsing::TriggerCreator::MaybeCreateTriggersForWebContents( +- profile, web_contents); + ReputationWebContentsObserver::CreateForWebContents(web_contents); + SearchEngineTabHelper::CreateForWebContents(web_contents); + SecurityStateTabHelper::CreateForWebContents(web_contents); +@@ -374,7 +370,6 @@ void TabHelpers::AttachTabHelpers(WebCon + pdf::PDFWebContentsHelper::CreateForWebContentsWithClient( + web_contents, std::make_unique()); + SadTabHelper::CreateForWebContents(web_contents); +- safe_browsing::SafeBrowsingTabObserver::CreateForWebContents(web_contents); + SearchTabHelper::CreateForWebContents(web_contents); + if (base::FeatureList::IsEnabled( + switches::kSyncSupportTrustedVaultPassphrase)) { +--- chrome/browser/ui/webui/downloads/downloads_dom_handler.cc ++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.cc +@@ -23,7 +23,6 @@ + #include "base/threading/thread.h" + #include "base/values.h" + #include "chrome/browser/browser_process.h" +-#include "chrome/browser/download/download_danger_prompt.h" + #include "chrome/browser/download/download_history.h" + #include "chrome/browser/download/download_item_model.h" + #include "chrome/browser/download/download_prefs.h" +@@ -168,9 +167,6 @@ void DownloadsDOMHandler::SaveDangerousR + } + + CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); +- download::DownloadItem* file = GetDownloadByStringId(id); +- if (file) +- ShowDangerPrompt(file); + } + + void DownloadsDOMHandler::DiscardDangerous(const std::string& id) { +@@ -317,12 +313,6 @@ void DownloadsDOMHandler::RemoveDownload + IdSet ids; + + for (auto* download : to_remove) { +- if (download->IsDangerous() || download->IsMixedContent()) { +- // Don't allow users to revive dangerous downloads; just nuke 'em. +- download->Remove(); +- continue; +- } +- + DownloadItemModel item_model(download); + if (!item_model.ShouldShowInShelf() || + download->GetState() == download::DownloadItem::IN_PROGRESS) { +@@ -396,44 +386,6 @@ void DownloadsDOMHandler::FinalizeRemova + } + } + +-void DownloadsDOMHandler::ShowDangerPrompt( +- download::DownloadItem* dangerous_item) { +- DownloadDangerPrompt* danger_prompt = DownloadDangerPrompt::Create( +- dangerous_item, GetWebUIWebContents(), false, +- base::Bind(&DownloadsDOMHandler::DangerPromptDone, +- weak_ptr_factory_.GetWeakPtr(), dangerous_item->GetId())); +- // danger_prompt will delete itself. +- DCHECK(danger_prompt); +-} +- +-void DownloadsDOMHandler::DangerPromptDone( +- int download_id, +- DownloadDangerPrompt::Action action) { +- if (action != DownloadDangerPrompt::ACCEPT) +- return; +- download::DownloadItem* item = NULL; +- if (GetMainNotifierManager()) +- item = GetMainNotifierManager()->GetDownload(download_id); +- if (!item && GetOriginalNotifierManager()) +- item = GetOriginalNotifierManager()->GetDownload(download_id); +- if (!item || item->IsDone()) +- return; +- CountDownloadsDOMEvents(DOWNLOADS_DOM_EVENT_SAVE_DANGEROUS); +- +- // If a download is mixed content, validate that first. Is most cases, mixed +- // content warnings will occur first, but in the worst case scenario, we show +- // a dangerous warning twice. That's better than showing a mixed content +- // warning, then dismissing the dangerous download warning. Since mixed +- // content downloads triggering the UI are temporary and rare to begin with, +- // this should very rarely occur. +- if (item->IsMixedContent()) { +- item->ValidateMixedContentDownload(); +- return; +- } +- +- item->ValidateDangerousDownload(); +-} +- + bool DownloadsDOMHandler::IsDeletingHistoryAllowed() { + content::DownloadManager* manager = GetMainNotifierManager(); + return manager && +--- chrome/browser/ui/webui/downloads/downloads_dom_handler.h ++++ chrome/browser/ui/webui/downloads/downloads_dom_handler.h +@@ -12,7 +12,6 @@ + + #include "base/macros.h" + #include "base/memory/weak_ptr.h" +-#include "chrome/browser/download/download_danger_prompt.h" + #include "chrome/browser/ui/webui/downloads/downloads.mojom-forward.h" + #include "chrome/browser/ui/webui/downloads/downloads_list_tracker.h" + #include "content/public/browser/web_contents_observer.h" +@@ -89,18 +88,6 @@ class DownloadsDOMHandler : public conte + // null-checking |original_notifier_|. + content::DownloadManager* GetOriginalNotifierManager() const; + +- // Displays a native prompt asking the user for confirmation after accepting +- // the dangerous download specified by |dangerous|. The function returns +- // immediately, and will invoke DangerPromptAccepted() asynchronously if the +- // user accepts the dangerous download. The native prompt will observe +- // |dangerous| until either the dialog is dismissed or |dangerous| is no +- // longer an in-progress dangerous download. +- virtual void ShowDangerPrompt(download::DownloadItem* dangerous); +- +- // Conveys danger acceptance from the DownloadDangerPrompt to the +- // DownloadItem. +- void DangerPromptDone(int download_id, DownloadDangerPrompt::Action action); +- + // Returns true if the records of any downloaded items are allowed (and able) + // to be deleted. + bool IsDeletingHistoryAllowed(); +--- chrome/browser/ui/webui/interstitials/interstitial_ui.cc ++++ chrome/browser/ui/webui/interstitials/interstitial_ui.cc +@@ -287,113 +287,6 @@ CreateInsecureFormPage(content::WebConte + request_url)); + } + +-std::unique_ptr +-CreateSafeBrowsingBlockingPage(content::WebContents* web_contents) { +- safe_browsing::SBThreatType threat_type = +- safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- GURL request_url("http://example.com"); +- std::string url_param; +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { +- if (GURL(url_param).is_valid()) { +- request_url = GURL(url_param); +- } +- } +- GURL main_frame_url(request_url); +- // TODO(mattm): add flag to change main_frame_url or add dedicated flag to +- // test subresource interstitials. +- std::string type_param; +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { +- if (type_param == "malware") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- } else if (type_param == "phishing") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING; +- } else if (type_param == "unwanted") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED; +- } else if (type_param == "clientside_malware") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_MALWARE; +- } else if (type_param == "clientside_phishing") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_CLIENT_SIDE_PHISHING; +- } else if (type_param == "billing") { +- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING; +- } +- } +- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; +- resource.url = request_url; +- resource.is_subresource = request_url != main_frame_url; +- resource.is_subframe = false; +- resource.threat_type = threat_type; +- resource.web_contents_getter = security_interstitials::GetWebContentsGetter( +- web_contents->GetMainFrame()->GetProcess()->GetID(), +- web_contents->GetMainFrame()->GetRoutingID()); +- resource.threat_source = g_browser_process->safe_browsing_service() +- ->database_manager() +- ->GetThreatSource(); +- +- // Normally safebrowsing interstitial types which block the main page load +- // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and +- // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a +- // pending navigation when the SafeBrowsingBlockingPage is created. This demo +- // creates a SafeBrowsingBlockingPage but does not actually show a real +- // interstitial. Instead it extracts the html and displays it manually, so the +- // parts which depend on the NavigationEntry are not hit. +- return base::WrapUnique( +- safe_browsing::SafeBrowsingBlockingPage::CreateBlockingPage( +- g_browser_process->safe_browsing_service()->ui_manager().get(), +- web_contents, main_frame_url, resource, true)); +-} +- +-std::unique_ptr +-CreateSafeBrowsingQuietBlockingPage(content::WebContents* web_contents) { +- safe_browsing::SBThreatType threat_type = +- safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- GURL request_url("http://example.com"); +- std::string url_param; +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "url", &url_param)) { +- if (GURL(url_param).is_valid()) +- request_url = GURL(url_param); +- } +- GURL main_frame_url(request_url); +- std::string type_param; +- bool is_giant_webview = false; +- if (net::GetValueForKeyInQuery(web_contents->GetURL(), "type", &type_param)) { +- if (type_param == "malware") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- } else if (type_param == "phishing") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_PHISHING; +- } else if (type_param == "unwanted") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_UNWANTED; +- } else if (type_param == "billing") { +- threat_type = safe_browsing::SB_THREAT_TYPE_BILLING; +- } else if (type_param == "giant") { +- threat_type = safe_browsing::SB_THREAT_TYPE_URL_MALWARE; +- is_giant_webview = true; +- } +- } +- safe_browsing::SafeBrowsingBlockingPage::UnsafeResource resource; +- resource.url = request_url; +- resource.is_subresource = request_url != main_frame_url; +- resource.is_subframe = false; +- resource.threat_type = threat_type; +- resource.web_contents_getter = security_interstitials::GetWebContentsGetter( +- web_contents->GetMainFrame()->GetProcess()->GetID(), +- web_contents->GetMainFrame()->GetRoutingID()); +- resource.threat_source = g_browser_process->safe_browsing_service() +- ->database_manager() +- ->GetThreatSource(); +- +- // Normally safebrowsing interstitial types which block the main page load +- // (SB_THREAT_TYPE_URL_MALWARE, SB_THREAT_TYPE_URL_PHISHING, and +- // SB_THREAT_TYPE_URL_UNWANTED on main-frame loads) would expect there to be a +- // pending navigation when the SafeBrowsingBlockingPage is created. This demo +- // creates a SafeBrowsingBlockingPage but does not actually show a real +- // interstitial. Instead it extracts the html and displays it manually, so the +- // parts which depend on the NavigationEntry are not hit. +- return base::WrapUnique( +- TestSafeBrowsingBlockingPageQuiet::CreateBlockingPage( +- g_browser_process->safe_browsing_service()->ui_manager().get(), +- web_contents, main_frame_url, resource, is_giant_webview)); +-} +- + #if BUILDFLAG(ENABLE_CAPTIVE_PORTAL_DETECTION) + std::unique_ptr CreateCaptivePortalBlockingPage( + content::WebContents* web_contents) { +@@ -510,8 +403,6 @@ void InterstitialHTMLSource::StartDataRe + interstitial_delegate = CreateBlockedInterceptionBlockingPage(web_contents); + } else if (path_without_query == "/legacy-tls") { + interstitial_delegate = CreateLegacyTLSBlockingPage(web_contents); +- } else if (path_without_query == "/safebrowsing") { +- interstitial_delegate = CreateSafeBrowsingBlockingPage(web_contents); + } else if (path_without_query == "/clock") { + interstitial_delegate = CreateBadClockBlockingPage(web_contents); + } else if (path_without_query == "/lookalike") { +@@ -526,16 +417,12 @@ void InterstitialHTMLSource::StartDataRe + interstitial_delegate = CreateInsecureFormPage(web_contents); + } + +- if (path_without_query == "/quietsafebrowsing") { +- std::unique_ptr blocking_page = +- CreateSafeBrowsingQuietBlockingPage(web_contents); +- html = blocking_page->GetHTML(); +- interstitial_delegate = std::move(blocking_page); + #if BUILDFLAG(ENABLE_SUPERVISED_USERS) +- } else if (path_without_query == "/supervised_user") { ++ if (path_without_query == "/supervised_user") { + html = GetSupervisedUserInterstitialHTML(path); ++ } else + #endif +- } else if (interstitial_delegate.get()) { ++ if (interstitial_delegate.get()) { + html = interstitial_delegate.get()->GetHTMLContents(); + } else { + html = ui::ResourceBundle::GetSharedInstance().LoadDataResourceString( +--- chrome/renderer/chrome_content_renderer_client.cc ++++ chrome/renderer/chrome_content_renderer_client.cc +@@ -95,7 +95,6 @@ + #include "components/prerender/renderer/prerender_utils.h" + #include "components/prerender/renderer/prerenderer_client.h" + #include "components/safe_browsing/buildflags.h" +-#include "components/safe_browsing/content/renderer/threat_dom_details.h" + #include "components/spellcheck/spellcheck_buildflags.h" + #include "components/subresource_filter/content/renderer/subresource_filter_agent.h" + #include "components/subresource_filter/content/renderer/unverified_ruleset_dealer.h" +--- components/security_interstitials/content/cert_report_helper.cc ++++ components/security_interstitials/content/cert_report_helper.cc +@@ -154,7 +154,6 @@ void CertReportHelper::FinishCertCollect + return; + } + +- ssl_cert_reporter_->ReportInvalidCertificateChain(serialized_report); + } + + bool CertReportHelper::ShouldShowCertificateReporterCheckbox() { diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch new file mode 100644 index 0000000..e2526ab --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0003-disable-autofill-download-manager.patch @@ -0,0 +1,97 @@ +--- components/autofill/core/browser/autofill_download_manager.cc ++++ components/autofill/core/browser/autofill_download_manager.cc +@@ -842,94 +842,6 @@ AutofillDownloadManager::GetRequestURLAn + } + + bool AutofillDownloadManager::StartRequest(FormRequestData request_data) { +- scoped_refptr url_loader_factory = +- driver_->GetURLLoaderFactory(); +- DCHECK(url_loader_factory); +- +- // Get the URL and method to use for this request. +- std::string method; +- GURL request_url; +- std::tie(request_url, method) = +- UseApi() ? GetRequestURLAndMethodForApi(request_data) +- : GetRequestURLAndMethod(request_data); +- +- // Track the URL length for GET queries because the URL length can be in the +- // thousands when rich metadata is enabled. +- if (request_data.request_type == AutofillDownloadManager::REQUEST_QUERY && +- method == "GET") { +- UMA_HISTOGRAM_COUNTS_100000("Autofill.Query.GetUrlLength", +- request_url.spec().length()); +- } +- +- auto resource_request = std::make_unique(); +- resource_request->url = request_url; +- resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; +- resource_request->method = method; +- +- // On iOS we have a single, shared URLLoaderFactory provided by BrowserState. +- // As it is shared, it is not trusted and we cannot assign trusted_params +- // to the network request. +-#if !defined(OS_IOS) +- resource_request->trusted_params = network::ResourceRequest::TrustedParams(); +- resource_request->trusted_params->isolation_info = driver_->IsolationInfo(); +-#endif +- +- // Add Chrome experiment state to the request headers. +- variations::AppendVariationsHeaderUnknownSignedIn( +- request_url, +- driver_->IsIncognito() ? variations::InIncognito::kYes +- : variations::InIncognito::kNo, +- resource_request.get()); +- +- // Set headers specific to the API if using it. +- if (UseApi()) +- // Encode response serialized proto in base64 for safety. +- resource_request->headers.SetHeader(kGoogEncodeResponseIfExecutable, +- "base64"); +- +- // Put API key in request's header if a key exists, and the endpoint is +- // trusted by Google. +- if (!api_key_.empty() && request_url.SchemeIs(url::kHttpsScheme) && +- google_util::IsGoogleAssociatedDomainUrl(request_url)) { +- resource_request->headers.SetHeader(kGoogApiKey, api_key_); +- } +- +- auto simple_loader = network::SimpleURLLoader::Create( +- std::move(resource_request), +- GetNetworkTrafficAnnotation(request_data.request_type)); +- +- // This allows reading the error message within the API response when status +- // is not 200 (e.g., 400). Otherwise, URL loader will not give any content in +- // the response when there is a failure, which makes debugging hard. +- simple_loader->SetAllowHttpErrorResults(true); +- +- if (method == "POST") { +- const std::string content_type = +- UseApi() ? "application/x-protobuf" : "text/proto"; +- std::string payload; +- if (UseApi()) { +- if (!GetAPIBodyPayload(request_data.payload, request_data.request_type, +- &payload)) { +- return false; +- } +- } else { +- payload = request_data.payload; +- } +- // Attach payload data and add data format header. +- simple_loader->AttachStringForUpload(payload, content_type); +- } +- +- // Transfer ownership of the loader into url_loaders_. Temporarily hang +- // onto the raw pointer to use it as a key and to kick off the request; +- // transferring ownership (std::move) invalidates the |simple_loader| +- // variable. +- auto* raw_simple_loader = simple_loader.get(); +- url_loaders_.push_back(std::move(simple_loader)); +- raw_simple_loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( +- url_loader_factory.get(), +- base::BindOnce(&AutofillDownloadManager::OnSimpleLoaderComplete, +- base::Unretained(this), std::move(--url_loaders_.end()), +- std::move(request_data), AutofillTickClock::NowTicks())); + return true; + } + diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch new file mode 100644 index 0000000..a2b9428 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0005-disable-default-extensions.patch @@ -0,0 +1,112 @@ +--- chrome/browser/extensions/component_extensions_whitelist/whitelist.cc ++++ chrome/browser/extensions/component_extensions_whitelist/whitelist.cc +@@ -26,7 +26,6 @@ namespace extensions { + + bool IsComponentExtensionWhitelisted(const std::string& extension_id) { + const char* const kAllowed[] = { +- extension_misc::kInAppPaymentsSupportAppId, + extension_misc::kCastExtensionIdRelease, + extension_misc::kPdfExtensionId, + #if defined(OS_CHROMEOS) +--- chrome/browser/extensions/component_loader.cc ++++ chrome/browser/extensions/component_loader.cc +@@ -350,11 +350,6 @@ void ComponentLoader::AddWebStoreApp() { + if (!IsNormalSession()) + return; + #endif +- +- AddWithNameAndDescription( +- IDR_WEBSTORE_MANIFEST, base::FilePath(FILE_PATH_LITERAL("web_store")), +- l10n_util::GetStringUTF8(IDS_WEBSTORE_NAME_STORE), +- l10n_util::GetStringUTF8(IDS_WEBSTORE_APP_DESCRIPTION)); + } + + #if defined(OS_CHROMEOS) +@@ -452,11 +447,6 @@ void ComponentLoader::AddDefaultComponen + AddKeyboardApp(); + #else // defined(OS_CHROMEOS) + DCHECK(!skip_session_components); +-#if BUILDFLAG(ENABLE_PRINTING) +- // Cloud Print component app. Not required on Chrome OS. +- Add(IDR_CLOUDPRINT_MANIFEST, +- base::FilePath(FILE_PATH_LITERAL("cloud_print"))); +-#endif // BUILDFLAG(ENABLE_PRINTING) + #endif // defined(OS_CHROMEOS) + + if (!skip_session_components) { +@@ -534,18 +524,6 @@ void ComponentLoader::AddDefaultComponen + AddHangoutServicesExtension(); + #endif // BUILDFLAG(ENABLE_HANGOUT_SERVICES_EXTENSION) + +- bool install_feedback = enable_background_extensions_during_testing; +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- install_feedback = true; +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) +- if (install_feedback) { +- AddWithNameAndDescription( +- IDR_FEEDBACK_MANIFEST, base::FilePath(FILE_PATH_LITERAL("feedback")), +- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_APP_TITLE), +- // Description string +- l10n_util::GetStringUTF8(IDS_FEEDBACK_REPORT_PAGE_TITLE)); +- } +- + #if defined(OS_CHROMEOS) + AddChromeCameraApp(); + AddVideoPlayerExtension(); +--- chrome/browser/extensions/external_component_loader.cc ++++ chrome/browser/extensions/external_component_loader.cc +@@ -31,9 +31,6 @@ ExternalComponentLoader::~ExternalCompon + + void ExternalComponentLoader::StartLoading() { + auto prefs = std::make_unique(); +-#if BUILDFLAG(GOOGLE_CHROME_BRANDING) +- AddExternalExtension(extension_misc::kInAppPaymentsSupportAppId, prefs.get()); +-#endif // BUILDFLAG(GOOGLE_CHROME_BRANDING) + + #if defined(OS_CHROMEOS) + { +--- chrome/browser/extensions/webstore_installer.cc ++++ chrome/browser/extensions/webstore_installer.cc +@@ -560,20 +560,6 @@ void WebstoreInstaller::DownloadNextPend + void WebstoreInstaller::DownloadCrx( + const std::string& extension_id, + InstallSource source) { +- download_url_ = GetWebstoreInstallURL(extension_id, source); +- MaybeAppendAuthUserParameter(approval_->authuser, &download_url_); +- +- base::FilePath user_data_dir; +- base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); +- base::FilePath download_path = user_data_dir.Append(kWebstoreDownloadFolder); +- +- base::FilePath download_directory(g_download_directory_for_tests ? +- *g_download_directory_for_tests : download_path); +- +- base::PostTaskAndReplyWithResult( +- GetExtensionFileTaskRunner().get(), FROM_HERE, +- base::BindOnce(&GetDownloadFilePath, download_directory, extension_id), +- base::BindOnce(&WebstoreInstaller::StartDownload, this, extension_id)); + } + + // http://crbug.com/165634 +@@ -720,21 +706,6 @@ void WebstoreInstaller::UpdateDownloadPr + void WebstoreInstaller::StartCrxInstaller(const DownloadItem& download) { + DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(!crx_installer_.get()); +- +- ExtensionService* service = ExtensionSystem::Get(profile_)-> +- extension_service(); +- CHECK(service); +- +- const Approval* approval = GetAssociatedApproval(download); +- DCHECK(approval); +- +- crx_installer_ = download_crx_util::CreateCrxInstaller(profile_, download); +- +- crx_installer_->set_expected_id(approval->extension_id); +- crx_installer_->set_is_gallery_install(true); +- crx_installer_->set_allow_silent_install(true); +- +- crx_installer_->InstallCrx(download.GetFullPath()); + } + + void WebstoreInstaller::ReportFailure(const std::string& error, diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch new file mode 100644 index 0000000..574a322 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0007-disable-web-resource-service.patch @@ -0,0 +1,48 @@ +--- components/web_resource/web_resource_service.cc ++++ components/web_resource/web_resource_service.cc +@@ -120,44 +120,7 @@ bool WebResourceService::GetFetchSchedul + // Initializes the fetching of data from the resource server. Data + // load calls OnSimpleLoaderComplete. + void WebResourceService::StartFetch() { +- // Set to false so that next fetch can be scheduled after this fetch or +- // if we receive notification that resource is allowed. +- fetch_scheduled_ = false; +- // Check whether fetching is allowed. +- if (!resource_request_allowed_notifier_->ResourceRequestsAllowed()) +- return; +- +- // First, put our next cache load on the MessageLoop. +- ScheduleFetch(cache_update_delay_ms_); +- +- // Set cache update time in preferences. +- prefs_->SetString(last_update_time_pref_name_, +- base::NumberToString(base::Time::Now().ToDoubleT())); +- +- // If we are still fetching data, exit. +- if (in_fetch_) +- return; +- in_fetch_ = true; +- +- GURL web_resource_server = +- application_locale_.empty() +- ? web_resource_server_ +- : google_util::AppendGoogleLocaleParam(web_resource_server_, +- application_locale_); +- +- DVLOG(1) << "WebResourceService StartFetch " << web_resource_server; +- auto resource_request = std::make_unique(); +- resource_request->url = web_resource_server; +- // Do not let url fetcher affect existing state in system context +- // (by setting cookies, for example). +- resource_request->load_flags = net::LOAD_DISABLE_CACHE; +- resource_request->credentials_mode = network::mojom::CredentialsMode::kOmit; +- simple_url_loader_ = network::SimpleURLLoader::Create( +- std::move(resource_request), traffic_annotation_); +- simple_url_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( +- url_loader_factory_.get(), +- base::BindOnce(&WebResourceService::OnSimpleLoaderComplete, +- base::Unretained(this))); ++ in_fetch_ = false; + } + + void WebResourceService::EndFetch() { diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch new file mode 100644 index 0000000..6bce17c --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0009-disable-google-ipv6-probes.patch @@ -0,0 +1,16 @@ +--- net/dns/host_resolver_manager.cc ++++ net/dns/host_resolver_manager.cc +@@ -131,10 +131,10 @@ const unsigned kMinimumTTLSeconds = kCac + // cached. + const int kIPv6ProbePeriodMs = 1000; + +-// Google DNS address used for IPv6 probes. +-const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x48, 0x60, 0x48, 0x60, ++// RIPE NCC k.root-servers.net. 2001:7fd::1 (anycasted), used for IPv6 probes. ++const uint8_t kIPv6ProbeAddress[] = {0x20, 0x01, 0x07, 0xfd, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, +- 0x00, 0x00, 0x88, 0x88}; ++ 0x00, 0x00, 0x00, 0x01}; + + enum DnsResolveStatus { + RESOLVE_STATUS_DNS_SUCCESS = 0, diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch new file mode 100644 index 0000000..75bde5b --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0015-disable-update-pings.patch @@ -0,0 +1,11 @@ +--- chrome/updater/configurator.cc ++++ chrome/updater/configurator.cc +@@ -62,7 +62,7 @@ int Configurator::UpdateDelay() const { + } + + std::vector Configurator::UpdateUrl() const { +- return external_constants_->UpdateURL(); ++ return std::vector; + } + + std::vector Configurator::PingUrl() const { diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch new file mode 100644 index 0000000..ab0a797 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0017-disable-new-avatar-menu.patch @@ -0,0 +1,11 @@ +--- components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc ++++ components/signin/internal/identity_manager/primary_account_policy_manager_impl.cc +@@ -81,7 +81,7 @@ void PrimaryAccountPolicyManagerImpl::On + } + + bool PrimaryAccountPolicyManagerImpl::IsSigninAllowed() const { +- return signin_allowed_.GetValue(); ++ return false; + } + + void PrimaryAccountPolicyManagerImpl::OnSigninAllowedPrefChanged( diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch new file mode 100644 index 0000000..05bd28a --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/inox-patchset/0021-disable-rlz.patch @@ -0,0 +1,12 @@ +# Disable rlz + +--- rlz/buildflags/buildflags.gni ++++ rlz/buildflags/buildflags.gni +@@ -6,6 +6,6 @@ import("//build/config/chrome_build.gni" + + # Whether we are using the rlz library or not. Platforms like Android send + # rlz codes for searches but do not use the library. +-enable_rlz_support = is_win || is_apple || is_chromeos ++enable_rlz_support = false + + enable_rlz = is_chrome_branded && enable_rlz_support diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch new file mode 100644 index 0000000..d168acc --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/all-add-trk-prefixes-to-possibly-evil-connections.patch @@ -0,0 +1,819 @@ +From cf98027e6f671068371d33e89db26d8bfcd6caff Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Mon, 3 Nov 2014 10:52:56 +0100 +Subject: [PATCH 64/66] all: add trk: prefixes to possibly evil connections + +Prefix URLs to Google services with trk: so that whenever something +tries to load them, the developer will be informed via printf and +dialog about this infraction. + +If you see such dialog, we know that (a) either the URL needs to be +whitelisted, or (b) the feature that triggered it needs to be disabled +by default. +--- + build/mac/tweak_info_plist.py | 2 +- + .../chromeos/customization/customization_document.cc | 2 +- + .../extensions/file_manager/private_api_drive.cc | 2 +- + .../extensions/file_manager/private_api_misc.cc | 2 +- + .../extensions/file_manager/private_api_strings.cc | 12 ++++++------ + .../api/cryptotoken_private/cryptotoken_private_api.cc | 4 ++-- + chrome/browser/extensions/install_signer.cc | 2 +- + chrome/browser/media/media_url_constants.cc | 2 +- + chrome/browser/nacl_host/nacl_infobar_delegate.cc | 2 +- + chrome/browser/net/predictor.cc | 2 +- + chrome/browser/profiles/profile_avatar_downloader.cc | 2 +- + .../chromeos/chromevox/chromevox/background/prefs.js | 4 ++-- + .../resources/default_apps/external_extensions.json | 6 +++--- + .../safe_browsing/client_side_detection_service.cc | 4 ++-- + chrome/browser/safe_browsing/download_feedback.cc | 2 +- + .../browser/safe_search_api/safe_search_url_checker.cc | 2 +- + .../spellchecker/spellcheck_hunspell_dictionary.cc | 2 +- + .../browser/supervised_user/supervised_user_service.cc | 2 +- + chrome/browser/tracing/crash_service_uploader.cc | 2 +- + .../browser/ui/views/outdated_upgrade_bubble_view.cc | 2 +- + chrome/browser/ui/webui/ntp/ntp_resource_cache.cc | 8 ++++---- + chrome/common/extensions/chrome_extensions_client.cc | 4 ++-- + chrome/common/extensions/extension_constants.cc | 2 +- + chrome/common/url_constants.cc | 6 +++--- + chrome/installer/util/google_chrome_distribution.cc | 2 +- + chromecast/browser/service/cast_service_simple.cc | 2 +- + chromeos/geolocation/simple_geolocation_provider.cc | 2 +- + components/cloud_devices/common/cloud_devices_urls.cc | 8 ++++---- + components/crash/content/app/breakpad_linux.cc | 2 +- + components/drive/service/drive_api_service.cc | 8 ++++---- + components/feedback/feedback_uploader.cc | 2 +- + components/gcm_driver/gcm_account_tracker.cc | 4 ++-- + components/google/core/browser/google_url_tracker.cc | 2 +- + components/history/core/browser/web_history_service.cc | 6 +++--- + components/invalidation/impl/gcm_network_channel.cc | 2 +- + components/invalidation/impl/p2p_invalidator.cc | 2 +- + components/metrics/url_constants.cc | 4 ++-- + .../password_manager/core/browser/password_store.cc | 8 ++++---- + components/policy/core/common/policy_loader_win.cc | 2 +- + components/policy/resources/policy_templates.json | 4 ++-- + components/rappor/rappor_service_impl.cc | 2 +- + components/search_engines/prepopulated_engines.json | 2 +- + .../translate/core/browser/translate_url_fetcher.cc | 1 + + components/translate/core/common/translate_util.cc | 2 +- + components/variations/variations_url_constants.cc | 2 +- + content/browser/speech/speech_recognition_engine.cc | 2 +- + content/shell/browser/shell_browser_main_parts.cc | 2 +- + google_apis/gaia/gaia_constants.cc | 18 +++++++++--------- + google_apis/gaia/google_service_auth_error.cc | 2 +- + google_apis/gcm/engine/gservices_settings.cc | 6 +++--- + jingle/notifier/base/gaia_token_pre_xmpp_auth.cc | 2 +- + remoting/base/breakpad_mac.mm | 2 +- + remoting/protocol/jingle_messages.cc | 2 +- + remoting/webapp/base/js/xmpp_login_handler.js | 2 +- + remoting/webapp/crd/manifest.json.jinja2 | 2 +- + rlz/lib/lib_values.cc | 2 +- + ui/app_list/demo/app_list_demo_views.cc | 2 +- + ui/views/examples/webview_example.cc | 2 +- + 61 files changed, 101 insertions(+), 100 deletions(-) + +--- build/apple/tweak_info_plist.py ++++ build/apple/tweak_info_plist.py +@@ -208,7 +208,7 @@ def _AddKeystoneKeys(plist, bundle_ident + also requires the |bundle_identifier| argument (com.example.product).""" + plist['KSVersion'] = plist['CFBundleShortVersionString'] + plist['KSProductID'] = bundle_identifier +- plist['KSUpdateURL'] = 'https://tools.google.com/service/update2' ++ plist['KSUpdateURL'] = 'trk:132:https://tools.google.com/service/update2' + + _RemoveKeys(plist, 'KSChannelID') + for tag_suffix in _TagSuffixes(): +--- chrome/browser/chromeos/customization/customization_document.cc ++++ chrome/browser/chromeos/customization/customization_document.cc +@@ -172,7 +172,7 @@ std::string ReadFileInBackground(const b + + // Template URL where to fetch OEM services customization manifest from. + const char ServicesCustomizationDocument::kManifestUrl[] = +- "https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; ++ "trk:151:https://ssl.gstatic.com/chrome/chromeos-customization/%s.json"; + + // A custom extensions::ExternalLoader that the ServicesCustomizationDocument + // creates and uses to publish OEM default apps to the extensions system. +--- chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc ++++ chrome/browser/chromeos/extensions/file_manager/private_api_drive.cc +@@ -1036,7 +1036,7 @@ void FileManagerPrivateInternalGetDownlo + const CoreAccountId& account_id = + identity_manager->GetPrimaryAccountId(signin::ConsentLevel::kNotRequired); + std::vector scopes; +- scopes.emplace_back("https://www.googleapis.com/auth/drive.readonly"); ++ scopes.emplace_back("trk:208:https://www.googleapis.com/auth/drive.readonly"); + + scoped_refptr url_loader_factory = + content::BrowserContext::GetDefaultStoragePartition( +--- chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc ++++ chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc +@@ -86,7 +86,7 @@ namespace { + + using api::file_manager_private::ProfileInfo; + +-const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore"; ++const char kCWSScope[] = "trk:209:https://www.googleapis.com/auth/chromewebstore"; + + // Thresholds for mountCrostini() API. + constexpr base::TimeDelta kMountCrostiniSlowOperationThreshold = +--- chrome/browser/chromeos/file_manager/file_manager_string_util.cc ++++ chrome/browser/chromeos/file_manager/file_manager_string_util.cc +@@ -19,21 +19,21 @@ namespace { + + // Location of the page to buy more storage for Google Drive. + const char kGoogleDriveBuyStorageUrl[] = +- "https://www.google.com/settings/storage"; ++ "trk:210:https://www.google.com/settings/storage"; + + // Location of the overview page about Google Drive. + const char kGoogleDriveOverviewUrl[] = +- "https://support.google.com/chromebook/?p=filemanager_drive"; ++ "trk:210:https://support.google.com/chromebook/?p=filemanager_drive"; + + // Location of Google Drive specific help. + const char kGoogleDriveHelpUrl[] = +- "https://support.google.com/chromebook/?p=filemanager_drivehelp"; ++ "trk:212:https://support.google.com/chromebook/?p=filemanager_drivehelp"; + + // Location of Google Drive root. +-const char kGoogleDriveRootUrl[] = "https://drive.google.com"; ++const char kGoogleDriveRootUrl[] = "trk:213:https://drive.google.com"; + + // Printf format +-const char kHelpURLFormat[] = "https://support.google.com/chromebook/answer/%d"; ++const char kHelpURLFormat[] = "trk:214:https://support.google.com/chromebook/answer/%d"; + + // Location of the help page for low space warning in the downloads directory. + const int kDownloadsLowSpaceWarningHelpNumber = 1061547; +--- chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc ++++ chrome/browser/extensions/api/cryptotoken_private/cryptotoken_private_api.cc +@@ -60,8 +60,8 @@ enum class U2FAttestationPromptResult { + + const char kGoogleDotCom[] = "google.com"; + constexpr const char* kGoogleGstaticAppIds[] = { +- "https://www.gstatic.com/securitykey/origins.json", +- "https://www.gstatic.com/securitykey/a/google.com/origins.json"}; ++ "trk:273:https://www.gstatic.com/securitykey/origins.json", ++ "trk:274:https://www.gstatic.com/securitykey/a/google.com/origins.json"}; + + // ContainsAppIdByHash returns true iff the SHA-256 hash of one of the + // elements of |list| equals |hash|. +--- chrome/browser/extensions/install_signer.cc ++++ chrome/browser/extensions/install_signer.cc +@@ -65,7 +65,7 @@ const int kSignatureFormatVersion = 2; + const size_t kSaltBytes = 32; + + const char kBackendUrl[] = +- "https://www.googleapis.com/chromewebstore/v1.1/items/verify"; ++ "trk:222:https://www.googleapis.com/chromewebstore/v1.1/items/verify"; + + const char kPublicKeyPEM[] = \ + "-----BEGIN PUBLIC KEY-----" \ +--- chrome/browser/nacl_host/nacl_infobar_delegate.cc ++++ chrome/browser/nacl_host/nacl_infobar_delegate.cc +@@ -32,7 +32,7 @@ base::string16 NaClInfoBarDelegate::GetL + } + + GURL NaClInfoBarDelegate::GetLinkURL() const { +- return GURL("https://support.google.com/chrome/?p=ib_nacl"); ++ return GURL("trk:143:https://support.google.com/chrome/?p=ib_nacl"); + } + + base::string16 NaClInfoBarDelegate::GetMessageText() const { +--- chrome/browser/profiles/profile_avatar_downloader.cc ++++ chrome/browser/profiles/profile_avatar_downloader.cc +@@ -19,7 +19,7 @@ + + namespace { + const char kHighResAvatarDownloadUrlPrefix[] = +- "https://www.gstatic.com/chrome/profile_avatars/"; ++ "trk:271:https://www.gstatic.com/chrome/profile_avatars/"; + } + + ProfileAvatarDownloader::ProfileAvatarDownloader(size_t icon_index, +--- chrome/browser/resources/default_apps/external_extensions.json ++++ chrome/browser/resources/default_apps/external_extensions.json +@@ -23,15 +23,15 @@ + }, + // Google Sheets + "aapocclcgogkmnckokdopfmhonfmgoek" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx" ++ "external_update_url": "trk:03:https://clients2.google.com/service/update2/crx" + }, + // Google Slides + "felcaaldnbdncclmgdcncolpebgiejap" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx" ++ "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx" + }, + // Drive extension + "ghbmnnjooekpmoecnnnilnnbdlolhkhi" : { +- "external_update_url": "https://clients2.google.com/service/update2/crx" ++ "external_update_url": "trk:04:https://clients2.google.com/service/update2/crx" + } + } + +--- chrome/browser/safe_browsing/client_side_detection_service.cc ++++ chrome/browser/safe_browsing/client_side_detection_service.cc +@@ -57,7 +57,7 @@ const int ClientSideDetectionService::kN + const int ClientSideDetectionService::kPositiveCacheIntervalMinutes = 30; + + const char ClientSideDetectionService::kClientReportPhishingUrl[] = +- "https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; ++ "trk:148:https://sb-ssl.google.com/safebrowsing/clientreport/phishing"; + + struct ClientSideDetectionService::ClientPhishingReportInfo { + std::unique_ptr loader; +--- chrome/browser/safe_browsing/download_protection/download_feedback.cc ++++ chrome/browser/safe_browsing/download_protection/download_feedback.cc +@@ -200,7 +200,7 @@ const int64_t DownloadFeedback::kMaxUplo + + // static + const char DownloadFeedback::kSbFeedbackURL[] = +- "https://safebrowsing.google.com/safebrowsing/uploads/chrome"; ++ "trk:164:https://safebrowsing.google.com/safebrowsing/uploads/chrome"; + + // static + DownloadFeedbackFactory* DownloadFeedback::factory_ = nullptr; +--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc ++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +@@ -278,7 +278,7 @@ GURL SpellcheckHunspellDictionary::GetDi + DCHECK(!bdict_file.empty()); + + static const char kDownloadServerUrl[] = +- "https://redirector.gvt1.com/edgedl/chrome/dict/"; ++ "trk:173:https://redirector.gvt1.com/edgedl/chrome/dict/"; + + return GURL(std::string(kDownloadServerUrl) + + base::ToLowerASCII(bdict_file)); +--- chrome/browser/supervised_user/supervised_user_service.cc ++++ chrome/browser/supervised_user/supervised_user_service.cc +@@ -85,7 +85,7 @@ namespace { + + // The URL from which to download a host denylist if no local one exists yet. + const char kDenylistURL[] = +- "https://www.gstatic.com/chrome/supervised_user/blacklist-20141001-1k.bin"; ++ "trk:272:https://www.gstatic.com/chrome/supervised_user/blacklist-20141001-1k.bin"; + // The filename under which we'll store the denylist (in the user data dir). + const char kDenylistFilename[] = "su-blacklist.bin"; + +--- chrome/browser/tracing/crash_service_uploader.cc ++++ chrome/browser/tracing/crash_service_uploader.cc +@@ -40,7 +40,7 @@ using std::string; + + namespace { + +-const char kUploadURL[] = "https://clients2.google.com/cr/report"; ++const char kUploadURL[] = "trk:109:https://clients2.google.com/cr/report"; + const char kCrashUploadContentType[] = "multipart/form-data"; + const char kCrashMultipartBoundary[] = + "----**--yradnuoBgoLtrapitluMklaTelgooG--**----"; +--- chrome/browser/ui/views/outdated_upgrade_bubble_view.cc ++++ chrome/browser/ui/views/outdated_upgrade_bubble_view.cc +@@ -37,7 +37,7 @@ namespace { + + // The URL to be used to re-install Chrome when auto-update failed for too long. + constexpr char kDownloadChromeUrl[] = +- "https://www.google.com/chrome/?&brand=CHWL" ++ "trk:242:https://www.google.com/chrome/?&brand=CHWL" + "&utm_campaign=en&utm_source=en-et-na-us-chrome-bubble&utm_medium=et"; + + // The maximum number of ignored bubble we track in the NumLaterPerReinstall +--- chrome/browser/ui/webui/ntp/ntp_resource_cache.cc ++++ chrome/browser/ui/webui/ntp/ntp_resource_cache.cc +@@ -79,17 +79,17 @@ namespace { + // The URL for the the Learn More page shown on incognito new tab. + const char kLearnMoreIncognitoUrl[] = + #if defined(OS_CHROMEOS) +- "https://support.google.com/chromebook/?p=incognito"; ++ "trk:246:https://support.google.com/chromebook/?p=incognito"; + #else +- "https://support.google.com/chrome/?p=incognito"; ++ "trk:247:https://support.google.com/chrome/?p=incognito"; + #endif + + // The URL for the Learn More page shown on guest session new tab. + const char kLearnMoreGuestSessionUrl[] = + #if defined(OS_CHROMEOS) +- "https://support.google.com/chromebook/?p=chromebook_guest"; ++ "trk:248:https://support.google.com/chromebook/?p=chromebook_guest"; + #else +- "https://support.google.com/chrome/?p=ui_guest"; ++ "trk:261:https://support.google.com/chrome/?p=ui_guest"; + #endif + + SkColor GetThemeColor(const ui::ThemeProvider& tp, int id) { +--- chrome/common/extensions/chrome_extensions_client.cc ++++ chrome/common/extensions/chrome_extensions_client.cc +@@ -46,9 +46,9 @@ namespace { + + // TODO(battre): Delete the HTTP URL once the blocklist is downloaded via HTTPS. + const char kExtensionBlocklistUrlPrefix[] = +- "http://www.gstatic.com/chrome/extensions/blocklist"; ++ "trk:269:http://www.gstatic.com/chrome/extensions/blocklist"; + const char kExtensionBlocklistHttpsUrlPrefix[] = +- "https://www.gstatic.com/chrome/extensions/blocklist"; ++ "trk:270:https://www.gstatic.com/chrome/extensions/blocklist"; + + const char kThumbsWhiteListedExtension[] = "khopmbdjffemhegeeobelklnbglcdgfh"; + +--- chrome/common/url_constants.cc ++++ chrome/common/url_constants.cc +@@ -263,7 +263,7 @@ const char kSyncErrorsHelpURL[] = + "https://support.google.com/chrome/?p=settings_sync_error"; + + const char kSyncGoogleDashboardURL[] = +- "https://www.google.com/settings/chrome/sync/"; ++ "trk:251:https://www.google.com/settings/chrome/sync/"; + + const char kSyncLearnMoreURL[] = + "https://support.google.com/chrome/?p=settings_sign_in"; +@@ -385,7 +385,7 @@ const char kNaturalScrollHelpURL[] = + const char kOemEulaURLPath[] = "oem"; + + const char kOnlineEulaURLPath[] = +- "https://policies.google.com/terms/embedded?hl=%s"; ++ "trk:250:https://policies.google.com/terms/embedded?hl=%s"; + + const char kAdditionalToSOnlineURLPath[] = + "https://www.google.com/intl/%s/chrome/terms/"; +--- chrome/installer/setup/google_chrome_behaviors.cc ++++ chrome/installer/setup/google_chrome_behaviors.cc +@@ -44,7 +44,7 @@ base::string16 LocalizeUrl(const wchar_t + + base::string16 GetUninstallSurveyUrl() { + static constexpr wchar_t kSurveyUrl[] = +- L"https://support.google.com/chrome/contact/chromeuninstall3?hl=$1"; ++ L"trk:253:https://support.google.com/chrome/contact/chromeuninstall3?hl=$1"; + return LocalizeUrl(kSurveyUrl); + } + +--- chromecast/browser/service/cast_service_simple.cc ++++ chromecast/browser/service/cast_service_simple.cc +@@ -27,7 +27,7 @@ GURL GetStartupURL() { + const base::CommandLine::StringVector& args = command_line->GetArgs(); + + if (args.empty()) +- return GURL("http://www.google.com/"); ++ return GURL("trk:255:http://www.google.com/"); + + GURL url(args[0]); + if (url.is_valid() && url.has_scheme()) +--- chromeos/geolocation/simple_geolocation_provider.cc ++++ chromeos/geolocation/simple_geolocation_provider.cc +@@ -20,7 +20,7 @@ namespace chromeos { + namespace { + + const char kDefaultGeolocationProviderUrl[] = +- "https://www.googleapis.com/geolocation/v1/geolocate?"; ++ "trk:215:https://www.googleapis.com/geolocation/v1/geolocate?"; + + } // namespace + +--- cloud_print/virtual_driver/win/port_monitor/port_monitor.cc ++++ cloud_print/virtual_driver/win/port_monitor/port_monitor.cc +@@ -40,7 +40,7 @@ namespace { + const wchar_t kIePath[] = L"Internet Explorer\\iexplore.exe"; + + const char kChromeInstallUrl[] = +- "https://google.com/cloudprint/learn/chrome.html"; ++ "trk:252:https://google.com/cloudprint/learn/chrome.html"; + + const wchar_t kCloudPrintRegKey[] = L"Software\\Google\\CloudPrint"; + +--- components/cloud_devices/common/cloud_devices_urls.cc ++++ components/cloud_devices/common/cloud_devices_urls.cc +@@ -14,27 +14,27 @@ + namespace cloud_devices { + + const char kCloudPrintAuthScope[] = +- "https://www.googleapis.com/auth/cloudprint"; ++ "trk:197:https://www.googleapis.com/auth/cloudprint"; + + const char kCloudPrintDeprecationHelpURL[] = + #if defined(OS_CHROMEOS) +- "https://support.google.com/chromebook/?p=cloudprint"; ++ "trk:198:https://support.google.com/chromebook/?p=cloudprint"; + #else +- "https://support.google.com/chrome/?p=cloudprint"; ++ "trk:198:https://support.google.com/chrome/?p=cloudprint"; + #endif + + const char kCloudPrintLearnMoreURL[] = +- "https://www.google.com/support/cloudprint"; ++ "trk:199:https://www.google.com/support/cloudprint"; + + const char kCloudPrintTestPageURL[] = +- "http://www.google.com/landing/cloudprint/enable.html?print=true"; ++ "trk:200:http://www.google.com/landing/cloudprint/enable.html?print=true"; + + namespace { + + // Url must not be matched by "urls" section of + // cloud_print_app/manifest.json. If it's matched, print driver dialog will + // open sign-in page in separate window. +-const char kCloudPrintURL[] = "https://www.google.com/cloudprint"; ++const char kCloudPrintURL[] = "trk:201:https://www.google.com/cloudprint"; + + } + +--- components/drive/service/drive_api_service.cc ++++ components/drive/service/drive_api_service.cc +@@ -76,10 +76,10 @@ namespace drive { + namespace { + + // OAuth2 scopes for Drive API. +-const char kDriveScope[] = "https://www.googleapis.com/auth/drive"; ++const char kDriveScope[] = "trk:217:https://www.googleapis.com/auth/drive"; + const char kDriveAppsReadonlyScope[] = +- "https://www.googleapis.com/auth/drive.apps.readonly"; +-const char kDriveAppsScope[] = "https://www.googleapis.com/auth/drive.apps"; ++ "trk:218:https://www.googleapis.com/auth/drive.apps.readonly"; ++const char kDriveAppsScope[] = "trk:219:https://www.googleapis.com/auth/drive.apps"; + + // Mime type to create a directory. + const char kFolderMimeType[] = "application/vnd.google-apps.folder"; +--- components/feedback/feedback_uploader.cc ++++ components/feedback/feedback_uploader.cc +@@ -25,7 +25,7 @@ constexpr base::FilePath::CharType kFeed + FILE_PATH_LITERAL("Feedback Reports"); + + constexpr char kFeedbackPostUrl[] = +- "https://www.google.com/tools/feedback/chrome/__submit"; ++ "trk:232:https://www.google.com/tools/feedback/chrome/__submit"; + + constexpr char kProtoBufMimeType[] = "application/x-protobuf"; + +--- components/gcm_driver/gcm_account_tracker.cc ++++ components/gcm_driver/gcm_account_tracker.cc +@@ -27,9 +27,9 @@ namespace gcm { + namespace { + + // Scopes needed by the OAuth2 access tokens. +-const char kGCMGroupServerScope[] = "https://www.googleapis.com/auth/gcm"; ++const char kGCMGroupServerScope[] = "trk:230:https://www.googleapis.com/auth/gcm"; + const char kGCMCheckinServerScope[] = +- "https://www.googleapis.com/auth/android_checkin"; ++ "trk:231:https://www.googleapis.com/auth/android_checkin"; + // Name of the GCM account tracker for fetching access tokens. + const char kGCMAccountTrackerName[] = "gcm_account_tracker"; + // Minimum token validity when sending to GCM groups server. +--- components/history/core/browser/web_history_service.cc ++++ components/history/core/browser/web_history_service.cc +@@ -41,13 +41,13 @@ namespace history { + namespace { + + const char kHistoryOAuthScope[] = +- "https://www.googleapis.com/auth/chromesync"; ++ "trk:138:https://www.googleapis.com/auth/chromesync"; + + const char kHistoryQueryHistoryUrl[] = +- "https://history.google.com/history/api/lookup?client=chrome"; ++ "trk:139:https://history.google.com/history/api/lookup?client=chrome"; + + const char kHistoryDeleteHistoryUrl[] = +- "https://history.google.com/history/api/delete?client=chrome"; ++ "trk:140:https://history.google.com/history/api/delete?client=chrome"; + + const char kHistoryAudioHistoryUrl[] = + "https://history.google.com/history/api/lookup?client=audio"; +--- components/metrics/url_constants.cc ++++ components/metrics/url_constants.cc +@@ -7,12 +7,12 @@ + namespace metrics { + + const char kNewMetricsServerUrl[] = +- "https://clientservices.googleapis.com/uma/v2"; ++ "trk:265:https://clientservices.googleapis.com/uma/v2"; + + const char kNewMetricsServerUrlInsecure[] = +- "http://clientservices.googleapis.com/uma/v2"; ++ "trk:265:http://clientservices.googleapis.com/uma/v2"; + +-const char kOldMetricsServerUrl[] = "https://clients4.google.com/uma/v2"; ++const char kOldMetricsServerUrl[] = "trk:265:https://clients4.google.com/uma/v2"; + + const char kDefaultMetricsMimeType[] = "application/vnd.chrome.uma"; + +--- components/password_manager/core/browser/password_store.cc ++++ components/password_manager/core/browser/password_store.cc +@@ -259,10 +259,10 @@ void PasswordStore::GetLogins(const Form + // TODO(mdm): actually delete them at some point, say M24 or so. + base::Time cutoff; // the null time + if (form.scheme == PasswordForm::Scheme::kHtml && +- (form.signon_realm == "http://www.google.com" || +- form.signon_realm == "http://www.google.com/" || +- form.signon_realm == "https://www.google.com" || +- form.signon_realm == "https://www.google.com/")) { ++ (form.signon_realm == "trk:187:http://www.google.com" || ++ form.signon_realm == "trk:188:http://www.google.com/" || ++ form.signon_realm == "trk:189:https://www.google.com" || ++ form.signon_realm == "trk:190:https://www.google.com/")) { + static const base::Time::Exploded exploded_cutoff = { + 2012, 1, 0, 1, 0, 0, 0, 0}; // 00:00 Jan 1 2012 + base::Time out_time; +--- components/policy/resources/policy_templates.json ++++ components/policy/resources/policy_templates.json +@@ -4436,7 +4436,7 @@ + 'dynamic_refresh': True, + 'per_profile': True, + }, +- 'example_value': ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;https://clients2.google.com/service/update2/crx', 'abcdefghijklmnopabcdefghijklmnop'], ++ 'example_value': ['aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa;trk:16:https://clients2.google.com/service/update2/crx', 'abcdefghijklmnopabcdefghijklmnop'], + 'id': 34, + 'caption': '''Configure the list of force-installed apps and extensions''', + 'tags': ['full-admin-access'], +@@ -9703,7 +9703,7 @@ + 'dynamic_refresh': True, + }, + 'deprecated': True, +- 'example_value': [ '{ "extension-id": "khgabmflimjjbclkmljlpmgaleanedem", "update-url": "https://clients2.google.com/service/update2/crx" }' ], ++ 'example_value': [ '{ "extension-id": "khgabmflimjjbclkmljlpmgaleanedem", "update-url": "trk:18:https://clients2.google.com/service/update2/crx" }' ], + 'id': 135, + 'caption': '''List of AppPack extensions''', + 'tags': [], +@@ -14725,7 +14725,7 @@ + 'features': { + 'dynamic_refresh': True, + }, +- 'example_value': ['khpfeaanjngmcnplbdlpegiifgpfgdco;https://clients2.google.com/service/update2/crx'], ++ 'example_value': ['khpfeaanjngmcnplbdlpegiifgpfgdco;trk:19:https://clients2.google.com/service/update2/crx'], + 'id': 336, + 'caption': '''Configure the list of installed apps and extensions on the login screen''', + 'tags': ['full-admin-access'], +--- components/rappor/rappor_service_impl.cc ++++ components/rappor/rappor_service_impl.cc +@@ -32,7 +32,7 @@ const char kMimeType[] = "application/vn + const char kRapporDailyEventHistogram[] = "Rappor.DailyEvent.IntervalType"; + + // The rappor server's URL. +-const char kDefaultServerUrl[] = "https://clients4.google.com/rappor"; ++const char kDefaultServerUrl[] = "trk:266:https://clients4.google.com/rappor"; + + } // namespace + +--- components/safe_search_api/safe_search/safe_search_url_checker_client.cc ++++ components/safe_search_api/safe_search/safe_search_url_checker_client.cc +@@ -29,7 +29,7 @@ namespace safe_search_api { + namespace { + + const char kSafeSearchApiUrl[] = +- "https://safesearch.googleapis.com/v1:classify"; ++ "trk:238:https://safesearch.googleapis.com/v1:classify"; + const char kDataContentType[] = "application/x-www-form-urlencoded"; + const char kDataFormat[] = "key=%s&urls=%s"; + +--- components/search_engines/prepopulated_engines.json ++++ components/search_engines/prepopulated_engines.json +@@ -115,7 +115,7 @@ + "google": { + "name": "Google", + "keyword": "google.com", +- "favicon_url": "https://www.google.com/images/branding/product/ico/googleg_lodp.ico", ++ "favicon_url": "trk:186:https://www.google.com/images/branding/product/ico/googleg_lodp.ico", + "search_url": "{google:baseURL}search?q={searchTerms}&{google:RLZ}{google:originalQueryForSuggestion}{google:assistedQueryStats}{google:searchFieldtrialParameter}{google:iOSSearchLanguage}{google:searchClient}{google:sourceId}{google:contextualSearchVersion}ie={inputEncoding}", + "suggest_url": "{google:baseSuggestURL}search?{google:searchFieldtrialParameter}client={google:suggestClient}&gs_ri={google:suggestRid}&xssi=t&q={searchTerms}&{google:inputType}{google:omniboxFocusType}{google:cursorPosition}{google:currentPageUrl}{google:pageClassification}{google:searchVersion}{google:sessionToken}{google:prefetchQuery}sugkey={google:suggestAPIKeyParameter}", + "image_url": "{google:baseURL}searchbyimage/upload", +--- components/translate/core/browser/translate_url_fetcher.cc ++++ components/translate/core/browser/translate_url_fetcher.cc +@@ -113,6 +113,7 @@ bool TranslateURLFetcher::Request(const + max_retry_on_5xx_, network::SimpleURLLoader::RetryMode::RETRY_ON_5XX); + } + ++ fprintf(stderr, "translator: fetching something from %s\n", url_.spec().c_str()); + simple_loader_->DownloadToStringOfUnboundedSizeUntilCrashAndDie( + url_loader_factory, + base::BindOnce(&TranslateURLFetcher::OnSimpleLoaderComplete, +--- components/translate/core/common/translate_util.cc ++++ components/translate/core/common/translate_util.cc +@@ -20,7 +20,7 @@ const char kDetectLanguageInSubFrames[] + + } // namespace + +-const char kSecurityOrigin[] = "https://translate.googleapis.com/"; ++const char kSecurityOrigin[] = "trk:220:https://translate.googleapis.com/"; + + const base::Feature kTranslateSubFrames{"TranslateSubFrames", + base::FEATURE_DISABLED_BY_DEFAULT}; +--- components/variations/variations_url_constants.cc ++++ components/variations/variations_url_constants.cc +@@ -8,7 +8,7 @@ namespace variations { + + // Default server of Variations seed info. + const char kDefaultServerUrl[] = +- "https://clientservices.googleapis.com/chrome-variations/seed"; ++ "trk:142:https://clientservices.googleapis.com/chrome-variations/seed"; + + const char kDefaultInsecureServerUrl[] = + "http://clientservices.googleapis.com/chrome-variations/seed"; +--- content/browser/speech/speech_recognition_engine.cc ++++ content/browser/speech/speech_recognition_engine.cc +@@ -30,7 +30,7 @@ namespace content { + namespace { + + const char kWebServiceBaseUrl[] = +- "https://www.google.com/speech-api/full-duplex/v1"; ++ "trk:184:https://www.google.com/speech-api/full-duplex/v1"; + const char kDownstreamUrl[] = "/down?"; + const char kUpstreamUrl[] = "/up?"; + +--- content/shell/browser/shell_browser_main_parts.cc ++++ content/shell/browser/shell_browser_main_parts.cc +@@ -84,7 +84,7 @@ GURL GetStartupURL() { + #else + const base::CommandLine::StringVector& args = command_line->GetArgs(); + if (args.empty()) +- return GURL("https://www.google.com/"); ++ return GURL("trk:183:https://www.google.com/"); + + GURL url(args[0]); + if (url.is_valid() && url.has_scheme()) +--- extensions/browser/updater/safe_manifest_parser.cc ++++ extensions/browser/updater/safe_manifest_parser.cc +@@ -28,7 +28,7 @@ namespace { + + constexpr char kExpectedGupdateProtocol[] = "2.0"; + constexpr char kExpectedGupdateXmlns[] = +- "http://www.google.com/update2/response"; ++ "trk:182:http://www.google.com/update2/response"; + + void ReportError(ParseUpdateManifestCallback callback, + const ManifestParseFailure& failure) { +--- extensions/common/extension_urls.cc ++++ extensions/common/extension_urls.cc +@@ -28,7 +28,7 @@ namespace extension_urls { + + const char kChromeWebstoreBaseURL[] = "https://chrome.google.com/webstore"; + const char kChromeWebstoreUpdateURL[] = +- "https://clients2.google.com/service/update2/crx"; ++ "trk:05:https://clients2.google.com/service/update2/crx"; + + GURL GetWebstoreLaunchURL() { + extensions::ExtensionsClient* client = extensions::ExtensionsClient::Get(); +--- google_apis/gaia/gaia_constants.cc ++++ google_apis/gaia/gaia_constants.cc +@@ -25,55 +25,55 @@ const char kSyncService[] = "chromiumsyn + const char kRemotingService[] = "chromoting"; + + // OAuth scopes. +-const char kOAuth1LoginScope[] = "https://www.google.com/accounts/OAuthLogin"; ++const char kOAuth1LoginScope[] = "trk:181:https://www.google.com/accounts/OAuthLogin"; + const char kOAuthWrapBridgeUserInfoScope[] = +- "https://www.googleapis.com/auth/userinfo.email"; ++ "trk:101:https://www.googleapis.com/auth/userinfo.email"; + + // Service/scope names for device management (cloud-based policy) server. + const char kDeviceManagementServiceOAuth[] = +- "https://www.googleapis.com/auth/chromeosdevicemanagement"; ++ "trk:102:https://www.googleapis.com/auth/chromeosdevicemanagement"; + + // OAuth2 scope for access to all Google APIs. +-const char kAnyApiOAuth2Scope[] = "https://www.googleapis.com/auth/any-api"; ++const char kAnyApiOAuth2Scope[] = "trk:103:https://www.googleapis.com/auth/any-api"; + + // OAuth2 scope for access to Chrome sync APIs + const char kChromeSyncOAuth2Scope[] = +- "https://www.googleapis.com/auth/chromesync"; ++ "trk:104:https://www.googleapis.com/auth/chromesync"; + // OAuth2 scope for access to the Chrome Sync APIs for managed profiles. + const char kChromeSyncSupervisedOAuth2Scope[] = +- "https://www.googleapis.com/auth/chromesync_playpen"; ++ "trk:105:https://www.googleapis.com/auth/chromesync_playpen"; + + // OAuth2 scope for parental consent logging for secondary account addition. + const char kKidManagementPrivilegedOAuth2Scope[] = +- "https://www.googleapis.com/auth/kid.management.privileged"; ++ "trk:276:https://www.googleapis.com/auth/kid.management.privileged"; + + // OAuth2 scope for access to Google Family Link Supervision Setup. + const char kKidsSupervisionSetupChildOAuth2Scope[] = +- "https://www.googleapis.com/auth/kids.supervision.setup.child"; ++ "trk:275:https://www.googleapis.com/auth/kids.supervision.setup.child"; + + // OAuth2 scope for access to Google Talk APIs (XMPP). + const char kGoogleTalkOAuth2Scope[] = +- "https://www.googleapis.com/auth/googletalk"; ++ "trk:106:https://www.googleapis.com/auth/googletalk"; + + const char kGoogleUserInfoEmail[] = +- "https://www.googleapis.com/auth/userinfo.email"; ++ "trk:107:https://www.googleapis.com/auth/userinfo.email"; + const char kGoogleUserInfoProfile[] = +- "https://www.googleapis.com/auth/userinfo.profile"; ++ "trk:260:https://www.googleapis.com/auth/userinfo.profile"; + + // OAuth scope for access to the people API (read-only). + const char kPeopleApiReadOnlyOAuth2Scope[] = +- "https://www.googleapis.com/auth/peopleapi.readonly"; ++ "trk:277:https://www.googleapis.com/auth/peopleapi.readonly"; + + // OAuth scope for access to the Reauth flow. + const char kAccountsReauthOAuth2Scope[] = +- "https://www.googleapis.com/auth/accounts.reauth"; ++ "trk:278:https://www.googleapis.com/auth/accounts.reauth"; + + // OAuth scope for access to audit recording (ARI). + const char kAuditRecordingOAuth2Scope[] = +- "https://www.googleapis.com/auth/auditrecording-pa"; ++ "trk:279:https://www.googleapis.com/auth/auditrecording-pa"; + + // OAuth scope for access to clear cut logs. +-const char kClearCutOAuth2Scope[] = "https://www.googleapis.com/auth/cclog"; ++const char kClearCutOAuth2Scope[] = "trk:280:https://www.googleapis.com/auth/cclog"; + + // OAuth scope for FCM, the Firebase Cloud Messaging service. + const char kFCMOAuthScope[] = +--- google_apis/gcm/engine/gservices_settings.cc ++++ google_apis/gcm/engine/gservices_settings.cc +@@ -30,18 +30,18 @@ const char kRegistrationURLKey[] = "gcm_ + + const int64_t kDefaultCheckinInterval = 2 * 24 * 60 * 60; // seconds = 2 days. + const int64_t kMinimumCheckinInterval = 12 * 60 * 60; // seconds = 12 hours. +-const char kDefaultCheckinURL[] = "https://android.clients.google.com/checkin"; ++const char kDefaultCheckinURL[] = "trk:110:https://android.clients.google.com/checkin"; + const char kDefaultMCSHostname[] = "mtalk.google.com"; + const int kDefaultMCSMainSecurePort = 5228; + const int kDefaultMCSFallbackSecurePort = 443; + const char kDefaultRegistrationURL[] = +- "https://android.clients.google.com/c2dm/register3"; ++ "trk:111:https://android.clients.google.com/c2dm/register3"; + // Settings that are to be deleted are marked with this prefix in checkin + // response. + const char kDeleteSettingPrefix[] = "delete_"; + // Settings digest starts with verison number followed by '-'. + const char kDigestVersionPrefix[] = "1-"; +-const char kMCSEnpointTemplate[] = "https://%s:%d"; ++const char kMCSEnpointTemplate[] = "trk:112:https://%s:%d"; + const int kMaxSecurePort = 65535; + + std::string MakeMCSEndpoint(const std::string& mcs_hostname, int port) { +--- jingle/notifier/base/gaia_token_pre_xmpp_auth.cc ++++ jingle/notifier/base/gaia_token_pre_xmpp_auth.cc +@@ -33,7 +33,7 @@ class GaiaCookieMechanism : public jingl + // These attributes are necessary for working with non-gmail gaia + // accounts. + const std::string NS_GOOGLE_AUTH_PROTOCOL( +- "http://www.google.com/talk/protocol/auth"); ++ "trk:179:http://www.google.com/talk/protocol/auth"); + const jingle_xmpp::QName QN_GOOGLE_ALLOW_GENERATED_JID_XMPP_LOGIN( + NS_GOOGLE_AUTH_PROTOCOL, "allow-generated-jid"); + const jingle_xmpp::QName QN_GOOGLE_AUTH_CLIENT_USES_FULL_BIND_RESULT( +--- remoting/base/breakpad_mac.mm ++++ remoting/base/breakpad_mac.mm +@@ -52,7 +52,7 @@ void InitializeCrashReporting() { + [breakpad_config setObject:@"21600" forKey:@BREAKPAD_REPORT_INTERVAL]; + } + if (![breakpad_config objectForKey:@BREAKPAD_URL]) { +- [breakpad_config setObject:@"https://clients2.google.com/cr/report" ++ [breakpad_config setObject:@"trk:108:https://clients2.google.com/cr/report" + forKey:@BREAKPAD_URL]; + } + +--- remoting/protocol/jingle_messages.cc ++++ remoting/protocol/jingle_messages.cc +@@ -25,7 +25,7 @@ const char kJabberNamespace[] = "jabber: + const char kJingleNamespace[] = "urn:xmpp:jingle:1"; + + // Namespace for transport messages when using standard ICE. +-const char kIceTransportNamespace[] = "google:remoting:ice"; ++const char kIceTransportNamespace[] = "trk:100:google:remoting:ice"; + + const char kWebrtcTransportNamespace[] = "google:remoting:webrtc"; + +--- ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js ++++ ui/accessibility/extensions/chromevoxclassic/chromevox/background/prefs.js +@@ -72,9 +72,9 @@ cvox.ChromeVoxPrefs.DEFAULT_PREFS = { + 'outputContextFirst': false, + 'position': '{}', + 'siteSpecificScriptBase': +- 'https://ssl.gstatic.com/accessibility/javascript/ext/', ++ 'trk:152:https://ssl.gstatic.com/accessibility/javascript/ext/', + 'siteSpecificScriptLoader': +- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js', ++ 'trk:153:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js', + 'sticky': false, + 'typingEcho': 0, + 'useIBeamCursor': cvox.ChromeVox.isMac, +--- ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js ++++ ui/accessibility/extensions/chromevoxclassic/host/chrome/host.js +@@ -96,9 +96,9 @@ cvox.ChromeHost.prototype.init = functio + (!cvox.ApiImplementation.siteSpecificScriptLoader || + !cvox.ApiImplementation.siteSpecificScriptBase); + cvox.ApiImplementation.siteSpecificScriptLoader = +- 'https://ssl.gstatic.com/accessibility/javascript/ext/loader.js'; ++ 'trk:154:https://ssl.gstatic.com/accessibility/javascript/ext/loader.js'; + cvox.ApiImplementation.siteSpecificScriptBase = +- 'https://ssl.gstatic.com/accessibility/javascript/ext/'; ++ 'trk:155:https://ssl.gstatic.com/accessibility/javascript/ext/'; + if (apiPrefsChanged) { + var searchInit = prefs['siteSpecificEnhancements'] === 'true' ? + cvox.SearchLoader.init : +--- ui/views/examples/webview_example.cc ++++ ui/views/examples/webview_example.cc +@@ -29,7 +29,7 @@ void WebViewExample::CreateExampleView(V + webview_->GetWebContents()->SetDelegate(this); + container->SetLayoutManager(std::make_unique()); + +- webview_->LoadInitialURL(GURL("http://www.google.com/")); ++ webview_->LoadInitialURL(GURL("trk:174:http://www.google.com/")); + webview_->GetWebContents()->Focus(); + } + diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch new file mode 100644 index 0000000..a92171c --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-incident-reporting.patch @@ -0,0 +1,75 @@ +From fe92c640c7e02841dcf5dbc20a5eddbd07fd7edf Mon Sep 17 00:00:00 2001 +From: Joachim Bauch +Date: Tue, 7 Jul 2015 17:02:09 +0200 +Subject: [PATCH 47/66] safe_browsing: disable incident reporting + +Disables the safebrowsing incident reporting where you could upload +information about a blocked URL to Google (also added a trk prefix to +the URL so we get notified if this happens again in the future). +--- + .../safe_browsing/incident_reporting/incident_report_uploader_impl.cc | 2 +- + .../safe_browsing/incident_reporting/incident_reporting_service.cc | 3 +++ + chrome/browser/safe_browsing/safe_browsing_blocking_page.cc | 3 +-- + chrome/browser/safe_browsing/safe_browsing_service.cc | 2 ++ + components/security_interstitials/core/safe_browsing_loud_error_ui.cc | 2 ++ + 5 files changed, 9 insertions(+), 3 deletions(-) + +--- chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc ++++ chrome/browser/safe_browsing/incident_reporting/incident_report_uploader_impl.cc +@@ -24,7 +24,7 @@ namespace safe_browsing { + namespace { + + const char kSbIncidentReportUrl[] = +- "https://sb-ssl.google.com/safebrowsing/clientreport/incident"; ++ "trk:268:https://sb-ssl.google.com/safebrowsing/clientreport/incident"; + + constexpr net::NetworkTrafficAnnotationTag + kSafeBrowsingIncidentTrafficAnnotation = +--- chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc ++++ chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.cc +@@ -303,11 +303,7 @@ IncidentReportingService::UploadContext: + + // static + bool IncidentReportingService::IsEnabledForProfile(Profile* profile) { +- if (profile->IsOffTheRecord()) +- return false; +- if (!IsSafeBrowsingEnabled(*profile->GetPrefs())) +- return false; +- return IsExtendedReportingEnabled(*profile->GetPrefs()); ++ return false; + } + + IncidentReportingService::IncidentReportingService( +--- chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ++++ chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +@@ -63,8 +63,7 @@ class SafeBrowsingBlockingPageFactoryImp + PrefService* prefs = + Profile::FromBrowserContext(web_contents->GetBrowserContext()) + ->GetPrefs(); +- bool is_extended_reporting_opt_in_allowed = +- IsExtendedReportingOptInAllowed(*prefs); ++ bool is_extended_reporting_opt_in_allowed = false; + bool is_proceed_anyway_disabled = + prefs->GetBoolean(prefs::kSafeBrowsingProceedAnywayDisabled); + +--- chrome/browser/safe_browsing/safe_browsing_service.cc ++++ chrome/browser/safe_browsing/safe_browsing_service.cc +@@ -254,7 +254,7 @@ SafeBrowsingUIManager* SafeBrowsingServi + } + + void SafeBrowsingService::RegisterAllDelayedAnalysis() { +-#if BUILDFLAG(FULL_SAFE_BROWSING) ++#if 0 + RegisterBinaryIntegrityAnalysis(); + #endif + } +--- components/security_interstitials/core/safe_browsing_loud_error_ui.cc ++++ components/security_interstitials/core/safe_browsing_loud_error_ui.cc +@@ -22,6 +22,7 @@ namespace { + + // For malware interstitial pages, we link the problematic URL to Google's + // diagnostic page. ++// trk:228 + const char kSbDiagnosticUrl[] = + "https://transparencyreport.google.com/safe-browsing/search?url=%s"; + diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch new file mode 100644 index 0000000..a1b1cf7 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/iridium-browser/safe_browsing-disable-reporting-of-safebrowsing-over.patch @@ -0,0 +1,108 @@ +From 8f348bf2c249701de2f6049ac57fe346bd6b665f Mon Sep 17 00:00:00 2001 +From: Joachim Bauch +Date: Tue, 7 Jul 2015 18:28:46 +0200 +Subject: [PATCH 48/66] safe_browsing: disable reporting of safebrowsing + override + +Disables reporting of the safebrowsing override, i.e. the report sent +if a user decides to visit a page that was flagged as "insecure". +This prevents trk:148 (phishing) and trk:149 (malware). +--- + .../browser/safe_browsing/client_side_detection_service.cc | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +--- chrome/browser/safe_browsing/client_side_detection_service.cc ++++ chrome/browser/safe_browsing/client_side_detection_service.cc +@@ -220,90 +220,8 @@ void ClientSideDetectionService::StartCl + DCHECK_CURRENTLY_ON(BrowserThread::UI); + std::unique_ptr request(verdict); + +- if (!enabled_) { +- if (!callback.is_null()) +- callback.Run(GURL(request->url()), false); +- return; +- } +- +- // Fill in metadata about which model we used. +- request->set_model_filename(model_loader_->name()); +- if (is_extended_reporting || is_enhanced_reporting) { +- if (is_enhanced_reporting) { +- request->mutable_population()->set_user_population( +- ChromeUserPopulation::ENHANCED_PROTECTION); +- } else { +- request->mutable_population()->set_user_population( +- ChromeUserPopulation::EXTENDED_REPORTING); +- } +- } else { +- request->mutable_population()->set_user_population( +- ChromeUserPopulation::SAFE_BROWSING); +- } +- request->mutable_population()->set_profile_management_status( +- GetProfileManagementStatus( +- g_browser_process->browser_policy_connector())); +- +- std::string request_data; +- request->SerializeToString(&request_data); +- +- net::NetworkTrafficAnnotationTag traffic_annotation = +- net::DefineNetworkTrafficAnnotation( +- "safe_browsing_client_side_phishing_detector", R"( +- semantics { +- sender: "Safe Browsing Client-Side Phishing Detector" +- description: +- "If the client-side phishing detector determines that the " +- "current page contents are similar to phishing pages, it will " +- "send a request to Safe Browsing to ask for a final verdict. If " +- "Safe Browsing agrees the page is dangerous, Chrome will show a " +- "full-page interstitial warning." +- trigger: +- "Whenever the clinet-side detector machine learning model " +- "computes a phishy-ness score above a threshold, after page-load." +- data: +- "Top-level page URL without CGI parameters, boolean and double " +- "features extracted from DOM, such as the number of resources " +- "loaded in the page, if certain likely phishing and social " +- "engineering terms found on the page, etc." +- destination: GOOGLE_OWNED_SERVICE +- } +- policy { +- cookies_allowed: YES +- cookies_store: "Safe browsing cookie store" +- setting: +- "Users can enable or disable this feature by toggling 'Protect " +- "you and your device from dangerous sites' in Chrome settings " +- "under Privacy. This feature is enabled by default." +- chrome_policy { +- SafeBrowsingEnabled { +- policy_options {mode: MANDATORY} +- SafeBrowsingEnabled: false +- } +- } +- })"); +- auto resource_request = std::make_unique(); +- resource_request->url = GetClientReportUrl(kClientReportPhishingUrl); +- resource_request->method = "POST"; +- resource_request->load_flags = net::LOAD_DISABLE_CACHE; +- auto loader = network::SimpleURLLoader::Create(std::move(resource_request), +- traffic_annotation); +- loader->AttachStringForUpload(request_data, "application/octet-stream"); +- loader->DownloadToStringOfUnboundedSizeUntilCrashAndDie( +- url_loader_factory_.get(), +- base::BindOnce(&ClientSideDetectionService::OnURLLoaderComplete, +- base::Unretained(this), loader.get())); +- +- // Remember which callback and URL correspond to the current fetcher object. +- std::unique_ptr info(new ClientPhishingReportInfo); +- auto* loader_ptr = loader.get(); +- info->loader = std::move(loader); +- info->callback = callback; +- info->phishing_url = GURL(request->url()); +- client_phishing_reports_[loader_ptr] = std::move(info); +- +- // Record that we made a request +- phishing_report_times_.push(base::Time::Now()); ++ if (!callback.is_null()) ++ callback.Run(GURL(request->url()), false); + } + + void ClientSideDetectionService::HandlePhishingVerdict( diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch new file mode 100644 index 0000000..03f4a64 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-requests.patch @@ -0,0 +1,75 @@ +## Prevent request attempts +# chrome://discards/ attempts to use d3 to display the graph +--- chrome/browser/resources/discards/graph_doc_template.html ++++ chrome/browser/resources/discards/graph_doc_template.html +@@ -78,10 +78,6 @@ URL. As result, this document needs to b + } + + +- + +--- chrome/browser/search/background/ntp_background_service.cc ++++ chrome/browser/search/background/ntp_background_service.cc +@@ -61,6 +61,7 @@ void NtpBackgroundService::Shutdown() { + } + + void NtpBackgroundService::FetchCollectionInfo() { ++ return; + if (collections_loader_ != nullptr) + return; + collection_error_info_.ClearError(); +--- chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc ++++ chrome/browser/search/one_google_bar/one_google_bar_loader_impl.cc +@@ -279,6 +279,7 @@ OneGoogleBarLoaderImpl::OneGoogleBarLoad + OneGoogleBarLoaderImpl::~OneGoogleBarLoaderImpl() = default; + + void OneGoogleBarLoaderImpl::Load(OneGoogleCallback callback) { ++ return; + callbacks_.push_back(std::move(callback)); + + // Note: If there is an ongoing request, abandon it. It's possible that +--- chrome/browser/search/promos/promo_service.cc ++++ chrome/browser/search/promos/promo_service.cc +@@ -131,6 +131,7 @@ PromoService::PromoService( + PromoService::~PromoService() = default; + + void PromoService::Refresh() { ++ return; + if (extensions::ShouldShowExtensionsCheckupPromo(profile_)) { + ServeExtensionCheckupPromo(); + return; +--- chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc ++++ chrome/browser/spellchecker/spellcheck_hunspell_dictionary.cc +@@ -285,6 +285,7 @@ GURL SpellcheckHunspellDictionary::GetDi + } + + void SpellcheckHunspellDictionary::DownloadDictionary(GURL url) { ++ return; + DCHECK_CURRENTLY_ON(BrowserThread::UI); + DCHECK(browser_context_); + +--- components/assist_ranker/ranker_url_fetcher.cc ++++ components/assist_ranker/ranker_url_fetcher.cc +@@ -31,6 +31,7 @@ bool RankerURLFetcher::Request( + const GURL& url, + RankerURLFetcher::Callback callback, + network::mojom::URLLoaderFactory* url_loader_factory) { ++ return false; + // This function is not supposed to be called if the previous operation is not + // finished. + if (state_ == REQUESTING) { +--- components/update_client/update_checker.cc ++++ components/update_client/update_checker.cc +@@ -126,6 +126,7 @@ void UpdateCheckerImpl::CheckForUpdates( + const base::flat_map& additional_attributes, + bool enabled_component_updates, + UpdateCheckCallback update_check_callback) { ++ return; + DCHECK(thread_checker_.CalledOnValidThread()); + + ids_checked_ = ids_checked; diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch new file mode 100644 index 0000000..7301d34 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/block-trk-and-subdomains.patch @@ -0,0 +1,247 @@ +# Block all connection requests with 'qjz9zk' in the domain name or with a 'trk:' scheme. +# This patch is based on Iridium's 'net: add "trk:" scheme and help identify URLs being retrieved' + +--- chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc ++++ chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.cc +@@ -55,6 +55,7 @@ ChromeAutocompleteSchemeClassifier::GetI + if (base::IsStringASCII(scheme) && + (ProfileIOData::IsHandledProtocol(scheme) || + base::LowerCaseEqualsASCII(scheme, content::kViewSourceScheme) || ++ base::LowerCaseEqualsASCII(scheme, url::kTraceScheme) || + base::LowerCaseEqualsASCII(scheme, url::kJavaScriptScheme) || + base::LowerCaseEqualsASCII(scheme, url::kDataScheme))) { + return metrics::OmniboxInputType::URL; +--- chrome/browser/history/history_utils.cc ++++ chrome/browser/history/history_utils.cc +@@ -21,6 +21,7 @@ bool CanAddURLToHistory(const GURL& url) + url.SchemeIs(content::kChromeDevToolsScheme) || + url.SchemeIs(content::kChromeUIScheme) || + url.SchemeIs(content::kViewSourceScheme) || ++ url.SchemeIs(url::kTraceScheme) || + url.SchemeIs(chrome::kChromeNativeScheme) || + url.SchemeIs(chrome::kChromeSearchScheme) || + url.SchemeIs(dom_distiller::kDomDistillerScheme)) +--- chrome/browser/ui/singleton_tabs.cc ++++ chrome/browser/ui/singleton_tabs.cc +@@ -99,7 +99,8 @@ int GetIndexOfExistingTab(Browser* brows + + // Skip view-source tabs. This is needed because RewriteURLIfNecessary + // removes the "view-source:" scheme which leads to incorrect matching. +- if (tab_url.SchemeIs(content::kViewSourceScheme)) ++ if (tab_url.SchemeIs(content::kViewSourceScheme) || ++ tab_url.SchemeIs(url::kTraceScheme)) + continue; + + GURL rewritten_tab_url = tab_url; +--- components/omnibox/browser/autocomplete_input.cc ++++ components/omnibox/browser/autocomplete_input.cc +@@ -486,7 +486,8 @@ void AutocompleteInput::ParseForEmphasiz + // For the view-source and blob schemes, we should emphasize the host of the + // URL qualified by the view-source or blob prefix. + if ((base::LowerCaseEqualsASCII(scheme_str, kViewSourceScheme) || +- base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme)) && ++ base::LowerCaseEqualsASCII(scheme_str, url::kBlobScheme) || ++ base::LowerCaseEqualsASCII(scheme_str, url::kTraceScheme)) && + (static_cast(text.length()) > after_scheme_and_colon)) { + // Obtain the URL prefixed by view-source or blob and parse it. + base::string16 real_url(text.substr(after_scheme_and_colon)); +@@ -559,7 +560,9 @@ int AutocompleteInput::NumNonHostCompone + bool AutocompleteInput::HasHTTPScheme(const base::string16& input) { + std::string utf8_input(base::UTF16ToUTF8(input)); + url::Component scheme; +- if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) { ++ if (url::FindAndCompareScheme(utf8_input, url::kTraceScheme, &scheme)) { ++ return false; ++ } else if (url::FindAndCompareScheme(utf8_input, kViewSourceScheme, &scheme)) { + utf8_input.erase(0, scheme.end() + 1); + } + return url::FindAndCompareScheme(utf8_input, url::kHttpScheme, nullptr); +--- components/url_formatter/url_fixer.cc ++++ components/url_formatter/url_fixer.cc +@@ -557,6 +557,10 @@ GURL FixupURL(const std::string& text, c + } + } + ++ if (scheme == url::kTraceScheme) { ++ return GURL(); ++ } ++ + // We handle the file scheme separately. + if (scheme == url::kFileScheme) + return GURL(parts.scheme.is_valid() ? text : FixupPath(text)); +--- content/browser/child_process_security_policy_impl.cc ++++ content/browser/child_process_security_policy_impl.cc +@@ -672,6 +672,7 @@ ChildProcessSecurityPolicyImpl::ChildPro + #endif // BUILDFLAG(ENABLE_WEBSOCKETS) + RegisterWebSafeScheme(url::kFtpScheme); + RegisterWebSafeScheme(url::kDataScheme); ++ RegisterWebSafeScheme(url::kTraceScheme); + RegisterWebSafeScheme("feed"); + + // TODO(nick): https://crbug.com/651534 blob: and filesystem: schemes embed +--- net/BUILD.gn ++++ net/BUILD.gn +@@ -1092,6 +1092,8 @@ component("net") { + "url_request/report_sender.h", + "url_request/static_http_user_agent_settings.cc", + "url_request/static_http_user_agent_settings.h", ++ "url_request/trk_protocol_handler.cc", ++ "url_request/trk_protocol_handler.h", + "url_request/url_fetcher.cc", + "url_request/url_fetcher.h", + "url_request/url_fetcher_core.cc", +--- /dev/null ++++ net/url_request/trk_protocol_handler.cc +@@ -0,0 +1,26 @@ ++// Copyright (c) 2018 The ungoogled-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. ++ ++#include "net/url_request/trk_protocol_handler.h" ++ ++#include "base/logging.h" ++#include "net/base/net_errors.h" ++#include "net/url_request/url_request_error_job.h" ++ ++namespace net { ++ ++TrkProtocolHandler::TrkProtocolHandler() = default; ++ ++URLRequestJob* TrkProtocolHandler::MaybeCreateJob( ++ URLRequest* request, NetworkDelegate* network_delegate) const { ++ LOG(ERROR) << "Blocked URL in TrkProtocolHandler: " << request->original_url(); ++ return new URLRequestErrorJob( ++ request, network_delegate, ERR_BLOCKED_BY_CLIENT); ++} ++ ++bool TrkProtocolHandler::IsSafeRedirectTarget(const GURL& location) const { ++ return true; ++} ++ ++} // namespace net +--- /dev/null ++++ net/url_request/trk_protocol_handler.h +@@ -0,0 +1,33 @@ ++// Copyright (c) 2018 The ungoogled-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. ++ ++#ifndef NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ ++#define NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ ++ ++#include "base/compiler_specific.h" ++#include "base/macros.h" ++#include "net/base/net_export.h" ++#include "net/url_request/url_request_job_factory.h" ++ ++namespace net { ++ ++class URLRequestJob; ++ ++// Implements a ProtocolHandler for Trk jobs. ++class NET_EXPORT TrkProtocolHandler ++ : public URLRequestJobFactory::ProtocolHandler { ++ public: ++ TrkProtocolHandler(); ++ URLRequestJob* MaybeCreateJob( ++ URLRequest* request, ++ NetworkDelegate* network_delegate) const override; ++ bool IsSafeRedirectTarget(const GURL& location) const override; ++ ++ private: ++ DISALLOW_COPY_AND_ASSIGN(TrkProtocolHandler); ++}; ++ ++} // namespace net ++ ++#endif // NET_URL_REQUEST_TRK_PROTOCOL_HANDLER_H_ +--- net/url_request/url_request.cc ++++ net/url_request/url_request.cc +@@ -13,6 +13,7 @@ + #include "base/metrics/histogram_macros.h" + #include "base/rand_util.h" + #include "base/stl_util.h" ++#include "base/strings/string_util.h" + #include "base/strings/utf_string_conversions.h" + #include "base/synchronization/lock.h" + #include "base/threading/thread_task_runner_handle.h" +@@ -40,6 +41,7 @@ + #include "net/url_request/url_request_redirect_job.h" + #include "url/gurl.h" + #include "url/origin.h" ++#include "url/url_constants.h" + + using base::Time; + using std::string; +@@ -570,6 +572,12 @@ URLRequest::URLRequest(const GURL& url, + // Sanity check out environment. + DCHECK(base::ThreadTaskRunnerHandle::IsSet()); + ++ if (!url.SchemeIs(url::kTraceScheme) && ++ base::EndsWith(url.host(), "qjz9zk", base::CompareCase::INSENSITIVE_ASCII)) { ++ LOG(ERROR) << "Block URL in URLRequest: " << url; ++ url_chain_[0] = GURL(url::kTraceScheme + (":" + url.possibly_invalid_spec())); ++ } ++ + context->url_requests()->insert(this); + net_log_.BeginEvent(NetLogEventType::REQUEST_ALIVE, [&] { + return NetLogURLRequestConstructorParams(url, priority_, +--- net/url_request/url_request_context_builder.cc ++++ net/url_request/url_request_context_builder.cc +@@ -44,6 +44,7 @@ + #include "net/quic/quic_stream_factory.h" + #include "net/ssl/ssl_config_service_defaults.h" + #include "net/url_request/static_http_user_agent_settings.h" ++#include "net/url_request/trk_protocol_handler.h" + #include "net/url_request/url_request_context.h" + #include "net/url_request/url_request_context_storage.h" + #include "net/url_request/url_request_job_factory_impl.h" +@@ -616,6 +617,9 @@ std::unique_ptr URLRe + } + protocol_handlers_.clear(); + ++ job_factory->SetProtocolHandler(url::kTraceScheme, ++ std::make_unique()); ++ + #if !BUILDFLAG(DISABLE_FTP_SUPPORT) + if (ftp_enabled_) { + storage->set_ftp_auth_cache(std::make_unique()); +--- url/url_constants.cc ++++ url/url_constants.cc +@@ -28,6 +28,7 @@ const char kMailToScheme[] = "mailto"; + // See also: https://www.iana.org/assignments/uri-schemes/prov/quic-transport + const char kQuicTransportScheme[] = "quic-transport"; + const char kTelScheme[] = "tel"; ++const char kTraceScheme[] = "trk"; + const char kWsScheme[] = "ws"; + const char kWssScheme[] = "wss"; + +--- url/url_constants.h ++++ url/url_constants.h +@@ -32,6 +32,7 @@ COMPONENT_EXPORT(URL) extern const char + COMPONENT_EXPORT(URL) extern const char kMailToScheme[]; + COMPONENT_EXPORT(URL) extern const char kQuicTransportScheme[]; + COMPONENT_EXPORT(URL) extern const char kTelScheme[]; ++COMPONENT_EXPORT(URL) extern const char kTraceScheme[]; + COMPONENT_EXPORT(URL) extern const char kWsScheme[]; + COMPONENT_EXPORT(URL) extern const char kWssScheme[]; + +--- url/url_util.cc ++++ url/url_util.cc +@@ -62,7 +62,7 @@ struct SchemeRegistry { + + // Schemes that do not trigger mixed content warning. + std::vector secure_schemes = { +- kHttpsScheme, kAboutScheme, kDataScheme, kQuicTransportScheme, kWssScheme, ++ kHttpsScheme, kAboutScheme, kDataScheme, kTraceScheme, kQuicTransportScheme, kWssScheme, + }; + + // Schemes that normal pages cannot link to or access (i.e., with the same +@@ -77,6 +77,7 @@ struct SchemeRegistry { + kAboutScheme, + kJavaScriptScheme, + kDataScheme, ++ kTraceScheme, + }; + + // Schemes that can be sent CORS requests. diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch new file mode 100644 index 0000000..440da65 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-crash-reporter.patch @@ -0,0 +1,43 @@ +# Disable some background communication with clients2.google.com + +--- chrome/browser/tracing/crash_service_uploader.cc ++++ chrome/browser/tracing/crash_service_uploader.cc +@@ -129,11 +129,16 @@ void TraceCrashServiceUploader::DoUpload + progress_callback_ = progress_callback; + done_callback_ = std::move(done_callback); + +- base::ThreadPool::PostTask( ++ if (!progress_callback_.is_null()) { ++ base::ThreadPool::PostTask( + FROM_HERE, {base::TaskPriority::BEST_EFFORT}, +- base::BindOnce(&TraceCrashServiceUploader::DoCompressOnBackgroundThread, +- base::Unretained(this), file_contents, upload_mode, +- upload_url_, std::move(metadata))); ++ base::Bind(progress_callback_, 1, 1)); ++ } ++ if (!done_callback_.is_null()) { ++ base::ThreadPool::PostTask( ++ FROM_HERE, {base::TaskPriority::BEST_EFFORT}, ++ base::BindOnce(std::move(done_callback_), true, "Upload skipped.")); ++ } + } + + void TraceCrashServiceUploader::DoCompressOnBackgroundThread( +@@ -306,6 +311,7 @@ bool TraceCrashServiceUploader::Compress + void TraceCrashServiceUploader::CreateAndStartURLLoader( + const std::string& upload_url, + const std::string& post_data) { ++ return; + DCHECK_CURRENTLY_ON(content::BrowserThread::UI); + DCHECK(!simple_url_loader_); + +--- third_party/breakpad/breakpad/src/client/linux/sender/google_crash_report_sender.cc ++++ third_party/breakpad/breakpad/src/client/linux/sender/google_crash_report_sender.cc +@@ -85,6 +85,7 @@ bool CheckForRequiredFlagsOrDie() { + } + + int main(int argc, char* argv[]) { ++ return 0; + google::InitGoogleLogging(argv[0]); + google::ParseCommandLineFlags(&argc, &argv, true); + if (!CheckForRequiredFlagsOrDie()) { diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch new file mode 100644 index 0000000..e223a10 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-domain-reliability.patch @@ -0,0 +1,685 @@ +# Disable domain reliability component + +--- components/domain_reliability/BUILD.gn ++++ components/domain_reliability/BUILD.gn +@@ -7,26 +7,6 @@ action("bake_in_configs") { + script = "bake_in_configs.py" + + inputs = [ +- "baked_in_configs/c_android_clients_google_com.json", +- "baked_in_configs/c_bigcache_googleapis_com.json", +- "baked_in_configs/c_doc-0-0-sj_sj_googleusercontent_com.json", +- "baked_in_configs/c_docs_google_com.json", +- "baked_in_configs/c_drive_google_com.json", +- "baked_in_configs/c_googlesyndication_com.json", +- "baked_in_configs/c_pack_google_com.json", +- "baked_in_configs/c_play_google_com.json", +- "baked_in_configs/c_youtube_com.json", +- "baked_in_configs/clients2_google_com.json", +- "baked_in_configs/docs_google_com.json", +- "baked_in_configs/gcp_gvt2_com.json", +- "baked_in_configs/gcp_gvt6_com.json", +- "baked_in_configs/google-analytics_com.json", +- "baked_in_configs/googlevideo_com.json", +- "baked_in_configs/gvt1_com.json", +- "baked_in_configs/gvt2_com.json", +- "baked_in_configs/gvt6_com.json", +- "baked_in_configs/ssl_gstatic_com.json", +- "baked_in_configs/www_google_com.json", + ] + + output_file = "$target_gen_dir/baked_in_configs.cc" +@@ -34,13 +14,21 @@ action("bake_in_configs") { + + # The JSON file list is too long for the command line on Windows, so put + # them in a response file. +- response_file_contents = rebase_path(inputs, root_build_dir) +- args = [ +- "--file-list", +- "{{response_file_name}}", +- "--output", +- rebase_path(output_file, root_build_dir), +- ] ++ if (is_win) { ++ args = [ ++ "--file-list", ++ "nul", ++ "--output", ++ rebase_path(output_file, root_build_dir), ++ ] ++ } else { ++ args = [ ++ "--file-list", ++ "/dev/null", ++ "--output", ++ rebase_path(output_file, root_build_dir), ++ ] ++ } + } + + component("domain_reliability") { +--- components/domain_reliability/bake_in_configs.py ++++ components/domain_reliability/bake_in_configs.py +@@ -490,7 +490,7 @@ def origin_is_whitelisted(origin): + domain = origin[8:-1] + else: + return False +- return any(domain == e or domain.endswith('.' + e) for e in DOMAIN_WHITELIST) ++ return False + + + def quote_and_wrap_text(text, width=79, prefix=' "', suffix='"'): +--- components/domain_reliability/google_configs.cc ++++ components/domain_reliability/google_configs.cc +@@ -11,564 +11,6 @@ + + namespace domain_reliability { + +-namespace { +- +-struct GoogleConfigParams { +- const char* hostname; +- bool include_subdomains; +- +- // If true, prepend a collector URL within https://|hostname|/. +- bool include_origin_specific_collector; +- +- // If true, also add a config for www.|hostname|. +- // +- // |include_subdomains| will be false in the extra config, but +- // |include_origin_specific_collector| will be respected, and will use the +- // www subdomain as the origin for the collector so it matches the config. +- bool duplicate_for_www; +-}; +- +-const GoogleConfigParams kGoogleConfigs[] = { +- // Origins with subdomains and same-origin collectors. Currently, all +- // origins with same-origin collectors also run collectors on their www +- // subdomain. (e.g., both foo.com and www.foo.com.) +- {"google.ac", true, true, true}, +- {"google.ad", true, true, true}, +- {"google.ae", true, true, true}, +- {"google.af", true, true, true}, +- {"google.ag", true, true, true}, +- {"google.al", true, true, true}, +- {"google.am", true, true, true}, +- {"google.as", true, true, true}, +- {"google.at", true, true, true}, +- {"google.az", true, true, true}, +- {"google.ba", true, true, true}, +- {"google.be", true, true, true}, +- {"google.bf", true, true, true}, +- {"google.bg", true, true, true}, +- {"google.bi", true, true, true}, +- {"google.bj", true, true, true}, +- {"google.bs", true, true, true}, +- {"google.bt", true, true, true}, +- {"google.by", true, true, true}, +- {"google.ca", true, true, true}, +- {"google.cc", true, true, true}, +- {"google.cd", true, true, true}, +- {"google.cf", true, true, true}, +- {"google.cg", true, true, true}, +- {"google.ch", true, true, true}, +- {"google.ci", true, true, true}, +- {"google.cl", true, true, true}, +- {"google.cm", true, true, true}, +- {"google.cn", true, true, true}, +- {"google.co.ao", true, true, true}, +- {"google.co.bw", true, true, true}, +- {"google.co.ck", true, true, true}, +- {"google.co.cr", true, true, true}, +- {"google.co.hu", true, true, true}, +- {"google.co.id", true, true, true}, +- {"google.co.il", true, true, true}, +- {"google.co.im", true, true, true}, +- {"google.co.in", true, true, true}, +- {"google.co.je", true, true, true}, +- {"google.co.jp", true, true, true}, +- {"google.co.ke", true, true, true}, +- {"google.co.kr", true, true, true}, +- {"google.co.ls", true, true, true}, +- {"google.co.ma", true, true, true}, +- {"google.co.mz", true, true, true}, +- {"google.co.nz", true, true, true}, +- {"google.co.th", true, true, true}, +- {"google.co.tz", true, true, true}, +- {"google.co.ug", true, true, true}, +- {"google.co.uk", true, true, true}, +- {"google.co.uz", true, true, true}, +- {"google.co.ve", true, true, true}, +- {"google.co.vi", true, true, true}, +- {"google.co.za", true, true, true}, +- {"google.co.zm", true, true, true}, +- {"google.co.zw", true, true, true}, +- {"google.com.af", true, true, true}, +- {"google.com.ag", true, true, true}, +- {"google.com.ai", true, true, true}, +- {"google.com.ar", true, true, true}, +- {"google.com.au", true, true, true}, +- {"google.com.bd", true, true, true}, +- {"google.com.bh", true, true, true}, +- {"google.com.bn", true, true, true}, +- {"google.com.bo", true, true, true}, +- {"google.com.br", true, true, true}, +- {"google.com.by", true, true, true}, +- {"google.com.bz", true, true, true}, +- {"google.com.cn", true, true, true}, +- {"google.com.co", true, true, true}, +- {"google.com.cu", true, true, true}, +- {"google.com.cy", true, true, true}, +- {"google.com.do", true, true, true}, +- {"google.com.ec", true, true, true}, +- {"google.com.eg", true, true, true}, +- {"google.com.et", true, true, true}, +- {"google.com.fj", true, true, true}, +- {"google.com.ge", true, true, true}, +- {"google.com.gh", true, true, true}, +- {"google.com.gi", true, true, true}, +- {"google.com.gr", true, true, true}, +- {"google.com.gt", true, true, true}, +- {"google.com.hk", true, true, true}, +- {"google.com.iq", true, true, true}, +- {"google.com.jm", true, true, true}, +- {"google.com.jo", true, true, true}, +- {"google.com.kh", true, true, true}, +- {"google.com.kw", true, true, true}, +- {"google.com.lb", true, true, true}, +- {"google.com.ly", true, true, true}, +- {"google.com.mm", true, true, true}, +- {"google.com.mt", true, true, true}, +- {"google.com.mx", true, true, true}, +- {"google.com.my", true, true, true}, +- {"google.com.na", true, true, true}, +- {"google.com.nf", true, true, true}, +- {"google.com.ng", true, true, true}, +- {"google.com.ni", true, true, true}, +- {"google.com.np", true, true, true}, +- {"google.com.nr", true, true, true}, +- {"google.com.om", true, true, true}, +- {"google.com.pa", true, true, true}, +- {"google.com.pe", true, true, true}, +- {"google.com.pg", true, true, true}, +- {"google.com.ph", true, true, true}, +- {"google.com.pk", true, true, true}, +- {"google.com.pl", true, true, true}, +- {"google.com.pr", true, true, true}, +- {"google.com.py", true, true, true}, +- {"google.com.qa", true, true, true}, +- {"google.com.ru", true, true, true}, +- {"google.com.sa", true, true, true}, +- {"google.com.sb", true, true, true}, +- {"google.com.sg", true, true, true}, +- {"google.com.sl", true, true, true}, +- {"google.com.sv", true, true, true}, +- {"google.com.tj", true, true, true}, +- {"google.com.tn", true, true, true}, +- {"google.com.tr", true, true, true}, +- {"google.com.tw", true, true, true}, +- {"google.com.ua", true, true, true}, +- {"google.com.uy", true, true, true}, +- {"google.com.vc", true, true, true}, +- {"google.com.ve", true, true, true}, +- {"google.com.vn", true, true, true}, +- {"google.cv", true, true, true}, +- {"google.cz", true, true, true}, +- {"google.de", true, true, true}, +- {"google.dj", true, true, true}, +- {"google.dk", true, true, true}, +- {"google.dm", true, true, true}, +- {"google.dz", true, true, true}, +- {"google.ee", true, true, true}, +- {"google.es", true, true, true}, +- {"google.fi", true, true, true}, +- {"google.fm", true, true, true}, +- {"google.fr", true, true, true}, +- {"google.ga", true, true, true}, +- {"google.ge", true, true, true}, +- {"google.gg", true, true, true}, +- {"google.gl", true, true, true}, +- {"google.gm", true, true, true}, +- {"google.gp", true, true, true}, +- {"google.gr", true, true, true}, +- {"google.gy", true, true, true}, +- {"google.hk", true, true, true}, +- {"google.hn", true, true, true}, +- {"google.hr", true, true, true}, +- {"google.ht", true, true, true}, +- {"google.hu", true, true, true}, +- {"google.ie", true, true, true}, +- {"google.im", true, true, true}, +- {"google.iq", true, true, true}, +- {"google.ir", true, true, true}, +- {"google.is", true, true, true}, +- {"google.it", true, true, true}, +- {"google.it.ao", true, true, true}, +- {"google.je", true, true, true}, +- {"google.jo", true, true, true}, +- {"google.jp", true, true, true}, +- {"google.kg", true, true, true}, +- {"google.ki", true, true, true}, +- {"google.kz", true, true, true}, +- {"google.la", true, true, true}, +- {"google.li", true, true, true}, +- {"google.lk", true, true, true}, +- {"google.lt", true, true, true}, +- {"google.lu", true, true, true}, +- {"google.lv", true, true, true}, +- {"google.md", true, true, true}, +- {"google.me", true, true, true}, +- {"google.mg", true, true, true}, +- {"google.mk", true, true, true}, +- {"google.ml", true, true, true}, +- {"google.mn", true, true, true}, +- {"google.ms", true, true, true}, +- {"google.mu", true, true, true}, +- {"google.mv", true, true, true}, +- {"google.mw", true, true, true}, +- {"google.ne", true, true, true}, +- {"google.ne.jp", true, true, true}, +- {"google.ng", true, true, true}, +- {"google.nl", true, true, true}, +- {"google.no", true, true, true}, +- {"google.nr", true, true, true}, +- {"google.nu", true, true, true}, +- {"google.off.ai", true, true, true}, +- {"google.pk", true, true, true}, +- {"google.pl", true, true, true}, +- {"google.pn", true, true, true}, +- {"google.ps", true, true, true}, +- {"google.pt", true, true, true}, +- {"google.ro", true, true, true}, +- {"google.rs", true, true, true}, +- {"google.ru", true, true, true}, +- {"google.rw", true, true, true}, +- {"google.sc", true, true, true}, +- {"google.se", true, true, true}, +- {"google.sh", true, true, true}, +- {"google.si", true, true, true}, +- {"google.sk", true, true, true}, +- {"google.sm", true, true, true}, +- {"google.sn", true, true, true}, +- {"google.so", true, true, true}, +- {"google.sr", true, true, true}, +- {"google.st", true, true, true}, +- {"google.td", true, true, true}, +- {"google.tg", true, true, true}, +- {"google.tk", true, true, true}, +- {"google.tl", true, true, true}, +- {"google.tm", true, true, true}, +- {"google.tn", true, true, true}, +- {"google.to", true, true, true}, +- {"google.tt", true, true, true}, +- {"google.us", true, true, true}, +- {"google.uz", true, true, true}, +- {"google.vg", true, true, true}, +- {"google.vu", true, true, true}, +- {"google.ws", true, true, true}, +- {"l.google.com", true, true, true}, +- +- // google.com is a special case. We have a custom config for www.google.com, +- // so set duplicate_for_www = false. +- {"google.com", true, true, false}, +- +- // Origins with subdomains and without same-origin collectors. +- {"2mdn.net", true, false, false}, +- {"adgoogle.net", true, false, false}, +- {"admeld.com", true, false, false}, +- {"admob.biz", true, false, false}, +- {"admob.co.in", true, false, false}, +- {"admob.co.kr", true, false, false}, +- {"admob.co.nz", true, false, false}, +- {"admob.co.uk", true, false, false}, +- {"admob.co.za", true, false, false}, +- {"admob.com", true, false, false}, +- {"admob.com.br", true, false, false}, +- {"admob.com.es", true, false, false}, +- {"admob.com.fr", true, false, false}, +- {"admob.com.mx", true, false, false}, +- {"admob.com.pt", true, false, false}, +- {"admob.de", true, false, false}, +- {"admob.dk", true, false, false}, +- {"admob.es", true, false, false}, +- {"admob.fi", true, false, false}, +- {"admob.fr", true, false, false}, +- {"admob.gr", true, false, false}, +- {"admob.hk", true, false, false}, +- {"admob.ie", true, false, false}, +- {"admob.in", true, false, false}, +- {"admob.it", true, false, false}, +- {"admob.jp", true, false, false}, +- {"admob.kr", true, false, false}, +- {"admob.mobi", true, false, false}, +- {"admob.no", true, false, false}, +- {"admob.ph", true, false, false}, +- {"admob.pt", true, false, false}, +- {"admob.sg", true, false, false}, +- {"admob.tw", true, false, false}, +- {"admob.us", true, false, false}, +- {"admob.vn", true, false, false}, +- {"adwhirl.com", true, false, false}, +- {"ampproject.com", true, false, false}, +- {"ampproject.net", true, false, false}, +- {"ampproject.org", true, false, false}, +- {"android.com", true, false, false}, +- {"anycast-edge.metric.gstatic.com", true, false, false}, +- {"anycast-stb.metric.gstatic.com", true, false, false}, +- {"anycast.metric.gstatic.com", true, false, false}, +- {"cdn.ampproject.org", true, false, false}, +- {"chromecast.com", true, false, false}, +- {"chromeexperiments.com", true, false, false}, +- {"chromestatus.com", true, false, false}, +- {"chromium.org", true, false, false}, +- {"clients6.google.com", true, false, false}, +- {"cloudendpointsapis.com", true, false, false}, +- {"dartmotif.com", true, false, false}, +- {"dartsearch.net", true, false, false}, +- {"doubleclick.com", true, false, false}, +- {"doubleclick.ne.jp", true, false, false}, +- {"doubleclick.net", true, false, false}, +- {"doubleclickusercontent.com", true, false, false}, +- {"fls.doubleclick.net", true, false, false}, +- {"g.co", true, false, false}, +- {"g.doubleclick.net", true, false, false}, +- {"ggpht.com", true, false, false}, +- {"gmodules.com", true, false, false}, +- {"goo.gl", true, false, false}, +- {"google-syndication.com", true, false, false}, +- {"google.cat", true, false, false}, +- {"google.info", true, false, false}, +- {"google.jobs", true, false, false}, +- {"google.net", true, false, false}, +- {"google.org", true, false, false}, +- {"google.stackdriver.com", true, false, false}, +- {"googleadapis.com", true, false, false}, +- {"googleadservices.com", true, false, false}, +- {"googleadsserving.cn", true, false, false}, +- {"googlealumni.com", true, false, false}, +- {"googleapis.cn", true, false, false}, +- {"googleapis.com", true, false, false}, +- {"googleapps.com", true, false, false}, +- {"googlecbs.com", true, false, false}, +- {"googlecode.com", true, false, false}, +- {"googlecommerce.com", true, false, false}, +- {"googledrive.com", true, false, false}, +- {"googleenterprise.com", true, false, false}, +- {"googlefiber.com", true, false, false}, +- {"googlefiber.net", true, false, false}, +- {"googlegoro.com", true, false, false}, +- {"googlehosted.com", true, false, false}, +- {"googlepayments.com", true, false, false}, +- {"googlesource.com", true, false, false}, +- {"googlesyndication.com", true, false, false}, +- {"googletagmanager.com", true, false, false}, +- {"googletagservices.com", true, false, false}, +- {"googleusercontent.com", true, false, false}, +- {"googlezip.net", true, false, false}, +- {"gstatic.cn", true, false, false}, +- {"gstatic.com", true, false, false}, +- {"gvt3.com", true, false, false}, +- {"gvt9.com", true, false, false}, +- {"picasa.com", true, false, false}, +- {"recaptcha.net", true, false, false}, +- {"stackdriver.com", true, false, false}, +- {"stbcast-stb.metric.gstatic.com", true, false, false}, +- {"stbcast.metric.gstatic.com", true, false, false}, +- {"stbcast2-stb.metric.gstatic.com", true, false, false}, +- {"stbcast2.metric.gstatic.com", true, false, false}, +- {"stbcast3-stb.metric.gstatic.com", true, false, false}, +- {"stbcast3.metric.gstatic.com", true, false, false}, +- {"stbcast4-stb.metric.gstatic.com", true, false, false}, +- {"stbcast4.metric.gstatic.com", true, false, false}, +- {"unicast-edge.metric.gstatic.com", true, false, false}, +- {"unicast-stb.metric.gstatic.com", true, false, false}, +- {"unicast.metric.gstatic.com", true, false, false}, +- {"unicast2-stb.metric.gstatic.com", true, false, false}, +- {"unicast2.metric.gstatic.com", true, false, false}, +- {"waze.com", true, false, false}, +- {"withgoogle.com", true, false, false}, +- {"youtu.be", true, false, false}, +- {"youtube-3rd-party.com", true, false, false}, +- {"youtube-nocookie.com", true, false, false}, +- {"youtube.ae", true, false, false}, +- {"youtube.al", true, false, false}, +- {"youtube.am", true, false, false}, +- {"youtube.at", true, false, false}, +- {"youtube.az", true, false, false}, +- {"youtube.ba", true, false, false}, +- {"youtube.be", true, false, false}, +- {"youtube.bg", true, false, false}, +- {"youtube.bh", true, false, false}, +- {"youtube.bo", true, false, false}, +- {"youtube.ca", true, false, false}, +- {"youtube.cat", true, false, false}, +- {"youtube.ch", true, false, false}, +- {"youtube.cl", true, false, false}, +- {"youtube.co", true, false, false}, +- {"youtube.co.ae", true, false, false}, +- {"youtube.co.at", true, false, false}, +- {"youtube.co.hu", true, false, false}, +- {"youtube.co.id", true, false, false}, +- {"youtube.co.il", true, false, false}, +- {"youtube.co.in", true, false, false}, +- {"youtube.co.jp", true, false, false}, +- {"youtube.co.ke", true, false, false}, +- {"youtube.co.kr", true, false, false}, +- {"youtube.co.ma", true, false, false}, +- {"youtube.co.nz", true, false, false}, +- {"youtube.co.th", true, false, false}, +- {"youtube.co.ug", true, false, false}, +- {"youtube.co.uk", true, false, false}, +- {"youtube.co.ve", true, false, false}, +- {"youtube.co.za", true, false, false}, +- {"youtube.com", true, false, false}, +- {"youtube.com.ar", true, false, false}, +- {"youtube.com.au", true, false, false}, +- {"youtube.com.az", true, false, false}, +- {"youtube.com.bh", true, false, false}, +- {"youtube.com.bo", true, false, false}, +- {"youtube.com.br", true, false, false}, +- {"youtube.com.by", true, false, false}, +- {"youtube.com.co", true, false, false}, +- {"youtube.com.do", true, false, false}, +- {"youtube.com.ee", true, false, false}, +- {"youtube.com.eg", true, false, false}, +- {"youtube.com.es", true, false, false}, +- {"youtube.com.gh", true, false, false}, +- {"youtube.com.gr", true, false, false}, +- {"youtube.com.gt", true, false, false}, +- {"youtube.com.hk", true, false, false}, +- {"youtube.com.hr", true, false, false}, +- {"youtube.com.jm", true, false, false}, +- {"youtube.com.jo", true, false, false}, +- {"youtube.com.kw", true, false, false}, +- {"youtube.com.lb", true, false, false}, +- {"youtube.com.lv", true, false, false}, +- {"youtube.com.mk", true, false, false}, +- {"youtube.com.mt", true, false, false}, +- {"youtube.com.mx", true, false, false}, +- {"youtube.com.my", true, false, false}, +- {"youtube.com.ng", true, false, false}, +- {"youtube.com.om", true, false, false}, +- {"youtube.com.pe", true, false, false}, +- {"youtube.com.ph", true, false, false}, +- {"youtube.com.pk", true, false, false}, +- {"youtube.com.pt", true, false, false}, +- {"youtube.com.qa", true, false, false}, +- {"youtube.com.ro", true, false, false}, +- {"youtube.com.sa", true, false, false}, +- {"youtube.com.sg", true, false, false}, +- {"youtube.com.tn", true, false, false}, +- {"youtube.com.tr", true, false, false}, +- {"youtube.com.tw", true, false, false}, +- {"youtube.com.ua", true, false, false}, +- {"youtube.com.uy", true, false, false}, +- {"youtube.com.ve", true, false, false}, +- {"youtube.cz", true, false, false}, +- {"youtube.de", true, false, false}, +- {"youtube.dk", true, false, false}, +- {"youtube.ee", true, false, false}, +- {"youtube.es", true, false, false}, +- {"youtube.fi", true, false, false}, +- {"youtube.fr", true, false, false}, +- {"youtube.ge", true, false, false}, +- {"youtube.gr", true, false, false}, +- {"youtube.gt", true, false, false}, +- {"youtube.hk", true, false, false}, +- {"youtube.hr", true, false, false}, +- {"youtube.hu", true, false, false}, +- {"youtube.ie", true, false, false}, +- {"youtube.in", true, false, false}, +- {"youtube.is", true, false, false}, +- {"youtube.it", true, false, false}, +- {"youtube.jo", true, false, false}, +- {"youtube.jp", true, false, false}, +- {"youtube.kr", true, false, false}, +- {"youtube.lk", true, false, false}, +- {"youtube.lt", true, false, false}, +- {"youtube.lv", true, false, false}, +- {"youtube.ma", true, false, false}, +- {"youtube.md", true, false, false}, +- {"youtube.me", true, false, false}, +- {"youtube.mk", true, false, false}, +- {"youtube.mx", true, false, false}, +- {"youtube.my", true, false, false}, +- {"youtube.ng", true, false, false}, +- {"youtube.nl", true, false, false}, +- {"youtube.no", true, false, false}, +- {"youtube.pe", true, false, false}, +- {"youtube.ph", true, false, false}, +- {"youtube.pk", true, false, false}, +- {"youtube.pl", true, false, false}, +- {"youtube.pr", true, false, false}, +- {"youtube.pt", true, false, false}, +- {"youtube.qa", true, false, false}, +- {"youtube.ro", true, false, false}, +- {"youtube.rs", true, false, false}, +- {"youtube.ru", true, false, false}, +- {"youtube.sa", true, false, false}, +- {"youtube.se", true, false, false}, +- {"youtube.sg", true, false, false}, +- {"youtube.si", true, false, false}, +- {"youtube.sk", true, false, false}, +- {"youtube.sn", true, false, false}, +- {"youtube.tn", true, false, false}, +- {"youtube.ua", true, false, false}, +- {"youtube.ug", true, false, false}, +- {"youtube.uy", true, false, false}, +- {"youtube.vn", true, false, false}, +- {"youtubeeducation.com", true, false, false}, +- {"youtubemobilesupport.com", true, false, false}, +- {"ytimg.com", true, false, false}, +- +- // Origins without subdomains and with same-origin collectors. +- {"accounts.google.com", false, true, false}, +- {"apis.google.com", false, true, false}, +- {"app.google.stackdriver.com", false, true, false}, +- {"b.mail.google.com", false, true, false}, +- {"chatenabled.mail.google.com", false, true, false}, +- {"ddm.google.com", false, true, false}, +- {"gmail.com", false, true, false}, +- {"gmail.google.com", false, true, false}, +- {"mail-attachment.googleusercontent.com", false, true, false}, +- {"mail.google.com", false, true, false}, +- {"www.gmail.com", false, true, false}, +- +- // Origins without subdomains or same-origin collectors. +- {"ad.doubleclick.net", false, false, false}, +- {"drive.google.com", false, false, false}, +- {"redirector.googlevideo.com", false, false, false}, +-}; +- +-const char* const kGoogleStandardCollectors[] = { +- "https://beacons.gcp.gvt2.com/domainreliability/upload", +- "https://beacons.gvt2.com/domainreliability/upload", +- "https://beacons2.gvt2.com/domainreliability/upload", +- "https://beacons3.gvt2.com/domainreliability/upload", +- "https://beacons4.gvt2.com/domainreliability/upload", +- "https://beacons5.gvt2.com/domainreliability/upload", +- "https://beacons5.gvt3.com/domainreliability/upload", +- "https://clients2.google.com/domainreliability/upload", +-}; +- +-const char* const kGoogleOriginSpecificCollectorPathString = +- "/domainreliability/upload"; +- +-std::unique_ptr CreateGoogleConfig( +- const GoogleConfigParams& params, +- bool is_www) { +- if (is_www) +- DCHECK(params.duplicate_for_www); +- +- std::string hostname = (is_www ? "www." : "") + std::string(params.hostname); +- bool include_subdomains = params.include_subdomains && !is_www; +- +- auto config = std::make_unique(); +- config->origin = GURL("https://" + hostname + "/"); +- config->include_subdomains = include_subdomains; +- config->collectors.clear(); +- if (params.include_origin_specific_collector) { +- GURL::Replacements replacements; +- replacements.SetPathStr(kGoogleOriginSpecificCollectorPathString); +- config->collectors.push_back( +- std::make_unique(config->origin.ReplaceComponents(replacements))); +- } +- for (const char* collector : kGoogleStandardCollectors) { +- config->collectors.push_back(std::make_unique(collector)); +- } +- config->success_sample_rate = 0.05; +- config->failure_sample_rate = 1.00; +- config->path_prefixes.clear(); +- return config; +-} +- +-} // namespace +- + std::unique_ptr MaybeGetGoogleConfig( + const std::string& hostname) { + bool is_www_subdomain = +@@ -578,23 +20,6 @@ std::unique_ptr config = nullptr; + std::unique_ptr superdomain_config = nullptr; + +- for (const auto& params : kGoogleConfigs) { +- if (params.hostname == hostname) { +- config = CreateGoogleConfig(params, false); +- break; +- } +- if (params.duplicate_for_www && is_www_subdomain && +- params.hostname == hostname_parent) { +- config = CreateGoogleConfig(params, true); +- break; +- } +- // Don't break out of the loop upon finding a superdomain config, because +- // there might be an exact match later on. +- if (params.include_subdomains && params.hostname == hostname_parent) { +- superdomain_config = CreateGoogleConfig(params, false); +- } +- } +- + if (config) { + DCHECK(config->origin.host() == hostname); + return config; +@@ -613,11 +38,6 @@ std::vector> configs_out; + +- for (const auto& params : kGoogleConfigs) { +- configs_out.push_back(CreateGoogleConfig(params, false)); +- if (params.duplicate_for_www) +- configs_out.push_back(CreateGoogleConfig(params, true)); +- } + return configs_out; + } + +--- components/domain_reliability/uploader.cc ++++ components/domain_reliability/uploader.cc +@@ -77,7 +77,7 @@ class DomainReliabilityUploaderImpl : pu + if (discard_uploads_) + discarded_upload_count_++; + +- if (discard_uploads_ || shutdown_) { ++ if (true) { + DVLOG(1) << "Discarding report instead of uploading."; + UploadResult result; + result.status = UploadResult::SUCCESS; diff --git a/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch new file mode 100644 index 0000000..d7781e9 --- /dev/null +++ b/unstable/ungoogled-chromium/ungoogled-chromium-patches/core/ungoogled-chromium/disable-fonts-googleapis-references.patch @@ -0,0 +1,107 @@ +# Disables references to fonts.googleapis.com + +--- components/dom_distiller/content/browser/dom_distiller_viewer_source.cc ++++ components/dom_distiller/content/browser/dom_distiller_viewer_source.cc +@@ -291,7 +291,7 @@ bool DomDistillerViewerSource::ShouldSer + std::string DomDistillerViewerSource::GetContentSecurityPolicy( + network::mojom::CSPDirectiveName directive) { + if (directive == network::mojom::CSPDirectiveName::StyleSrc) { +- return "style-src 'self' https://fonts.googleapis.com;"; ++ return "style-src 'self';"; + } else if (directive == network::mojom::CSPDirectiveName::ChildSrc) { + return "child-src *;"; + } else if (directive == +--- components/dom_distiller/core/html/preview.html ++++ components/dom_distiller/core/html/preview.html +@@ -11,7 +11,7 @@ found in the LICENSE file. + + Title goes here and it could be kind of lengthy - Publisher name + +- ++ + ++ + + ++ +--- chrome/browser/resources/settings/privacy_page/personalization_options.html ++++ chrome/browser/resources/settings/privacy_page/personalization_options.html +@@ -35,7 +35,7 @@ + border-top: none; + } + +- ++ + + $i18n{autofillPageTitle} + ++ + ++ +