Test data mismatch indymedia (#19136)

* Indymedia.xml: Drop old hosts and update rules

* Remove Indymedia.xml from ruleset-whitelist.csv

Author: jayvdb

src/chrome/content/rules/Indymedia.xml

@@ -22,22 +22,27 @@
 		- bristol	Redirects to http
 		- colorado ᵈ
 		- cyprus ʳ
+		- grenoble & www.grenoble
 		- hu ¹
 		- hungary ¹
 		- istanbul ⁴
 		- japan ᵃ
 		- la ᵖ
 		- lists ³
+		- linksunten
 		- liveradio ³
 		- mexico ²
 		- miami ²
 		- neworleans ²
 		- newsreal ²
+		- nyc
 		- piter ʳ
 		- pittsburgh ʳ
 		- portland ²
 		- portugal ᵖ
+		- pouget
 		- print ʳ
+		- publish
 		- pt ᵖ
 		- richmond ²
 		- satellite ²
@@ -60,7 +65,7 @@
 		- antwerpen ᵐ
 		- barcelona ⁵
 		- calabria ᵉ ᵘ
-		- www.belgium ᵐ
+		- www.belgium ¹ ᵐ
 		- ch ²
 		- chat ¹ ²
 		- emiliaromagna ᵉ ᵘ
@@ -78,6 +83,7 @@
 		- nottingham ² ⁶
 		- perth ᵐ
 		- piemonte ᵉ ᵘ ˣ
+		- publish.nyc
 		- publish.portland ¹ ⁶
 		- roma ¹ ⁵
 		- swizerland ²
@@ -134,57 +140,18 @@
 				-->
 	<target host="indymedia.org" />
 	<target host="athens.indymedia.org" />
-	<target host="belgium.indymedia.org" />
 	<target host="brussels.indymedia.org" />
 	<target host="bruxelles.indymedia.org" />
 	<target host="bxl.indymedia.org" />
 	<target host="de.indymedia.org" />
-	<target host="grenoble.indymedia.org" />
-	<target host="*.grenoble.indymedia.org" />
 	<target host="lille.indymedia.org" />
-	<target host="linksunten.indymedia.org" />
-	<target host="www.linksunten.indymedia.org" />
 	<target host="nantes.indymedia.org" />
 	<target host="www.nantes.indymedia.org" />
-	<target host="nyc.indymedia.org" />
-	<target host="publish.nyc.indymedia.org" />
-	<target host="www.nyc.indymedia.org" />
-	<target host="pouget.indymedia.org" />
-	<target host="publish.indymedia.org" />
 	<target host="www.indymedia.org" />
 
-		<!--	includeSubdomains applies to one level only, so:
-									-->
-		<exclusion pattern="http://(?:[^./]+\.){2,}(?:belgium|brussels|bruxelles|bxl|grenoble|nantes)\.indymedia\.org/" />
-
-			<!--	+ve:
-					-->
-			<test url="http://this.host.belgium.indymedia.org/" />
-			<test url="http://exists.not.belgium.indymedia.org/" />
-			<test url="http://this.host.brussels.indymedia.org/" />
-			<test url="http://exists.not.brussels.indymedia.org/" />
-			<test url="http://this.host.bruxelles.indymedia.org/" />
-			<test url="http://exists.not.bruxelles.indymedia.org/" />
-			<test url="http://this.host.bxl.indymedia.org/" />
-			<test url="http://exists.not.bxl.indymedia.org/" />
-			<test url="http://this.host.grenoble.indymedia.org/" />
-			<test url="http://exists.not.grenoble.indymedia.org/" />
-			<test url="http://this.host.nantes.indymedia.org/" />
-			<test url="http://exists.not.nantes.indymedia.org/" />
-
-			<!--	-ve:
-					-->
-			<test url="http://www.belgium.indymedia.org/" />
-			<test url="http://www.grenoble.indymedia.org/" />
-			<test url="http://www.nantes.indymedia.org/" />
-
-		<!--	Sets cookie without Secure:
-							-->
-		<test url="http://publish.nyc.indymedia.org/nyc/servlet/OpenMir" />
-		<test url="http://publish.indymedia.org/earth/servlet/OpenMir" />
-
 	<!--	Complications:
 				-->
+
 	<target host="netherlands.indymedia.org" />
 
 
@@ -198,9 +165,10 @@
 
 	<securecookie host="^\w" name=".+" />
 
+	<target host="belgium.indymedia.org" />
 
-	<rule from="^http://www\.belgium\.indymedia\.org/"
-		to="https://belgium.indymedia.org/" />
+	<rule from="^http://(?:www\.)?belgium\.indymedia\.org/"
+		to="https://bxl.indymedia.org/" />
 
 	<rule from="^http://netherlands\.indymedia\.org/"
 		to="https://www.indymedia.nl/" />

utils/ruleset-whitelist.csv

@@ -992,7 +992,6 @@ d63109c1bda717546892ddf2e5b7b43230f77a743589f6003cf2eca75b704f87,1,1,Imperative_
 76196600f67cde4e2a5a69869eae23ded468e8c8ad6837e111b44ce8104cbff1,1,1,Indiegogo.xml
 8f065e04d6bf03937cb8af0c1e8ca08925d3ef8f1b1fb681688cc3d5983cd356,1,1,Induction_Solutions.com-falsemixed.xml
 0d4727dd514988748b9ce48c4b407c7b52ca4cf4aaca1d13f867067eae1de9a2,1,1,Induction_Solutions.com.xml
-6943e0bf9fc5a32b2be598a64a25b6a4d8ee059154c859dd15d2da7b3c9889cc,1,0,Indymedia.xml
 69f67c7a6a357cbe15b8e565e6d2afc6b8fc2ba6cd3cfd393c4491b3861fa503,1,1,Infinet.com.au-falsemixed.xml
 d885a05161cc68f32429419ba4b53b0936456a6743206734896c8345467193ef,1,0,Infinet.com.au.xml
 3c43448b0f0cb113e11bd417ce99292ae25d977fd5191687aed8be931bb3550e,0,1,Infinity_Tracking.xml