mirror of
https://github.com/opnsense/plugins.git
synced 2026-02-04 21:30:25 -06:00
DNS/Dnscrypt-proxy remove discontinued feeds (#1886)
This commit is contained in:
J.Townsend
GitHub
parent
28930cd881
commit
ff2bbcc41e
@ -1,6 +1,5 @@
|
||||
PLUGIN_NAME= dnscrypt-proxy
|
||||
PLUGIN_VERSION= 1.7
|
||||
PLUGIN_REVISION= 1
|
||||
PLUGIN_VERSION= 1.8
|
||||
PLUGIN_COMMENT= Flexible DNS proxy supporting DNSCrypt and DoH
|
||||
PLUGIN_DEPENDS= dnscrypt-proxy2
|
||||
PLUGIN_MAINTAINER= m.muenz@gmail.com
|
||||
|
||||
@ -5,6 +5,10 @@ such as DNSCrypt v2 and DNS-over-HTTPS.
|
||||
Plugin Changelog
|
||||
================
|
||||
|
||||
1.8
|
||||
|
||||
* Remove 8 discontinued DNSBL lists and 2 that are not updated any more
|
||||
|
||||
1.7
|
||||
|
||||
* Add comment field to whitelist section
|
||||
|
||||
@ -16,19 +16,10 @@
|
||||
<bla>Blocklist.site Ads</bla>
|
||||
<blf>Blocklist.site Fraud</blf>
|
||||
<blp>Blocklist.site Phishing</blp>
|
||||
<ca>Cameleon List</ca>
|
||||
<el>Easy List</el>
|
||||
<emd>EMD Malicious Domains List</emd>
|
||||
<ep>Easyprivacy List</ep>
|
||||
<hpa>hpHosts Ads</hpa>
|
||||
<hpf>hpHosts FSA</hpf>
|
||||
<hpp>hpHosts PSH</hpp>
|
||||
<hup>hpHosts PUP</hup>
|
||||
<ht>Hbbtv List</ht>
|
||||
<mw>Malwaredomain List</mw>
|
||||
<nc>NoCoin List</nc>
|
||||
<pt>PornTop1M List</pt>
|
||||
<rw>Ransomware Tracker List</rw>
|
||||
<sa>Simple Ad List</sa>
|
||||
<st>Simple Tracker List</st>
|
||||
<sb>Steven Black List</sb>
|
||||
|
||||
@ -63,13 +63,6 @@ porntop() {
|
||||
rm ${WORKDIR}/porntop-raw
|
||||
}
|
||||
|
||||
emdlist() {
|
||||
# EMD
|
||||
${FETCH} https://hosts-file.net/emd.txt -o ${WORKDIR}/emdlist-raw
|
||||
sed "/\.$/d" ${WORKDIR}/emdlist-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/emdlist
|
||||
rm ${WORKDIR}/emdlist-raw
|
||||
}
|
||||
|
||||
adguard() {
|
||||
# AdGuard
|
||||
${FETCH} https://justdomains.github.io/blocklists/lists/adguarddns-justdomains.txt -o ${WORKDIR}/adguard-raw
|
||||
@ -84,20 +77,6 @@ nocoin() {
|
||||
rm ${WORKDIR}/nocoin-raw
|
||||
}
|
||||
|
||||
rwtracker() {
|
||||
# RansomWare Tracker abuse.ch
|
||||
${FETCH} https://ransomwaretracker.abuse.ch/downloads/RW_DOMBL.txt -o ${WORKDIR}/rwtracker-raw
|
||||
sed "/\.$/d" ${WORKDIR}/rwtracker-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/rwtracker
|
||||
rm ${WORKDIR}/rwtracker-raw
|
||||
}
|
||||
|
||||
mwdomains() {
|
||||
# MalwareDomains
|
||||
${FETCH} http://malwaredomains.lehigh.edu/files/justdomains -o ${WORKDIR}/malwaredomains-raw
|
||||
sed "/\.$/d" ${WORKDIR}/malwaredomains-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/malwaredomains
|
||||
rm ${WORKDIR}/malwaredomains-raw
|
||||
}
|
||||
|
||||
windowsspyblockerspy() {
|
||||
# WindowsSpyBlocker (spy)
|
||||
${FETCH} https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt -o ${WORKDIR}/windowsspyblockerspy-raw
|
||||
@ -119,13 +98,6 @@ windowsspyblockerextra() {
|
||||
rm ${WORKDIR}/windowsspyblockerextra-raw
|
||||
}
|
||||
|
||||
cameleon() {
|
||||
# Cameleon List
|
||||
${FETCH} http://sysctl.org/cameleon/hosts -o ${WORKDIR}/cameleon-raw
|
||||
sed "/\.$/d" ${WORKDIR}/cameleon-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/cameleon
|
||||
rm ${WORKDIR}/cameleon-raw
|
||||
}
|
||||
|
||||
adaway() {
|
||||
# AdAway List
|
||||
${FETCH} https://adaway.org/hosts.txt -o ${WORKDIR}/adaway-raw
|
||||
@ -168,41 +140,6 @@ blocklistphishing() {
|
||||
rm ${WORKDIR}/blocklistphishing-raw
|
||||
}
|
||||
|
||||
hphosts-ads() {
|
||||
# hphosts-ads
|
||||
${FETCH} https://hosts-file.net/ad_servers.txt -o ${WORKDIR}/hphosts-ads-raw
|
||||
sed "/\.$/d" ${WORKDIR}/hphosts-ads-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-ads
|
||||
rm ${WORKDIR}/hphosts-ads-raw
|
||||
}
|
||||
|
||||
hphosts-fsa() {
|
||||
# hphosts-fsa
|
||||
${FETCH} https://hosts-file.net/fsa.txt -o ${WORKDIR}/hphosts-fsa-raw
|
||||
sed "/\.$/d" ${WORKDIR}/hphosts-fsa-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-fsa
|
||||
rm ${WORKDIR}/hphosts-fsa-raw
|
||||
}
|
||||
|
||||
hphosts-psh() {
|
||||
# hphosts-psh
|
||||
${FETCH} https://hosts-file.net/psh.txt -o ${WORKDIR}/hphosts-psh-raw
|
||||
sed "/\.$/d" ${WORKDIR}/hphosts-psh-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-psh
|
||||
rm ${WORKDIR}/hphosts-psh-raw
|
||||
}
|
||||
|
||||
hphosts-pup() {
|
||||
# hphosts-pup
|
||||
${FETCH} https://hosts-file.net/pup.txt -o ${WORKDIR}/hphosts-pup-raw
|
||||
sed "/\.$/d" ${WORKDIR}/hphosts-pup-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" | sed "/localhost/d" | sed "/255\.255\.255\.255/d" | sed "/\:\:1/d" | sed "/fe80\:\:1/d" | sed "/ff00\:\:/d" | sed "/ff02\:\:/d" | sed "/0\.0\.0\.0 0\.0\.0\.0/d" | tr -d '\r' | awk 'BEGIN{FS=OFS=" ";}{print $2;}' > ${WORKDIR}/hphosts-pup
|
||||
rm ${WORKDIR}/hphosts-pup-raw
|
||||
}
|
||||
|
||||
hbbtv() {
|
||||
# HBBTV List
|
||||
${FETCH} https://raw.githubusercontent.com/Akamaru/Pi-Hole-Lists/master/hbbtv.txt -o ${WORKDIR}/hbbtv-raw
|
||||
sed "/\.$/d" ${WORKDIR}/hbbtv-raw | sed "/^#/d" | sed "/\_/d" | sed "/^\s*$/d" | sed "/\.\./d" | sed "s/^\.//g" > ${WORKDIR}/hbbtv
|
||||
rm ${WORKDIR}/hbbtv-raw
|
||||
}
|
||||
|
||||
simplead() {
|
||||
# Simple Ad List
|
||||
${FETCH} https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt -o ${WORKDIR}/simplead-raw
|
||||
@ -252,45 +189,15 @@ for CAT in $(echo ${DNSBL} | tr ',' ' '); do
|
||||
blp)
|
||||
blocklistphishing
|
||||
;;
|
||||
ca)
|
||||
cameleon
|
||||
;;
|
||||
el)
|
||||
easylist
|
||||
;;
|
||||
ep)
|
||||
easyprivacy
|
||||
;;
|
||||
emd)
|
||||
emdlist
|
||||
;;
|
||||
hpa)
|
||||
hphosts-ads
|
||||
;;
|
||||
hpf)
|
||||
hphosts-fsa
|
||||
;;
|
||||
hpp)
|
||||
hphosts-psh
|
||||
;;
|
||||
hup)
|
||||
hphosts-pup
|
||||
;;
|
||||
ht)
|
||||
hbbtv
|
||||
;;
|
||||
nc)
|
||||
nocoin
|
||||
;;
|
||||
rw)
|
||||
rwtracker
|
||||
;;
|
||||
mw)
|
||||
mwdomains
|
||||
;;
|
||||
pa)
|
||||
#pornall
|
||||
;;
|
||||
pt)
|
||||
porntop
|
||||
;;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user