From 46df6e7dd390d9631f30727854eb8c98320eb166 Mon Sep 17 00:00:00 2001 From: Adam Warner Date: Thu, 16 Jun 2016 10:11:55 +0100 Subject: [PATCH 1/6] Update adlists.default Add C&C malware list from #528 --- adlists.default | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adlists.default b/adlists.default index 02d9b92c..6e9cec50 100644 --- a/adlists.default +++ b/adlists.default @@ -43,6 +43,8 @@ https://raw.githubusercontent.com/quidsup/notrack/master/trackers.txt # Block the BBC News website Breaking News banner #https://raw.githubusercontent.com/BreakingTheNews/BreakingTheNews.github.io/master/hosts +# List of known C&C malware servers (see https://github.com/pi-hole/pi-hole/issues/528) +https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt # Untested Lists: #https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt From fd92752f5215a496f22e7627474b6a265f3e374c Mon Sep 17 00:00:00 2001 From: Frederic Hemberger Date: Mon, 20 Jun 2016 19:10:06 +0200 Subject: [PATCH 2/6] Fix link for spam404scamlist.txt The redirect `http://spam404bl.com/spam404scamlist.txt` resolves to `https://raw.githubusercontent.com/spam404scamlist.txt/Dawsey21/Lists/master/main-blacklist.txt`, which is wrong. Instead, use `https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt`directly. --- adlists.default | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/adlists.default b/adlists.default index 6e9cec50..0aeee73b 100644 --- a/adlists.default +++ b/adlists.default @@ -48,7 +48,7 @@ https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt # Untested Lists: #https://raw.githubusercontent.com/reek/anti-adblock-killer/master/anti-adblock-killer-filters.txt -#http://spam404bl.com/spam404scamlist.txt +#https://raw.githubusercontent.com/Dawsey21/Lists/master/main-blacklist.txt #http://malwaredomains.lehigh.edu/files/domains.txt # Following two lists should be used simultaneously: (readme https://github.com/notracking/hosts-blocklists/) #https://raw.github.com/notracking/hosts-blocklists/master/hostnames.txt From 1f130b6550c8f72a61f8a55439eada864b734aa5 Mon Sep 17 00:00:00 2001 From: Mcat12 Date: Tue, 21 Jun 2016 19:16:11 -0400 Subject: [PATCH 3/6] Fix missing permissions on piholeIP Without sudo/root privileges, the echo command is unable to write to the file. --- automated install/basic-install.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index 699f68ee..d26c33cc 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -236,7 +236,7 @@ getStaticIPv4Settings() { If you are worried, either manually set the address, or modify the DHCP reservation pool so it does not include the IP you want. It is also possible to use a DHCP reservation, but if you are going to do that, you might as well set a static address." $r $c #piholeIP is saved to a permanent file so gravity.sh can use it when updating - echo "${IPv4addr%/*}" > /etc/pihole/piholeIP + $SUDO echo "${IPv4addr%/*}" > /etc/pihole/piholeIP # Nothing else to do since the variables are already set above else # Otherwise, we need to ask the user to input their desired settings. @@ -258,8 +258,8 @@ It is also possible to use a DHCP reservation, but if you are going to do that, Gateway: $IPv4gw" $r $c)then # If the settings are correct, then we need to set the piholeIP # Saving it to a temporary file us to retrieve it later when we run the gravity.sh script. piholeIP is saved to a permanent file so gravity.sh can use it when updating - echo "${IPv4addr%/*}" > /etc/pihole/piholeIP - echo "$piholeInterface" > /tmp/piholeINT + $SUDO echo "${IPv4addr%/*}" > /etc/pihole/piholeIP + $SUDO echo "$piholeInterface" > /tmp/piholeINT # After that's done, the loop ends and we move on ipSettingsCorrect=True else From 636a9123b83d8d8a229e82898f58bf36b7dcc8aa Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Thu, 23 Jun 2016 18:37:45 -0700 Subject: [PATCH 4/6] Have `curl` auto-redirect This should solve the redirection issue if a list is moved. --- gravity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity.sh b/gravity.sh index ce04e181..130c5409 100755 --- a/gravity.sh +++ b/gravity.sh @@ -152,7 +152,7 @@ function gravity_transport() { fi # Silently curl url - curl -s $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer + curl -s -L $cmd_ext $heisenbergCompensator -A "$agent" $url > $patternBuffer # Check for list updates gravity_patternCheck "$patternBuffer" # Cleanup From 7670b4e380e4526099eac53d0725b56c9dac99f1 Mon Sep 17 00:00:00 2001 From: Dan Schaper Date: Sat, 25 Jun 2016 06:00:49 -0700 Subject: [PATCH 5/6] Mahakala User Agen modernization Update Curl User Agent for Maha list. --- gravity.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gravity.sh b/gravity.sh index ce04e181..8fa93e22 100755 --- a/gravity.sh +++ b/gravity.sh @@ -181,7 +181,7 @@ function gravity_spinup() { # to complete properly and reset the user agent when required case "$domain" in "adblock.mahakala.is") - agent='Mozilla/5.0 (X11; Linux x86_64; rv:30.0) Gecko/20100101 Firefox/30.0' + agent='Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/41.0.2228.0 Safari/537.36' cmd_ext="-e http://forum.xda-developers.com/" ;; From 0e143f727561b96c8c1fe879907be6dd59ed1918 Mon Sep 17 00:00:00 2001 From: Matth Date: Sat, 25 Jun 2016 15:45:51 +0200 Subject: [PATCH 6/6] Update adlists.default --- adlists.default | 2 ++ 1 file changed, 2 insertions(+) diff --git a/adlists.default b/adlists.default index 0aeee73b..d2b5e798 100644 --- a/adlists.default +++ b/adlists.default @@ -53,3 +53,5 @@ https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt # Following two lists should be used simultaneously: (readme https://github.com/notracking/hosts-blocklists/) #https://raw.github.com/notracking/hosts-blocklists/master/hostnames.txt #https://raw.github.com/notracking/hosts-blocklists/master/domains.txt +# Combination of serveral host files on the internet (warning some facebook domains are also blocked but you can go to facebook.com). See https://github.com/mat1th/Dns-add-block for more information. +#https://raw.githubusercontent.com/mat1th/Dns-add-block/master/hosts