Retry upload of version 0.999.4-1 (Alpha 4)

4 files changed, 95 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c308e55d6793..820e96f2e2cb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = hostsblock
-	pkgdesc = A script and cronjob that downloads, sorts, and installs multiple ad- and malware-blocking hosts files.
-	pkgver = 0.999.3
+	pkgdesc = A script that downloads, sorts, and compiles multiple ad- and malware-blocking hosts files.
+	pkgver = 0.999.4
 	pkgrel = 1
 	url = http://gaenserich.github.com/hostsblock/
 	install = hostsblock.install
@@ -12,34 +12,31 @@ pkgbase = hostsblock
 	depends = grep
 	depends = sed
 	depends = coreutils
+	depends = gzip
 	optdepends = dnsmasq: helps speed up DNS resolutions
 	optdepends = pixelserv: removes boilerplate page on blocked urls
 	optdepends = kwakd: removes boilerplate page on blocked urls (recommended)
 	optdepends = unzip: allows the use of zipped downloads
 	optdepends = p7zip: allows the use of 7zipped downloads
-	optdepends = gzip: allows compression of old blockfile
-	backup = etc/hostsblock/hostsblock.conf
-	backup = etc/hostsblock/black.list
-	backup = etc/hostsblock/white.list
-	backup = etc/hostsblock/hosts.head
+	optdepends = pigz: improves performance of gzip operations
+	backup = var/lib/hostsblock/hostsblock.conf
+	backup = var/lib/hostsblock/black.list
+	backup = var/lib/hostsblock/white.list
+	backup = var/lib/hostsblock/hosts.head
 	source = hostsblock.sh
-	source = hostsblock-urlcheck.sh
-	source = hostsblock-common.sh
 	source = hostsblock.conf
 	source = black.list
 	source = white.list
 	source = hosts.head
 	source = hostsblock.service
 	source = hostsblock.timer
-	md5sums = c37b64ca1e12e349f33e851bd1c0d0cc
-	md5sums = befb6ba1997af9b60c22ffc1ac1b51bc
-	md5sums = 5dd054e334343338b7f4e550b39fc6dc
-	md5sums = ae9e36a9c77780306fa48d10684f71fd
-	md5sums = 216d5af213e0eb3690ea3c27d4cc6258
-	md5sums = 3a6ea9f5b0eef002b6ca1dd57388d78a
-	md5sums = 949af91b7a40582de127eb43a96f001e
-	md5sums = c42cf86eb028e30feacc828231b8c084
-	md5sums = 96d43b8f9e81f85111a2ac370c8954d8
+	sha1sums = 344d904a3710e980d8a7770db210e8f3af7c409c
+	sha1sums = d9db54fb078ff0e674a1f32a886ad29969830459
+	sha1sums = 30fdaad1ee0497b9b88b61cfbd958d20c644801b
+	sha1sums = 11ab0a6bac002879a04872ec06a3611c32c80e1d
+	sha1sums = cff64336645b54e11248d31a6e4406cc3642483f
+	sha1sums = 7196c143f060f4dcfc12d2d1ca36a5055ac51ef2
+	sha1sums = f57b1cd082e29631b6fbaae5a7191dbc3ddf176b
 
 pkgname = hostsblock
 
diff --git a/PKGBUILD b/PKGBUILD
index b575220e7444..4c2e89b1ff95 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,40 +1,37 @@
-# Maintainer: Jake VanderKolk <jakevanderkolk@gmail.com>
+# Maintainer/Originator: Jake VanderKolk <jakevanderkolk@gmail.com>
 pkgname=hostsblock
-pkgver=0.999.3
+pkgver=0.999.4
 pkgrel=1
-pkgdesc="A script and cronjob that downloads, sorts, and installs multiple ad- and malware-blocking hosts files."
+pkgdesc="A script that downloads, sorts, and compiles multiple ad- and malware-blocking hosts files."
 arch=(any)
 url="http://gaenserich.github.com/hostsblock/"
 license=('GPL')
-depends=(bash curl grep sed coreutils)
+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)'
 	    'unzip: allows the use of zipped downloads'
 	    'p7zip: allows the use of 7zipped downloads'
-            'gzip: allows compression of old blockfile')
-backup=('etc/hostsblock/hostsblock.conf' 'etc/hostsblock/black.list' 'etc/hostsblock/white.list' 'etc/hostsblock/hosts.head')
+            'pigz: improves performance of gzip operations')
+backup=('var/lib/hostsblock/hostsblock.conf' 'var/lib/hostsblock/black.list' 'var/lib/hostsblock/white.list' 'var/lib/hostsblock/hosts.head')
 changelog=$pkgname.changelog
 install=$pkgname.install
-source=('hostsblock.sh' 'hostsblock-urlcheck.sh' 'hostsblock-common.sh' 'hostsblock.conf' 'black.list' 'white.list' 'hosts.head' 'hostsblock.service' 'hostsblock.timer')
-md5sums=('c37b64ca1e12e349f33e851bd1c0d0cc'
-         'befb6ba1997af9b60c22ffc1ac1b51bc'
-         '5dd054e334343338b7f4e550b39fc6dc'
-         'ae9e36a9c77780306fa48d10684f71fd'
-         '216d5af213e0eb3690ea3c27d4cc6258'
-         '3a6ea9f5b0eef002b6ca1dd57388d78a'
-         '949af91b7a40582de127eb43a96f001e'
-         'c42cf86eb028e30feacc828231b8c084'
-         '96d43b8f9e81f85111a2ac370c8954d8')
+source=('hostsblock.sh' 'hostsblock.conf' 'black.list' 'white.list' 'hosts.head' 'hostsblock.service' 'hostsblock.timer')
+sha1sums=('344d904a3710e980d8a7770db210e8f3af7c409c'
+          'd9db54fb078ff0e674a1f32a886ad29969830459'
+          '30fdaad1ee0497b9b88b61cfbd958d20c644801b'
+          '11ab0a6bac002879a04872ec06a3611c32c80e1d'
+          'cff64336645b54e11248d31a6e4406cc3642483f'
+          '7196c143f060f4dcfc12d2d1ca36a5055ac51ef2'
+          'f57b1cd082e29631b6fbaae5a7191dbc3ddf176b')
 
 package() {
-  install -Dm744 "$srcdir"/hostsblock.sh "$pkgdir"/usr/bin/hostsblock
-  install -Dm744 "$srcdir"/hostsblock-urlcheck.sh "$pkgdir"/usr/bin/hostsblock-urlcheck
-  install -Dm644 "$srcdir"/hostsblock-common.sh "$pkgdir"/usr/lib/hostsblock-common.sh
-  install -Dm644 "$srcdir"/hostsblock.conf "$pkgdir"/etc/hostsblock/hostsblock.conf
-  install -Dm644 "$srcdir"/black.list "$pkgdir"/etc/hostsblock/black.list
-  install -Dm644 "$srcdir"/white.list "$pkgdir"/etc/hostsblock/white.list
-  install -Dm644 "$srcdir"/hosts.head "$pkgdir"/etc/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
+  install -Dm750 "$srcdir"/hostsblock.sh "$pkgdir"/usr/bin/hostsblock
+  ln -sf "$pkgdir"/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 -Dm640 "$srcdir"/hostsblock.service "$pkgdir"/usr/lib/systemd/system/hostsblock.service
+  install -Dm640 "$srcdir"/hostsblock.timer "$pkgdir"/usr/lib/systemd/system/hostsblock.timer
 }
diff --git a/hostsblock.changelog b/hostsblock.changelog
index a633a54d73f9..f22ac4f0a51c 100644
--- a/hostsblock.changelog
+++ b/hostsblock.changelog
@@ -1,5 +1,13 @@
 See https://github.com/gaenserich/hostsblock/commits/master for a complete list of updates
 
+Version 0.999.4 (Alpha 4) (07.23.2017)
+*Massive simplification of script, removing excess verbosity options, combining hostsblock.sh with hostsblock-urlcheck.sh
+*Mandate that hostsblock now runs as unpriviledged user, i.e. 'hostsblock' (see hostsblock.conf)
+*Mandate the use of gzip for annotation file and HOSTS file backup
+*Now uses /var/lib/hostsblock as its default configuration and /var/lib/hostsblock/cache as its default cache directories (to aid with priviledge containment).
+*Removed repetitive grep calls with single grep call with multiple "-e" options.
+*For performance improvements, replaced regex-aware grep with grep -F when regex not needed.
+
 Version 0.999.3 (Alpha 3) (30.10.2015)
 *Added more optional source files to hostsblock.conf. Added user agent info to curl to make work with more sites. Sanitized hostsblock.conf file a little bit.
 *Added function to force target file update even if no changes are found to source files
diff --git a/hostsblock.install b/hostsblock.install
index 66da20654ec8..cea01f46a539 100644
--- a/hostsblock.install
+++ b/hostsblock.install
@@ -1,8 +1,54 @@
+add_user_group() {
+    _changed=0
+    if getent passwd | grep -q "^hostsblock:"; then
+        true
+    else
+        _changed=1
+        useradd -d /var/lib/hostsblock -c "hostsblock" -m -U hostsblock
+    fi
+    if getent group | grep -q "^hostsblock:"; then
+        true
+    else
+        _changed=1
+        groupadd hostsblock
+    fi
+    if [ $_changed == 1 ]; then
+        gpasswd -a hostsblock hostsblock
+        gpasswd -A hostsblock hostsblock
+        chmod 750 /var/lib/hostsblock
+        chmod -R 640 /var/lib/hostsblock/*
+        chown -R hostsblock:hostsblock /var/lib/hostsblock
+    fi
+}
+
 post_install() {
-  cat << EOF
-If you will be running hostsblock on your main '/etc/hosts' file, copy your
-original to '/etc/hostsblock/hosts.head' to preserve your entries.
+    add_user_group
+    chown hostsblock:hostsblock /usr/bin/hostsblock
+    cat << EOF
+
+As of 0.999.4, hostsblock requires additional sudo permissions.
+Please see https://github.com/gaenserich/hostsblock for details.
+
+EOF
+}
+
+post_upgrade() {
+    add_user_group
+    chown hostsblock:hostsblock /usr/bin/hostsblock
+    cat << EOF
+
+As of 0.999.4, hostsblock requires additional sudo permissions.
+Please see https://github.com/gaenserich/hostsblock for details.
+
+EOF
+}
+
+post_remove() {
+    userdel hostsblock
+    groupdel hostsblock
+    cat << EOF
+hostsblock's configuration and cache directory (/var/lib/hostsblock) has not been removed.
 
-A documented configuration file is available under '/etc/hostsblock/rc.conf'.
+You should now remove the entries you put into sudoers (via sudo visudo) for hostsblock.
 EOF
 }