From 7d8721e99de9daf35155fda1df9a46adcbe0d7bd Mon Sep 17 00:00:00 2001 From: Pasu Chan Chak Shing Date: Mon, 8 Jan 2018 19:27:09 +0800 Subject: [PATCH 1/3] Update Scotland.gov.uk.xml and Create gov.scot.xml --- src/chrome/content/rules/GOV.UK.xml | 2 +- src/chrome/content/rules/Scotland.gov.uk.xml | 32 +++++++ src/chrome/content/rules/gov.scot.xml | 95 ++++++++++++++++++++ utils/ruleset-whitelist.csv | 2 +- 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 src/chrome/content/rules/Scotland.gov.uk.xml create mode 100644 src/chrome/content/rules/gov.scot.xml diff --git a/src/chrome/content/rules/GOV.UK.xml b/src/chrome/content/rules/GOV.UK.xml index 1acb9547d950..2acbe9ad54f3 100644 --- a/src/chrome/content/rules/GOV.UK.xml +++ b/src/chrome/content/rules/GOV.UK.xml @@ -259,7 +259,7 @@ - scambs.gov.uk.xml - scarborough.gov.uk.xml - Scot_Borders.gov.uk.xml - - scotland.gov.uk.xml + - Scotland.gov.uk.xml - scotland.police.uk.xml - Secret_Intelligence_Service.xml - sepa.org.uk.xml diff --git a/src/chrome/content/rules/Scotland.gov.uk.xml b/src/chrome/content/rules/Scotland.gov.uk.xml new file mode 100644 index 000000000000..68e385e1bcc8 --- /dev/null +++ b/src/chrome/content/rules/Scotland.gov.uk.xml @@ -0,0 +1,32 @@ + + + + + + + + + + diff --git a/src/chrome/content/rules/gov.scot.xml b/src/chrome/content/rules/gov.scot.xml new file mode 100644 index 000000000000..5cc9509ec747 --- /dev/null +++ b/src/chrome/content/rules/gov.scot.xml @@ -0,0 +1,95 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/utils/ruleset-whitelist.csv b/utils/ruleset-whitelist.csv index 771a5efb476e..01e628084c8d 100644 --- a/utils/ruleset-whitelist.csv +++ b/utils/ruleset-whitelist.csv @@ -1366,7 +1366,7 @@ dbc8f2862e1855fd07a89a7d842b4ff03b2a93340d912a1f321e8a2c9a0840a8,1,1,GO_Transit. 73cc7eb8fa700154372dbc586aaa1adc8d0c0b86d17f2efcc14b7e9843a09004,1,1,Got_Vape.net.xml b2ee2374e3bdc3d03f5d60bd4b00bec95592a38b54a32a8b3097d1ec6cf1c86b,1,1,GourmetGiftBaskets.com.xml 38ea979b7f650765d00622f7919e2589f093c8f0df62b005e1ee37f97e821289,1,1,Government-Security-News.xml -d260b4da347c8b65d83536ac0d29c64485a22f36ce6ff03541ad6274ec7a532b,1,0,GOV.UK.xml +4fb6c41a0baf5d2a91ab39618b57d963f6a8052b57c6cd91ffb2585133da7fec,1,0,GOV.UK.xml b4741f899272079753bb0118f166d0130bbedf31d16434e9b8127821fcc41f50,1,0,GoWork.pl.xml 0ee8f20c7adbecd195a0b332aaeb6fa49a1b97192c94840236733f0a29dd5d75,1,0,GQ-magazine.co.uk.xml b4936c9408ab836adc37b0b41551860a35d85bd2adb24c2df60cc8fc04084e55,0,1,Grab_Media.xml From 6f4babbf27682070a4e109af5184bd6085eebca7 Mon Sep 17 00:00:00 2001 From: Pasu Chan Chak Shing Date: Mon, 8 Jan 2018 19:39:35 +0800 Subject: [PATCH 2/3] Delete scotland.gov.uk.xml --- src/chrome/content/rules/scotland.gov.uk.xml | 100 ------------------- 1 file changed, 100 deletions(-) delete mode 100644 src/chrome/content/rules/scotland.gov.uk.xml diff --git a/src/chrome/content/rules/scotland.gov.uk.xml b/src/chrome/content/rules/scotland.gov.uk.xml deleted file mode 100644 index d53278c064e7..000000000000 --- a/src/chrome/content/rules/scotland.gov.uk.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - From 9fe84d02a4e0fbf7923f74d25083c75a8887a5fa Mon Sep 17 00:00:00 2001 From: Pasu Chan Chak Shing Date: Wed, 10 Jan 2018 20:19:33 +0800 Subject: [PATCH 3/3] Add aquaculture.scotland.gov.uk --- src/chrome/content/rules/Scotland.gov.uk.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/chrome/content/rules/Scotland.gov.uk.xml b/src/chrome/content/rules/Scotland.gov.uk.xml index 68e385e1bcc8..c1a3a2fffc16 100644 --- a/src/chrome/content/rules/Scotland.gov.uk.xml +++ b/src/chrome/content/rules/Scotland.gov.uk.xml @@ -9,6 +9,7 @@ - www.scotland.gov.uk SSL peer certificate was not OK: + - aquaculture.scotland.gov.uk - business.scotland.gov.uk - dpea.scotland.gov.uk - environment.scotland.gov.uk