summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD6
-rw-r--r--pi-hole-server.install5
3 files changed, 13 insertions, 8 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 821f42150dc7..ee541dd7e2ff 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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 = 5.2.4
- pkgrel = 6
+ pkgrel = 7
url = https://github.com/pi-hole/pi-hole
install = pi-hole-server.install
arch = any
@@ -26,8 +26,8 @@ pkgbase = pi-hole-server
backup = etc/dnsmasq.conf
source = pi-hole-server-core-5.2.4.tar.gz::https://github.com/pi-hole/pi-hole/archive/v5.2.4.tar.gz
source = pi-hole-server-admin-5.4.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v5.4.tar.gz
- source = arch-server-core-5.2.4-345808841.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-5.2.4.patch
- source = arch-server-admin-5.4-345808841.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-5.4.patch
+ source = arch-server-core-5.2.4-544511899.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-5.2.4.patch
+ source = arch-server-admin-5.4-544511899.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-5.4.patch
source = dnsmasq.include
source = lighttpd.pi-hole.conf
source = nginx.pi-hole.conf
@@ -41,8 +41,8 @@ pkgbase = pi-hole-server
source = piholeDebug.sh
sha256sums = 550de24beae4d701c0486208083e06efa5476fb87a729fe39ddf7fc3cac83a75
sha256sums = 16a3599879a57d59896ba7879c769d5deb45ded6d1d6fb3739a6f623db1dc423
- sha256sums = 555ab4cffc221a370b51b8075ec22df9cfc49b9d076681e59fb3a547936c3818
- sha256sums = f0eaf5d5511f079581c8744a6234ce57165de3baebb4e24814ed766e36a3e774
+ sha256sums = d2c6d82e6ee410ce490e166572f4523f2190b1eaf9d390a25e1db4c753950770
+ sha256sums = 52d6d444c391d6152408646390770c0c496959dff7128fe8ff24787caaddd704
sha256sums = 96c1fb8b15e1d0e99c18dc768f5dc3d4991184fb2631af84c5e2111028bc5287
sha256sums = 6495a9db2e77cc2e6b822f3c93d637842acdb7447811dd6dda9ded94bb205630
sha256sums = 032770450ba4a1085bcb0bf3f944c436c5702f3a3faf984fbbba2d3dbc6accea
diff --git a/PKGBUILD b/PKGBUILD
index b831af5108ee..14a4c8778a21 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
pkgname=pi-hole-server
_pkgname=pi-hole
pkgver=5.2.4
-pkgrel=6
+pkgrel=7
_wwwpkgname=AdminLTE
_wwwpkgver=5.4
_now=`date +%N`
@@ -43,8 +43,8 @@ source=($pkgname-core-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/arc
sha256sums=('550de24beae4d701c0486208083e06efa5476fb87a729fe39ddf7fc3cac83a75'
'16a3599879a57d59896ba7879c769d5deb45ded6d1d6fb3739a6f623db1dc423'
- '555ab4cffc221a370b51b8075ec22df9cfc49b9d076681e59fb3a547936c3818'
- 'f0eaf5d5511f079581c8744a6234ce57165de3baebb4e24814ed766e36a3e774'
+ 'd2c6d82e6ee410ce490e166572f4523f2190b1eaf9d390a25e1db4c753950770'
+ '52d6d444c391d6152408646390770c0c496959dff7128fe8ff24787caaddd704'
'96c1fb8b15e1d0e99c18dc768f5dc3d4991184fb2631af84c5e2111028bc5287'
'6495a9db2e77cc2e6b822f3c93d637842acdb7447811dd6dda9ded94bb205630'
'032770450ba4a1085bcb0bf3f944c436c5702f3a3faf984fbbba2d3dbc6accea'
diff --git a/pi-hole-server.install b/pi-hole-server.install
index dace15dba754..341ed6c07033 100644
--- a/pi-hole-server.install
+++ b/pi-hole-server.install
@@ -6,6 +6,10 @@ cache_problem() {
echo -e "\e[1;33m==>\e[0m If you suffer strange rendering issues in the web GUI, please clear your browser cache.\e[0m"
}
+php7() {
+ echo -e "\e[1;33m==>\e[0m As of WebAdmin Ver. 5.4: \e[1;31mDNS settings page is not PHP8 compatible.\e[0m If you need it, please use PHP7.\e[0m"
+}
+
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"
@@ -40,6 +44,7 @@ post_upgrade() {
# warning
cache_problem
+ php7
# keep pacman from throwing errors should none them be on the filesystem
return 0