diff options
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 32 | ||||
-rw-r--r-- | piholeDebug.sh | 4 |
3 files changed, 29 insertions, 11 deletions
@@ -1,7 +1,7 @@ pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. pkgver = 3.2.1 - pkgrel = 4 + pkgrel = 5 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any @@ -34,6 +34,7 @@ pkgbase = pi-hole-server source = pi-hole-logtruncate.timer source = mimic_setupVars.conf.sh source = version.patch + source = piholeDebug.sh md5sums = a0ff29ba87d22b695baa48194b1ebfd2 md5sums = 948e23bdd0fba84d69231f1ee08957cb md5sums = 3f1aeea43af0b192edb36b9e5484ff87 @@ -47,6 +48,7 @@ pkgbase = pi-hole-server md5sums = 291d3c95e445fe65caf40c3605efd186 md5sums = c227ffa88ddebc34cb715b73640cd845 md5sums = 93fe5e50cf3fcb08b24cf29b0cace85b + md5sums = d7b69ae51db0e8ac8e27f20a234eed85 pkgname = pi-hole-server @@ -4,7 +4,7 @@ pkgname=pi-hole-server _pkgname=pi-hole pkgver=3.2.1 -pkgrel=4 +pkgrel=5 _wwwpkgname=AdminLTE _wwwpkgver=3.2.1 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.' @@ -36,6 +36,7 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$ $_pkgname-logtruncate.timer mimic_setupVars.conf.sh version.patch + piholeDebug.sh ) md5sums=('a0ff29ba87d22b695baa48194b1ebfd2' @@ -50,7 +51,8 @@ md5sums=('a0ff29ba87d22b695baa48194b1ebfd2' '20c5b0c6b4e23e55b25ab6c28dda709d' '291d3c95e445fe65caf40c3605efd186' 'c227ffa88ddebc34cb715b73640cd845' - '93fe5e50cf3fcb08b24cf29b0cace85b') + '93fe5e50cf3fcb08b24cf29b0cace85b' + 'd7b69ae51db0e8ac8e27f20a234eed85') prepare() { _ssc="/tmp/sedcontrol" @@ -60,9 +62,9 @@ prepare() { if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: the return of service management" && return 1 ; fi # setting up and securing pihole wrapper script - sed -n "/debugFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 1" && return 1 ; fi - sed -i '/debugFunc() {/,+16d' "$srcdir"/$_pkgname-$pkgver/pihole + #sed -n "/debugFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + #if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 1" && return 1 ; fi + #sed -i '/debugFunc() {/,+16d' "$srcdir"/$_pkgname-$pkgver/pihole sed -n "/updatePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 2" && return 1 ; fi @@ -84,13 +86,13 @@ prepare() { if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 6" && return 1 ; fi sed -i '/tricorderFunc() {/,+29d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/\"\-[d,r,up]/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + sed -n "/\"\-[r,up]/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 7" && return 1 ; fi - sed -i '/\"\-[d,r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -i '/\"\-[r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/^ \-d/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 8" && return 1 ; fi - sed -i '/^ \-d/,+2d' "$srcdir"/$_pkgname-$pkgver/pihole + #sed -n "/^ \-d/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + #if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 8" && return 1 ; fi + #sed -i '/^ \-d/,+2d' "$srcdir"/$_pkgname-$pkgver/pihole sed -n "/^ \-up/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 9" && return 1 ; fi @@ -221,6 +223,16 @@ prepare() { # ----------------- + # web admin footer update setup + sed -i "s|https:\/\/github.com\/pi-hole\/pi-hole\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 1" && return 1 ; fi + sed -i "s|https:\/\/github.com\/pi-hole\/AdminLTE\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 2" && return 1 ; fi + sed -i "s|https:\/\/github.com\/pi-hole\/FTL\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 3" && return 1 ; fi + +# ----------------- + # sudo pihole full path (php-fpm compatibility) sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 1" && return 1 ; fi diff --git a/piholeDebug.sh b/piholeDebug.sh new file mode 100644 index 000000000000..26cbde8ff866 --- /dev/null +++ b/piholeDebug.sh @@ -0,0 +1,4 @@ +#!/usr/bin/sh +echo -e "Pi-hole debug options are \e[1;31mdisabled\e[0m.\n" +echo -e "ArchLinux distribution of Pi-hole is not supported by official project and this debug report CAN NOT be uploaded to their debug team." +echo -e "Follow instructions carefully on the project wiki page (\e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m) and please refer to AUR package web page for support and debugging (\e[1;36mhttps://aur.archlinux.org/packages/pi-hole-server\e[0m).\n" |