v. 2.12

3 files changed, 12 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a4e6482e4891..394cfab70bc2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pi-hole-standalone
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.
-	pkgver = 2.11.2
-	pkgrel = 2
+	pkgver = 2.12
+	pkgrel = 1
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-standalone.install
 	arch = any
@@ -12,7 +12,7 @@ pkgbase = pi-hole-standalone
 	conflicts = pi-hole-server
 	backup = etc/pihole/whitelist.txt
 	backup = etc/pihole/blacklist.txt
-	source = https://github.com/pi-hole/pi-hole/archive/v2.11.2.tar.gz
+	source = https://github.com/pi-hole/pi-hole/archive/v2.12.tar.gz
 	source = configuration
 	source = dnsmasq.main
 	source = dnsmasq.include
@@ -21,7 +21,7 @@ pkgbase = pi-hole-standalone
 	source = whitelist.txt
 	source = blacklist.txt
 	source = mimic_setupVars.conf.sh
-	md5sums = 32a79fcd5d2d49228e99a493418469a1
+	md5sums = 451877c24c517e056cf4289f72dd5c0b
 	md5sums = 630a24a3ca258005d11c4a59659f76ed
 	md5sums = b955136ef15be29a468e8d9f85f24b8c
 	md5sums = 796a8c6321e671af80fe884948e466f1
diff --git a/PKGBUILD b/PKGBUILD
index 734c9ac1f9a7..6ef54e120725 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=pi-hole-standalone
 _pkgname=pi-hole
-pkgver=2.11.2
-pkgrel=2
+pkgver=2.12
+pkgrel=1
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.'
 arch=('any')
 license=('GPL2')
@@ -23,7 +23,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	blacklist.txt
 	mimic_setupVars.conf.sh)
 
-md5sums=('32a79fcd5d2d49228e99a493418469a1'
+md5sums=('451877c24c517e056cf4289f72dd5c0b'
          '630a24a3ca258005d11c4a59659f76ed'
          'b955136ef15be29a468e8d9f85f24b8c'
          '796a8c6321e671af80fe884948e466f1'
@@ -57,10 +57,6 @@ prepare() {
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 5" && return 1 ; fi
   sed -i '/reconfigurePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
 
-  sed -n "/setupLCDFunction() {/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 '/setupLCDFunction() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
-
   sed -n "/chronometerFunc() {/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 '/chronometerFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
@@ -142,6 +138,9 @@ prepare() {
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: arch useless" && return 1 ; fi
   sed -i '/#ensure \/etc\/dnsmasq\.d\//,+5d' "$srcdir"/$_pkgname-$pkgver/gravity.sh
 
+  sed -n "/#Overwrite /w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: arch useless 2" && return 1 ; fi
+  sed -i '/#Overwrite /,+1d' "$srcdir"/$_pkgname-$pkgver/gravity.sh
 }
 
 package() {
diff --git a/pi-hole-standalone.install b/pi-hole-standalone.install
index b714cdce4275..c3292d0caeea 100644
--- a/pi-hole-standalone.install
+++ b/pi-hole-standalone.install
@@ -4,8 +4,8 @@ post_install() {
   echo -e "\e[1;33m==>\e[0m Pay attention: this package now manage all dnsmasq.d include files"
   echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps"
   echo -e "\e[1;33m==>\e[0m Neutrino emissions detected..."
-  [ -e /proc/net/if_inet6 ] && touch /etc/pihole/.useIPv6  #this will be obsoleted soon
   touch /etc/dnsmasq.d/02-pihole-dhcp.conf
+  touch /etc/dnsmasq.d/03-pihole-wildcard.conf
   /opt/pihole/mimic_setupVars.conf.sh
   /usr/bin/pihole updateGravity > /dev/null
   /usr/bin/pihole -a setdns 8.8.8.8 8.8.4.4 > /dev/null
@@ -23,4 +23,5 @@ post_remove() {
   rm -R /etc/pihole/
   [ -e /run/log/pihole.log ] && rm /run/log/pihole.log
   [ -e /etc/dnsmasq.d/02-pihole-dhcp.conf ] && rm /etc/dnsmasq.d/02-pihole-dhcp.conf
+  [ -e /etc/dnsmasq.d/03-pihole-wildcard.conf ] && rm /etc/dnsmasq.d/03-pihole-wildcard.conf
 }