From 0c2e567f125d5a6268d5ff958e2fe353e24a25a4 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Tue, 11 Feb 2020 12:30:05 +0700
Subject: [PATCH 1/4] Greek-travel.xml: Remove outdated tests

Fixes https://github.com/EFForg/https-everywhere/issues/18893
---
 src/chrome/content/rules/Greek-travel.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/chrome/content/rules/Greek-travel.xml b/src/chrome/content/rules/Greek-travel.xml
index 791550b76fa3..659413cd9fcb 100644
--- a/src/chrome/content/rules/Greek-travel.xml
+++ b/src/chrome/content/rules/Greek-travel.xml
@@ -95,8 +95,8 @@ schedulechange. mismatch
 	<test url="http://de.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://it.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://fr.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
-	<test url="http://es.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
-	<test url="http://ru.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
+	<!--test url="http://es.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" /-->
+	<!--test url="http://ru.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" /-->
 
 	<test url="http://en.aegeanair.com/sys/flights/airports" />
 	<test url="http://el.aegeanair.com/sys/flights/airports" />

From bb1c5bfa4d8d304a7b9e90712a4c6d6be9d3e3c1 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Wed, 19 Feb 2020 09:32:22 +0700
Subject: [PATCH 2/4] Greek-travel.xml: Remove non-existent hosts

---
 src/chrome/content/rules/Greek-travel.xml | 29 ++++-------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/chrome/content/rules/Greek-travel.xml b/src/chrome/content/rules/Greek-travel.xml
index 659413cd9fcb..e43fa2dfd44e 100644
--- a/src/chrome/content/rules/Greek-travel.xml
+++ b/src/chrome/content/rules/Greek-travel.xml
@@ -1,5 +1,8 @@
 <!--
-This ruleset is experimental. If you experience problems please open an issue at https://github.com/kargig/https-everywhere-greek-rules/issues/new or https://github.com/EFForg/https-everywhere/issues/new
+
+	Problematic subdomains
+
+		- aegeanair.com and www.aegeanair.com redirect to non-existent en.aegeanair.com
 
 hotel. mismatch
 flights. expired
@@ -9,19 +12,13 @@ schedulechange. mismatch
 -->
 
 <ruleset name="Greek-travel">
-	<target host="aegeanair.com" />
-	<target host="www.aegeanair.com" />
 	<target host="el.aegeanair.com" />
-	<target host="en.aegeanair.com" />
 	<target host="de.aegeanair.com" />
 	<target host="it.aegeanair.com" />
 	<target host="fr.aegeanair.com" />
 	<target host="es.aegeanair.com" />
 	<target host="ru.aegeanair.com" />
 	<target host="rentacar.aegeanair.com" />
-	<target host="en.about.aegeanair.com" />
-	<target host="alphabankbonusredemptionen.aegeanair.com" />
-	<target host="alphabankbonusredemptionel.aegeanair.com" />
 	<target host="el.about.aegeanair.com" />
 	<target host="it.about.aegeanair.com" />
 	<target host="de.about.aegeanair.com" />
@@ -32,7 +29,6 @@ schedulechange. mismatch
 	<!--<exclusion pattern="^http://(?:en|el|de|it|fr|es|ru)\.aegeanair\.com/(?:sys/flights/|Css/fonts/|$|\?)" />-->
 	<!--<exclusion pattern="^http://(?:en|el|de|it|fr)\.about\.aegeanair\.com/(?:Css/fonts/|$|\?)" />-->
 
-	<exclusion pattern="^http://en\.aegeanair\.com/sys/flights/" />
 	<exclusion pattern="^http://el\.aegeanair\.com/sys/flights/" />
 	<exclusion pattern="^http://de\.aegeanair\.com/sys/flights/" />
 	<exclusion pattern="^http://it\.aegeanair\.com/sys/flights/" />
@@ -40,7 +36,6 @@ schedulechange. mismatch
 	<exclusion pattern="^http://es\.aegeanair\.com/sys/flights/" />
 	<exclusion pattern="^http://ru\.aegeanair\.com/sys/flights/" />
 
-	<exclusion pattern="^http://en\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://el\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://de\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://it\.aegeanair\.com/Css/fonts/" />
@@ -48,7 +43,6 @@ schedulechange. mismatch
 	<exclusion pattern="^http://es\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://ru\.aegeanair\.com/Css/fonts/" />
 
-	<exclusion pattern="^http://en\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://el\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://de\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://it\.aegeanair\.com/?$" />
@@ -56,7 +50,6 @@ schedulechange. mismatch
 	<exclusion pattern="^http://es\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://ru\.aegeanair\.com/?$" />
 
-	<exclusion pattern="^http://en\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://el\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://de\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://it\.aegeanair\.com/?\?" />
@@ -64,25 +57,21 @@ schedulechange. mismatch
 	<exclusion pattern="^http://es\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://ru\.aegeanair\.com/?\?" />
 
-	<exclusion pattern="^http://en\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://el\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://de\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://it\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://fr\.about\.aegeanair\.com/Css/fonts/" />
 
-	<exclusion pattern="^http://en\.about\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://el\.about\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://de\.about\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://it\.about\.aegeanair\.com/?$" />
 	<exclusion pattern="^http://fr\.about\.aegeanair\.com/?$" />
 
-	<exclusion pattern="^http://en\.about\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://el\.about\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://de\.about\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://it\.about\.aegeanair\.com/?\?" />
 	<exclusion pattern="^http://fr\.about\.aegeanair\.com/?\?" />
 
-	<test url="http://en.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://el.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://de.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://it.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
@@ -90,7 +79,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://ru.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 
-	<test url="http://en.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://el.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://de.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://it.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
@@ -98,7 +86,6 @@ schedulechange. mismatch
 	<!--test url="http://es.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" /-->
 	<!--test url="http://ru.about.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" /-->
 
-	<test url="http://en.aegeanair.com/sys/flights/airports" />
 	<test url="http://el.aegeanair.com/sys/flights/airports" />
 	<test url="http://de.aegeanair.com/sys/flights/airports" />
 	<test url="http://it.aegeanair.com/sys/flights/airports" />
@@ -106,7 +93,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/sys/flights/airports" />
 	<test url="http://ru.aegeanair.com/sys/flights/airports" />
 
-	<test url="http://en.aegeanair.com?" />
 	<test url="http://el.aegeanair.com?" />
 	<test url="http://de.aegeanair.com?" />
 	<test url="http://it.aegeanair.com?" />
@@ -114,7 +100,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com?" />
 	<test url="http://ru.aegeanair.com?" />
 
-	<test url="http://en.aegeanair.com" />
 	<test url="http://el.aegeanair.com" />
 	<test url="http://de.aegeanair.com" />
 	<test url="http://it.aegeanair.com" />
@@ -122,7 +107,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com" />
 	<test url="http://ru.aegeanair.com" />
 
-	<test url="http://en.aegeanair.com/?" />
 	<test url="http://el.aegeanair.com/?" />
 	<test url="http://de.aegeanair.com/?" />
 	<test url="http://it.aegeanair.com/?" />
@@ -130,7 +114,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/?" />
 	<test url="http://ru.aegeanair.com/?" />
 
-	<test url="http://en.aegeanair.com/?q" />
 	<test url="http://el.aegeanair.com/?q" />
 	<test url="http://de.aegeanair.com/?q" />
 	<test url="http://it.aegeanair.com/?q" />
@@ -138,25 +121,21 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/?q" />
 	<test url="http://ru.aegeanair.com/?q" />
 
-	<test url="http://en.about.aegeanair.com?" />
 	<test url="http://el.about.aegeanair.com?" />
 	<test url="http://de.about.aegeanair.com?" />
 	<test url="http://it.about.aegeanair.com?" />
 	<test url="http://fr.about.aegeanair.com?" />
 
-	<test url="http://en.about.aegeanair.com" />
 	<test url="http://el.about.aegeanair.com" />
 	<test url="http://de.about.aegeanair.com" />
 	<test url="http://it.about.aegeanair.com" />
 	<test url="http://fr.about.aegeanair.com" />
 
-	<test url="http://en.about.aegeanair.com/?" />
 	<test url="http://el.about.aegeanair.com/?" />
 	<test url="http://de.about.aegeanair.com/?" />
 	<test url="http://it.about.aegeanair.com/?" />
 	<test url="http://fr.about.aegeanair.com/?" />
 
-	<test url="http://en.about.aegeanair.com/?q" />
 	<test url="http://el.about.aegeanair.com/?q" />
 	<test url="http://de.about.aegeanair.com/?q" />
 	<test url="http://it.about.aegeanair.com/?q" />

From 969eeb396fc3469750c18a26227e85f2f464b5a2 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Wed, 19 Feb 2020 11:11:21 +0700
Subject: [PATCH 3/4] Greek-travel.xml: Delete some exceptions

These exclusions cause the checker to report
insufficient tests, and also appear unnecessary now.
---
 src/chrome/content/rules/Greek-travel.xml | 60 -----------------------
 1 file changed, 60 deletions(-)

diff --git a/src/chrome/content/rules/Greek-travel.xml b/src/chrome/content/rules/Greek-travel.xml
index e43fa2dfd44e..7e70d5ba94ff 100644
--- a/src/chrome/content/rules/Greek-travel.xml
+++ b/src/chrome/content/rules/Greek-travel.xml
@@ -43,35 +43,11 @@ schedulechange. mismatch
 	<exclusion pattern="^http://es\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://ru\.aegeanair\.com/Css/fonts/" />
 
-	<exclusion pattern="^http://el\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://de\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://it\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://fr\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://es\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://ru\.aegeanair\.com/?$" />
-
-	<exclusion pattern="^http://el\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://de\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://it\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://fr\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://es\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://ru\.aegeanair\.com/?\?" />
-
 	<exclusion pattern="^http://el\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://de\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://it\.about\.aegeanair\.com/Css/fonts/" />
 	<exclusion pattern="^http://fr\.about\.aegeanair\.com/Css/fonts/" />
 
-	<exclusion pattern="^http://el\.about\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://de\.about\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://it\.about\.aegeanair\.com/?$" />
-	<exclusion pattern="^http://fr\.about\.aegeanair\.com/?$" />
-
-	<exclusion pattern="^http://el\.about\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://de\.about\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://it\.about\.aegeanair\.com/?\?" />
-	<exclusion pattern="^http://fr\.about\.aegeanair\.com/?\?" />
-
 	<test url="http://el.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://de.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
 	<test url="http://it.aegeanair.com/Css/fonts/Roboto-Bold/Roboto-Bold.ttf" />
@@ -93,27 +69,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/sys/flights/airports" />
 	<test url="http://ru.aegeanair.com/sys/flights/airports" />
 
-	<test url="http://el.aegeanair.com?" />
-	<test url="http://de.aegeanair.com?" />
-	<test url="http://it.aegeanair.com?" />
-	<test url="http://fr.aegeanair.com?" />
-	<test url="http://es.aegeanair.com?" />
-	<test url="http://ru.aegeanair.com?" />
-
-	<test url="http://el.aegeanair.com" />
-	<test url="http://de.aegeanair.com" />
-	<test url="http://it.aegeanair.com" />
-	<test url="http://fr.aegeanair.com" />
-	<test url="http://es.aegeanair.com" />
-	<test url="http://ru.aegeanair.com" />
-
-	<test url="http://el.aegeanair.com/?" />
-	<test url="http://de.aegeanair.com/?" />
-	<test url="http://it.aegeanair.com/?" />
-	<test url="http://fr.aegeanair.com/?" />
-	<test url="http://es.aegeanair.com/?" />
-	<test url="http://ru.aegeanair.com/?" />
-
 	<test url="http://el.aegeanair.com/?q" />
 	<test url="http://de.aegeanair.com/?q" />
 	<test url="http://it.aegeanair.com/?q" />
@@ -121,21 +76,6 @@ schedulechange. mismatch
 	<test url="http://es.aegeanair.com/?q" />
 	<test url="http://ru.aegeanair.com/?q" />
 
-	<test url="http://el.about.aegeanair.com?" />
-	<test url="http://de.about.aegeanair.com?" />
-	<test url="http://it.about.aegeanair.com?" />
-	<test url="http://fr.about.aegeanair.com?" />
-
-	<test url="http://el.about.aegeanair.com" />
-	<test url="http://de.about.aegeanair.com" />
-	<test url="http://it.about.aegeanair.com" />
-	<test url="http://fr.about.aegeanair.com" />
-
-	<test url="http://el.about.aegeanair.com/?" />
-	<test url="http://de.about.aegeanair.com/?" />
-	<test url="http://it.about.aegeanair.com/?" />
-	<test url="http://fr.about.aegeanair.com/?" />
-
 	<test url="http://el.about.aegeanair.com/?q" />
 	<test url="http://de.about.aegeanair.com/?q" />
 	<test url="http://it.about.aegeanair.com/?q" />

From 8ae902f7fd87d33100463ad72c27de9ca5557730 Mon Sep 17 00:00:00 2001
From: John Vandenberg <jayvdb@gmail.com>
Date: Mon, 9 Mar 2020 19:46:35 +0700
Subject: [PATCH 4/4] Update ruleset-whitelist.csv

---
 utils/ruleset-allowlist.csv | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/ruleset-allowlist.csv b/utils/ruleset-allowlist.csv
index bc90c2157370..5aa1e8f1d429 100644
--- a/utils/ruleset-allowlist.csv
+++ b/utils/ruleset-allowlist.csv
@@ -832,7 +832,6 @@ adce25fe2ad3aaf12d9c15ea4ea6d9cdc060c1c52203c24c4a119f5c27e8c1f7,1,1,Gran-Turism
 a86f4c61b5cbb47cfeaf651f2afd0fa4ea39f82dd2e73c927622cedad59f86a8,0,1,Gravatar.xml
 b7d75abaa69773098bd0b108a48aa4cbde2c00a211bacca52b107728f4230fcd,1,1,Grays-of-Westminster.xml
 6320c8a92fc89f7e04d91bd84a2570081ff7ac69ed87e0b5d3ce0055c3361b3c,0,1,Greasy_Fork.org.xml
-fc962bf40a250e4699366c462922924e03ef9e820b5071a47a0522abffc06a48,1,0,Greek-travel.xml
 e4b6f7597186eff47f30a38f678dfc3d78db9dc04515fd3ee31e8831e0a743d5,1,0,GreenSky_Credit.com.xml
 054ef9c8b5459c29b97998aba9220474e3af78bb8af72316267560fea5174ef3,1,1,Greenmangaming.com.xml
 4988b2fe799481ffac172ac384a3951b46cf89ceda1461bf82522f468dcf566e,1,1,Grenet.fr.xml