diff options
author | max.bra | 2017-06-22 19:09:18 +0200 |
---|---|---|
committer | max.bra | 2017-06-22 19:09:18 +0200 |
commit | e70f1415b62809a592731d383bab702f0099e1eb (patch) | |
tree | c09b8aac601a30b36758f171729077160dd408f2 | |
parent | 5a0a562025fc5314368cad6a35d1bc40a1afda85 (diff) | |
download | aur-e70f1415b62809a592731d383bab702f0099e1eb.tar.gz |
core v. 3.1 - web v. 3.1
-rw-r--r-- | .SRCINFO | 16 | ||||
-rw-r--r-- | PKGBUILD | 104 | ||||
-rw-r--r-- | pi-hole-server.install | 5 | ||||
-rw-r--r-- | version.patch | 72 |
4 files changed, 143 insertions, 54 deletions
@@ -1,9 +1,7 @@ -# Generated by mksrcinfo v8 -# Wed Jun 21 21:24:15 UTC 2017 pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. - pkgver = 3.0.1 - pkgrel = 5 + pkgver = 3.1 + pkgrel = 1 url = https://github.com/pi-hole/pi-hole install = pi-hole-server.install arch = any @@ -21,8 +19,8 @@ pkgbase = pi-hole-server conflicts = pi-hole-standalone backup = etc/pihole/whitelist.txt backup = etc/pihole/blacklist.txt - source = pihole-3.0.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v3.0.1.tar.gz - source = admin-3.0.1a.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v3.0.1a.tar.gz + source = pihole-3.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v3.1.tar.gz + source = admin-3.1.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v3.1.tar.gz source = configuration source = dnsmasq.main source = dnsmasq.include @@ -37,8 +35,9 @@ pkgbase = pi-hole-server source = whitelist.txt source = blacklist.txt source = mimic_setupVars.conf.sh - md5sums = e68ea77830554afe11c71055cec33dca - md5sums = 74fe2ed6fd9c917437f149ebaf5ceddf + source = version.patch + md5sums = e24ce6a12ee97cd7de2c5ab13af99511 + md5sums = 2c0bf61ec96bdb85edeb9fd2cc2f330b md5sums = 3acf27ca01d931db363634dbfc95a061 md5sums = 3f1aeea43af0b192edb36b9e5484ff87 md5sums = f39fa3e607ff7346e93febfa2d0e565e @@ -53,6 +52,7 @@ pkgbase = pi-hole-server md5sums = d41d8cd98f00b204e9800998ecf8427e md5sums = d41d8cd98f00b204e9800998ecf8427e md5sums = 302102fdaf6f59d232c552ee10c4a229 + md5sums = 93fe5e50cf3fcb08b24cf29b0cace85b pkgname = pi-hole-server @@ -1,12 +1,12 @@ -# Maintainer: max.bra <max dot bra at alice dot it> +# Maintainer: max.bra <max dot bra dot gtalk at gmail dot com> # Maintainer: graysky <graysky AT archlinux DOT us> pkgname=pi-hole-server _pkgname=pi-hole -pkgver=3.0.1 -pkgrel=5 +pkgver=3.1 +pkgrel=1 _wwwpkgname=AdminLTE -_wwwpkgver=3.0.1a +_wwwpkgver=3.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') @@ -29,7 +29,7 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$ dnsmasq.include dnsmasq.local lighttpd.conf - nginx.pi-hole.conf + nginx.pi-hole.conf $_pkgname.tmpfile $_pkgname-gravity.service $_pkgname-gravity.timer @@ -37,10 +37,11 @@ source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$ $_pkgname-logtruncate.timer whitelist.txt blacklist.txt - mimic_setupVars.conf.sh) + mimic_setupVars.conf.sh + version.patch) -md5sums=('e68ea77830554afe11c71055cec33dca' - '74fe2ed6fd9c917437f149ebaf5ceddf' +md5sums=('e24ce6a12ee97cd7de2c5ab13af99511' + '2c0bf61ec96bdb85edeb9fd2cc2f330b' '3acf27ca01d931db363634dbfc95a061' '3f1aeea43af0b192edb36b9e5484ff87' 'f39fa3e607ff7346e93febfa2d0e565e' @@ -54,7 +55,8 @@ md5sums=('e68ea77830554afe11c71055cec33dca' '291d3c95e445fe65caf40c3605efd186' 'd41d8cd98f00b204e9800998ecf8427e' 'd41d8cd98f00b204e9800998ecf8427e' - '302102fdaf6f59d232c552ee10c4a229') + '302102fdaf6f59d232c552ee10c4a229' + '93fe5e50cf3fcb08b24cf29b0cace85b') prepare() { _ssc="/tmp/sedcontrol" @@ -78,28 +80,31 @@ 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() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -i '/piholeCheckoutFunc() {/,+20d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/::: \-[u,r,s]/w $_ssc" "$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 - sed -i '/::: \-[u,r,s]/d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -i '/tricorderFunc() {/,+29d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/::: \-d/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + sed -n "/\"\-[d,r,up]/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 '/::: \-d/,+3d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -i '/\"\-[d,r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/\"\-[d,u,r,s]/w $_ssc" "$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 8" && return 1 ; fi - sed -i '/\"\-[d,u,r,s]/d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -i '/uninstall/d' "$srcdir"/$_pkgname-$pkgver/pihole - sed -n "/uninstall/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + sed -i "s|^ checkout.*$|\";|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 9" && 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 10" && return 1 ; fi sed -i '/checkout/d' "$srcdir"/$_pkgname-$pkgver/pihole + sed -n "/tricorder/w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing pihole wrapper script 10" && return 1 ; fi + sed -i '/tricorder/d' "$srcdir"/$_pkgname-$pkgver/pihole + # ----------------- # setup gravity.sh @@ -136,9 +141,9 @@ prepare() { # ----------------- - # 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 + # change FTL port file location to chronometer.sh + sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/chronometer.sh + if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change FTL port file location to chronometer.sh" && return 1 ; fi # ----------------- @@ -165,26 +170,26 @@ prepare() { # ----------------- # since we don't directly install from git... - sed -n "/\$piholeVersion =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -n "/\$core_branch =.*$/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... 1" && return 1 ; fi - sed -i 's/\$piholeVersion =.*$/\$piholeVersion = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - sed -n "/\$webVersion =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -i 's/\$core_branch =.*$/\$core_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php + sed -n "/\$web_branch =.*$/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... 2" && return 1 ; fi - sed -i 's/\$webVersion =.*$/\$webVersion = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -i 's/\$web_branch =.*$/\$web_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - sed -n "/\$piholeBranch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -n "/\$core_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... 3" && return 1 ; fi - sed -i 's/\$piholeBranch =.*$/\$piholeBranch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - sed -n "/\$webBranch =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -i 's/\$core_current =.*$/\$core_current = "'"$pkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php + sed -n "/\$web_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 - sed -i 's/\$webBranch =.*$/\$webBranch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -i 's/\$web_current =.*$/\$web_current = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - sed -n "/\$piholeCommit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.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 - sed -i 's/\$piholeCommit =.*$/\$piholeCommit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - sed -n "/\$webCommit =.*$/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + 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 - sed -i 's/\$webCommit =.*$/\$webCommit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php + sed -i 's/\$web_commit =.*$/\$web_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php sed -n "/\$piHoleVersion =.*$/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/index.php if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: since we don't directly install from git... 7" && return 1 ; fi @@ -193,21 +198,32 @@ prepare() { 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... 8" && return 1 ; fi - sed -n "/\$(getLocalVersion \"\${PHGITDIR}\")/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... 9" && return 1 ; fi - sed -i "s/\$(getLocalVersion \"\${PHGITDIR}\")/$pkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh +# sed -n "/\$(getLocalVersion \"\${PHGITDIR}\")/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... 9" && return 1 ; fi +# sed -i "s/\$(getLocalVersion \"\${PHGITDIR}\")/$pkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - sed -n "/\$(getLocalVersion \"\${WEBGITDIR}\")/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... 9" && return 1 ; fi - sed -i "s/\$(getLocalVersion \"\${WEBGITDIR}\")/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh +# sed -n "/\$(getLocalVersion \"\${WEBGITDIR}\")/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... 10" && return 1 ; fi +# sed -i "s/\$(getLocalVersion \"\${WEBGITDIR}\")/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh - sed -n "/\$(getLocalHash \"\${PHGITDIR}\")/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... 9" && return 1 ; fi - sed -i "s/\$(getLocalHash \"\${PHGITDIR}\")/N.A./" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh +# sed -n "/\$(getLocalHash \"\${PHGITDIR}\")/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... 11" && return 1 ; fi +# sed -i "s/\$(getLocalHash \"\${PHGITDIR}\")/N.A./" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh + +# sed -n "/\$(getLocalHash \"\${WEBGITDIR}\")/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... 12" && return 1 ; fi +# sed -i "s/\$(getLocalHash \"\${WEBGITDIR}\")/N.A./" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh + + cd "$srcdir"/"$_pkgname"-"$pkgver" + patch -p1 -i "$srcdir"/version.patch + cd "$srcdir" - sed -n "/\$(getLocalHash \"\${WEBGITDIR}\")/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh + 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... 9" && return 1 ; fi - sed -i "s/\$(getLocalHash \"\${WEBGITDIR}\")/N.A./" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh + 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... 10" && return 1 ; fi + sed -i "s/{{webver}}/$_wwwpkgver/" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/version.sh # ----------------- diff --git a/pi-hole-server.install b/pi-hole-server.install index ae75f6f8f2c7..ea47a8d98311 100644 --- a/pi-hole-server.install +++ b/pi-hole-server.install @@ -1,7 +1,8 @@ post_install() { echo -e "\e[1;33m==>\e[0m Please read configuration instructions at /usr/share/doc/pihole/configuration" - echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 3.0.1-1\e[0m: lighttpd conf file is changed" - echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps" + echo -e "\e[1;33m==>\e[0m or ArchWiki page at \e[1;36mhttps://wiki.archlinux.org/index.php/Pi-hole\e[0m" +# echo -e "\e[1;33m==>\e[0m \e[1;31mVer. 3.0.1-1\e[0m: lighttpd conf file is changed" +# echo -e "\e[1;33m==>\e[0m Please follow configuration upgrade steps" echo -e "\e[1;33m==>\e[0m Neutrino emissions detected..." touch /etc/dnsmasq.d/02-pihole-dhcp.conf touch /etc/dnsmasq.d/03-pihole-wildcard.conf diff --git a/version.patch b/version.patch new file mode 100644 index 000000000000..0c0eb70fba30 --- /dev/null +++ b/version.patch @@ -0,0 +1,72 @@ +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 + +- # 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 + } + + 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 daemon="${1}" +- local branch="${2}" +- +- 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 + } + |