From faba429796eb594088b51387273c8cf374a7eecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20=C5=A0egina?= <psegina@ymail.com>
Date: Sun, 30 Apr 2017 20:15:57 +0200
Subject: [PATCH 1/4] Add basic ruleset for www.fer.unizg.hr

This is the official website of the Faculty of Electrical Engineering
and Computing in Zagreb, Croatia. The site supports HTTPS, but defaults
to HTTP, unless the user goes through the log in flow.
---
 src/chrome/content/rules/www.fer.unizg.hr.xml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 src/chrome/content/rules/www.fer.unizg.hr.xml

diff --git a/src/chrome/content/rules/www.fer.unizg.hr.xml b/src/chrome/content/rules/www.fer.unizg.hr.xml
new file mode 100644
index 000000000000..bac463574c34
--- /dev/null
+++ b/src/chrome/content/rules/www.fer.unizg.hr.xml
@@ -0,0 +1,5 @@
+<ruleset name="www.fer.unizg.hr">
+	<target host="www.fer.unizg.hr" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>

From 4b8ca30e7abd3b8ce0806e261b04c058a96dddb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20=C5=A0egina?= <psegina@ymail.com>
Date: Mon, 11 Dec 2017 18:35:47 +0100
Subject: [PATCH 2/4] Expand the ruleset to more unizg hosts

---
 src/chrome/content/rules/unizg.hr.xml         | 12 ++++++++++++
 src/chrome/content/rules/www.fer.unizg.hr.xml |  5 -----
 2 files changed, 12 insertions(+), 5 deletions(-)
 create mode 100644 src/chrome/content/rules/unizg.hr.xml
 delete mode 100644 src/chrome/content/rules/www.fer.unizg.hr.xml

diff --git a/src/chrome/content/rules/unizg.hr.xml b/src/chrome/content/rules/unizg.hr.xml
new file mode 100644
index 000000000000..852aa7d1aeba
--- /dev/null
+++ b/src/chrome/content/rules/unizg.hr.xml
@@ -0,0 +1,12 @@
+<ruleset name="unizg.hr (partial)">
+	<target host="ferko.fer.hr" />
+	<target host="www.fer.unizg.hr" />
+
+	<target host="www.vef.unizg.hr" />
+	<target host="www.pmf.unizg.hr" />
+	<target host="ffzg.unizg.hr" />
+	<target host="www.ffzg.unizg.hr" />
+	<target host="vojni.unizg.hr" />
+
+	<rule from="^http:" to="https:" />
+</ruleset>
diff --git a/src/chrome/content/rules/www.fer.unizg.hr.xml b/src/chrome/content/rules/www.fer.unizg.hr.xml
deleted file mode 100644
index bac463574c34..000000000000
--- a/src/chrome/content/rules/www.fer.unizg.hr.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<ruleset name="www.fer.unizg.hr">
-	<target host="www.fer.unizg.hr" />
-
-	<rule from="^http:" to="https:" />
-</ruleset>

From 5bcf9172c384ebc38e34ffdf97b6f06b16623aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20=C5=A0egina?= <psegina@ymail.com>
Date: Mon, 11 Dec 2017 23:24:12 +0100
Subject: [PATCH 3/4] Sort hosts and add non-working ones

---
 src/chrome/content/rules/unizg.hr.xml | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/chrome/content/rules/unizg.hr.xml b/src/chrome/content/rules/unizg.hr.xml
index 852aa7d1aeba..46648d600405 100644
--- a/src/chrome/content/rules/unizg.hr.xml
+++ b/src/chrome/content/rules/unizg.hr.xml
@@ -1,11 +1,26 @@
 <ruleset name="unizg.hr (partial)">
+<!--
+	Invalid certificate:
+		unizg.hr
+		fer.unizg.hr
+
+	Unresolvable:
+		vef.unizg.hr
+		pmf.unizg.hr
+
+	Refused:
+		www.unizg.hr
+-->
 	<target host="ferko.fer.hr" />
 	<target host="www.fer.unizg.hr" />
 
-	<target host="www.vef.unizg.hr" />
-	<target host="www.pmf.unizg.hr" />
-	<target host="ffzg.unizg.hr" />
 	<target host="www.ffzg.unizg.hr" />
+	<target host="ffzg.unizg.hr" />
+
+	<target host="www.pmf.unizg.hr" />
+
+	<target host="www.vef.unizg.hr" />
+
 	<target host="vojni.unizg.hr" />
 
 	<rule from="^http:" to="https:" />

From 4b847db050858071654b8036d74a34c159ec22bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petar=20=C5=A0egina?= <psegina@ymail.com>
Date: Thu, 14 Dec 2017 00:37:17 +0100
Subject: [PATCH 4/4] Update ruleset according to [1]

[1] https://github.com/EFForg/https-everywhere/pull/9729#issuecomment-351559497
---
 .../content/rules/{unizg.hr.xml => Unizg.hr.xml}   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 rename src/chrome/content/rules/{unizg.hr.xml => Unizg.hr.xml} (77%)

diff --git a/src/chrome/content/rules/unizg.hr.xml b/src/chrome/content/rules/Unizg.hr.xml
similarity index 77%
rename from src/chrome/content/rules/unizg.hr.xml
rename to src/chrome/content/rules/Unizg.hr.xml
index 46648d600405..14b43fbd0d5c 100644
--- a/src/chrome/content/rules/unizg.hr.xml
+++ b/src/chrome/content/rules/Unizg.hr.xml
@@ -1,24 +1,24 @@
-<ruleset name="unizg.hr (partial)">
 <!--
 	Invalid certificate:
 		unizg.hr
 		fer.unizg.hr
 
-	Unresolvable:
-		vef.unizg.hr
-		pmf.unizg.hr
-
 	Refused:
 		www.unizg.hr
+
 -->
-	<target host="ferko.fer.hr" />
+<ruleset name="Unizg.hr (partial)">
 	<target host="www.fer.unizg.hr" />
 
-	<target host="www.ffzg.unizg.hr" />
+	<target host="ferko.fer.hr" />
+
 	<target host="ffzg.unizg.hr" />
+	<target host="www.ffzg.unizg.hr" />
 
+	<!-- pmf.unizg.hr is not in DNS -->
 	<target host="www.pmf.unizg.hr" />
 
+	<!-- vef.unizg.hr is not in DNS -->
 	<target host="www.vef.unizg.hr" />
 
 	<target host="vojni.unizg.hr" />