Update packages
This commit is contained in:
moparisthebest committed
1 parent
e2fd47cde7
commit
59e4cffa8b
130 files changed
+1078
-2538
No files matched your search
+40
-229
@@ -3,15 +3,15 @@
|
||||
|
||||
pkgname=pi-hole-server
|
||||
_pkgname=pi-hole
|
||||
pkgver=3.3.1
|
||||
pkgver=4.2.2
|
||||
pkgrel=1
|
||||
_wwwpkgname=AdminLTE
|
||||
_wwwpkgver=3.3
|
||||
_wwwpkgver=4.2
|
||||
pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
|
||||
arch=('any')
|
||||
license=('EUPL-1.1')
|
||||
url="https://github.com/pi-hole/pi-hole"
|
||||
depends=('dnsmasq' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'pi-hole-ftl')
|
||||
depends=('pi-hole-ftl' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'bind-tools')
|
||||
optdepends=(
|
||||
'lighttpd: a secure, fast, compliant and very flexible web-server'
|
||||
'php-cgi: CGI and FCGI SAPI for PHP needed only for lighttpd'
|
||||
@@ -20,241 +20,48 @@ optdepends=(
|
||||
)
|
||||
conflicts=('pi-hole-standalone')
|
||||
install=$pkgname.install
|
||||
backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
|
||||
'etc/dnsmasq.d/01-pihole.conf')
|
||||
backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' 'etc/pihole/regex.list'
|
||||
'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf')
|
||||
|
||||
source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
|
||||
admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz
|
||||
dnsmasq.main
|
||||
dnsmasq.include
|
||||
lighttpd.pi-hole.conf
|
||||
nginx.pi-hole.conf
|
||||
$_pkgname.tmpfile
|
||||
$_pkgname-gravity.service
|
||||
$_pkgname-gravity.timer
|
||||
$_pkgname-logtruncate.service
|
||||
$_pkgname-logtruncate.timer
|
||||
mimic_setupVars.conf.sh
|
||||
version.patch
|
||||
piholeDebug.sh
|
||||
)
|
||||
admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz
|
||||
"https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-$pkgver.patch"
|
||||
"https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-$pkgver.patch"
|
||||
dnsmasq.include
|
||||
lighttpd.pi-hole.conf
|
||||
nginx.pi-hole.conf
|
||||
$_pkgname.tmpfile
|
||||
$_pkgname-gravity.service
|
||||
$_pkgname-gravity.timer
|
||||
$_pkgname-logtruncate.service
|
||||
$_pkgname-logtruncate.timer
|
||||
mimic_setupVars.conf.sh
|
||||
version.patch
|
||||
piholeDebug.sh
|
||||
)
|
||||
|
||||
md5sums=('ea4f64bdf88620f59a1b01c19253e4e3'
|
||||
'23368537fa576480e45f625b5e1a7cd7'
|
||||
'3f1aeea43af0b192edb36b9e5484ff87'
|
||||
'ad008fac3c7351aa0d5205079b3dfb18'
|
||||
'a3518f54241ef2e67c17c7b144cb6a93'
|
||||
md5sums=('deebe32fd4867b289687689e0f377d72'
|
||||
'36f3125e753c0e6f37496b26309501da'
|
||||
'fc9f91dee70d0e73a14a63ecd3743ec1'
|
||||
'e93d67128df08b0ed66893f3fbf5ed68'
|
||||
'4d9038588164bb9130c8ca11653f83f3'
|
||||
'971cc2859672341d77f8deba702fb7f7'
|
||||
'b63fcf29c29796023a2677bcf2b369a7'
|
||||
'990b8abd0bfbba23a7ce82c59f2e3d64'
|
||||
'9bc23c314397a0f59978cfe246140cda'
|
||||
'047f13d4ac97877f724f87b002aaee63'
|
||||
'd42a864f88299998f8233c0bc0dd093d'
|
||||
'20c5b0c6b4e23e55b25ab6c28dda709d'
|
||||
'291d3c95e445fe65caf40c3605efd186'
|
||||
'c227ffa88ddebc34cb715b73640cd845'
|
||||
'93fe5e50cf3fcb08b24cf29b0cace85b'
|
||||
'4e65ef5a25a9a7358cba24450dbed7cc'
|
||||
'd7b69ae51db0e8ac8e27f20a234eed85')
|
||||
|
||||
prepare() {
|
||||
_ssc="/tmp/sedcontrol"
|
||||
|
||||
# the return of service management
|
||||
sed -i "s|service dnsmasq \${svcOption}|systemctl \${svcOption} dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
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 "/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
|
||||
sed -i '/updatePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/reconfigurePiholeFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 3" && return 1 ; fi
|
||||
sed -i '/reconfigurePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/uninstallFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 4" && return 1 ; fi
|
||||
sed -i '/uninstallFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/piholeCheckoutFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 5" && return 1 ; fi
|
||||
sed -i '/piholeCheckoutFunc() {/,+20d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/tricorderFunc() {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
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 "/\"\-[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 '/\"\-[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 "/^ \-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
|
||||
sed -i '/^ \-up/d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/^ \-r/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 10" && return 1 ; fi
|
||||
sed -i '/^ \-r/d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/uninstall/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 11" && return 1 ; fi
|
||||
sed -i '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -i "s|^ checkout.*$|\";|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 12" && return 1 ; fi
|
||||
|
||||
sed -n "/checkout/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 13" && return 1 ; fi
|
||||
sed -i '/checkout/d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
sed -n "/tricorder/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 14" && return 1 ; fi
|
||||
sed -i '/tricorder/d' "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
|
||||
# -----------------
|
||||
|
||||
# setup gravity.sh
|
||||
sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setup gravity.sh 1" && return 1 ; fi
|
||||
sed -i "s|/etc/\.|/etc/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setup gravity.sh 2" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# setting up and securing webpage.sh script
|
||||
sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/webpage.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing webpage.sh script 1" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# change log location to pihole script
|
||||
sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to pihole script" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# change log location to piholeLogFlush.sh
|
||||
sed -n "/\/var\/log\/pihole.log/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to piholeLogFlush.sh" && return 1 ; fi
|
||||
sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|g" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
|
||||
|
||||
# -----------------
|
||||
|
||||
# change log and bin location to logrotate
|
||||
sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 1" && return 1 ; fi
|
||||
sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/logrotate
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi
|
||||
sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 3" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# change FTL port file location to chronometer.sh
|
||||
sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change FTL port file location to chronometer.sh" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# no debug for us, right now
|
||||
sed -n "/\-\- Generate debug log \-\-/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: no debug for us, right now 1" && return 1 ; fi
|
||||
sed -i '/\-\- Generate debug log \-\-/,+5d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
|
||||
|
||||
# -----------------
|
||||
|
||||
# change log location in admin php interface
|
||||
sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/data.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 1" && return 1 ; fi
|
||||
|
||||
sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/FTL.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 2" && return 1 ; fi
|
||||
sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 3" && return 1 ; fi
|
||||
sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 4" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# since we don't directly install from git...
|
||||
# sed -n "/\$core_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 1" && return 1 ; fi
|
||||
# sed -i 's/\$core_branch =.*$/\$core_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# sed -n "/\$web_branch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 2" && return 1 ; fi
|
||||
# sed -i 's/\$web_branch =.*$/\$web_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
|
||||
sed -n "/\$core_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 3" && return 1 ; fi
|
||||
sed -i 's/\$core_current =.*$/\$core_current = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
sed -n "/\$web_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi
|
||||
sed -i 's/\$web_current =.*$/\$web_current = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
sed -n "/\$FTL_current =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 4" && return 1 ; fi
|
||||
sed -i 's/\$FTL_current =.*$/\$FTL_current = exec("pihole-FTL version");/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
|
||||
# sed -n "/\$core_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 5" && return 1 ; fi
|
||||
# sed -i 's/\$core_commit =.*$/\$core_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# sed -n "/\$web_commit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
# if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 6" && return 1 ; fi
|
||||
# sed -i 's/\$web_commit =.*$/\$web_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php
|
||||
|
||||
sed -i "s|/var/www/html/admin/|/srv/http/pihole/admin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 7" && return 1 ; fi
|
||||
|
||||
cd "$srcdir"/"$_pkgname"-"$pkgver"
|
||||
patch -Np1 -i "$srcdir"/arch-server-core-$pkgver.patch
|
||||
patch -p1 -i "$srcdir"/version.patch
|
||||
cd "$srcdir"
|
||||
|
||||
sed -n "/{{corever}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 13" && return 1 ; fi
|
||||
sed -i "s/{{corever}}/$pkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
|
||||
sed -n "/{{webver}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 14" && return 1 ; fi
|
||||
sed -i "s/{{webver}}/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
|
||||
|
||||
# -----------------
|
||||
|
||||
# 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
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 2" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/queryads.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 3" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/savesettings.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 4" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/sub.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 5" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/add.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 6" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/gravity.sh.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 7" && return 1 ; fi
|
||||
sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/loginpage.php
|
||||
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 8" && return 1 ; fi
|
||||
|
||||
# -----------------
|
||||
|
||||
# pi-hole sudoers file is now populated by install script
|
||||
echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/pihole.sudo
|
||||
cd "$srcdir"/"$_wwwpkgname"-"$_wwwpkgver"
|
||||
patch -Np1 -i "$srcdir"/arch-server-admin-$pkgver.patch
|
||||
}
|
||||
|
||||
package() {
|
||||
@@ -269,12 +76,17 @@ package() {
|
||||
install -Dm755 $_pkgname-$pkgver/advanced/Scripts/list.sh "$pkgdir"/opt/pihole/list.sh
|
||||
install -Dm755 $_pkgname-$pkgver/advanced/Scripts/webpage.sh "$pkgdir"/opt/pihole/webpage.sh
|
||||
install -Dm755 $_pkgname-$pkgver/advanced/Scripts/COL_TABLE "$pkgdir"/opt/pihole/COL_TABLE
|
||||
install -Dm755 $_pkgname-$pkgver/advanced/Scripts/wildcard_regex_converter.sh "$pkgdir"/opt/pihole/wildcard_regex_converter.sh
|
||||
install -Dm755 $_pkgname-$pkgver/advanced/Scripts/query.sh "$pkgdir"/opt/pihole/query.sh
|
||||
|
||||
install -Dm755 piholeDebug.sh "$pkgdir"/opt/pihole/piholeDebug.sh
|
||||
install -Dm755 mimic_setupVars.conf.sh "$pkgdir"/opt/pihole/mimic_setupVars.conf.sh
|
||||
|
||||
install -dm750 "$pkgdir"/etc/sudoers.d
|
||||
install -Dm440 $_pkgname-$pkgver/advanced/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole
|
||||
install -Dm440 $_pkgname-$pkgver/advanced/Templates/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole
|
||||
install -Dm644 $_pkgname-$pkgver/advanced/dnsmasq.conf.original "$pkgdir"/etc/dnsmasq.conf
|
||||
# install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
|
||||
install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
|
||||
|
||||
install -Dm644 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf
|
||||
|
||||
@@ -288,13 +100,12 @@ package() {
|
||||
|
||||
install -dm755 "$pkgdir"/etc/pihole
|
||||
install -dm755 "$pkgdir"/usr/share/pihole/configs
|
||||
install -Dm644 $_pkgname-$pkgver/adlists.default "$pkgdir"/etc/pihole/adlists.default
|
||||
install -Dm644 $_pkgname-$pkgver/advanced/logrotate "$pkgdir"/etc/pihole/logrotate
|
||||
install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list
|
||||
install -Dm644 $_pkgname-$pkgver/advanced/Templates/logrotate "$pkgdir"/etc/pihole/logrotate
|
||||
install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt
|
||||
install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt
|
||||
install -Dm644 /dev/null "$pkgdir"/etc/pihole/regex.list
|
||||
|
||||
install -Dm644 dnsmasq.main "$pkgdir"/usr/share/pihole/configs/dnsmasq.example.conf
|
||||
install -Dm644 dnsmasq.include "$pkgdir"/etc/dnsmasq.d/01-pihole.conf
|
||||
install -Dm644 lighttpd.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/lighttpd.example.conf
|
||||
install -Dm644 nginx.pi-hole.conf "$pkgdir"/usr/share/pihole/configs/nginx.example.conf
|
||||
|
||||
|
||||
@@ -28,7 +28,11 @@ localise-queries
|
||||
bogus-priv
|
||||
no-resolv
|
||||
cache-size=10000
|
||||
log-queries=extra
|
||||
log-queries
|
||||
log-facility=/run/log/pihole/pihole.log
|
||||
local-ttl=300
|
||||
local-ttl=2
|
||||
log-async
|
||||
# If a DHCP client claims that its name is "wpad", ignore that.
|
||||
# This fixes a security hole. see CERT Vulnerability VU#598349
|
||||
dhcp-name-match=set:wpad-ignore,wpad
|
||||
dhcp-ignore-names=tag:wpad-ignore
|
||||
@@ -86,4 +86,4 @@ $HTTP["url"] =~ "^/admin/\.(.*)" {
|
||||
}
|
||||
|
||||
# Add user chosen options held in external file
|
||||
include_shell "cat external.conf 2>/dev/null"
|
||||
#include_shell "cat external.conf 2>/dev/null"
|
||||
Executable → Regular
File mode changed.
@@ -5,8 +5,12 @@ warning() {
|
||||
post_install() {
|
||||
echo -e "\e[1;33m==>\e[0m Read setup instructions at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m"
|
||||
echo -e "\e[1;33m==>\e[0m Generating initial block list, please wait...\e[0m"
|
||||
|
||||
# permissions
|
||||
chown -R http:http /srv/http/pihole
|
||||
chown pihole:pihole /etc/pihole
|
||||
chown nobody:nobody /etc/pihole
|
||||
chown http:root /etc/pihole/regex.list
|
||||
|
||||
/opt/pihole/mimic_setupVars.conf.sh
|
||||
|
||||
# update lists on first run
|
||||
@@ -22,8 +26,9 @@ post_upgrade() {
|
||||
[ -e /etc/pihole/hosts ] && rm /etc/pihole/hosts
|
||||
[ -e /etc/pihole/.useIPv6 ] && rm /etc/pihole/.useIPv6
|
||||
|
||||
# update owner of existing dir
|
||||
chown pihole:pihole /etc/pihole
|
||||
# update owner of existing dir and file
|
||||
chown nobody:nobody /etc/pihole
|
||||
chown http:root /etc/pihole/regex.list
|
||||
|
||||
# warning
|
||||
|
||||
|
||||
@@ -1,3 +1,3 @@
|
||||
d /run/pihole 0755 http root - -
|
||||
d /run/log/pihole 0755 dnsmasq root - -
|
||||
f /run/log/pihole/pihole.log 0644 dnsmasq root - -
|
||||
d /run/log/pihole 0755 nobody root - -
|
||||
f /run/log/pihole/pihole.log 0644 nobody root - -
|
||||
@@ -1,72 +1,49 @@
|
||||
diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/version.sh
|
||||
--- pi-hole-3.1/advanced/Scripts/version.sh 2017-06-20 23:17:41.000000000 +0200
|
||||
+++ pi-hole-3.1.a/advanced/Scripts/version.sh 2017-06-22 13:52:36.293206505 +0200
|
||||
@@ -20,63 +20,21 @@
|
||||
return 0
|
||||
fi
|
||||
--- pi-hole-4.0.a/advanced/Scripts/version.sh 2018-08-05 19:40:22.000000000 +0200
|
||||
+++ pi-hole-4.0/advanced/Scripts/version.sh 2018-08-24 15:28:44.141363877 +0200
|
||||
@@ -20,42 +20,16 @@
|
||||
return 0
|
||||
fi
|
||||
|
||||
- # Get the tagged version of the local repository
|
||||
- local directory="${1}"
|
||||
- local version
|
||||
- # Get the tagged version of the local repository
|
||||
- local directory="${1}"
|
||||
- local version
|
||||
-
|
||||
- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
||||
- version=$(git describe --tags --always || echo "$DEFAULT")
|
||||
- if [[ "${version}" =~ ^v ]]; then
|
||||
- echo "${version}"
|
||||
- elif [[ "${version}" == "${DEFAULT}" ]]; then
|
||||
- echo "ERROR"
|
||||
- return 1
|
||||
+ if [[ "$1" == "pi-hole" ]]; then
|
||||
+ echo "{{corever}}"
|
||||
else
|
||||
- echo "Untagged"
|
||||
+ echo "{{webver}}"
|
||||
fi
|
||||
return 0
|
||||
- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
||||
- version=$(git describe --tags --always || echo "$DEFAULT")
|
||||
- if [[ "${version}" =~ ^v ]]; then
|
||||
- echo "${version}"
|
||||
- elif [[ "${version}" == "${DEFAULT}" ]]; then
|
||||
- echo "ERROR"
|
||||
- return 1
|
||||
+ if [[ "$1" == "pi-hole" ]]; then
|
||||
+ echo "4.2.1"
|
||||
else
|
||||
- echo "Untagged"
|
||||
+ echo "4.2.1"
|
||||
fi
|
||||
return 0
|
||||
}
|
||||
|
||||
getLocalHash() {
|
||||
- # Local FTL hash does not exist on filesystem
|
||||
- if [[ "$1" == "FTL" ]]; then
|
||||
- echo "N/A"
|
||||
- return 0
|
||||
- fi
|
||||
-
|
||||
- # Get the short hash of the local repository
|
||||
- local directory="${1}"
|
||||
- local hash
|
||||
- # Local FTL hash does not exist on filesystem
|
||||
- if [[ "$1" == "FTL" ]]; then
|
||||
- echo "N/A"
|
||||
- return 0
|
||||
- fi
|
||||
-
|
||||
- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
||||
- hash=$(git rev-parse --short HEAD || echo "$DEFAULT")
|
||||
- if [[ "${hash}" == "${DEFAULT}" ]]; then
|
||||
- echo "ERROR"
|
||||
- return 1
|
||||
- else
|
||||
- echo "${hash}"
|
||||
- fi
|
||||
+ echo "N/A"
|
||||
return 0
|
||||
}
|
||||
|
||||
getRemoteHash(){
|
||||
- # Remote FTL hash is not applicable
|
||||
- if [[ "$1" == "FTL" ]]; then
|
||||
- echo "N/A"
|
||||
- return 0
|
||||
- fi
|
||||
- # Get the short hash of the local repository
|
||||
- local directory="${1}"
|
||||
- local hash
|
||||
-
|
||||
- local daemon="${1}"
|
||||
- local branch="${2}"
|
||||
-
|
||||
- hash=$(git ls-remote --heads "https://github.com/pi-hole/${daemon}" | \
|
||||
- awk -v bra="$branch" '$0~bra {print substr($0,0,8);exit}')
|
||||
- if [[ -n "$hash" ]]; then
|
||||
- echo "$hash"
|
||||
- else
|
||||
- echo "ERROR"
|
||||
- return 1
|
||||
- fi
|
||||
+ echo "N/A"
|
||||
return 0
|
||||
- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; }
|
||||
- hash=$(git rev-parse --short HEAD || echo "$DEFAULT")
|
||||
- if [[ "${hash}" == "${DEFAULT}" ]]; then
|
||||
- echo "ERROR"
|
||||
- return 1
|
||||
- else
|
||||
- echo "${hash}"
|
||||
- fi
|
||||
+ echo "N/A"
|
||||
return 0
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user