v. 2.7

author: max.bra 2016-06-12 23:45:38 +0200
committer: max.bra 2016-06-12 23:45:38 +0200
commit: 27bea277a3698c020e360fa7b48fc5bf840063fd (patch)
tree: 7f82da79bf5819510f364233346876cec7576e7c
parent: ac8a45a821a170781b31325c0dc916209692bdd2 (diff)
download: aur-27bea277a3698c020e360fa7b48fc5bf840063fd.tar.gz
5 files changed, 78 insertions, 22 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f6e1eb1a3fb2..96eb64de41ca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Sun Jun  5 14:49:45 UTC 2016
+# Sun Jun 12 21:45:38 UTC 2016
 pkgbase = pi-hole-server
 	pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.
-	pkgver = 2.6.3
-	pkgrel = 4
+	pkgver = 2.7
+	pkgrel = 1
 	url = https://github.com/jacobsalmela/pi-hole
 	install = pi-hole-server.install
 	arch = any
@@ -15,8 +15,8 @@ pkgbase = pi-hole-server
 	conflicts = pi-hole-standalone
 	backup = etc/pihole/whitelist.txt
 	backup = etc/pihole/blacklist.txt
-	source = https://github.com/pi-hole/pi-hole/archive/v2.6.3.tar.gz
-	source = https://github.com/pi-hole/AdminLTE/archive/v1.2.tar.gz
+	source = https://github.com/pi-hole/pi-hole/archive/v2.7.tar.gz
+	source = https://github.com/pi-hole/AdminLTE/archive/v1.3.tar.gz
 	source = configuration
 	source = dnsmasq.include
 	source = dnsmasq.complete
@@ -28,13 +28,13 @@ pkgbase = pi-hole-server
 	source = pi-hole-logtruncate.timer
 	source = whitelist.txt
 	source = blacklist.txt
-	md5sums = abbae7fa93007970b32747dbf0f0318d
-	md5sums = 6daf833c014dc65812409a3685f90411
+	md5sums = 1caf939ad916be62b84890ca357389ec
+	md5sums = e83a5207a711838186ae12c47643b4ed
 	md5sums = 791c86996377ceca23d1459ea0fd5cd6
 	md5sums = cba1675593bb43c94a35aabe8a210efa
 	md5sums = fc7852b5deb952335c0ebbf4ee61cb8c
-	md5sums = f5282a9dd44cc0090e4cf58190972139
-	md5sums = 008d6cb6a8ea389d22cbb969c62b0c80
+	md5sums = a776c1a9393c14c51bde2c0a7901a91f
+	md5sums = 990b8abd0bfbba23a7ce82c59f2e3d64
 	md5sums = 09a4bb7aef7bbe1a1f4c6c85c1fd48b4
 	md5sums = d42a864f88299998f8233c0bc0dd093d
 	md5sums = 7b9925a4516d91cd4282f181a4b4e473
diff --git a/PKGBUILD b/PKGBUILD
index 4bd8a9c01422..f435ad648a37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,10 +2,10 @@
 
 pkgname=pi-hole-server
 _pkgname=pi-hole
-pkgver=2.6.3
-pkgrel=4
+pkgver=2.7
+pkgrel=1
 _wwwpkgname=AdminLTE
-_wwwpkgver=1.2
+_wwwpkgver=1.3
 pkgdesc='The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server.'
 arch=('any')
 license=('GPL2')
@@ -29,13 +29,13 @@ source=(https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz
 	whitelist.txt
 	blacklist.txt)
 
-md5sums=('abbae7fa93007970b32747dbf0f0318d'
-         '6daf833c014dc65812409a3685f90411'
+md5sums=('1caf939ad916be62b84890ca357389ec'
+         'e83a5207a711838186ae12c47643b4ed'
          '791c86996377ceca23d1459ea0fd5cd6'
          'cba1675593bb43c94a35aabe8a210efa'
          'fc7852b5deb952335c0ebbf4ee61cb8c'
-         'f5282a9dd44cc0090e4cf58190972139'
-         '008d6cb6a8ea389d22cbb969c62b0c80'
+         'a776c1a9393c14c51bde2c0a7901a91f'
+         '990b8abd0bfbba23a7ce82c59f2e3d64'
          '09a4bb7aef7bbe1a1f4c6c85c1fd48b4'
          'd42a864f88299998f8233c0bc0dd093d'
          '7b9925a4516d91cd4282f181a4b4e473'
@@ -53,7 +53,10 @@ prepare() {
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: undebianizing 2" && return 1 ; fi
   sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/whitelist.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: undebianizing 3" && return 1 ; fi
+  sed -i 's|\[\[ \$(dpkg-query -s sudo) \]\]|hash sudo 2\>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: undebianizing 4" && return 1 ; fi
 
+# -----------------
 
   # modify service management
   sed -i 's|\[\[ \$dnsmasqPid \]\]|systemctl is-active dnsmasq 2\>\&1 \>\/dev\/null|'"w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
@@ -83,27 +86,74 @@ prepare() {
   sed -i "s|\$SUDO service dnsmasq start|\$SUDO systemctl start dnsmasq|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/blacklist.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: modify service management 11" && return 1 ; fi
 
+# -----------------
+
+  # sudoers setup
+  sed -i "s/www-data/http/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/pihole.sudo
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudoers setup 1" && return 1 ; fi
+  sed -i "s|/usr/local/bin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/pihole.sudo
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: sudoers setup 2" && return 1 ; fi
+
+# -----------------
+
+  # setting up and securing pihole wrapper script
+  sed -n "/function debugFunc {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 1" && return 1 ; fi
+  sed -i '/function debugFunc {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/function flushFunc {/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 '/function flushFunc {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/function updateDashboardFunc {/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
+  sed -i '/function updateDashboardFunc {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/function setupLCDFunction {/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole
+  if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: setting up and securing pihole wrapper script 4" && return 1 ; fi
+  sed -i '/function setupLCDFunction {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/function uninstallFunc {/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 '/function uninstallFunc {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/\-[d,f,u,s]/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 '/\-[d,f,u,s]/d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -n "/uninstall/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 '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole
+
+  sed -i "s|/opt/pihole|/usr/bin|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
+
+# -----------------
 
   # gravity call paths changing
   sed -i "s|/opt/pihole/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: gravity call paths changing" && return 1 ; fi
 
+# -----------------
 
   # adlists.default is already there
   sed -i "s/\$SUDO cp \/etc\/.pihole\/adlists.default \/etc\/pihole\/adlists.default//w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: adlists.default is already there" && return 1 ; fi
 
+# -----------------
 
   # 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
 
+# -----------------
 
   # change log location to chronometer.sh
   sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location to chronometer.sh" && return 1 ; fi
 
+# -----------------
 
   # little arch changes to chronometer.sh
   sed -i "s|.*ifconfig eth0.*|NICDEV=\$\(ip route get 8.8.8.8 \| awk '{for\(i=1;i<=NF;i++\)if\(\$\i~/dev/\)print $\(i+1\)}'\)\n&|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
@@ -113,27 +163,32 @@ prepare() {
   sed -i "s|/inet addr/|/inet /|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: little arch changes to chronometer.sh 3" && return 1 ; fi
 
+# -----------------
 
   # change log location in admin php interface
   sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/data.php
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: change log location in admin php interface" && return 1 ; fi
 
+# -----------------
 
   # since we don't directly install from git...
-  sed -n "/<b>Pi-hole Version <\/b> /w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
+  sed -n "/\$piholeVersion =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 1" && return 1 ; fi
-  sed -i '/<b>Pi-hole Version <\/b> /,+1d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
-  sed -n "/<div class=\"pull-right hidden-xs\">/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
+  sed -i 's/\$piholeVersion =.*$/\$piholeVersion = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
+  sed -n "/\$webVersion =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
   if [ -s $_ssc ] ; then rm $_ssc ; else echo "   ==> Sed error: since we don't directly install from git... 2" && return 1 ; fi
-  sed -i '/<div class="pull-right hidden-xs">/a<b>Pi-hole Version </b> '"$pkgver"'\n<b> - Web Interface Version </b>'"$_wwwpkgver"'' "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
+  sed -i 's/\$webVersion =.*$/\$webVersion = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/footer.php
 }
 
 package() {
   cd "$srcdir"
   install -Dm755 ./$_pkgname-$pkgver/gravity.sh "$pkgdir"/usr/bin/gravity.sh || return 1
+  install -Dm755 ./$_pkgname-$pkgver/pihole "$pkgdir"/usr/bin/pihole || return 1
   install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/chronometer.sh "$pkgdir"/usr/bin/chronometer.sh || return 1
   install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/blacklist.sh "$pkgdir"/usr/bin/blacklist.sh || return 1
   install -Dm755 ./$_pkgname-$pkgver/advanced/Scripts/whitelist.sh "$pkgdir"/usr/bin/whitelist.sh || return 1
+  install -dm750 "$pkgdir"/etc/sudoers.d
+  install -Dm644 ./$_pkgname-$pkgver/advanced/pihole.sudo "$pkgdir"/etc/sudoers.d/pihole || return 1
   install -Dm644 pi-hole.tmpfile "$pkgdir"/etc/tmpfiles.d/pi-hole.conf || return 1
 
   install -Dm644 "$_pkgname-gravity.timer" "$pkgdir/usr/lib/systemd/system/$_pkgname-gravity.timer"
diff --git a/lighttpd.conf b/lighttpd.conf
index 2de0c98a58c8..e276318c5265 100644
--- a/lighttpd.conf
+++ b/lighttpd.conf
@@ -24,7 +24,7 @@ mimetype.assign		= (
 fastcgi.server = ( 
     ".php" => (
         "localhost" => ( 
-            "bin-path" => "/usr/bin/php-cgi -d open_basedir=/srv/http/pihole:/etc/pihole:/etc/hosts:/run/log/pihole",
+            "bin-path" => "/usr/bin/php-cgi -d open_basedir=/srv/http/pihole:/etc/pihole:/etc/hosts:/run/log/pihole:/run/pihole -d session.save_path=/run/pihole",
             "socket" => "/tmp/php-fastcgi.sock",
             "broken-scriptfilename" => "enable",
             "max-procs" => 4, 
diff --git a/pi-hole-server.install b/pi-hole-server.install
index 1db1b673f123..086cc4a4035e 100644
--- a/pi-hole-server.install
+++ b/pi-hole-server.install
@@ -1,8 +1,8 @@
 post_install() {
   cat <<- EOF
     ==> please read configuration instructions at /usr/share/doc/pihole/configuration
-    ==> ver. 2.6.3-1: lighttpd conf file is changed, please repeat the installation steps
     ==> ver. 2.6.3-4: lighttpd conf file is changed, please repeat the installation steps
+    ==> ver.   2.7-1: lighttpd conf file is changed, please repeat the installation steps
     ==> first install/update run...
 EOF
   chown -R http.http /srv/http/pihole
diff --git a/pi-hole.tmpfile b/pi-hole.tmpfile
index b1c6add835e7..b4aca5e07d27 100644
--- a/pi-hole.tmpfile
+++ b/pi-hole.tmpfile
@@ -1,2 +1,3 @@
+d /run/pihole 0755 http root - -
 d /run/log/pihole 0755 dnsmasq root - -
 f /run/log/pihole/pihole.log 0644 dnsmasq root - -
author	max.bra	2016-06-12 23:45:38 +0200
committer	max.bra	2016-06-12 23:45:38 +0200
commit	27bea277a3698c020e360fa7b48fc5bf840063fd (patch)
tree	7f82da79bf5819510f364233346876cec7576e7c
parent	ac8a45a821a170781b31325c0dc916209692bdd2 (diff)
download	aur-27bea277a3698c020e360fa7b48fc5bf840063fd.tar.gz