v. 3.2.1

2 files changed, 12 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4864cbd88dc4..ed307de9941d 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 = 3.2
-	pkgrel = 3
+	pkgver = 3.2.1
+	pkgrel = 1
 	url = https://github.com/pi-hole/pi-hole
 	install = pi-hole-server.install
 	arch = any
@@ -21,8 +21,8 @@ pkgbase = pi-hole-server
 	backup = etc/pihole/whitelist.txt
 	backup = etc/pihole/blacklist.txt
 	backup = etc/dnsmasq.d/01-pihole.conf
-	source = pihole-3.2.tar.gz::https://github.com/pi-hole/pi-hole/archive/v3.2.tar.gz
-	source = admin-3.2.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v3.2.tar.gz
+	source = pihole-3.2.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v3.2.1.tar.gz
+	source = admin-3.2.1.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v3.2.1.tar.gz
 	source = dnsmasq.main
 	source = dnsmasq.include
 	source = lighttpd.pi-hole.conf
@@ -34,9 +34,8 @@ pkgbase = pi-hole-server
 	source = pi-hole-logtruncate.timer
 	source = mimic_setupVars.conf.sh
 	source = version.patch
-	source = https://github.com/pi-hole/pi-hole/commit/80e17ab72180f15ac4d5ff0044d4e8eafd95bc29.patch
-	md5sums = 12b29c41a1e8e2892da2684fea566ebb
-	md5sums = 70309212a3c77bfed2112c4f2f4f4e24
+	md5sums = a0ff29ba87d22b695baa48194b1ebfd2
+	md5sums = 948e23bdd0fba84d69231f1ee08957cb
 	md5sums = 3f1aeea43af0b192edb36b9e5484ff87
 	md5sums = 7ac346581ada71187b7fd18f164bbee9
 	md5sums = a3518f54241ef2e67c17c7b144cb6a93
@@ -48,7 +47,6 @@ pkgbase = pi-hole-server
 	md5sums = 291d3c95e445fe65caf40c3605efd186
 	md5sums = c227ffa88ddebc34cb715b73640cd845
 	md5sums = 93fe5e50cf3fcb08b24cf29b0cace85b
-	md5sums = cc37c7f1fc27c9246b442f0464fc1886
 
 pkgname = pi-hole-server
 
diff --git a/PKGBUILD b/PKGBUILD
index 477cf1de24e0..bc4ea9e3af77 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,10 +3,10 @@
 
 pkgname=pi-hole-server
 _pkgname=pi-hole
-pkgver=3.2
-pkgrel=3
+pkgver=3.2.1
+pkgrel=1
 _wwwpkgname=AdminLTE
-_wwwpkgver=3.2
+_wwwpkgver=3.2.1
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
 arch=('any')
 license=('EUPL-1.1')
@@ -36,11 +36,10 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$
 	$_pkgname-logtruncate.timer
 	mimic_setupVars.conf.sh
 	version.patch
-	https://github.com/pi-hole/pi-hole/commit/80e17ab72180f15ac4d5ff0044d4e8eafd95bc29.patch
   )
 
-md5sums=('12b29c41a1e8e2892da2684fea566ebb'
-         '70309212a3c77bfed2112c4f2f4f4e24'
+md5sums=('a0ff29ba87d22b695baa48194b1ebfd2'
+         '948e23bdd0fba84d69231f1ee08957cb'
          '3f1aeea43af0b192edb36b9e5484ff87'
          '7ac346581ada71187b7fd18f164bbee9'
          'a3518f54241ef2e67c17c7b144cb6a93'
@@ -51,8 +50,7 @@ md5sums=('12b29c41a1e8e2892da2684fea566ebb'
          '94d5aa0e8aa3d4170bcea71078a9da25'
          '291d3c95e445fe65caf40c3605efd186'
          'c227ffa88ddebc34cb715b73640cd845'
-         '93fe5e50cf3fcb08b24cf29b0cace85b'
-         'cc37c7f1fc27c9246b442f0464fc1886')
+         '93fe5e50cf3fcb08b24cf29b0cace85b')
 
 prepare() {
   _ssc="/tmp/sedcontrol"
@@ -206,7 +204,6 @@ prepare() {
 
   cd "$srcdir"/"$_pkgname"-"$pkgver"
   patch -p1 -i "$srcdir"/version.patch
-  patch -p1 -i "$srcdir"/80e17ab72180f15ac4d5ff0044d4e8eafd95bc29.patch
   cd "$srcdir"
 
   sed -n "/{{corever}}/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh