From 94c1803683d6dbc66a6d11d0d7a222a308a141f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20HUBSCHER?= Date: Mon, 21 Mar 2016 14:15:31 +0100 Subject: [PATCH] Update blocklist to use v3. --- Makefile | 2 +- blocklist.xml | 766 ++++++++++++++++++++++++++++++++++++++++++++------ 2 files changed, 676 insertions(+), 92 deletions(-) diff --git a/Makefile b/Makefile index 28062b4..af301de 100644 --- a/Makefile +++ b/Makefile @@ -8,7 +8,7 @@ TEMPDIR := $(shell mktemp -d) KINTO_SERVER = https://kinto.stage.mozaws.net/v1 -BLOCKLIST_FILE_URL = "https://blocklist.addons.mozilla.org/blocklist/0/default/default/default/default/default/default/default/default/default/default/default/default/default/" +BLOCKLIST_FILE_URL = "https://blocklist.addons.mozilla.org/blocklist/3/%7Bec8030f7-c20a-464f-9b0e-13a3a9e97384%7D/44.0a1/" AMO_BLOCKLIST_UI_SCHEMA = "https://raw.githubusercontent.com/mozilla-services/amo-blocklist-ui/master/amo-blocklist.json" BLOCKLIST_BUCKET = "staging" diff --git a/blocklist.xml b/blocklist.xml index f5b8690..397bc54 100644 --- a/blocklist.xml +++ b/blocklist.xml @@ -92,6 +92,15 @@ + + + + + + + + + @@ -163,6 +172,15 @@ browser.startup.homepage browser.search.defaultenginename + + + + + + + + + @@ -262,8 +280,8 @@ - - + + @@ -297,6 +315,15 @@ + + + + + + + + + @@ -304,8 +331,13 @@ - + + + + + + @@ -433,6 +465,15 @@ + + + + + + + + + @@ -440,7 +481,7 @@ - + @@ -483,7 +524,12 @@ - + + + + + + @@ -503,6 +549,15 @@ + + + + + + + + + @@ -545,6 +600,15 @@ + + + + + + + + + @@ -641,6 +705,15 @@ + + + + + + + + + @@ -786,6 +859,15 @@ + + + + + + + + + @@ -833,8 +915,13 @@ - + + + + + + @@ -901,6 +988,15 @@ + + + + + + + + + @@ -1012,6 +1108,15 @@ + + + + + + + + + @@ -1132,12 +1237,6 @@ - - - - - - @@ -1285,8 +1384,8 @@ - - + + @@ -1296,6 +1395,12 @@ + + + + + + @@ -1444,6 +1549,15 @@ + + + + + + + + + @@ -1582,6 +1696,20 @@ + + + + + + + + + + + + + + @@ -1732,6 +1860,15 @@ + + + + + + + + + @@ -1978,6 +2115,15 @@ + + + + + + + + + @@ -2026,6 +2172,20 @@ + + + + + + + + + + + + + + @@ -2080,6 +2240,15 @@ + + + + + + + + + @@ -2174,6 +2343,15 @@ + + + + + + + + + @@ -2240,8 +2418,8 @@ - - + + @@ -2258,7 +2436,7 @@ browser.search.defaultenginename - + @@ -2404,6 +2582,15 @@ + + + + + + + + + @@ -2516,6 +2703,12 @@ + + + + + + @@ -2529,8 +2722,11 @@ - - + + + + + @@ -2542,121 +2738,509 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + - + + + + + + + + + https://get.adobe.com/flashplayer/ + - + + - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://java.com/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + - + + - + - + + + + + + + + + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + + + + + + + + https://get.adobe.com/flashplayer/ + - + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://java.com/ - + https://java.com/ @@ -2676,47 +3260,47 @@ https://java.com/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://java.com/ - + https://java.com/ @@ -2736,57 +3320,57 @@ https://java.com/ - + - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://java.com/ - + https://real.com/ - + https://get.adobe.com/shockwave/ - + https://get.adobe.com/shockwave/ - + https://java.com/ - + https://java.com/ @@ -2806,63 +3390,63 @@ https://java.com/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://www.microsoft.com/getsilverlight - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://get.adobe.com/flashplayer/ - + https://java.com/ - + https://java.com/