core and web v. 4.0

3 files changed, 84 insertions, 94 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8f20ca050773..490000e844d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = pi-hole-server
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.
-	pkgver = 3.3.1
+	pkgver = 4.0
 	pkgrel = 1
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-server.install
@@ -21,8 +21,9 @@ pkgbase = pi-hole-server
 	backup = etc/pihole/whitelist.txt
 	backup = etc/pihole/blacklist.txt
 	backup = etc/dnsmasq.d/01-pihole.conf
-	source = pihole-3.3.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v3.3.1.tar.gz
-	source = admin-3.3.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v3.3.tar.gz
+	backup = etc/pihole/adlists.list
+	source = pihole-4.0.tar.gz::https://github.com/pi-hole/pi-hole/archive/v4.0.tar.gz
+	source = admin-4.0.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v4.0.tar.gz
 	source = dnsmasq.main
 	source = dnsmasq.include
 	source = lighttpd.pi-hole.conf
@@ -35,8 +36,8 @@ pkgbase = pi-hole-server
 	source = mimic_setupVars.conf.sh
 	source = version.patch
 	source = piholeDebug.sh
-	md5sums = ea4f64bdf88620f59a1b01c19253e4e3
-	md5sums = 23368537fa576480e45f625b5e1a7cd7
+	md5sums = d4e3f74a7a49c243c8b49b27923ecff3
+	md5sums = 176e9bb1bcdbb4cb4e54e859b93d2d0d
 	md5sums = 3f1aeea43af0b192edb36b9e5484ff87
 	md5sums = ad008fac3c7351aa0d5205079b3dfb18
 	md5sums = a3518f54241ef2e67c17c7b144cb6a93
@@ -47,7 +48,7 @@ pkgbase = pi-hole-server
 	md5sums = 20c5b0c6b4e23e55b25ab6c28dda709d
 	md5sums = 291d3c95e445fe65caf40c3605efd186
 	md5sums = c227ffa88ddebc34cb715b73640cd845
-	md5sums = 93fe5e50cf3fcb08b24cf29b0cace85b
+	md5sums = 3c120e67240f6f83f4d803a211fc16aa
 	md5sums = d7b69ae51db0e8ac8e27f20a234eed85
 
 pkgname = pi-hole-server
diff --git a/PKGBUILD b/PKGBUILD
index 4bebef8088c0..f51eef814513 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=pi-hole-server
 _pkgname=pi-hole
-pkgver=3.3.1
+pkgver=4.0
 pkgrel=1
 _wwwpkgname=AdminLTE
-_wwwpkgver=3.3
+_wwwpkgver=4.0
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
 arch=('any')
 license=('EUPL-1.1')
@@ -21,7 +21,7 @@ optdepends=(
 conflicts=('pi-hole-standalone')
 install=$pkgname.install
 backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt'
-'etc/dnsmasq.d/01-pihole.conf')
+'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list')
 
 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
@@ -39,8 +39,8 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$
 	piholeDebug.sh
   )
 
-md5sums=('ea4f64bdf88620f59a1b01c19253e4e3'
-         '23368537fa576480e45f625b5e1a7cd7'
+md5sums=('d4e3f74a7a49c243c8b49b27923ecff3'
+         '176e9bb1bcdbb4cb4e54e859b93d2d0d'
          '3f1aeea43af0b192edb36b9e5484ff87'
          'ad008fac3c7351aa0d5205079b3dfb18'
          'a3518f54241ef2e67c17c7b144cb6a93'
@@ -51,14 +51,14 @@ md5sums=('ea4f64bdf88620f59a1b01c19253e4e3'
          '20c5b0c6b4e23e55b25ab6c28dda709d'
          '291d3c95e445fe65caf40c3605efd186'
          'c227ffa88ddebc34cb715b73640cd845'
-         '93fe5e50cf3fcb08b24cf29b0cace85b'
+         '3c120e67240f6f83f4d803a211fc16aa'
          '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
+  sed -i "s|service \${resolver} \${svcOption}|systemctl \${svcOption} \${resolver}|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
@@ -68,7 +68,7 @@ prepare() {
 
   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 -i '/updatePiholeFunc() {/,+5d' "$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
@@ -80,7 +80,7 @@ prepare() {
 
   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 -i '/piholeCheckoutFunc() {/,+22d' "$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
@@ -122,8 +122,6 @@ prepare() {
   # 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
 
 # -----------------
 
@@ -147,9 +145,9 @@ prepare() {
 # -----------------
 
   # 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
+  sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Templates/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
+  sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Templates/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
@@ -170,8 +168,8 @@ prepare() {
 # -----------------
 
   # 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/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
@@ -197,28 +195,28 @@ prepare() {
   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
+  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/\$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
+#  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/\$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
+#  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 7" && 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
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 8" && return 1 ; fi
 
   cd "$srcdir"/"$_pkgname"-"$pkgver"
   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
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 9" && 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
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 10" && return 1 ; fi
   sed -i "s/{{webver}}/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh
 
 # -----------------
@@ -254,7 +252,19 @@ prepare() {
 # -----------------
 
   # pi-hole sudoers file is now populated by install script
-  echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/pihole.sudo
+  echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/Templates/pihole.sudo
+
+  # adlists.default is gone and adlists.list is populated by install script
+  # from basic-install.sh -- function chooseBlocklists()
+  cat <<EOF > $_pkgname-$pkgver/adlists.list
+https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts
+https://mirror1.malwaredomains.com/files/justdomains
+http://sysctl.org/cameleon/hosts
+https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist
+https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt
+https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt
+https://hosts-file.net/ad_servers.txt
+EOF
 }
 
 package() {
@@ -269,12 +279,14 @@ 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 pi-hole.tmpfile "$pkgdir"/usr/lib/tmpfiles.d/pi-hole.conf
 
@@ -288,8 +300,8 @@ 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
 
diff --git a/version.patch b/version.patch
index 0c0eb70fba30..5979ad8f42a5 100644
--- a/version.patch
+++ b/version.patch
@@ -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 "{{corever}}"
+     else
+-        echo "Untagged"
++        echo "{{webver}}"
+     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
--
--  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
+-    # Local FTL hash does not exist on filesystem
+-    if [[ "$1" == "FTL" ]]; then
+-        echo "N/A"
+-        return 0
+-    fi
 -
--  local daemon="${1}"
--  local branch="${2}"
+-    # Get the short hash of the local repository
+-    local directory="${1}"
+-    local hash
 -
--  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
  }