summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authormax.bra2017-03-15 13:03:47 +0100
committermax.bra2017-03-15 13:03:47 +0100
commit34aaa9b1c56af03bc6fe4428e6eb88f7a63cbf88 (patch)
treeda3a965ef725c76e5ea482e3c96374b8d3a91d29
parent9125c6fadedab5610945069f9b10dbe3e0077eb4 (diff)
downloadaur-34aaa9b1c56af03bc6fe4428e6eb88f7a63cbf88.tar.gz
v. 2.13.2
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD32
2 files changed, 23 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f96e2c260076..46f63b2452b0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pi-hole-standalone
pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.
- pkgver = 2.13.1
+ pkgver = 2.13.2
pkgrel = 1
url = https://github.com/pi-hole/pi-hole
install = pi-hole-standalone.install
@@ -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.13.1.tar.gz
+ source = https://github.com/pi-hole/pi-hole/archive/v2.13.2.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 = 3b9fd78dde1c8ab60552fe5dc28f07f0
+ md5sums = 4fdf2df146e87920dd427f4a93bbc6c3
md5sums = 630a24a3ca258005d11c4a59659f76ed
md5sums = b955136ef15be29a468e8d9f85f24b8c
md5sums = 796a8c6321e671af80fe884948e466f1
diff --git a/PKGBUILD b/PKGBUILD
index f18a6b8d6e5b..32cbe2ff0077 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=pi-hole-standalone
_pkgname=pi-hole
-pkgver=2.13.1
+pkgver=2.13.2
pkgrel=1
pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch alteration for standalone PC.'
arch=('any')
@@ -23,7 +23,7 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
blacklist.txt
mimic_setupVars.conf.sh)
-md5sums=('3b9fd78dde1c8ab60552fe5dc28f07f0'
+md5sums=('4fdf2df146e87920dd427f4a93bbc6c3'
'630a24a3ca258005d11c4a59659f76ed'
'b955136ef15be29a468e8d9f85f24b8c'
'796a8c6321e671af80fe884948e466f1'
@@ -65,6 +65,10 @@ prepare() {
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 7" && return 1 ; fi
sed -i '/uninstallFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+ 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 6" && return 1 ; fi
+ sed -i '/piholeCheckoutFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
sed -n "/::: \-[f,u,s,c,v]/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 8" && return 1 ; fi
sed -i '/::: \-[f,u,s,c,v]/d' "$srcdir"/$_pkgname-$pkgver/pihole
@@ -81,6 +85,20 @@ prepare() {
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 11" && return 1 ; fi
sed -i '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole
+ sed -n "/checkout/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
+ if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 11" && return 1 ; fi
+ sed -i '/checkout/d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+# -----------------
+
+ # arch useless
+ sed -n "/#ensure \/etc\/dnsmasq\.d\//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
+ 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
+
# -----------------
# setting up and securing webpage.sh script
@@ -135,16 +153,6 @@ prepare() {
if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing webpage.sh script 14" && return 1 ; fi
sed -i '/\"privacymode/d' "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/webpage.sh
-# -----------------
-
- # arch useless
- sed -n "/#ensure \/etc\/dnsmasq\.d\//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
- 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() {