From 3655c5b6d43cc7ad77b11abbee87445e7b3ce53b Mon Sep 17 00:00:00 2001 From: Bardi Harborow Date: Mon, 16 Oct 2017 07:34:40 +0000 Subject: [PATCH] Bulk re-enabling of default_off="expired" rulesets. --- src/chrome/content/rules/Adsurve.com.xml | 11 +++--- src/chrome/content/rules/Amnistia.cl.xml | 2 +- src/chrome/content/rules/Boost.xml | 10 ++---- .../content/rules/BrightContext.com.xml | 21 +---------- src/chrome/content/rules/Bufferbloat.xml | 5 +-- src/chrome/content/rules/Cloudmining.guru.xml | 4 +-- src/chrome/content/rules/CodingTeam.net.xml | 22 +++++++++--- src/chrome/content/rules/Com-Sys.xml | 12 +++---- src/chrome/content/rules/ConnectiCon.org.xml | 14 +++----- .../content/rules/Crafty_Syntax.com.xml | 6 +--- src/chrome/content/rules/Craphound.xml | 4 +-- src/chrome/content/rules/CrazyBump.xml | 7 ++-- .../content/rules/Digital_News_Agency.com.xml | 35 ++----------------- src/chrome/content/rules/Ferroh.com.xml | 13 +++---- src/chrome/content/rules/FileTrip.net.xml | 17 +++++---- src/chrome/content/rules/Grupo_Avante.org.xml | 15 ++------ .../content/rules/Guillaume-Dargaud.xml | 9 +++++ .../rules/Guillaume_Dargauds_website.xml | 14 -------- src/chrome/content/rules/Healthfuze.com.xml | 6 ++-- src/chrome/content/rules/Hotel_Managaby.xml | 2 +- .../content/rules/Kaiserslautern.de.xml | 25 +++++-------- src/chrome/content/rules/Linux_Forums.xml | 25 +------------ src/chrome/content/rules/MOBIUS.xml | 16 +++------ .../content/rules/Orange_Static.com.xml | 21 ++--------- src/chrome/content/rules/Papakaya.com.xml | 13 +++---- src/chrome/content/rules/Scott-Hanselman.xml | 19 +++++----- src/chrome/content/rules/Sears_Labs.com.xml | 11 ++---- src/chrome/content/rules/SmartHide.xml | 15 +------- src/chrome/content/rules/Social_Fixer.com.xml | 19 ++-------- src/chrome/content/rules/SourceMaking.xml | 12 +++---- src/chrome/content/rules/Spankwire.xml | 12 +++---- src/chrome/content/rules/Spectator.org.xml | 15 ++++---- .../content/rules/Stop_Software_Patents.xml | 20 ++++++----- .../content/rules/The_Internet_Co.net.xml | 15 ++------ src/chrome/content/rules/finseth.com.xml | 11 +----- 35 files changed, 145 insertions(+), 333 deletions(-) create mode 100644 src/chrome/content/rules/Guillaume-Dargaud.xml delete mode 100644 src/chrome/content/rules/Guillaume_Dargauds_website.xml diff --git a/src/chrome/content/rules/Adsurve.com.xml b/src/chrome/content/rules/Adsurve.com.xml index 7732f2fbb44d..ea16cbccd881 100644 --- a/src/chrome/content/rules/Adsurve.com.xml +++ b/src/chrome/content/rules/Adsurve.com.xml @@ -3,20 +3,17 @@ - www01 (refused) - - Expired 2013-11-20 - --> - + - + - + diff --git a/src/chrome/content/rules/Amnistia.cl.xml b/src/chrome/content/rules/Amnistia.cl.xml index 064ceb255552..8479fb7f8fc0 100644 --- a/src/chrome/content/rules/Amnistia.cl.xml +++ b/src/chrome/content/rules/Amnistia.cl.xml @@ -9,7 +9,7 @@ ˢ Secured by us --> - + diff --git a/src/chrome/content/rules/Boost.xml b/src/chrome/content/rules/Boost.xml index ec52d87efed4..232701940001 100644 --- a/src/chrome/content/rules/Boost.xml +++ b/src/chrome/content/rules/Boost.xml @@ -2,19 +2,15 @@ Nonfunctional subdomains: - (www.) (redirects to http) - - lists ² - - ² Redirects to www2 --> - + - + - + - + diff --git a/src/chrome/content/rules/Bufferbloat.xml b/src/chrome/content/rules/Bufferbloat.xml index 932662f154e2..170b041b349e 100644 --- a/src/chrome/content/rules/Bufferbloat.xml +++ b/src/chrome/content/rules/Bufferbloat.xml @@ -3,11 +3,8 @@ - snapon.lab (refused) - - Expired 2014. - --> - + diff --git a/src/chrome/content/rules/Cloudmining.guru.xml b/src/chrome/content/rules/Cloudmining.guru.xml index 04c622e60478..37d1713d9c89 100644 --- a/src/chrome/content/rules/Cloudmining.guru.xml +++ b/src/chrome/content/rules/Cloudmining.guru.xml @@ -1,7 +1,5 @@ - + - diff --git a/src/chrome/content/rules/CodingTeam.net.xml b/src/chrome/content/rules/CodingTeam.net.xml index 133bf7ff28b8..e5551484efeb 100644 --- a/src/chrome/content/rules/CodingTeam.net.xml +++ b/src/chrome/content/rules/CodingTeam.net.xml @@ -1,8 +1,20 @@ - - - + + + + + + + + + - diff --git a/src/chrome/content/rules/Com-Sys.xml b/src/chrome/content/rules/Com-Sys.xml index afd349396e47..91e16cac4fdc 100644 --- a/src/chrome/content/rules/Com-Sys.xml +++ b/src/chrome/content/rules/Com-Sys.xml @@ -1,8 +1,4 @@ - - + @@ -11,7 +7,7 @@ - + - \ No newline at end of file + diff --git a/src/chrome/content/rules/ConnectiCon.org.xml b/src/chrome/content/rules/ConnectiCon.org.xml index 7e9c10029973..8e9bd2277ff7 100644 --- a/src/chrome/content/rules/ConnectiCon.org.xml +++ b/src/chrome/content/rules/ConnectiCon.org.xml @@ -1,8 +1,4 @@ - - + @@ -11,9 +7,7 @@ - - + - \ No newline at end of file + diff --git a/src/chrome/content/rules/Crafty_Syntax.com.xml b/src/chrome/content/rules/Crafty_Syntax.com.xml index 1f021168206d..55559320970e 100644 --- a/src/chrome/content/rules/Crafty_Syntax.com.xml +++ b/src/chrome/content/rules/Crafty_Syntax.com.xml @@ -1,8 +1,4 @@ - - + diff --git a/src/chrome/content/rules/Craphound.xml b/src/chrome/content/rules/Craphound.xml index 6f6fac239bdb..92af06fbf763 100644 --- a/src/chrome/content/rules/Craphound.xml +++ b/src/chrome/content/rules/Craphound.xml @@ -1,10 +1,10 @@ - + - + + - - + diff --git a/src/chrome/content/rules/Digital_News_Agency.com.xml b/src/chrome/content/rules/Digital_News_Agency.com.xml index 92c041191678..e89d4426861c 100644 --- a/src/chrome/content/rules/Digital_News_Agency.com.xml +++ b/src/chrome/content/rules/Digital_News_Agency.com.xml @@ -1,41 +1,12 @@ - - - - - - - + - - - - + - - - diff --git a/src/chrome/content/rules/Ferroh.com.xml b/src/chrome/content/rules/Ferroh.com.xml index dc917d77bd56..64f268e63a97 100644 --- a/src/chrome/content/rules/Ferroh.com.xml +++ b/src/chrome/content/rules/Ferroh.com.xml @@ -1,15 +1,16 @@ - + - - + diff --git a/src/chrome/content/rules/FileTrip.net.xml b/src/chrome/content/rules/FileTrip.net.xml index 54c24d73011e..93108a0372aa 100644 --- a/src/chrome/content/rules/FileTrip.net.xml +++ b/src/chrome/content/rules/FileTrip.net.xml @@ -1,23 +1,22 @@ - + - + - - + + diff --git a/src/chrome/content/rules/Grupo_Avante.org.xml b/src/chrome/content/rules/Grupo_Avante.org.xml index e660e9160dd6..28f59eee303f 100644 --- a/src/chrome/content/rules/Grupo_Avante.org.xml +++ b/src/chrome/content/rules/Grupo_Avante.org.xml @@ -1,13 +1,4 @@ - - + @@ -16,7 +7,7 @@ - + diff --git a/src/chrome/content/rules/Guillaume-Dargaud.xml b/src/chrome/content/rules/Guillaume-Dargaud.xml new file mode 100644 index 000000000000..3e10daa24dc0 --- /dev/null +++ b/src/chrome/content/rules/Guillaume-Dargaud.xml @@ -0,0 +1,9 @@ + + + + + + + + diff --git a/src/chrome/content/rules/Guillaume_Dargauds_website.xml b/src/chrome/content/rules/Guillaume_Dargauds_website.xml deleted file mode 100644 index f8cf0a4d27fd..000000000000 --- a/src/chrome/content/rules/Guillaume_Dargauds_website.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - diff --git a/src/chrome/content/rules/Healthfuze.com.xml b/src/chrome/content/rules/Healthfuze.com.xml index 971d8c2055ad..19c21532b358 100644 --- a/src/chrome/content/rules/Healthfuze.com.xml +++ b/src/chrome/content/rules/Healthfuze.com.xml @@ -1,12 +1,10 @@ - + - - + + diff --git a/src/chrome/content/rules/Kaiserslautern.de.xml b/src/chrome/content/rules/Kaiserslautern.de.xml index 86b0d653b10a..6e2f59216c43 100644 --- a/src/chrome/content/rules/Kaiserslautern.de.xml +++ b/src/chrome/content/rules/Kaiserslautern.de.xml @@ -1,32 +1,23 @@ - + - - + + - + diff --git a/src/chrome/content/rules/Linux_Forums.xml b/src/chrome/content/rules/Linux_Forums.xml index 21697c58158a..4abc61172455 100644 --- a/src/chrome/content/rules/Linux_Forums.xml +++ b/src/chrome/content/rules/Linux_Forums.xml @@ -6,36 +6,13 @@ * Shows www, mismatched - - Expired 2014 - - - Mixed content: - - - Images from $self * - - - Ads/bugs, from: - - - gae.caspion.com - - partner.googleadservices.com * - - www.lijit.com * - - ad.netshelter.net - - c5.zedo.com * - - * Secured by us - --> - + - - - - diff --git a/src/chrome/content/rules/MOBIUS.xml b/src/chrome/content/rules/MOBIUS.xml index 00e794f13740..861fe270074e 100644 --- a/src/chrome/content/rules/MOBIUS.xml +++ b/src/chrome/content/rules/MOBIUS.xml @@ -3,21 +3,13 @@ - MOBIUS_Catalog.xml - - - www: mismatched - - Expired 2012-12-06 - --> - + + - - - - - - \ No newline at end of file + diff --git a/src/chrome/content/rules/Orange_Static.com.xml b/src/chrome/content/rules/Orange_Static.com.xml index 406c0efb11fa..119c3906d660 100644 --- a/src/chrome/content/rules/Orange_Static.com.xml +++ b/src/chrome/content/rules/Orange_Static.com.xml @@ -1,24 +1,9 @@ - - + - - + diff --git a/src/chrome/content/rules/Papakaya.com.xml b/src/chrome/content/rules/Papakaya.com.xml index 1e4e3ed5f132..ac2e25e59005 100644 --- a/src/chrome/content/rules/Papakaya.com.xml +++ b/src/chrome/content/rules/Papakaya.com.xml @@ -1,9 +1,4 @@ - - + @@ -12,7 +7,7 @@ - + - \ No newline at end of file + diff --git a/src/chrome/content/rules/Scott-Hanselman.xml b/src/chrome/content/rules/Scott-Hanselman.xml index 951163b79208..7584296ac7d7 100644 --- a/src/chrome/content/rules/Scott-Hanselman.xml +++ b/src/chrome/content/rules/Scott-Hanselman.xml @@ -1,15 +1,18 @@ - + + + + + + - - + diff --git a/src/chrome/content/rules/Sears_Labs.com.xml b/src/chrome/content/rules/Sears_Labs.com.xml index 985384c78d29..f0f051099e19 100644 --- a/src/chrome/content/rules/Sears_Labs.com.xml +++ b/src/chrome/content/rules/Sears_Labs.com.xml @@ -1,18 +1,13 @@ - + - + diff --git a/src/chrome/content/rules/SmartHide.xml b/src/chrome/content/rules/SmartHide.xml index 5cf909530307..d1328205f866 100644 --- a/src/chrome/content/rules/SmartHide.xml +++ b/src/chrome/content/rules/SmartHide.xml @@ -5,27 +5,14 @@ ᵃ Shows ^smarthide.com - - www.smarthide.com: Mismatched - --> - + - - - - - - - diff --git a/src/chrome/content/rules/Social_Fixer.com.xml b/src/chrome/content/rules/Social_Fixer.com.xml index 3f0b335cfe06..57afd0d86a9d 100644 --- a/src/chrome/content/rules/Social_Fixer.com.xml +++ b/src/chrome/content/rules/Social_Fixer.com.xml @@ -1,22 +1,9 @@ - - + - - + diff --git a/src/chrome/content/rules/SourceMaking.xml b/src/chrome/content/rules/SourceMaking.xml index be0ef413631d..b31c70866b5e 100644 --- a/src/chrome/content/rules/SourceMaking.xml +++ b/src/chrome/content/rules/SourceMaking.xml @@ -1,17 +1,13 @@ - - + - + - + diff --git a/src/chrome/content/rules/Spankwire.xml b/src/chrome/content/rules/Spankwire.xml index 3da773692ef0..91efbef4d31a 100644 --- a/src/chrome/content/rules/Spankwire.xml +++ b/src/chrome/content/rules/Spankwire.xml @@ -1,11 +1,11 @@ - + - - + + - + - + diff --git a/src/chrome/content/rules/Spectator.org.xml b/src/chrome/content/rules/Spectator.org.xml index cbaddbc4a63e..a15a8691a5b4 100644 --- a/src/chrome/content/rules/Spectator.org.xml +++ b/src/chrome/content/rules/Spectator.org.xml @@ -6,20 +6,17 @@ - news (shows www) - - Expired 2013-04-12 - --> - + - + - + - + - \ No newline at end of file + diff --git a/src/chrome/content/rules/Stop_Software_Patents.xml b/src/chrome/content/rules/Stop_Software_Patents.xml index 3747f54c0d4b..b9cbbdb79555 100644 --- a/src/chrome/content/rules/Stop_Software_Patents.xml +++ b/src/chrome/content/rules/Stop_Software_Patents.xml @@ -1,16 +1,20 @@ - + - + + - - - - \ No newline at end of file + + + diff --git a/src/chrome/content/rules/The_Internet_Co.net.xml b/src/chrome/content/rules/The_Internet_Co.net.xml index 6fb35fefa9d2..e1310621468f 100644 --- a/src/chrome/content/rules/The_Internet_Co.net.xml +++ b/src/chrome/content/rules/The_Internet_Co.net.xml @@ -1,17 +1,8 @@ - - + - - - + diff --git a/src/chrome/content/rules/finseth.com.xml b/src/chrome/content/rules/finseth.com.xml index df2e4fa20c70..5e7707742f46 100644 --- a/src/chrome/content/rules/finseth.com.xml +++ b/src/chrome/content/rules/finseth.com.xml @@ -1,13 +1,4 @@ - - +