dns/void-zones-tools: Update links to hosts files

Add ca_root_nss dependency while here

PR:		232727
Submitted by:	Vidar Karlsen <vidar@karlsen.tech> (maintainer)
This commit is contained in:
Steve Wills 2018-10-27 00:21:55 +00:00
parent ddc202266d
commit 93da292603
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=483064
2 changed files with 47 additions and 2 deletions

View file

@ -3,7 +3,7 @@
PORTNAME= void-zones-tools
DISTVERSIONPREFIX= v
DISTVERSION= 1.0.2
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= dns
MAINTAINER= vidar@karlsen.tech
@ -12,6 +12,8 @@ COMMENT= Prepare a list of void zones that can be readily fed into Unbound
LICENSE= BSD2CLAUSE
LICENSE_FILE= ${WRKSRC}/LICENSE
RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
USES= compiler:c11
USE_GITHUB= yes
GH_ACCOUNT= cyclaero

View file

@ -1,4 +1,4 @@
--- void-zones-update.sh.orig 2017-08-26 23:00:56 UTC
--- void-zones-update.sh.orig 2017-08-22 12:36:14 UTC
+++ void-zones-update.sh
@@ -47,6 +47,8 @@ fi
ZONES_DIR="/usr/local/etc/void-zones"
@ -9,3 +9,46 @@
echo "# white list" > "$ZONES_DIR/my_void_hosts.txt"
echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt"
echo "" >> "$ZONES_DIR/my_void_hosts.txt"
@@ -63,9 +65,8 @@ $FETCH -o "$ZONES_DIR/mdl_void_hosts.txt
$FETCH -o "$ZONES_DIR/away_void_hosts.txt" "https://adaway.org/hosts.txt"
$FETCH -o "$ZONES_DIR/jdom_void_list.txt" "http://mirror1.malwaredomains.com/files/justdomains"
$FETCH -o "$ZONES_DIR/ucky_void_host.txt" "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
-$FETCH -o "$ZONES_DIR/w10telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt"
-$FETCH -o "$ZONES_DIR/w81telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win81/spy.txt"
-$FETCH -o "$ZONES_DIR/w7telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win7/spy.txt"
+$FETCH -o "$ZONES_DIR/wintelm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
+
if [ ! -f "$ZONES_DIR/pgl_void_hosts.txt" ] ; then
echo "# No hosts from pgl." > "$ZONES_DIR/pgl_void_hosts.txt"
@@ -95,17 +96,10 @@ if [ ! -f "$ZONES_DIR/ucky_void_host.txt
echo "# No hosts from FadeMind/unchecky." > "$ZONES_DIR/ucky_void_host.txt"
fi
-if [ ! -f "$ZONES_DIR/w10telm_void_hosts.txt" ] ; then
- echo "# No hosts from WindowsSpyBlocker/win10/spy." > "$ZONES_DIR/w10telm_void_hosts.txt"
-fi
-
-if [ ! -f "$ZONES_DIR/w81telm_void_hosts.txt" ] ; then
- echo "# No hosts from WindowsSpyBlocker/win81/spy." > "$ZONES_DIR/w81telm_void_hosts.txt"
+if [ ! -f "$ZONES_DIR/wintelm_void_hosts.txt" ] ; then
+ echo "# No hosts from WindowsSpyBlocker/hosts/spy." > "$ZONES_DIR/wintelm_void_hosts.txt"
fi
-if [ ! -f "$ZONES_DIR/w7telm_void_hosts.txt" ] ; then
- echo "# No hosts from WindowsSpyBlocker/win7/spy." > "$ZONES_DIR/w7telm_void_hosts.txt"
-fi
/usr/local/bin/hosts2zones /tmp/local-void.zones \
"$ZONES_DIR/my_void_hosts.txt" \
@@ -116,9 +110,7 @@ fi
"$ZONES_DIR/away_void_hosts.txt" \
"$ZONES_DIR/jdom_void_list.txt" \
"$ZONES_DIR/ucky_void_host.txt" \
- "$ZONES_DIR/w10telm_void_hosts.txt" \
- "$ZONES_DIR/w81telm_void_hosts.txt" \
- "$ZONES_DIR/w7telm_void_hosts.txt" \
+ "$ZONES_DIR/wintelm_void_hosts.txt" \
"$ZONES_DIR/x_void_list.txt" \
"$ZONES_DIR/y_void_list.txt" \
"$ZONES_DIR/z_void_list.txt" \