Merging upstream version 127.0.

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

5 files changed, 247 insertions, 83 deletions

diff --git a/services/settings/dumps/blocklists/addons-bloomfilters.json b/services/settings/dumps/blocklists/addons-bloomfilters.json
index 489a3dc429..6cdec41139 100644
--- a/services/settings/dumps/blocklists/addons-bloomfilters.json
+++ b/services/settings/dumps/blocklists/addons-bloomfilters.json
@@ -3,6 +3,35 @@
     {
       "stash": {
         "blocked": [
+          "{a5eff3e0-fd15-4905-8799-a3c8a3a1eb56}:1.6",
+          "{437c932f-fa9f-459d-8dab-ea6219d23513}:1.7",
+          "{2aeb7e23-47e4-4a41-9125-f5a28e9b62cf}:1.4"
+        ],
+        "unblocked": []
+      },
+      "schema": 1717054814742,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1717094105559,
+      "id": "410c26fe-3975-49d7-9926-511f891fcfcf",
+      "last_modified": 1717094162111
+    },
+    {
+      "stash": {
+        "blocked": [
+          "superiorblock@ext:1.0",
+          "charityaff@testnet:2024.1"
+        ],
+        "unblocked": []
+      },
+      "schema": 1716455304678,
+      "key_format": "{guid}:{version}",
+      "stash_time": 1716834906988,
+      "id": "dcd0b6d7-76ec-4c93-a447-c90fb79a8376",
+      "last_modified": 1716834963648
+    },
+    {
+      "stash": {
+        "blocked": [
           "hiddenads@addon:1.2",
           "hiddenads@addon:1.1"
         ],
@@ -678,5 +707,5 @@
       "last_modified": 1707395854769
     }
   ],
-  "timestamp": 1715085361954
+  "timestamp": 1717094162111
 }
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 4f78ce96d0..0f422a8f37 100644
--- a/services/settings/dumps/main/devtools-compatibility-browsers.json
+++ b/services/settings/dumps/main/devtools-compatibility-browsers.json
@@ -1,6 +1,15 @@
 {
   "data": [
     {
+      "name": "Edge",
+      "schema": 1716941107417,
+      "status": "current",
+      "version": "125",
+      "browserid": "edge",
+      "id": "f1147d5f-d690-43d0-879d-117c6ca24a16",
+      "last_modified": 1716966331501
+    },
+    {
       "name": "Firefox",
       "schema": 1715731507143,
       "status": "planned",
@@ -182,15 +191,6 @@
     },
     {
       "name": "Edge",
-      "schema": 1714638388703,
-      "status": "beta",
-      "version": "125",
-      "browserid": "edge",
-      "id": "f1147d5f-d690-43d0-879d-117c6ca24a16",
-      "last_modified": 1715003394958
-    },
-    {
-      "name": "Edge",
       "schema": 1714867506401,
       "status": "nightly",
       "version": "126",
@@ -208,15 +208,6 @@
       "last_modified": 1714638388565
     },
     {
-      "name": "Edge",
-      "schema": 1714521906580,
-      "status": "current",
-      "version": "124",
-      "browserid": "edge",
-      "id": "3837dc37-38b7-483b-82b3-c5593e7a4c91",
-      "last_modified": 1714638388557
-    },
-    {
       "name": "Opera",
       "schema": 1713917107636,
       "status": "current",
@@ -289,5 +280,5 @@
       "last_modified": 1665656484764
     }
   ],
-  "timestamp": 1715839095932
+  "timestamp": 1716966331504
 }
diff --git a/services/settings/dumps/main/search-config-v2.json b/services/settings/dumps/main/search-config-v2.json
index ec2e2cd829..3848d688ae 100644
--- a/services/settings/dumps/main/search-config-v2.json
+++ b/services/settings/dumps/main/search-config-v2.json
@@ -2524,10 +2524,10 @@
         }
       },
       "id": "8111d157-e064-40fa-993d-e1d972534754",
-      "identifier": "mercadolibre",
-      "last_modified": 1702906502289,
+      "identifier": "mercadolibre-ar",
+      "last_modified": 1717416922456,
       "recordType": "engine",
-      "schema": 1702901827142,
+      "schema": 1717411267717,
       "variants": [
         {
           "environment": {
@@ -7219,10 +7219,10 @@
         }
       },
       "id": "7c9d2fc3-1e6b-40f6-80ad-080bd94fe24b",
-      "identifier": "wiktionary",
-      "last_modified": 1702906502251,
+      "identifier": "wiktionary-oc",
+      "last_modified": 1717416922458,
       "recordType": "engine",
-      "schema": 1702901835738,
+      "schema": 1717411323291,
       "variants": [
         {
           "environment": {
@@ -7420,5 +7420,5 @@
       "schema": 1707824831520
     }
   ],
-  "timestamp": 1715090108535
+  "timestamp": 1717416922458
 }
diff --git a/services/settings/dumps/security-state/intermediates.json b/services/settings/dumps/security-state/intermediates.json
index 35b0b0893d..49a76e2cec 100644
--- a/services/settings/dumps/security-state/intermediates.json
+++ b/services/settings/dumps/security-state/intermediates.json
@@ -1,6 +1,114 @@
 {
   "data": [
     {
+      "schema": 1717559643220,
+      "derHash": "zBufnkNw+2gUHSihFeqoY/jq23oE4r0js8YvnZ8XwmM=",
+      "subject": "CN=FIRMAPROFESIONAL ICA A01 QWAC 2022,O=Firmaprofesional SA,C=ES",
+      "subjectDN": "MHIxCzAJBgNVBAYTAkVTMRwwGgYDVQQKDBNGaXJtYXByb2Zlc2lvbmFsIFNBMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxKzApBgNVBAMMIkZJUk1BUFJPRkVTSU9OQUwgSUNBIEEwMSBRV0FDIDIwMjI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "d736a3e7ddd478034b9ce53949685d8115e8a539876acfe978db47a7cda1e5c6",
+        "size": 1447,
+        "filename": "bVle95d2TFsMug2xpivw0fPUY7VsTluskvwQa1q1hms=.pem",
+        "location": "security-state-staging/intermediates/ef18664d-a3b4-4937-86fa-040d42090680.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "bVle95d2TFsMug2xpivw0fPUY7VsTluskvwQa1q1hms=",
+      "crlite_enrolled": false,
+      "id": "b693d627-7f28-4463-adb8-51bd4f3c2712",
+      "last_modified": 1717559823094
+    },
+    {
+      "schema": 1717559643616,
+      "derHash": "Iv1U+TOxf0WJQsNF465iXkBc5AsZGzFriHyj0CzKw7E=",
+      "subject": "CN=FIRMAPROFESIONAL ICA A02 NO QWAC 2022,O=Firmaprofesional SA,C=ES",
+      "subjectDN": "MHUxCzAJBgNVBAYTAkVTMRwwGgYDVQQKDBNGaXJtYXByb2Zlc2lvbmFsIFNBMRgwFgYDVQRhDA9WQVRFUy1BNjI2MzQwNjgxLjAsBgNVBAMMJUZJUk1BUFJPRkVTSU9OQUwgSUNBIEEwMiBOTyBRV0FDIDIwMjI=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "c1332c5b2b17a40d7e1c836a6cff328b9adb70daa8683b785dd00bc661c36f89",
+        "size": 1451,
+        "filename": "d96AQ4m8-YeSRHUqkGB8vTJPwsoHOcOVl8BS6_lfdXM=.pem",
+        "location": "security-state-staging/intermediates/01df6fff-e459-4353-a8c7-56a5333a7ebe.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "d96AQ4m8+YeSRHUqkGB8vTJPwsoHOcOVl8BS6/lfdXM=",
+      "crlite_enrolled": false,
+      "id": "27e327c4-059e-49c9-8697-35cb673ccf87",
+      "last_modified": 1717559823092
+    },
+    {
+      "schema": 1717192455323,
+      "derHash": "158fDIFBgEs50EslktV6/r50+UYGVK/0kUkNu3xaLXQ=",
+      "subject": "CN=XinChaCha Trust EV TLS G2 R34 CA,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN",
+      "subjectDN": "MHAxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xKTAnBgNVBAMMIFhpbkNoYUNoYSBUcnVzdCBFViBUTFMgRzIgUjM0IENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "cf9549b1295f7f5940d1eecd85224fe71746a9062b3324375a1ba76e6d1076db",
+        "size": 2393,
+        "filename": "-NirAYepPYxIIKyEoNgiZNqhl8nplSzI0S3gILMyP48=.pem",
+        "location": "security-state-staging/intermediates/3304fe4e-f870-45ba-8df0-81b2a42b4266.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "+NirAYepPYxIIKyEoNgiZNqhl8nplSzI0S3gILMyP48=",
+      "crlite_enrolled": false,
+      "id": "6b1982a7-6538-4496-a5ea-475ad795dca4",
+      "last_modified": 1717192623098
+    },
+    {
+      "schema": 1717192454914,
+      "derHash": "tch6CyI52v4KUoXjQGJiaayl6Q9XSSw46QUMpdGLwho=",
+      "subject": "CN=XinChaCha Trust DV TLS G2 R34 CA,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN",
+      "subjectDN": "MHAxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xKTAnBgNVBAMMIFhpbkNoYUNoYSBUcnVzdCBEViBUTFMgRzIgUjM0IENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "46a17eb3357831af3e72dd3e752ae9d06b7ab5c7e2bde38c552efac33da3c3e7",
+        "size": 2393,
+        "filename": "ia3jA8mRz8AVBO57iULX9U3eGAXK9KzaSydFhjkVQp8=.pem",
+        "location": "security-state-staging/intermediates/d7185123-3b86-4d58-897d-92ce9c326347.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "ia3jA8mRz8AVBO57iULX9U3eGAXK9KzaSydFhjkVQp8=",
+      "crlite_enrolled": false,
+      "id": "0c74406b-6c55-4aa5-a137-e7f059e08b40",
+      "last_modified": 1717192623095
+    },
+    {
+      "schema": 1717192454523,
+      "derHash": "tdRtwCcTDlztO+UIPrNAKN2SMPTVo2rRkk0hwO+YTLo=",
+      "subject": "CN=XinChaCha Trust OV TLS G2 R34 CA,O=Beijing Xinchacha Credit Management Co.\\, Ltd.,C=CN",
+      "subjectDN": "MHAxCzAJBgNVBAYTAkNOMTYwNAYDVQQKDC1CZWlqaW5nIFhpbmNoYWNoYSBDcmVkaXQgTWFuYWdlbWVudCBDby4sIEx0ZC4xKTAnBgNVBAMMIFhpbkNoYUNoYSBUcnVzdCBPViBUTFMgRzIgUjM0IENB",
+      "whitelist": false,
+      "attachment": {
+        "hash": "f3b04dbb9ce45e317a43dd7e0bb1f2d617cf950b6c4f4dcd9041ba8c29903ca9",
+        "size": 2393,
+        "filename": "BTYzRPrLbl9bgC2AezB8r8c6OQbO2yNxAWm2wTdHcPM=.pem",
+        "location": "security-state-staging/intermediates/5b4a4976-5c36-4f3c-ad2c-c646050b9449.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "BTYzRPrLbl9bgC2AezB8r8c6OQbO2yNxAWm2wTdHcPM=",
+      "crlite_enrolled": false,
+      "id": "6ab4c9cc-76f0-46fa-a224-955f948b8672",
+      "last_modified": 1717192623093
+    },
+    {
+      "schema": 1717192453960,
+      "derHash": "UJq7uShkwsRNfLxGa2OVDjUBZe53KjA3roFo6SImpG8=",
+      "subject": "CN=Shoper DV TLS G2 R34 CA,O=Shoper S.A.,C=PL",
+      "subjectDN": "MEUxCzAJBgNVBAYTAlBMMRQwEgYDVQQKDAtTaG9wZXIgUy5BLjEgMB4GA1UEAwwXU2hvcGVyIERWIFRMUyBHMiBSMzQgQ0E=",
+      "whitelist": false,
+      "attachment": {
+        "hash": "89370aee0f5144d748f03671a40cd353d07ebc3e624152b697c93eac8414ae0c",
+        "size": 2337,
+        "filename": "-g6X50iw1KjEyqdAsOvTe7IZ3ChaEo_P0UMuuNWHp4s=.pem",
+        "location": "security-state-staging/intermediates/90e3e772-6b7e-49ca-ad56-1ad21d0e3c6b.pem",
+        "mimetype": "application/x-pem-file"
+      },
+      "pubKeyHash": "+g6X50iw1KjEyqdAsOvTe7IZ3ChaEo/P0UMuuNWHp4s=",
+      "crlite_enrolled": false,
+      "id": "9de0322b-3852-44e0-a52c-20c5398fb224",
+      "last_modified": 1717192623090
+    },
+    {
       "schema": 1714791237384,
       "derHash": "5b/O2dIW66faNjSBn7U0+5zroez55jee2DWD0usXfBs=",
       "subject": "CN=CrowdStrike TLS RSA CA G5,O=CrowdStrike\\, Inc.,C=US",
@@ -30907,5 +31015,5 @@
       "last_modified": 1559865884636
     }
   ],
-  "timestamp": 1715637423088
+  "timestamp": 1717559823094
 }