From c66d41e5e22d4fef0503ccb5559f9a5324ba147d Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Mon, 23 Mar 2015 22:53:18 +0100
Subject: [PATCH 1/4] Update swissgov.xml

commented out safe redirect to www. (Browser will correct the url itself).
removed false positive (extra download of issuer cert)
---
 src/chrome/content/rules/swissgov.xml | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml
index ade07e9d5cda..fb51137d74fc 100644
--- a/src/chrome/content/rules/swissgov.xml
+++ b/src/chrome/content/rules/swissgov.xml
@@ -1,10 +1,4 @@
 <!--
-Disabled by https-everywhere-checker because:
-Fetch error: http://ar.ch/ => https://www.ar.ch/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://www.ar.ch/ => https://www.ar.ch/: (60, 'SSL certificate problem: unable to get local issuer certificate')
-Fetch error: http://zh.ch/ => https://www.zh.ch/: (6, 'Could not resolve host: zh.ch')
-Fetch error: http://vs.ch/ => https://www.vs.ch/: (6, 'Could not resolve host: vs.ch')
-Fetch error: http://gr.ch/ => https://www.gr.ch/: (6, 'Could not resolve host: gr.ch')
 	no certificate:
 	*.admin.ch
 	*.*.admin.ch
@@ -31,7 +25,7 @@ Fetch error: http://gr.ch/ => https://www.gr.ch/: (6, 'Could not resolve host: g
 	<target host="*.so.ch"/>
 	<target host="so.ch"/>
 -->
-<ruleset name="Schweizer Regierung" default_off='failed ruleset test'>
+<ruleset name="Schweizer Regierung">
 	<target host="www.blog.edoeb.admin.ch"/>
 	<target host="ag.ch"/>
 	<target host="*.ag.ch"/>
@@ -76,12 +70,12 @@ Fetch error: http://gr.ch/ => https://www.gr.ch/: (6, 'Could not resolve host: g
 		to="https://www.jura.ch/"/>
 	<rule from="^http://([^/:@]*)\.jura\.ch/"
 		to="https://$1.jura.ch/"/>
-	<rule from="^http://(?:www\.)?zh\.ch/"
-		to="https://www.zh.ch/"/>
+	<!--<rule from="^http://(?:www\.)?zh\.ch/"
+		to="https://www.zh.ch/"/>-->
 	<rule from="^http://([^/:@]*)\.zh\.ch/"
 		to="https://$1.zh.ch/"/>
-	<rule from="^http://(?:www\.)?vs\.ch/"
-		to="https://www.vs.ch/"/>
+	<!--<rule from="^http://(?:www\.)?vs\.ch/"
+		to="https://www.vs.ch/"/>-->
 	<rule from="^http://([^/:@]*)\.vs\.ch/"
 		to="https://$1.vs.ch/"/>
 	<rule from="^http://(?:www\.)?baselland\.ch/"
@@ -92,8 +86,8 @@ Fetch error: http://gr.ch/ => https://www.gr.ch/: (6, 'Could not resolve host: g
 		to="https://www.sh.ch/"/>
 	<rule from="^http://([^/:@]*)\.sh\.ch/"
 		to="https://$1.sh.ch/"/>
-	<rule from="^http://(?:www\.)?gr\.ch/"
-		to="https://www.gr.ch/"/>
+	<!--<rule from="^http://(?:www\.)?gr\.ch/"
+		to="https://www.gr.ch/"/>-->
 	<rule from="^http://([^/:@]*)\.gr\.ch/"
 		to="https://$1.gr.ch/"/>
 	<rule from="^http://(?:www\.)?fr\.ch/"

From 6ee59f64bb45e9e9c61f2e83ddd477c96e4b3ebf Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Wed, 25 Mar 2015 02:11:02 +0100
Subject: [PATCH 2/4] Update swissgov.xml

---
 src/chrome/content/rules/swissgov.xml | 40 ++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml
index fb51137d74fc..d250e3bfeedf 100644
--- a/src/chrome/content/rules/swissgov.xml
+++ b/src/chrome/content/rules/swissgov.xml
@@ -51,16 +51,42 @@
 	<target host="*.gr.ch"/>
 	<target host="fr.ch"/>
 	<target host="www.fr.ch"/>
+	
+	<test url="http://www.blog.edoeb.admin.ch/" />
+	<test url="http://ag.ch/" />
+	<test url="http://www.ag.ch/" />
+	<test url="http://ge.ch/" />
+	<test url="http://www.ge.ch/" />
+	<test url="http://ar.ch/" />
+	<test url="http://www.ar.ch/" />
+	<test url="http://gl.ch/" />
+	<test url="http://www.gl.ch/" />
+	<test url="http://jura.ch/" />
+	<test url="http://www.jura.ch/" />
+	<test url="http://zh.ch/" />
+	<test url="http://www.zh.ch/" />
+	<test url="http://vs.ch/" />
+	<test url="http://www.vs.ch/" />
+	<test url="http://baselland.ch/" />
+	<test url="http://www.baselland.ch/" />
+	<test url="http://be.ch/" />
+	<test url="http://www.be.ch/" />
+	<test url="http://sh.ch/" />
+	<test url="http://www.sh.ch/" />
+	<test url="http://gr.ch/" />
+	<test url="http://www.gr.ch/" />
+	<test url="http://fr.ch/" />
+	<test url="http://www.fr.ch/" />
 
 	<rule from="^http://www\.blog\.edoeb\.admin\.ch/"
 		to="https://www.blog.edoeb.admin.ch/"/>
 	<rule from="^http://(?:www\.)?ag\.ch/"
 		to="https://www.ag.ch/"/>
-	<rule from="^http://([^/:@]*)\.ag\.ch/"
+	<rule from="^http://([\w-]+)\.ag\.ch/"
 		to="https://$1.ag.ch/"/>
 	<rule from="^http://(?:www\.)?ge\.ch/"
 		to="https://www.ge.ch/"/>
-	<rule from="^http://([^/:@]*)\.ge\.ch/"
+	<rule from="^http://([\w-]+)\.ge\.ch/"
 		to="https://$1.ge.ch/"/>
 	<rule from="^http://(?:www\.)?ar\.ch/"
 		to="https://www.ar.ch/"/>
@@ -68,15 +94,15 @@
 		to="https://www.gl.ch/"/>
 	<rule from="^http://(?:www\.)?jura\.ch/"
 		to="https://www.jura.ch/"/>
-	<rule from="^http://([^/:@]*)\.jura\.ch/"
+	<rule from="^http://([\w-]+)\.jura\.ch/"
 		to="https://$1.jura.ch/"/>
 	<!--<rule from="^http://(?:www\.)?zh\.ch/"
 		to="https://www.zh.ch/"/>-->
-	<rule from="^http://([^/:@]*)\.zh\.ch/"
+	<rule from="^http://([\w-]+)\.zh\.ch/"
 		to="https://$1.zh.ch/"/>
 	<!--<rule from="^http://(?:www\.)?vs\.ch/"
 		to="https://www.vs.ch/"/>-->
-	<rule from="^http://([^/:@]*)\.vs\.ch/"
+	<rule from="^http://([\w-]+)\.vs\.ch/"
 		to="https://$1.vs.ch/"/>
 	<rule from="^http://(?:www\.)?baselland\.ch/"
 		to="https://www.baselland.ch/"/>
@@ -84,11 +110,11 @@
 		to="https://www.be.ch/"/>
 	<rule from="^http://(?:www\.)?sh\.ch/"
 		to="https://www.sh.ch/"/>
-	<rule from="^http://([^/:@]*)\.sh\.ch/"
+	<rule from="^http://([\w-]+)\.sh\.ch/"
 		to="https://$1.sh.ch/"/>
 	<!--<rule from="^http://(?:www\.)?gr\.ch/"
 		to="https://www.gr.ch/"/>-->
-	<rule from="^http://([^/:@]*)\.gr\.ch/"
+	<rule from="^http://([\w-]+)\.gr\.ch/"
 		to="https://$1.gr.ch/"/>
 	<rule from="^http://(?:www\.)?fr\.ch/"
 		to="https://www.fr.ch/"/>

From 22a527c05fb7f22434e5339b0b46d5bf5cfbbf85 Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Wed, 25 Mar 2015 23:32:14 +0100
Subject: [PATCH 3/4] rebase swissgov.xml

---
 src/chrome/content/rules/swissgov.xml | 158 +++++++++++++-------------
 1 file changed, 81 insertions(+), 77 deletions(-)

diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml
index d250e3bfeedf..e2a6fade0c19 100644
--- a/src/chrome/content/rules/swissgov.xml
+++ b/src/chrome/content/rules/swissgov.xml
@@ -12,6 +12,56 @@
 	ti.ch
 	ur.ch
 	vd.ch
+	
+	ag.ch
+	-hydroftp
+	-newsletter
+	
+	ge.ch
+	-bdp
+	-edu
+	-icp
+	-ot
+	-rc
+	-slj
+	-wwwedu
+	-wap
+	-vnm
+	
+	jura.ch
+	-extranet
+	-geoportail
+	-mapfish
+	-w3
+	404:
+	-album
+	-eco
+	-rsju
+	
+	zh.ch
+	-www.*
+	
+	vs.ch
+	-escadaweb
+	-web
+	-webta
+	-www.*
+	
+	so.ch
+	-ausbildungsprogramm
+	-lehrmittelshop
+	-rrb
+	-www.*
+	Missmatch:
+	-bgs
+	
+	sh.ch
+	-404 on subdomains
+	
+	gr.ch
+	-www.*
+	mixed content:
+	-geo
 
 	not working:
 	<target host="www.edoeb.admin.ch"/>
@@ -20,102 +70,56 @@
 	<target host="*.zg.ch"/>
 	<target host="zg.ch"/>
 	<target host="*.lu.ch"/>
-
-	mixedcontent:
-	<target host="*.so.ch"/>
-	<target host="so.ch"/>
 -->
 <ruleset name="Schweizer Regierung">
 	<target host="www.blog.edoeb.admin.ch"/>
+
 	<target host="ag.ch"/>
-	<target host="*.ag.ch"/>
+	<target host="gesetzessammlungen.ag.ch"/>
+	<target host="www.ag.ch"/>
+
 	<target host="ge.ch"/>
-	<target host="*.ge.ch"/>
+	<target host="www.ge.ch"/>
+
 	<target host="ar.ch"/>
 	<target host="www.ar.ch"/>
+
 	<target host="gl.ch"/>
 	<target host="www.gl.ch"/>
+
 	<target host="jura.ch"/>
-	<target host="*.jura.ch"/>
+	<target host="guichet.jura.ch"/>
+	<target host="www.jura.ch"/>
+
 	<target host="zh.ch"/>
-	<target host="*.zh.ch"/>
+	<target host="dsb.zh.ch"/>
+	<target host="www.zh.ch"/>
+
 	<target host="vs.ch"/>
-	<target host="*.vs.ch"/>
+	<target host="webtransfer.vs.ch"/>
+	<target host="www.vs.ch"/>
+
 	<target host="baselland.ch"/>
 	<target host="www.baselland.ch"/>
+
 	<target host="be.ch"/>
 	<target host="www.be.ch"/>
+
 	<target host="sh.ch"/>
-	<target host="*.sh.ch"/>
+	<target host="www.sh.ch"/>
+
+	<target host="so.ch"/>
+	<target host="bbzsogr.so.ch"/>
+	<target host="berufsmatura.so.ch"/>
+	<target host="pkso.so.ch"/>
+	<target host="www.so.ch"/>
+
 	<target host="gr.ch"/>
-	<target host="*.gr.ch"/>
+	<target host="www.gr.ch"/>
+
 	<target host="fr.ch"/>
 	<target host="www.fr.ch"/>
 	
-	<test url="http://www.blog.edoeb.admin.ch/" />
-	<test url="http://ag.ch/" />
-	<test url="http://www.ag.ch/" />
-	<test url="http://ge.ch/" />
-	<test url="http://www.ge.ch/" />
-	<test url="http://ar.ch/" />
-	<test url="http://www.ar.ch/" />
-	<test url="http://gl.ch/" />
-	<test url="http://www.gl.ch/" />
-	<test url="http://jura.ch/" />
-	<test url="http://www.jura.ch/" />
-	<test url="http://zh.ch/" />
-	<test url="http://www.zh.ch/" />
-	<test url="http://vs.ch/" />
-	<test url="http://www.vs.ch/" />
-	<test url="http://baselland.ch/" />
-	<test url="http://www.baselland.ch/" />
-	<test url="http://be.ch/" />
-	<test url="http://www.be.ch/" />
-	<test url="http://sh.ch/" />
-	<test url="http://www.sh.ch/" />
-	<test url="http://gr.ch/" />
-	<test url="http://www.gr.ch/" />
-	<test url="http://fr.ch/" />
-	<test url="http://www.fr.ch/" />
-
-	<rule from="^http://www\.blog\.edoeb\.admin\.ch/"
-		to="https://www.blog.edoeb.admin.ch/"/>
-	<rule from="^http://(?:www\.)?ag\.ch/"
-		to="https://www.ag.ch/"/>
-	<rule from="^http://([\w-]+)\.ag\.ch/"
-		to="https://$1.ag.ch/"/>
-	<rule from="^http://(?:www\.)?ge\.ch/"
-		to="https://www.ge.ch/"/>
-	<rule from="^http://([\w-]+)\.ge\.ch/"
-		to="https://$1.ge.ch/"/>
-	<rule from="^http://(?:www\.)?ar\.ch/"
-		to="https://www.ar.ch/"/>
-	<rule from="^http://(?:www\.)?gl\.ch/"
-		to="https://www.gl.ch/"/>
-	<rule from="^http://(?:www\.)?jura\.ch/"
-		to="https://www.jura.ch/"/>
-	<rule from="^http://([\w-]+)\.jura\.ch/"
-		to="https://$1.jura.ch/"/>
-	<!--<rule from="^http://(?:www\.)?zh\.ch/"
-		to="https://www.zh.ch/"/>-->
-	<rule from="^http://([\w-]+)\.zh\.ch/"
-		to="https://$1.zh.ch/"/>
-	<!--<rule from="^http://(?:www\.)?vs\.ch/"
-		to="https://www.vs.ch/"/>-->
-	<rule from="^http://([\w-]+)\.vs\.ch/"
-		to="https://$1.vs.ch/"/>
-	<rule from="^http://(?:www\.)?baselland\.ch/"
-		to="https://www.baselland.ch/"/>
-	<rule from="^http://(?:www\.)?be\.ch/"
-		to="https://www.be.ch/"/>
-	<rule from="^http://(?:www\.)?sh\.ch/"
-		to="https://www.sh.ch/"/>
-	<rule from="^http://([\w-]+)\.sh\.ch/"
-		to="https://$1.sh.ch/"/>
-	<!--<rule from="^http://(?:www\.)?gr\.ch/"
-		to="https://www.gr.ch/"/>-->
-	<rule from="^http://([\w-]+)\.gr\.ch/"
-		to="https://$1.gr.ch/"/>
-	<rule from="^http://(?:www\.)?fr\.ch/"
-		to="https://www.fr.ch/"/>
+	<rule from="^http:"
+		to="https:" />
 </ruleset>

From 0e31cd43541a65a38324f06faf85b587ac0e1184 Mon Sep 17 00:00:00 2001
From: J0WI <sjw@gmx.ch>
Date: Wed, 25 Mar 2015 23:51:45 +0100
Subject: [PATCH 4/4] Update swissgov.xml

---
 src/chrome/content/rules/swissgov.xml | 40 +++++++++++++--------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/chrome/content/rules/swissgov.xml b/src/chrome/content/rules/swissgov.xml
index e2a6fade0c19..5e81d56fc2c8 100644
--- a/src/chrome/content/rules/swissgov.xml
+++ b/src/chrome/content/rules/swissgov.xml
@@ -12,6 +12,12 @@
 	ti.ch
 	ur.ch
 	vd.ch
+
+	not working:
+	-lu.ch
+	-ne.ch
+	-www.edoeb.admin.ch
+	-zg.ch
 	
 	ag.ch
 	-hydroftp
@@ -28,6 +34,11 @@
 	-wap
 	-vnm
 	
+	gr.ch
+	-www.*
+	mixed content:
+	-geo
+	
 	jura.ch
 	-extranet
 	-geoportail
@@ -38,14 +49,8 @@
 	-eco
 	-rsju
 	
-	zh.ch
-	-www.*
-	
-	vs.ch
-	-escadaweb
-	-web
-	-webta
-	-www.*
+	sh.ch
+	-404 on subdomains
 	
 	so.ch
 	-ausbildungsprogramm
@@ -55,21 +60,14 @@
 	Missmatch:
 	-bgs
 	
-	sh.ch
-	-404 on subdomains
+	vs.ch
+	-escadaweb
+	-web
+	-webta
+	-www.*
 	
-	gr.ch
+	zh.ch
 	-www.*
-	mixed content:
-	-geo
-
-	not working:
-	<target host="www.edoeb.admin.ch"/>
-	<target host="*.ne.ch"/>
-	<target host="ne.ch"/>
-	<target host="*.zg.ch"/>
-	<target host="zg.ch"/>
-	<target host="*.lu.ch"/>
 -->
 <ruleset name="Schweizer Regierung">
 	<target host="www.blog.edoeb.admin.ch"/>