Version 0.999.7 (Alpha 7)

5 files changed, 32 insertions, 8 deletions

diff --git a/PKGBUILD b/PKGBUILD
index b88a412543df..00b23fc7885d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer/Originator: Jake VanderKolk <jakevanderkolk@gmail.com>
 pkgname=hostsblock
-pkgver=0.999.6
-pkgrel=3
+pkgver=0.999.7
+pkgrel=0
 pkgdesc="A script that downloads, sorts, and compiles multiple ad- and malware-blocking hosts files."
 arch=(any)
 url="http://gaenserich.github.com/hostsblock/"
@@ -10,6 +10,7 @@ depends=(bash curl grep sed coreutils gzip)
 optdepends=('dnsmasq: helps speed up DNS resolutions'
 	    'pixelserv: removes boilerplate page on blocked urls'
 	    'kwakd: removes boilerplate page on blocked urls (recommended)'
+            'pixelserv-tls: removes boilerplate page on blocked urls (supports HTTPS)'
 	    'unzip: allows the use of zipped downloads'
 	    'p7zip: allows the use of 7zipped downloads'
             'pigz: improves performance of gzip operations')
@@ -17,7 +18,7 @@ backup=('var/lib/hostsblock/hostsblock.conf' 'var/lib/hostsblock/black.list' 'va
 changelog=$pkgname.changelog
 install=$pkgname.install
 source=('hostsblock.sh' 'hostsblock.conf' 'black.list' 'white.list' 'hosts.head' 'hostsblock.service' 'hostsblock.timer')
-sha1sums=('5bb46b63a3371494cbd1ccc5b955583c635267d7'
+sha1sums=('895e820e6ff80d9e7a8fec5992dedd72b7dc57c7'
           'd9db54fb078ff0e674a1f32a886ad29969830459'
           '30fdaad1ee0497b9b88b61cfbd958d20c644801b'
           '11ab0a6bac002879a04872ec06a3611c32c80e1d'
@@ -29,10 +30,10 @@ package() {
   mkdir -p -m 750 "$pkgdir"/var/lib/hostsblock
   install -Dm750 "$srcdir"/hostsblock.sh "$pkgdir"/usr/bin/hostsblock
   ln -sf /usr/bin/hostsblock "$pkgdir"/usr/bin/hostsblock-urlcheck
-  install -Dm640 "$srcdir"/hostsblock.conf "$pkgdir"/var/lib/hostsblock/hostsblock.conf
-  install -Dm640 "$srcdir"/black.list "$pkgdir"/var/lib/hostsblock/black.list
-  install -Dm640 "$srcdir"/white.list "$pkgdir"/var/lib/hostsblock/white.list
-  install -Dm640 "$srcdir"/hosts.head "$pkgdir"/var/lib/hostsblock/hosts.head
+  install -Dm644 "$srcdir"/hostsblock.conf "$pkgdir"/var/lib/hostsblock/hostsblock.conf
+  install -Dm644 "$srcdir"/black.list "$pkgdir"/var/lib/hostsblock/black.list
+  install -Dm644 "$srcdir"/white.list "$pkgdir"/var/lib/hostsblock/white.list
+  install -Dm644 "$srcdir"/hosts.head "$pkgdir"/var/lib/hostsblock/hosts.head
   install -Dm644 "$srcdir"/hostsblock.service "$pkgdir"/usr/lib/systemd/system/hostsblock.service
   install -Dm644 "$srcdir"/hostsblock.timer "$pkgdir"/usr/lib/systemd/system/hostsblock.timer
 }
diff --git a/hostsblock.changelog b/hostsblock.changelog
index 5f5ece588034..2becd0969634 100644
--- a/hostsblock.changelog
+++ b/hostsblock.changelog
@@ -1,5 +1,12 @@
 See https://github.com/gaenserich/hostsblock/commits/master for a complete list of updates
 
+Version 0.999.7 (Alpha 7) (19.01.2018)
+*Typo fixes in install.sh (Commits ccdd26d14fce89452e71f7fa4310360f51e0c94e 895e820e6ff80d9e7a8fec5992dedd72b7dc57c7)
+*Added cryptomining block lists (Commits efee8ca4a08867a076c5ac8a0a93d7a149214239 2dc51cdc97db0d73bcb00d68b54da0f8e929ee36)
+*Fixed permission errors in packaging (Commit 1a272e22638661f0f527310937189383a75bd2d1)
+*Added optdepend (pixelserv-tls) (Commit 156dfeefd16a8f4fb93267116c4c13de0ddeb93b)
+*Fixed superficial warning (Commit e271d78a3b79dac2d337f3a00dc0bc21c74307c1)
+
 Version 0.999.6 (Alpha 6) (03.08.2017)
 *Fixed parsing function that falsely expected gzip
 *Fixed verbosity typo
diff --git a/hostsblock.conf b/hostsblock.conf
index f69ec747b167..1f001f279317 100644
--- a/hostsblock.conf
+++ b/hostsblock.conf
@@ -193,6 +193,21 @@ blocklists=(
     # anti-ad (sysctl.org/cameleon/)
     #'http://sysctl.org/cameleon/hosts'
 
+## ANTI-CRYTPOMINING LISTS
+
+    # anti-cryptomining in browser (github.com/hoshsadiq/adblock-nocoin-list)
+    #'https://raw.githubusercontent.com/hoshsadiq/adblock-nocoin-list/master/hosts.txt'
+
+    # anti-cryptomining from https://github.com/ZeroDot1/CoinBlockerLists
+        # All domains
+        #'https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/hosts'
+
+        # Optional domains
+        #'https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/hosts_optional'
+
+        # Browser mining domains; prevents browser mining only
+        #'https://raw.githubusercontent.com/ZeroDot1/CoinBlockerLists/master/hosts_browser'
+
 ## OPTIONAL LISTS
     # hpHosts for yahoo adservers (hosts-file.net/)
     #'http://hosts-file.net/download/yahoo_servers.zip'
diff --git a/hostsblock.install b/hostsblock.install
index e7639a1257a4..2a1ec5a202a2 100644
--- a/hostsblock.install
+++ b/hostsblock.install
@@ -17,6 +17,7 @@ add_user_group() {
         gpasswd -A hostsblock hostsblock
     fi
     chown -R hostsblock:hostsblock /var/lib/hostsblock /usr/bin/hostsblock
+    chmod 755 /var/lib/hostsblock
 }
 
 post_install() {
diff --git a/hostsblock.sh b/hostsblock.sh
index 5c64f93f5e73..23bf183211a9 100755
--- a/hostsblock.sh
+++ b/hostsblock.sh
@@ -458,7 +458,7 @@ else
         fi
 
         # INCLUDE HOSTS.HEAD FILE AS THE BEGINNING OF THE NEW TARGET HOSTS FILE
-        if [ "$hostshead" == "0" ] || [ $hostshead -eq 0 ]; then
+        if [ "$hostshead" == "0" ]; then
             rm $_v -- "$hostsfile" || _notify 1 "FAILED to delete existing $hostsfile."
         else
             cp $_v -f -- "$hostshead" "$hostsfile" || _notify 1 "FAILED to replace $hostsfile with $hostshead"