From d9172d8b50baaece1b0977d03a8e4ba5061eb3e9 Mon Sep 17 00:00:00 2001
From: Pasu Chan <ccspasu@gmail.com>
Date: Thu, 4 May 2017 10:00:23 +0800
Subject: [PATCH 1/2] Update Umea_Hackerspace.se.xml

---
 .../content/rules/Umea_Hackerspace.se.xml     | 51 ++++++-------------
 1 file changed, 15 insertions(+), 36 deletions(-)

diff --git a/src/chrome/content/rules/Umea_Hackerspace.se.xml b/src/chrome/content/rules/Umea_Hackerspace.se.xml
index 3dca04b3cb12..3016a114a394 100644
--- a/src/chrome/content/rules/Umea_Hackerspace.se.xml
+++ b/src/chrome/content/rules/Umea_Hackerspace.se.xml
@@ -1,46 +1,25 @@
 <!--
-	Umeå Hackerspace
-
-
-	Fully covered hosts in *umeahackerspace.se:
-
-		- (www.)?
-		- social
-		- stuff
-		- wiki
-
-
-	Insecure cookies are set for these hosts:
-
-		- social.umeahackerspace.se
-
-
-	Mixed content:
-
-		- css on ^ from fonts.googleapis.com *
-
-	* Secured by us
-
+	Non-functional hosts
+		Peer certificate cannot be authenticated with given CA certificates:
+			 - asbest.umeahackerspace.se
+			 - gram.umeahackerspace.se
+			 - gumboda.umeahackerspace.se
+			 
+		Mixed Content Blocking (MCB) tiggered:
+			 - from font.google.com on umeahackerspace.se
 -->
-<ruleset name="Umea Hackerspace.se" platform="cacert">
-
-	<!--	Direct rewrites:
-				-->
+<ruleset name="Umea Hackerspace.se (partial)" platform="mixedcontent">
 	<target host="umeahackerspace.se" />
+	<target host="lists.umeahackerspace.se" />
+	<target host="music.umeahackerspace.se" />
+	<target host="musik.umeahackerspace.se" />
 	<target host="social.umeahackerspace.se" />
 	<target host="stuff.umeahackerspace.se" />
+	<target host="stuff-rw.umeahackerspace.se" />
 	<target host="wiki.umeahackerspace.se" />
-	<target host="www.umeahackerspace.se" />
-
-
-	<!--	Not secured by server:
-					-->
-	<!--securecookie host="^social\.umeahackerspace\.se$" name="^PHPSESSID$" /-->
 
+	<securecookie host="^umeahackerspace\.se$" name=".+" />
 	<securecookie host="^social\.umeahackerspace\.se$" name=".+" />
 
-
-	<rule from="^http:"
-		to="https:" />
-
+	<rule from="^http:" to="https:" />
 </ruleset>

From 85d1b5deff7bfe2dc34fd74e8c997dd6862e012b Mon Sep 17 00:00:00 2001
From: Pasu <cschanaj@users.noreply.github.com>
Date: Thu, 4 May 2017 21:19:16 +0800
Subject: [PATCH 2/2] Update Umea_Hackerspace.se.xml

Removed 'mixedcontent' platform and comment.
---
 src/chrome/content/rules/Umea_Hackerspace.se.xml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/chrome/content/rules/Umea_Hackerspace.se.xml b/src/chrome/content/rules/Umea_Hackerspace.se.xml
index 3016a114a394..09cc8fcb9b67 100644
--- a/src/chrome/content/rules/Umea_Hackerspace.se.xml
+++ b/src/chrome/content/rules/Umea_Hackerspace.se.xml
@@ -4,11 +4,8 @@
 			 - asbest.umeahackerspace.se
 			 - gram.umeahackerspace.se
 			 - gumboda.umeahackerspace.se
-			 
-		Mixed Content Blocking (MCB) tiggered:
-			 - from font.google.com on umeahackerspace.se
 -->
-<ruleset name="Umea Hackerspace.se (partial)" platform="mixedcontent">
+<ruleset name="Umea Hackerspace.se (partial)">
 	<target host="umeahackerspace.se" />
 	<target host="lists.umeahackerspace.se" />
 	<target host="music.umeahackerspace.se" />