Merging upstream version 115.12.0esr.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 253 insertions, 226 deletions

diff --git a/services/settings/dumps/main/cookie-banner-rules-list.json b/services/settings/dumps/main/cookie-banner-rules-list.json
index e1757708ea..440c43ec92 100644
--- a/services/settings/dumps/main/cookie-banner-rules-list.json
+++ b/services/settings/dumps/main/cookie-banner-rules-list.json
@@ -2,6 +2,96 @@
   "data": [
     {
       "click": {
+        "optIn": "custom-button#consentAccept",
+        "presence": "main[data-consent-main]"
+      },
+      "schema": 1717015159283,
+      "domains": [
+        "rp-online.de"
+      ],
+      "id": "06ae9b8e-909a-4f50-be66-0046a1a75ddf",
+      "last_modified": 1717071078321
+    },
+    {
+      "click": {
+        "optIn": ".cookie-consent-banner__btn-primary",
+        "presence": "#cookie-consent-banner"
+      },
+      "schema": 1717015159283,
+      "cookies": {
+        "optOut": [
+          {
+            "name": "__tnw_cookieConsent",
+            "value": "{%22ad_storage%22:%22denied%22%2C%22analytics_storage%22:%22denied%22}"
+          }
+        ]
+      },
+      "domains": [
+        "thenextweb.com"
+      ],
+      "id": "02c3c5e1-03a6-426a-b00b-fa34f62322fd",
+      "last_modified": 1717071078318
+    },
+    {
+      "click": {
+        "optIn": "div[data-tracking-opt-in-accept=\"true\"]",
+        "optOut": "div[data-tracking-opt-in-reject=\"true\"]",
+        "presence": "div[data-tracking-opt-in-overlay=\"true\"]"
+      },
+      "schema": 1717015159283,
+      "domains": [
+        "fandom.com"
+      ],
+      "id": "D168AF87-F481-4AD7-BE78-28A59F798406",
+      "last_modified": 1717071078313
+    },
+    {
+      "schema": 1717015159283,
+      "cookies": {
+        "optIn": [
+          {
+            "name": "d_prefs",
+            "value": "MToxLGNvbnNlbnRfdmVyc2lvbjoyLHRleHRfdmVyc2lvbjoxMDAw"
+          }
+        ],
+        "optOut": [
+          {
+            "name": "d_prefs",
+            "value": "MjoxLGNvbnNlbnRfdmVyc2lvbjoyLHRleHRfdmVyc2lvbjoxMDAw"
+          },
+          {
+            "name": "twtr_pixel_opt_in",
+            "value": "N"
+          }
+        ]
+      },
+      "domains": [
+        "twitter.com",
+        "x.com"
+      ],
+      "id": "05b3b417-c4c7-4ed0-a3cf-43053e8b33ab",
+      "last_modified": 1717071078310
+    },
+    {
+      "click": {
+        "optIn": "[data-cookiebanner=\"accept_button\"]",
+        "optOut": "[data-cookiebanner=\"accept_only_essential_button\"]",
+        "presence": "[data-testid=\"cookie-policy-manage-dialog\"]"
+      },
+      "schema": 1717015159283,
+      "domains": [
+        "facebook.com",
+        "instagram.com",
+        "messenger.com",
+        "meta.com",
+        "oculus.com",
+        "workplace.com"
+      ],
+      "id": "d1d8ba36-ced7-4453-8b17-2e051e0ab1eb",
+      "last_modified": 1717071078306
+    },
+    {
+      "click": {
         "optIn": "#shopify-pc__banner__btn-accept",
         "optOut": "#shopify-pc__banner__btn-decline",
         "presence": "#shopify-pc__banner"
@@ -1368,32 +1458,6 @@
       "last_modified": 1714811639827
     },
     {
-      "schema": 1714780808679,
-      "cookies": {
-        "optIn": [
-          {
-            "name": "d_prefs",
-            "value": "MToxLGNvbnNlbnRfdmVyc2lvbjoyLHRleHRfdmVyc2lvbjoxMDAw"
-          }
-        ],
-        "optOut": [
-          {
-            "name": "d_prefs",
-            "value": "MjoxLGNvbnNlbnRfdmVyc2lvbjoyLHRleHRfdmVyc2lvbjoxMDAw"
-          },
-          {
-            "name": "twtr_pixel_opt_in",
-            "value": "N"
-          }
-        ]
-      },
-      "domains": [
-        "twitter.com"
-      ],
-      "id": "05b3b417-c4c7-4ed0-a3cf-43053e8b33ab",
-      "last_modified": 1714811639824
-    },
-    {
       "click": {
         "optIn": "button#CybotCookiebotDialogBodyLevelButtonLevelOptinAllowAll",
         "optOut": "button#CybotCookiebotDialogBodyButtonDecline",
@@ -2182,22 +2246,6 @@
     },
     {
       "click": {
-        "optIn": "[data-cookiebanner=\"accept_button\"]",
-        "optOut": "[data-cookiebanner=\"accept_only_essential_button\"]",
-        "presence": "[data-testid=\"cookie-policy-manage-dialog\"]"
-      },
-      "schema": 1710174339269,
-      "domains": [
-        "facebook.com",
-        "messenger.com",
-        "oculus.com",
-        "workplace.com"
-      ],
-      "id": "d1d8ba36-ced7-4453-8b17-2e051e0ab1eb",
-      "last_modified": 1710331175381
-    },
-    {
-      "click": {
         "optIn": "#cookiescript_accept",
         "optOut": "#cookiescript_reject",
         "presence": "#cookiescript_injected_wrapper"
@@ -4212,18 +4260,6 @@
       "last_modified": 1697710931635
     },
     {
-      "click": {
-        "optIn": "div[data-tracking-opt-in-accept=\"true\"]",
-        "presence": "div[data-tracking-opt-in-overlay=\"true\"]"
-      },
-      "schema": 1697557061727,
-      "domains": [
-        "fandom.com"
-      ],
-      "id": "D168AF87-F481-4AD7-BE78-28A59F798406",
-      "last_modified": 1697710931628
-    },
-    {
       "schema": 1697557061727,
       "cookies": {
         "optOut": [
@@ -10115,5 +10151,5 @@
       "last_modified": 1670498155651
     }
   ],
-  "timestamp": 1714811640008
+  "timestamp": 1717071078321
 }
diff --git a/services/settings/dumps/main/devtools-compatibility-browsers.json b/services/settings/dumps/main/devtools-compatibility-browsers.json
index b187738643..0f422a8f37 100644
--- a/services/settings/dumps/main/devtools-compatibility-browsers.json
+++ b/services/settings/dumps/main/devtools-compatibility-browsers.json
@@ -1,238 +1,238 @@
 {
   "data": [
     {
-      "name": "Samsung Internet",
-      "schema": 1714521906708,
-      "status": "current",
-      "version": "25.0",
-      "browserid": "samsunginternet_android",
-      "id": "91fb10f8-ce37-4722-9eac-296c08d297c6",
-      "last_modified": 1714638388565
-    },
-    {
       "name": "Edge",
-      "schema": 1714521906580,
+      "schema": 1716941107417,
       "status": "current",
-      "version": "124",
-      "browserid": "edge",
-      "id": "3837dc37-38b7-483b-82b3-c5593e7a4c91",
-      "last_modified": 1714638388557
-    },
-    {
-      "name": "Chrome",
-      "schema": 1713917106736,
-      "status": "beta",
       "version": "125",
-      "browserid": "chrome",
-      "id": "98f20ad9-f47a-476b-b376-be58dbcc76ff",
-      "last_modified": 1713943930239
-    },
-    {
-      "name": "Chrome Android",
-      "schema": 1713917106908,
-      "status": "beta",
-      "version": "125",
-      "browserid": "chrome_android",
-      "id": "7cb3db05-b658-4c6c-a57a-c17a1ceefd38",
-      "last_modified": 1713943930237
+      "browserid": "edge",
+      "id": "f1147d5f-d690-43d0-879d-117c6ca24a16",
+      "last_modified": 1716966331501
     },
     {
       "name": "Firefox",
-      "schema": 1713917107195,
+      "schema": 1715731507143,
       "status": "planned",
-      "version": "128",
+      "version": "129",
       "browserid": "firefox",
-      "id": "565161dc-52d8-4cb1-8cf3-8171b960f9e4",
-      "last_modified": 1713943930235
+      "id": "aed9aeed-2d00-44d3-9b04-065a3df6af27",
+      "last_modified": 1715839095932
     },
     {
       "name": "Firefox for Android",
-      "schema": 1713917107461,
+      "schema": 1715731507714,
       "status": "planned",
-      "version": "128",
+      "version": "129",
       "browserid": "firefox_android",
-      "id": "05aa43eb-3966-4fc1-8b33-53c493448d2d",
-      "last_modified": 1713943930232
-    },
-    {
-      "name": "Opera",
-      "schema": 1713917107636,
-      "status": "current",
-      "version": "109",
-      "browserid": "opera",
-      "id": "bd13befe-c011-403f-a0d5-b6f691ff03fb",
-      "last_modified": 1713943930230
-    },
-    {
-      "name": "Opera",
-      "schema": 1713917107684,
-      "status": "beta",
-      "version": "110",
-      "browserid": "opera",
-      "id": "08a3849f-52fd-40ae-9054-b0e33272d279",
-      "last_modified": 1713943930228
-    },
-    {
-      "name": "Opera Android",
-      "schema": 1713917107783,
-      "status": "current",
-      "version": "81",
-      "browserid": "opera_android",
-      "id": "e1ea7758-028a-45df-beab-8c83d0dd0d14",
-      "last_modified": 1713943930225
+      "id": "0e014c85-acab-44d6-8108-3441175573e2",
+      "last_modified": 1715839095930
     },
     {
-      "name": "WebView Android",
-      "schema": 1713917107962,
-      "status": "beta",
-      "version": "125",
-      "browserid": "webview_android",
-      "id": "c9ec1a0b-5d6d-4727-9f93-fb4dd3f1979f",
-      "last_modified": 1713943930223
-    },
-    {
-      "name": "Chrome Android",
-      "schema": 1713917106856,
-      "status": "current",
-      "version": "124",
-      "browserid": "chrome_android",
-      "id": "6946fbe1-bfff-4b64-aead-f001f0e486de",
-      "last_modified": 1713943930211
-    },
-    {
-      "name": "Chrome",
-      "schema": 1713917106676,
+      "name": "Safari on iOS",
+      "schema": 1715731507984,
       "status": "current",
-      "version": "124",
-      "browserid": "chrome",
-      "id": "f26cb7b0-cf29-4c33-8fb7-a2cc466a7e3c",
-      "last_modified": 1713943930205
+      "version": "17.5",
+      "browserid": "safari_ios",
+      "id": "4375a82d-f2f1-4883-8da7-0aedfb05b8f9",
+      "last_modified": 1715839095923
     },
     {
-      "name": "WebView Android",
-      "schema": 1713917107903,
+      "name": "Safari",
+      "schema": 1715731507854,
       "status": "current",
-      "version": "124",
-      "browserid": "webview_android",
-      "id": "2dd2f70c-7c64-4aee-a05e-a0eb05d29ed5",
-      "last_modified": 1713943930203
+      "version": "17.5",
+      "browserid": "safari",
+      "id": "24e30aff-fbf8-4a96-a036-84f970447d4b",
+      "last_modified": 1715839095920
     },
     {
       "name": "Firefox",
-      "schema": 1713917107078,
+      "schema": 1715731506990,
       "status": "beta",
-      "version": "126",
+      "version": "127",
       "browserid": "firefox",
-      "id": "70b05b0b-bbef-486c-901a-ea3221a28fc1",
-      "last_modified": 1713943930201
+      "id": "1477a1c3-a8be-4e6f-916e-8cf8eb789e3f",
+      "last_modified": 1715839095918
     },
     {
       "name": "Firefox for Android",
-      "schema": 1713917107363,
+      "schema": 1715731507415,
       "status": "beta",
-      "version": "126",
+      "version": "127",
       "browserid": "firefox_android",
-      "id": "b77524e9-58dc-4196-acbd-41dddc4daea2",
-      "last_modified": 1713943930199
+      "id": "13f02b93-14c9-4ca4-937d-0a83fb7fb3a5",
+      "last_modified": 1715839095915
     },
     {
       "name": "Firefox for Android",
-      "schema": 1713917107309,
+      "schema": 1715731507341,
       "status": "current",
-      "version": "125",
+      "version": "126",
       "browserid": "firefox_android",
-      "id": "a8f570e9-574d-4193-891f-fa8e0a875388",
-      "last_modified": 1713943930193
+      "id": "b77524e9-58dc-4196-acbd-41dddc4daea2",
+      "last_modified": 1715839095908
     },
     {
       "name": "Firefox",
-      "schema": 1713917107027,
+      "schema": 1715731506911,
       "status": "current",
-      "version": "125",
+      "version": "126",
       "browserid": "firefox",
-      "id": "5ae5bd40-deb0-40c4-bba6-cd411b78ee16",
-      "last_modified": 1713943930190
+      "id": "70b05b0b-bbef-486c-901a-ea3221a28fc1",
+      "last_modified": 1715839095906
     },
     {
       "name": "Firefox for Android",
-      "schema": 1713917107413,
+      "schema": 1715731507485,
       "status": "nightly",
-      "version": "127",
+      "version": "128",
       "browserid": "firefox_android",
-      "id": "13f02b93-14c9-4ca4-937d-0a83fb7fb3a5",
-      "last_modified": 1713943930188
+      "id": "05aa43eb-3966-4fc1-8b33-53c493448d2d",
+      "last_modified": 1715839095903
     },
     {
       "name": "Firefox",
-      "schema": 1713917107141,
+      "schema": 1715731507063,
       "status": "nightly",
-      "version": "127",
+      "version": "128",
       "browserid": "firefox",
-      "id": "1477a1c3-a8be-4e6f-916e-8cf8eb789e3f",
-      "last_modified": 1713943930185
+      "id": "565161dc-52d8-4cb1-8cf3-8171b960f9e4",
+      "last_modified": 1715839095900
     },
     {
-      "name": "Deno",
-      "schema": 1712707507752,
+      "name": "Node.js",
+      "schema": 1715126727137,
       "status": "current",
-      "version": "1.42",
-      "browserid": "deno",
-      "id": "a308f3c2-cc19-4a1e-825f-898696606328",
-      "last_modified": 1712840749681
+      "version": "22.0.0",
+      "browserid": "nodejs",
+      "id": "c28dfac7-c7de-4e20-8212-abc7c0de635a",
+      "last_modified": 1715589742262
     },
     {
-      "name": "Edge",
-      "schema": 1712707507922,
-      "status": "planned",
+      "name": "Chrome",
+      "schema": 1715385903539,
+      "status": "beta",
       "version": "126",
-      "browserid": "edge",
-      "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9",
-      "last_modified": 1712840749678
+      "browserid": "chrome",
+      "id": "329bb17c-2556-40a6-8e88-eb2fe353913a",
+      "last_modified": 1715589742259
     },
     {
-      "name": "Safari",
-      "schema": 1712707507975,
+      "name": "Chrome Android",
+      "schema": 1715385903774,
       "status": "beta",
-      "version": "17.5",
-      "browserid": "safari",
-      "id": "24e30aff-fbf8-4a96-a036-84f970447d4b",
-      "last_modified": 1712840749675
+      "version": "126",
+      "browserid": "chrome_android",
+      "id": "e8108829-a3d5-4363-86c9-7e9f1015c2fd",
+      "last_modified": 1715589742256
     },
     {
-      "name": "Safari on iOS",
-      "schema": 1712707508032,
+      "name": "Opera",
+      "schema": 1715385903851,
+      "status": "nightly",
+      "version": "111",
+      "browserid": "opera",
+      "id": "880cc50c-e430-43ac-aa57-d1f02fae0e30",
+      "last_modified": 1715589742254
+    },
+    {
+      "name": "Opera Android",
+      "schema": 1715385904000,
+      "status": "current",
+      "version": "82",
+      "browserid": "opera_android",
+      "id": "dad8a164-2e60-4363-a9b2-169aa15ea735",
+      "last_modified": 1715589742251
+    },
+    {
+      "name": "WebView Android",
+      "schema": 1715385904222,
       "status": "beta",
-      "version": "17.5",
-      "browserid": "safari_ios",
-      "id": "4375a82d-f2f1-4883-8da7-0aedfb05b8f9",
-      "last_modified": 1712840749673
+      "version": "126",
+      "browserid": "webview_android",
+      "id": "97b0b530-34a9-4e02-949f-d525bf6bc793",
+      "last_modified": 1715589742248
+    },
+    {
+      "name": "WebView Android",
+      "schema": 1715385904147,
+      "status": "current",
+      "version": "125",
+      "browserid": "webview_android",
+      "id": "c9ec1a0b-5d6d-4727-9f93-fb4dd3f1979f",
+      "last_modified": 1715589742235
+    },
+    {
+      "name": "Chrome Android",
+      "schema": 1715385903692,
+      "status": "current",
+      "version": "125",
+      "browserid": "chrome_android",
+      "id": "7cb3db05-b658-4c6c-a57a-c17a1ceefd38",
+      "last_modified": 1715589742230
+    },
+    {
+      "name": "Chrome",
+      "schema": 1715385903420,
+      "status": "current",
+      "version": "125",
+      "browserid": "chrome",
+      "id": "98f20ad9-f47a-476b-b376-be58dbcc76ff",
+      "last_modified": 1715589742227
     },
     {
       "name": "Edge",
-      "schema": 1712707507867,
+      "schema": 1714867506498,
+      "status": "planned",
+      "version": "127",
+      "browserid": "edge",
+      "id": "9e227c6c-b6ca-4c69-868c-e133a0ee9dbd",
+      "last_modified": 1715003394961
+    },
+    {
+      "name": "Edge",
+      "schema": 1714867506401,
       "status": "nightly",
-      "version": "125",
+      "version": "126",
       "browserid": "edge",
-      "id": "f1147d5f-d690-43d0-879d-117c6ca24a16",
-      "last_modified": 1712840749665
+      "id": "c8bf4918-03b7-4be2-bf75-4d6139dbd7c9",
+      "last_modified": 1715003394956
     },
     {
-      "name": "Safari",
-      "schema": 1709769903331,
+      "name": "Samsung Internet",
+      "schema": 1714521906708,
       "status": "current",
-      "version": "17.4",
-      "browserid": "safari",
-      "id": "380463f2-6aa8-499e-b186-5f80cf4cc573",
-      "last_modified": 1709801393999
+      "version": "25.0",
+      "browserid": "samsunginternet_android",
+      "id": "91fb10f8-ce37-4722-9eac-296c08d297c6",
+      "last_modified": 1714638388565
     },
     {
-      "name": "Safari on iOS",
-      "schema": 1709769903472,
+      "name": "Opera",
+      "schema": 1713917107636,
       "status": "current",
-      "version": "17.4",
-      "browserid": "safari_ios",
-      "id": "b99772c5-e366-42c6-b2db-330aca62dba5",
-      "last_modified": 1709801393995
+      "version": "109",
+      "browserid": "opera",
+      "id": "bd13befe-c011-403f-a0d5-b6f691ff03fb",
+      "last_modified": 1713943930230
+    },
+    {
+      "name": "Opera",
+      "schema": 1713917107684,
+      "status": "beta",
+      "version": "110",
+      "browserid": "opera",
+      "id": "08a3849f-52fd-40ae-9054-b0e33272d279",
+      "last_modified": 1713943930228
+    },
+    {
+      "name": "Deno",
+      "schema": 1712707507752,
+      "status": "current",
+      "version": "1.42",
+      "browserid": "deno",
+      "id": "a308f3c2-cc19-4a1e-825f-898696606328",
+      "last_modified": 1712840749681
     },
     {
       "name": "Node.js",
@@ -244,15 +244,6 @@
       "last_modified": 1702890886929
     },
     {
-      "name": "Node.js",
-      "schema": 1700957104515,
-      "status": "current",
-      "version": "21.2.0",
-      "browserid": "nodejs",
-      "id": "b9979c74-bcbd-478d-99bc-55b92fcb2833",
-      "last_modified": 1701078578067
-    },
-    {
       "name": "Firefox for Android",
       "schema": 1698797104411,
       "status": "esr",
@@ -289,5 +280,5 @@
       "last_modified": 1665656484764
     }
   ],
-  "timestamp": 1714638388565
+  "timestamp": 1716966331504
 }
diff --git a/services/settings/dumps/main/url-classifier-skip-urls.json b/services/settings/dumps/main/url-classifier-skip-urls.json
index 54e7371601..35cea1645a 100644
--- a/services/settings/dumps/main/url-classifier-skip-urls.json
+++ b/services/settings/dumps/main/url-classifier-skip-urls.json
@@ -16,5 +16,5 @@
       "last_modified": 1701090424139
     }
   ],
-  "timestamp": 1701090424142
+  "timestamp": 1716288373828
 }