diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 27 |
2 files changed, 28 insertions, 3 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Wed Apr 13 21:17:16 UTC 2016 +# Thu Apr 21 05:40:54 UTC 2016 pkgbase = pi-hole-standalone pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC. pkgver = 2.6.2 - pkgrel = 4 + pkgrel = 5 url = https://github.com/jacobsalmela/pi-hole install = pi-hole-standalone.install arch = any @@ -3,7 +3,7 @@ pkgname=pi-hole-standalone _pkgname=pi-hole pkgver=2.6.2 -pkgrel=4 +pkgrel=5 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.' arch=('any') license=('GPL2') @@ -38,10 +38,12 @@ prepare() { if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change local ip to unusable 0.0.0.0 (ref. http://dlaa.me/blog/post/skyhole)" && return 1 ; fi sed -i '/^function gravity_reload() {/a sed -i "s/^[0-9\\.]\\+\\s/0.0.0.0 /g" /etc/pihole/gravity.list' "$srcdir"/$_pkgname-$pkgver/gravity.sh + # undebianizing sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: undebianizing" && return 1 ; fi + # modify service management sed -i 's|\[\[ \$dnsmasqPid \]\]|systemctl is-active dnsmasq 2\>\&1 \>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 1" && return 1 ; fi @@ -50,14 +52,37 @@ prepare() { sed -i "s|\$SUDO service dnsmasq start|\$SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 3" && return 1 ; fi + sed -n "/dnsmasqPid\=/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 4" && return 1 ; fi + sed -i '/dnsmasqPid\=/d' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh + sed -i 's|\[\[ \$dnsmasqPid \]\]|systemctl is-active dnsmasq 2\>\&1 \>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 5" && return 1 ; fi + sed -i "s|sudo kill -HUP \"\$dnsmasqPid\"|\$SUDO systemctl reload dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 6" && return 1 ; fi + sed -i "s|sudo service dnsmasq start|\$SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 7" && return 1 ; fi + + sed -n "/dnsmasqPid\=/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 8" && return 1 ; fi + sed -i '/dnsmasqPid\=/d' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh + sed -i 's|\[\[ \$dnsmasqPid \]\]|systemctl is-active dnsmasq 2\>\&1 \>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 9" && return 1 ; fi + sed -i "s|sudo kill -HUP \"\$dnsmasqPid\"|\$SUDO systemctl reload dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 10" && return 1 ; fi + sed -i "s|sudo service dnsmasq start|\$SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: modify service management 11" && return 1 ; fi + + # gravity call paths changing sed -i "s|/opt/pihole/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: gravity call paths changing" && return 1 ; fi + # adlists.default is already there sed -i "s/\$SUDO cp \/etc\/.pihole\/adlists.default \/etc\/pihole\/adlists.default//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: adlists.default is already there" && return 1 ; fi + # arch useless sed -n "/#ensure \/etc\/dnsmasq\.d\//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: arch useless" && return 1 ; fi |