Attachment #198674 for bug #232727

View | Details | Raw Unified | Return to bug 232727
Collapse All | Expand All

Lines 3-9 Link Here

(-)dns/void-zones-tools/Makefile (-1 / +3 lines)
3	PORTNAME= void-zones-tools	3	PORTNAME= void-zones-tools
4	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
5	DISTVERSION= 1.0.2	5	DISTVERSION= 1.0.2
6	PORTREVISION= 4	6	PORTREVISION= 5
7	CATEGORIES= dns	7	CATEGORIES= dns
8		8
9	MAINTAINER= vidar@karlsen.tech	9	MAINTAINER= vidar@karlsen.tech
Lines 12-17 Link Here
12	LICENSE= BSD2CLAUSE	12	LICENSE= BSD2CLAUSE
13	LICENSE_FILE= ${WRKSRC}/LICENSE	13	LICENSE_FILE= ${WRKSRC}/LICENSE
14		14
		15	RUN_DEPENDS= ca_root_nss>0:security/ca_root_nss
		16
15	USES= compiler:c11	17	USES= compiler:c11
16	USE_GITHUB= yes	18	USE_GITHUB= yes
17	GH_ACCOUNT= cyclaero	19	GH_ACCOUNT= cyclaero




--- 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"

    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" \

Return to bug 232727

Lines 1-4 Link Here

(-)dns/void-zones-tools/files/patch-void-zones-update.sh (-1 / +44 lines)
1	--- void-zones-update.sh.orig 2017-08-26 23:00:56 UTC	1	--- void-zones-update.sh.orig 2017-08-22 12:36:14 UTC
2	+++ void-zones-update.sh	2	+++ void-zones-update.sh
3	@@ -47,6 +47,8 @@ fi	3	@@ -47,6 +47,8 @@ fi
4	ZONES_DIR="/usr/local/etc/void-zones"	4	ZONES_DIR="/usr/local/etc/void-zones"
Lines 9-11 Link Here
9	echo "# white list" > "$ZONES_DIR/my_void_hosts.txt"	9	echo "# white list" > "$ZONES_DIR/my_void_hosts.txt"
10	echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt"	10	echo "1.1.1.1 my.white.dom" >> "$ZONES_DIR/my_void_hosts.txt"
11	echo "" >> "$ZONES_DIR/my_void_hosts.txt"	11	echo "" >> "$ZONES_DIR/my_void_hosts.txt"
		12	@@ -63,9 +65,8 @@ $FETCH -o "$ZONES_DIR/mdl_void_hosts.txt
		13	$FETCH -o "$ZONES_DIR/away_void_hosts.txt" "https://adaway.org/hosts.txt"
		14	$FETCH -o "$ZONES_DIR/jdom_void_list.txt" "http://mirror1.malwaredomains.com/files/justdomains"
		15	$FETCH -o "$ZONES_DIR/ucky_void_host.txt" "https://raw.githubusercontent.com/FadeMind/hosts.extras/master/UncheckyAds/hosts"
		16	-$FETCH -o "$ZONES_DIR/w10telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win10/spy.txt"
		17	-$FETCH -o "$ZONES_DIR/w81telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win81/spy.txt"
		18	-$FETCH -o "$ZONES_DIR/w7telm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/win7/spy.txt"
		19	+$FETCH -o "$ZONES_DIR/wintelm_void_hosts.txt" "https://raw.githubusercontent.com/crazy-max/WindowsSpyBlocker/master/data/hosts/spy.txt"
		20	+
		21
		22	if [ ! -f "$ZONES_DIR/pgl_void_hosts.txt" ] ; then
		23	echo "# No hosts from pgl." > "$ZONES_DIR/pgl_void_hosts.txt"
		24	@@ -95,17 +96,10 @@ if [ ! -f "$ZONES_DIR/ucky_void_host.txt
		25	echo "# No hosts from FadeMind/unchecky." > "$ZONES_DIR/ucky_void_host.txt"
		26	fi
		27
		28	-if [ ! -f "$ZONES_DIR/w10telm_void_hosts.txt" ] ; then
		29	- echo "# No hosts from WindowsSpyBlocker/win10/spy." > "$ZONES_DIR/w10telm_void_hosts.txt"
		30	-fi
		31	-
		32	-if [ ! -f "$ZONES_DIR/w81telm_void_hosts.txt" ] ; then
		33	- echo "# No hosts from WindowsSpyBlocker/win81/spy." > "$ZONES_DIR/w81telm_void_hosts.txt"
		34	+if [ ! -f "$ZONES_DIR/wintelm_void_hosts.txt" ] ; then
		35	+ echo "# No hosts from WindowsSpyBlocker/hosts/spy." > "$ZONES_DIR/wintelm_void_hosts.txt"
		36	fi
		37
		38	-if [ ! -f "$ZONES_DIR/w7telm_void_hosts.txt" ] ; then
		39	- echo "# No hosts from WindowsSpyBlocker/win7/spy." > "$ZONES_DIR/w7telm_void_hosts.txt"
		40	-fi
		41
		42	/usr/local/bin/hosts2zones /tmp/local-void.zones \
		43	"$ZONES_DIR/my_void_hosts.txt" \
		44	@@ -116,9 +110,7 @@ fi
		45	"$ZONES_DIR/away_void_hosts.txt" \
		46	"$ZONES_DIR/jdom_void_list.txt" \
		47	"$ZONES_DIR/ucky_void_host.txt" \
		48	- "$ZONES_DIR/w10telm_void_hosts.txt" \
		49	- "$ZONES_DIR/w81telm_void_hosts.txt" \
		50	- "$ZONES_DIR/w7telm_void_hosts.txt" \
		51	+ "$ZONES_DIR/wintelm_void_hosts.txt" \
		52	"$ZONES_DIR/x_void_list.txt" \
		53	"$ZONES_DIR/y_void_list.txt" \
		54	"$ZONES_DIR/z_void_list.txt" \