v. 5.0

1 files changed, 20 insertions, 16 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 40a19e7898ba..1f46b1cc1890 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -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
 }