diff options
| -rw-r--r-- | .SRCINFO | 23 | ||||
| -rw-r--r-- | PKGBUILD | 36 | ||||
| -rw-r--r-- | pi-hole-server.install | 4 |
3 files changed, 31 insertions, 32 deletions
@@ -1,12 +1,12 @@ pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. - pkgver = 4.4 + pkgver = 5.0 pkgrel = 1 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any license = EUPL-1.1 - depends = pi-hole-ftl + depends = pi-hole-ftl>=5.0 depends = bc depends = perl depends = net-tools @@ -18,16 +18,13 @@ pkgbase = pi-hole-server optdepends = nginx-mainline: lightweight http server optdepends = php-fpm: FastCGI process manager for php needed for nginx conflicts = pi-hole-standalone - backup = etc/pihole/whitelist.txt - backup = etc/pihole/blacklist.txt - backup = etc/pihole/regex.list backup = etc/dnsmasq.d/01-pihole.conf backup = etc/pihole/adlists.list backup = etc/dnsmasq.conf - source = pi-hole-server-core-4.4.tar.gz::https://github.com/pi-hole/pi-hole/archive/v4.4.tar.gz - source = pi-hole-server-admin-4.3.3.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v4.3.3.tar.gz - source = arch-server-core-4.4-525247940.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-4.4.patch - source = arch-server-admin-4.3.3-525247940.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-4.3.3.patch + source = pi-hole-server-core-5.0.tar.gz::https://github.com/pi-hole/pi-hole/archive/v5.0.tar.gz + source = pi-hole-server-admin-5.0.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v5.0.tar.gz + source = arch-server-core-5.0-277764637.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-5.0.patch + source = arch-server-admin-5.0-277764637.patch::https://raw.githubusercontent.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-5.0.patch source = dnsmasq.include source = lighttpd.pi-hole.conf source = nginx.pi-hole.conf @@ -38,10 +35,10 @@ pkgbase = pi-hole-server source = pi-hole-logtruncate.timer source = mimic_setupVars.conf.sh source = piholeDebug.sh - md5sums = 970013bf8e273b868dd184ac2ffb1348 - md5sums = 3f9da0e1f9134393758b7a1425ca66f6 - md5sums = 0bd2c2e7ec7f2645dc27ffef7072e54b - md5sums = a4d70c8d89a9832444a3d30fa05eb058 + md5sums = 0f19aeefad3063c44f421de1ad21b233 + md5sums = 9402041b365e78a02a95942bdd3c3c05 + md5sums = e86d30019550856eebfbaf3c66b24b3e + md5sums = 7836b40de628a6e35992c5547bd5d5f4 md5sums = 4d9038588164bb9130c8ca11653f83f3 md5sums = 971cc2859672341d77f8deba702fb7f7 md5sums = b63fcf29c29796023a2677bcf2b369a7 @@ -3,16 +3,16 @@ pkgname=pi-hole-server _pkgname=pi-hole -pkgver=4.4 +pkgver=5.0 pkgrel=1 _wwwpkgname=AdminLTE -_wwwpkgver=4.3.3 +_wwwpkgver=5.0 _now=`date +%N` 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=('pi-hole-ftl' 'bc' 'perl' 'net-tools' 'iproute2' 'logrotate' 'bind-tools') +depends=('pi-hole-ftl>=5.0' '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' @@ -21,8 +21,7 @@ optdepends=( ) conflicts=('pi-hole-standalone') install=$pkgname.install -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') +backup=('etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf') source=($pkgname-core-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz $pkgname-admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz @@ -40,10 +39,10 @@ source=($pkgname-core-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/arc piholeDebug.sh ) -md5sums=('970013bf8e273b868dd184ac2ffb1348' - '3f9da0e1f9134393758b7a1425ca66f6' - '0bd2c2e7ec7f2645dc27ffef7072e54b' - 'a4d70c8d89a9832444a3d30fa05eb058' +md5sums=('0f19aeefad3063c44f421de1ad21b233' + '9402041b365e78a02a95942bdd3c3c05' + 'e86d30019550856eebfbaf3c66b24b3e' + '7836b40de628a6e35992c5547bd5d5f4' '4d9038588164bb9130c8ca11653f83f3' '971cc2859672341d77f8deba702fb7f7' 'b63fcf29c29796023a2677bcf2b369a7' @@ -77,9 +76,14 @@ package() { 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 -Dm644 $_pkgname-$pkgver/advanced/Templates/gravity.db.sql "$pkgdir"/opt/pihole/gravity.db.sql + install -Dm644 $_pkgname-$pkgver/advanced/Templates/gravity_copy.sql "$pkgdir"/opt/pihole/gravity_copy.sql + install -Dm755 piholeDebug.sh "$pkgdir"/opt/pihole/piholeDebug.sh install -Dm755 mimic_setupVars.conf.sh "$pkgdir"/opt/pihole/mimic_setupVars.conf.sh + cp -dpr --no-preserve=ownership $_pkgname-$pkgver/advanced/Scripts/database_migration "$pkgdir"/opt/pihole/ + install -dm750 "$pkgdir"/etc/sudoers.d 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 @@ -98,12 +102,12 @@ package() { install -dm755 "$pkgdir"/etc/pihole install -dm755 "$pkgdir"/usr/share/pihole/configs - install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list install -Dm644 $_pkgname-$pkgver/dns-servers.conf "$pkgdir"/etc/pihole/dns-servers.conf 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 -Dm664 /dev/null "$pkgdir"/etc/pihole/regex.list + install -Dm644 $_pkgname-$pkgver/adlists.list "$pkgdir"/etc/pihole/adlists.list +# install -Dm644 /dev/null "$pkgdir"/etc/pihole/whitelist.txt +# install -Dm644 /dev/null "$pkgdir"/etc/pihole/blacklist.txt +# install -Dm664 /dev/null "$pkgdir"/etc/pihole/regex.list 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 @@ -118,12 +122,12 @@ package() { install -dm755 "$pkgdir"/usr/share/licenses/pihole install -Dm644 ${pkgname%-*}-$pkgver/LICENSE "$pkgdir"/usr/share/licenses/pihole/Pi-hole install -Dm644 $_wwwpkgname-$_wwwpkgver/LICENSE "$pkgdir"/usr/share/licenses/pihole/AdminLTE - install -Dm644 $_wwwpkgname-$_wwwpkgver/style/vendor/SourceSansPro/OFL.txt \ - "$pkgdir"/usr/share/licenses/pihole/SourceSansPro +# install -Dm644 $_wwwpkgname-$_wwwpkgver/style/vendor/SourceSansPro/OFL.txt \ +# "$pkgdir"/usr/share/licenses/pihole/SourceSansPro rm "$pkgdir"/srv/http/pihole/admin/*.md rm "$pkgdir"/srv/http/pihole/admin/LICENSE rm "$pkgdir"/srv/http/pihole/admin/style/vendor/LICENSE rm "$pkgdir"/srv/http/pihole/admin/scripts/vendor/LICENSE - rm "$pkgdir"/srv/http/pihole/admin/style/vendor/SourceSansPro/OFL.txt +# rm "$pkgdir"/srv/http/pihole/admin/style/vendor/SourceSansPro/OFL.txt } diff --git a/pi-hole-server.install b/pi-hole-server.install index 3e51e2390992..bbe2fbbaeb11 100644 --- a/pi-hole-server.install +++ b/pi-hole-server.install @@ -9,7 +9,6 @@ post_install() { # permissions chown -R http:http /srv/http/pihole chown pihole:pihole /etc/pihole - chown http:root /etc/pihole/regex.list /opt/pihole/mimic_setupVars.conf.sh @@ -28,7 +27,6 @@ post_upgrade() { # update owner of existing dir and file chown pihole:pihole /etc/pihole - chown http:root /etc/pihole/regex.list # warning @@ -39,5 +37,5 @@ post_upgrade() { post_remove() { # delete all temp files except those modified the user # TODO - make this more intelligent to save *.pacsave.# where # is a number - find /etc/pihole -type f ! -name '*.pacsave' ! -name 'pihole-FTL.conf' ! -name 'pihole-FTL.db' -delete + find /etc/pihole -type f ! -name '*.pacsave' ! -name 'pihole-FTL.conf' ! -name 'pihole-FTL.db' ! -name 'gravity.db' -delete } |