From 930db542919a37b2fc49b27557f6613b5270cf3f Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 11:08:01 +0200
Subject: [PATCH 1/2] Delete Rev2pub.com.xml

---
 src/chrome/content/rules/Rev2pub.com.xml | 26 ------------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 src/chrome/content/rules/Rev2pub.com.xml

diff --git a/src/chrome/content/rules/Rev2pub.com.xml b/src/chrome/content/rules/Rev2pub.com.xml
deleted file mode 100644
index 90abefd86afa..000000000000
--- a/src/chrome/content/rules/Rev2pub.com.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-<!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-
-Automatically by https-everywhere-checker because:
-Fetch error: http://creative.rev2pub.com/ => https://d1col0l9yjljr0.cloudfront.net/: (6, 'Could not resolve host: d1col0l9yjljr0.cloudfront.net')
-	For other Matomy coverage, see Matomy-Media.xml.
-
-
-	CDN buckets:
-
-		- d1col0l9yjljr0.cloudfront.net
-
-			- creative
-
--->
-<ruleset name="rev2pub.com" default_off="failed ruleset test">
-
-	<target host="creative.rev2pub.com" />
-
-
-	<rule from="^http://creative\.rev2pub\.com/"
-		to="https://d1col0l9yjljr0.cloudfront.net/" />
-
-</ruleset>

From 40c980c5c0405f06e5feb6f1dc5c01fb62df19f2 Mon Sep 17 00:00:00 2001
From: cschanaj <cschanaj@users.noreply.github.com>
Date: Sun, 13 Sep 2020 12:37:36 +0200
Subject: [PATCH 2/2] Remove dangling reference and update related rulests

---
 src/chrome/content/rules/M2pub.com.xml      | 45 ---------------------
 src/chrome/content/rules/Matomy-Media.xml   | 24 -----------
 src/chrome/content/rules/Matomy_Market.xml  | 14 ++-----
 src/chrome/content/rules/Xtendmedia.com.xml | 21 ----------
 4 files changed, 3 insertions(+), 101 deletions(-)
 delete mode 100644 src/chrome/content/rules/M2pub.com.xml
 delete mode 100644 src/chrome/content/rules/Matomy-Media.xml
 delete mode 100644 src/chrome/content/rules/Xtendmedia.com.xml

diff --git a/src/chrome/content/rules/M2pub.com.xml b/src/chrome/content/rules/M2pub.com.xml
deleted file mode 100644
index 19d50ff8ae0e..000000000000
--- a/src/chrome/content/rules/M2pub.com.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<!--
-	For other Matomy Media coverage, see Matomy-Media.xml.
-
-
-	CDN buckets:
-
-		- ads.adk2.com
-
-			- s
-
-		- d3vg9hiogk70qz.cloudfront.net
-
-			creative
-
-
-	Problematic subdomains:
-
-		- creative	(cloudfront)
-		- s		(works; mismatched, CN: ads.adk2.com)
-
-
-	Fully covered subdomains:
-
-		- creative	(→ d3vg9hiogk70qz.cloudfront.net)
-		- s		(→ ads.adk2.com)
-
-
-	(www.)m2pub.com doesn't exist.
-
-	Ads and web bugs.
-
--->
-<ruleset name="M2pub.com">
-
-	<target host="creative.m2pub.com" />
-	<target host="s.m2pub.com" />
-
-
-	<rule from="^http://creative\.m2pub\.com/"
-		to="https://d3vg9hiogk70qz.cloudfront.net/" />
-
-	<rule from="^http://s\.m2pub\.com/"
-		to="https://ads.adk2.com/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Matomy-Media.xml b/src/chrome/content/rules/Matomy-Media.xml
deleted file mode 100644
index 4d493b5f5b76..000000000000
--- a/src/chrome/content/rules/Matomy-Media.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-	Other Matomy Media rulesets:
-
-		- M2pub.com.xml
-		- Matomy_Market.xml
-		- Rev2pub.com.xml
-		- Xtendmedia.com.xml
-
-
-	Expired 2013-05-18
-
--->
-<ruleset name="Matomy Media" default_off="expired">
-
-	<target host="matomymedia.com" />
-	<target host="www.matomymedia.com" />
-
-
-	<!--	Cert only matches www.
-					-->
-	<rule from="^http://(?:www\.)?matomymedia\.com/"
-		to="https://www.matomymedia.com/" />
-
-</ruleset>
diff --git a/src/chrome/content/rules/Matomy_Market.xml b/src/chrome/content/rules/Matomy_Market.xml
index 983693b19ef9..90c0dbb78f5e 100644
--- a/src/chrome/content/rules/Matomy_Market.xml
+++ b/src/chrome/content/rules/Matomy_Market.xml
@@ -1,18 +1,10 @@
-<!--
-	For other Matomy Media coverage, see Matomy-Media.xml.
-
-
-	Nonfunctional subdomains:
-
-		- (www.)	(shows matomymedia.com)
-
--->
 <ruleset name="Matomy Market">
 
-	<target host="network.adsmarket.com" />
+	<target host="adsmarket.com" />
+	<target host="www.adsmarket.com" />
 
 
-	<securecookie host="^\.?network\.adsmarket\.com$" name=".+" />
+	<securecookie host=".+" name=".+" />
 
 
 	<rule from="^http:" to="https:" />
diff --git a/src/chrome/content/rules/Xtendmedia.com.xml b/src/chrome/content/rules/Xtendmedia.com.xml
deleted file mode 100644
index edca6bac52ea..000000000000
--- a/src/chrome/content/rules/Xtendmedia.com.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<!--
-	For other Matomy Media coverage, see Matomy-Media.xml.
-
-
-	Problematic subdomains:
-
-		- creative	(works, akamai)
-
--->
-<ruleset name="xtendmedia.com">
-
-	<target host="ad.xtendmedia.com" />
-
-
-	<!--	- Cert doesn't match
-		- Data seem identical
-				-->
-	<rule from="^http://ad\.xtendmedia\.com/"
-		to="https://ad.rmxads.com/" />
-
-</ruleset>