From a13e24ced777a637788f67b71551d011ac14c275 Mon Sep 17 00:00:00 2001 From: Peter Lowe Date: Wed, 3 Feb 2016 11:36:52 +0100 Subject: [PATCH] Updated pgl.yoyo.org to use HTTPS in URLs --- README.md | 2 +- assets/thirdparties/pgl.yoyo.org/as/README.md | 2 +- assets/ublock/filter-lists.json | 4 ++-- assets/update-3rdparties.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index e20011fac..b4a3416b3 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ The donations sought by the [individual](https://github.com/chrisaljoudi/) behin *** -uBlock Origin is **NOT** an "ad blocker": [it is a wide-spectrum blocker](https://github.com/gorhill/uBlock/wiki/Blocking-mode) -- which happens to be able to function as a mere "ad blocker". The default behavior of uBlock Origin when newly installed is to block ads, trackers and malware sites -- through [_EasyList_](https://easylist.adblockplus.org/en/policy#easylist), [_EasyPrivacy_](https://easylist.adblockplus.org/en/policy#easyprivacy), [_Peter Lowe’s ad/tracking/malware servers_](http://pgl.yoyo.org/adservers/policy.php), various lists of [malware](http://www.malwaredomainlist.com/) [sites](http://www.malwaredomains.com/), and uBlock Origin's [own filter lists](https://github.com/gorhill/uBlock/tree/master/assets/ublock). +uBlock Origin is **NOT** an "ad blocker": [it is a wide-spectrum blocker](https://github.com/gorhill/uBlock/wiki/Blocking-mode) -- which happens to be able to function as a mere "ad blocker". The default behavior of uBlock Origin when newly installed is to block ads, trackers and malware sites -- through [_EasyList_](https://easylist.adblockplus.org/en/policy#easylist), [_EasyPrivacy_](https://easylist.adblockplus.org/en/policy#easyprivacy), [_Peter Lowe’s ad/tracking/malware servers_](https://pgl.yoyo.org/adservers/policy.php), various lists of [malware](http://www.malwaredomainlist.com/) [sites](http://www.malwaredomains.com/), and uBlock Origin's [own filter lists](https://github.com/gorhill/uBlock/tree/master/assets/ublock). *** diff --git a/assets/thirdparties/pgl.yoyo.org/as/README.md b/assets/thirdparties/pgl.yoyo.org/as/README.md index 18d17adbb..8c1a49f43 100644 --- a/assets/thirdparties/pgl.yoyo.org/as/README.md +++ b/assets/thirdparties/pgl.yoyo.org/as/README.md @@ -1,4 +1,4 @@ -: +: Site does encourage use of the list, and nowhere could I find terms and conditions to use the list. Assuming it can be used freely. diff --git a/assets/ublock/filter-lists.json b/assets/ublock/filter-lists.json index 4f78cbd15..86c0fce78 100644 --- a/assets/ublock/filter-lists.json +++ b/assets/ublock/filter-lists.json @@ -227,8 +227,8 @@ "pgl.yoyo.org/as/serverlist": { "title": "Peter Lowe’s Ad server list", "group": "ads", - "homeURL": "http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", - "supportURL": "http://pgl.yoyo.org/adservers/" + "homeURL": "https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&mimetype=plaintext", + "supportURL": "https://pgl.yoyo.org/adservers/" }, "https://raw.githubusercontent.com/AdBlockPlusIsrael/EasyListHebrew/master/EasyListHebrew.txt": { "off": true, diff --git a/assets/update-3rdparties.sh b/assets/update-3rdparties.sh index ab16b80ba..e324da83b 100755 --- a/assets/update-3rdparties.sh +++ b/assets/update-3rdparties.sh @@ -11,7 +11,7 @@ assets=( ['thirdparties/easylist-downloads.adblockplus.org/easylist.txt']='https://easylist-downloads.adblockplus.org/easylist.txt' ['thirdparties/easylist-downloads.adblockplus.org/easyprivacy.txt']='https://easylist-downloads.adblockplus.org/easyprivacy.txt' ['thirdparties/mirror1.malwaredomains.com/files/justdomains']='http://mirror1.malwaredomains.com/files/justdomains' - ['thirdparties/pgl.yoyo.org/as/serverlist']='http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&startdate%5Bday%5D=&startdate%5Bmonth%5D=&startdate%5Byear%5D=&mimetype=plaintext' + ['thirdparties/pgl.yoyo.org/as/serverlist']='https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&showintro=1&startdate%5Bday%5D=&startdate%5Bmonth%5D=&startdate%5Byear%5D=&mimetype=plaintext' ['thirdparties/publicsuffix.org/list/effective_tld_names.dat']='https://publicsuffix.org/list/effective_tld_names.dat' ['thirdparties/www.malwaredomainlist.com/hostslist/hosts.txt']='https://www.malwaredomainlist.com/hostslist/hosts.txt' )