diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | PKGBUILD | 16 | ||||
| -rw-r--r-- | pi-hole-server.install | 2 |
3 files changed, 7 insertions, 17 deletions
@@ -1,6 +1,6 @@ pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. - pkgver = 2.7.1 + pkgver = 2.8.1 pkgrel = 1 url = https://github.com/jacobsalmela/pi-hole install = pi-hole-server.install @@ -13,7 +13,7 @@ pkgbase = pi-hole-server conflicts = pi-hole-standalone backup = etc/pihole/whitelist.txt backup = etc/pihole/blacklist.txt - source = https://github.com/pi-hole/pi-hole/archive/v2.7.1.tar.gz + source = https://github.com/pi-hole/pi-hole/archive/v2.8.1.tar.gz source = https://github.com/pi-hole/AdminLTE/archive/v1.3.tar.gz source = configuration source = dnsmasq.include @@ -26,7 +26,7 @@ pkgbase = pi-hole-server source = pi-hole-logtruncate.timer source = whitelist.txt source = blacklist.txt - md5sums = 9e0b161df45dca59b995ea1a20d1d2a1 + md5sums = 9542c877ebd348aa15a62cd50a08c1c9 md5sums = e83a5207a711838186ae12c47643b4ed md5sums = 791c86996377ceca23d1459ea0fd5cd6 md5sums = cba1675593bb43c94a35aabe8a210efa @@ -2,7 +2,7 @@ pkgname=pi-hole-server _pkgname=pi-hole -pkgver=2.7.1 +pkgver=2.8.1 pkgrel=1 _wwwpkgname=AdminLTE _wwwpkgver=1.3 @@ -29,7 +29,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz whitelist.txt blacklist.txt) -md5sums=('9e0b161df45dca59b995ea1a20d1d2a1' +md5sums=('9542c877ebd348aa15a62cd50a08c1c9' 'e83a5207a711838186ae12c47643b4ed' '791c86996377ceca23d1459ea0fd5cd6' 'cba1675593bb43c94a35aabe8a210efa' @@ -46,18 +46,6 @@ md5sums=('9e0b161df45dca59b995ea1a20d1d2a1' prepare() { _ssc="/tmp/sedcontrol" - # 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 1" && return 1 ; fi - sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: undebianizing 2" && return 1 ; fi - sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: undebianizing 3" && return 1 ; fi - sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: undebianizing 4" && 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 diff --git a/pi-hole-server.install b/pi-hole-server.install index 086cc4a4035e..8bd082324b5e 100644 --- a/pi-hole-server.install +++ b/pi-hole-server.install @@ -5,6 +5,7 @@ post_install() { ==> ver. 2.7-1: lighttpd conf file is changed, please repeat the installation steps ==> first install/update run... EOF + cat /proc/net/if_inet6 2>&1 > /dev/null && touch /etc/pihole/.useIPv6 chown -R http.http /srv/http/pihole systemd-tmpfiles --create pi-hole.conf /usr/bin/gravity.sh > /dev/null @@ -22,3 +23,4 @@ post_remove() { rm -R /etc/pihole/ rm /run/log/pihole.log } + |