From c2ba2024d44f5165bd88a26c177a16b7356ce117 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Fri, 26 Apr 2024 09:27:03 +0000 Subject: [PATCH 1/3] Update embedded files --- .../AppPrivacyConfigurationDataProvider.swift | 4 +- DuckDuckGo/ContentBlocker/macos-config.json | 93 +++++++++++++++---- 2 files changed, 75 insertions(+), 22 deletions(-) diff --git a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift index 504b70a61f..474021e012 100644 --- a/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift +++ b/DuckDuckGo/ContentBlocker/AppPrivacyConfigurationDataProvider.swift @@ -22,8 +22,8 @@ import BrowserServicesKit final class AppPrivacyConfigurationDataProvider: EmbeddedDataProvider { public struct Constants { - public static let embeddedDataETag = "\"a482727f0d20b29eabd1e22fde2d54cf\"" - public static let embeddedDataSHA = "993aa84559944a8866e40cebbce02beee2b1597f86b63f998d000d2a0e5d617a" + public static let embeddedDataETag = "\"bb4ba4890f36ae108cd2dfe7599c61b9\"" + public static let embeddedDataSHA = "82064eef480ac6adfcfa0c43f369d738f350b17df813ef46be303d34c9d8f838" } var embeddedDataEtag: String { diff --git a/DuckDuckGo/ContentBlocker/macos-config.json b/DuckDuckGo/ContentBlocker/macos-config.json index 7c20612900..8b97706f07 100644 --- a/DuckDuckGo/ContentBlocker/macos-config.json +++ b/DuckDuckGo/ContentBlocker/macos-config.json @@ -1,6 +1,6 @@ { "readme": "https://github.com/duckduckgo/privacy-configuration", - "version": 1713140318814, + "version": 1714120242935, "features": { "adClickAttribution": { "readme": "https://help.duckduckgo.com/duckduckgo-help-pages/privacy/web-tracking-protections/#3rd-party-tracker-loading-protection", @@ -135,6 +135,9 @@ { "domain": "ksta.de" }, + { + "domain": "larazon.es" + }, { "domain": "motherdenim.com" }, @@ -279,6 +282,18 @@ { "domain": "condell-ltd.com" }, + { + "domain": "leefgemeenschapzilt.nl" + }, + { + "domain": "healthline.com" + }, + { + "domain": "sporthoj.com" + }, + { + "domain": "www.michelinman.com" + }, { "domain": "marvel.com" }, @@ -290,13 +305,11 @@ "disabledCMPs": [ "generic-cosmetic", "termsfeed3", - "strato.de", - "healthline-media", - "tarteaucitron.js" + "healthline-media" ] }, "state": "enabled", - "hash": "0eaff8b64b6d3e8a59879f3b4ab6c0ba" + "hash": "c9424128cbba2b62fdd54ab79f6eccb6" }, "autofill": { "exceptions": [ @@ -1084,6 +1097,10 @@ { "domain": "web.de", "reason": "https://github.com/duckduckgo/privacy-configuration/issues/1931" + }, + { + "domain": "id.seb.se", + "reason": "https://github.com/duckduckgo/privacy-configuration/issues/2025" } ], "webViewDefault": [ @@ -1111,7 +1128,7 @@ }, "exceptions": [], "state": "enabled", - "hash": "76976e1ac417949aae8cb1c7c7ca0a60" + "hash": "c52448ca8da413a93de9822cac039920" }, "dbp": { "state": "enabled", @@ -2843,6 +2860,27 @@ } ] }, + { + "domain": "independent.co.uk", + "rules": [ + { + "selector": "#partners", + "type": "hide-empty" + }, + { + "selector": "#top-banner-wrapper", + "type": "hide-empty" + }, + { + "selector": "[data-mpu1=true]", + "type": "hide-empty" + }, + { + "selector": "#stickyFooterRoot", + "type": "hide" + } + ] + }, { "domain": "indiatimes.com", "rules": [ @@ -4231,7 +4269,7 @@ ] }, "state": "enabled", - "hash": "c0fa0dfbc6231be31492023b623ac99b" + "hash": "765e789c939c6e3307f576bc698fbb9e" }, "exceptionHandler": { "exceptions": [ @@ -4245,6 +4283,11 @@ "state": "disabled", "hash": "dc1b4fa301193a03ddcd4bdf7ee3e610" }, + "extendedOnboarding": { + "exceptions": [], + "state": "disabled", + "hash": "728493ef7a1488e4781656d3f9db84aa" + }, "fingerprintingAudio": { "state": "disabled", "exceptions": [ @@ -4884,18 +4927,11 @@ } }, "toggleReports": { - "state": "enabled", - "rollout": { - "steps": [ - { - "percent": 10 - } - ] - } + "state": "enabled" } }, "state": "enabled", - "hash": "b337f9c7cf15e7e4807ef232befaa999" + "hash": "66968d9b69520975185476473cc11824" }, "privacyPro": { "state": "enabled", @@ -5218,7 +5254,8 @@ { "rule": "static.adsafeprotected.com/iasPET.1.js", "domains": [ - "corriere.it" + "corriere.it", + "independent.co.uk" ] }, { @@ -5958,6 +5995,12 @@ "sbs.com.au" ] }, + { + "rule": "https://googleads.g.doubleclick.net/ads/preferences/naioptout", + "domains": [ + "zojirushi.com" + ] + }, { "rule": "www3.doubleclick.net", "domains": [ @@ -6886,6 +6929,7 @@ { "rule": "a.klaviyo.com/media/js/onsite/onsite.js", "domains": [ + "bonescoffee.com", "tanglefree.com" ] }, @@ -6894,7 +6938,8 @@ "domains": [ "andieswim.com", "footweartruth.com", - "kmail-lists.com" + "kmail-lists.com", + "usafacts.org" ] } ] @@ -7107,7 +7152,8 @@ { "rule": "npttech.com/advertising.js", "domains": [ - "blick.ch" + "blick.ch", + "independent.co.uk" ] } ] @@ -7192,6 +7238,7 @@ "abc.net.au", "emol.com", "oufc.co.uk", + "the-afc.com", "theposh.com" ] } @@ -7210,6 +7257,12 @@ "domains": [ "hgtv.com" ] + }, + { + "rule": "https://cdn.optimizely.com/js/271989291.js", + "domains": [ + "my.zipcar.com" + ] } ] }, @@ -8195,7 +8248,7 @@ "domain": "sundancecatalog.com" } ], - "hash": "2d627140b59bca8b8edbc236e79cd46e" + "hash": "8f6b1176f9bc6e6c1105122d52a89d5d" }, "trackingCookies1p": { "settings": { From fe52967fdd2d618f1a00edccbf672f4abdd40fac Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Fri, 26 Apr 2024 09:27:04 +0000 Subject: [PATCH 2/3] Set marketing version to 0.81.0 --- Configuration/Version.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/Version.xcconfig b/Configuration/Version.xcconfig index cf0375b1c6..dc149104a7 100644 --- a/Configuration/Version.xcconfig +++ b/Configuration/Version.xcconfig @@ -1 +1 @@ -MARKETING_VERSION = 0.80.0 +MARKETING_VERSION = 0.81.0 From 02c975b9a0bfd4d4ccdd29d837c400d786864394 Mon Sep 17 00:00:00 2001 From: Dax the Duck Date: Fri, 26 Apr 2024 09:36:20 +0000 Subject: [PATCH 3/3] Bump version to 0.81.0 (401) --- Configuration/BuildNumber.xcconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Configuration/BuildNumber.xcconfig b/Configuration/BuildNumber.xcconfig index 089bbf518f..7d3ff03504 100644 --- a/Configuration/BuildNumber.xcconfig +++ b/Configuration/BuildNumber.xcconfig @@ -1 +1 @@ -CURRENT_PROJECT_VERSION = 400 +CURRENT_PROJECT_VERSION = 401