diff options
| author | max.bra | 2018-12-11 11:21:07 +0100 |
|---|---|---|
| committer | max.bra | 2018-12-11 11:21:07 +0100 |
| commit | cad4e53f63659549399b5186734f488609cdeea7 (patch) | |
| tree | 984de0471322f3ac6df7f44f15d68673c1b2bc2a | |
| parent | db1607e2e6760ea44002f124607dda3474413c4c (diff) | |
| download | aur-cad4e53f63659549399b5186734f488609cdeea7.tar.gz | |
diff-patch migration
| -rw-r--r-- | .SRCINFO | 8 | ||||
| -rw-r--r-- | PKGBUILD | 246 | ||||
| -rw-r--r-- | version.patch | 4 |
3 files changed, 28 insertions, 230 deletions
@@ -1,5 +1,3 @@ -# Generated by mksrcinfo v8 -# Mon Dec 10 01:04:35 UTC 2018 pkgbase = pi-hole-server pkgdesc = The Pi-hole is an advertising-aware DNS/Web server. Arch adaptation for lan wide DNS server. pkgver = 4.1 @@ -28,6 +26,8 @@ pkgbase = pi-hole-server backup = etc/dnsmasq.conf source = pihole-4.1.tar.gz::https://github.com/pi-hole/pi-hole/archive/v4.1.tar.gz source = admin-4.1.tar.gz::https://github.com/pi-hole/AdminLTE/archive/v4.1.tar.gz + source = https://raw.github.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-4.1.patch + source = https://raw.github.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-4.1.patch source = dnsmasq.include source = lighttpd.pi-hole.conf source = nginx.pi-hole.conf @@ -41,6 +41,8 @@ pkgbase = pi-hole-server source = piholeDebug.sh md5sums = c128bec162c5cff3136ad680c326579f md5sums = 5d87f45f3811cafbf9a4c0685a87170a + md5sums = a318efbfb3d56cc554f885dd6484f1e6 + md5sums = e5ce7c27f31b4eb8f0c7e9415e94c9b6 md5sums = 4d6b3db77bd0b712fc193aa32ba4eea8 md5sums = 971cc2859672341d77f8deba702fb7f7 md5sums = b63fcf29c29796023a2677bcf2b369a7 @@ -50,7 +52,7 @@ pkgbase = pi-hole-server md5sums = 20c5b0c6b4e23e55b25ab6c28dda709d md5sums = 291d3c95e445fe65caf40c3605efd186 md5sums = c227ffa88ddebc34cb715b73640cd845 - md5sums = 3c120e67240f6f83f4d803a211fc16aa + md5sums = adfcdfb4b90e278b1a850b0d506d2e76 md5sums = d7b69ae51db0e8ac8e27f20a234eed85 pkgname = pi-hole-server @@ -24,22 +24,26 @@ backup=('etc/pihole/whitelist.txt' 'etc/pihole/blacklist.txt' 'etc/pihole/regex. 'etc/dnsmasq.d/01-pihole.conf' 'etc/pihole/adlists.list' 'etc/dnsmasq.conf') source=(pihole-$pkgver.tar.gz::https://github.com/$_pkgname/$_pkgname/archive/v$pkgver.tar.gz - admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz - dnsmasq.include - lighttpd.pi-hole.conf - nginx.pi-hole.conf - $_pkgname.tmpfile - $_pkgname-gravity.service - $_pkgname-gravity.timer - $_pkgname-logtruncate.service - $_pkgname-logtruncate.timer - mimic_setupVars.conf.sh - version.patch - piholeDebug.sh - ) + admin-$_wwwpkgver.tar.gz::https://github.com/$_pkgname/$_wwwpkgname/archive/v$_wwwpkgver.tar.gz + "https://raw.github.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-core-$pkgver.patch" + "https://raw.github.com/max72bra/pi-hole-server-archlinux-customization/master/arch-server-admin-$pkgver.patch" + dnsmasq.include + lighttpd.pi-hole.conf + nginx.pi-hole.conf + $_pkgname.tmpfile + $_pkgname-gravity.service + $_pkgname-gravity.timer + $_pkgname-logtruncate.service + $_pkgname-logtruncate.timer + mimic_setupVars.conf.sh + version.patch + piholeDebug.sh +) md5sums=('c128bec162c5cff3136ad680c326579f' '5d87f45f3811cafbf9a4c0685a87170a' + 'a318efbfb3d56cc554f885dd6484f1e6' + 'e5ce7c27f31b4eb8f0c7e9415e94c9b6' '4d6b3db77bd0b712fc193aa32ba4eea8' '971cc2859672341d77f8deba702fb7f7' 'b63fcf29c29796023a2677bcf2b369a7' @@ -49,223 +53,15 @@ md5sums=('c128bec162c5cff3136ad680c326579f' '20c5b0c6b4e23e55b25ab6c28dda709d' '291d3c95e445fe65caf40c3605efd186' 'c227ffa88ddebc34cb715b73640cd845' - '3c120e67240f6f83f4d803a211fc16aa' + 'adfcdfb4b90e278b1a850b0d506d2e76' 'd7b69ae51db0e8ac8e27f20a234eed85') prepare() { - _ssc="/tmp/sedcontrol" - - # the return of service management - sed -i "s|service \${resolver} \${svcOption}|systemctl \${svcOption} \${resolver}|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: the return of service management" && return 1 ; fi - - # setting up and securing pihole wrapper script - #sed -n "/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 '/debugFunc() {/,+16d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/updatePiholeFunc() {/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 '/updatePiholeFunc() {/,+5d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/reconfigurePiholeFunc() {/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 '/reconfigurePiholeFunc() {/,+4d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/uninstallFunc() {/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 '/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 5" && return 1 ; fi - sed -i '/piholeCheckoutFunc() {/,+22d' "$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 '/tricorderFunc() {/,+29d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/\"\-[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 '/\"\-[r,up]/d' "$srcdir"/$_pkgname-$pkgver/pihole - - #sed -n "/^ \-d/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/,+2d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/^ \-up/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 '/^ \-up/d' "$srcdir"/$_pkgname-$pkgver/pihole - - sed -n "/^ \-r/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 '/^ \-r/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 11" && return 1 ; fi - sed -i '/uninstall/d' "$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 12" && return 1 ; fi - - 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 13" && 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 14" && return 1 ; fi - sed -i '/tricorder/d' "$srcdir"/$_pkgname-$pkgver/pihole - -# ----------------- - - # setup gravity.sh - sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/gravity.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setup gravity.sh 1" && return 1 ; fi - -# ----------------- - - # setting up and securing webpage.sh script - sed -i "s|/usr/local/bin/|/usr/bin/|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/webpage.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: setting up and securing webpage.sh script 1" && return 1 ; fi - -# ----------------- - - # change log location to pihole script - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/pihole - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to pihole script" && return 1 ; fi - -# ----------------- - - # change log location to piholeLogFlush.sh - sed -n "/\/var\/log\/pihole.log/w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location to piholeLogFlush.sh" && return 1 ; fi - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|g" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - -# ----------------- - - # change log and bin location to logrotate - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Templates/logrotate - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 1" && return 1 ; fi - sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Templates/logrotate - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 2" && return 1 ; fi - sed -i "s|/usr/sbin|/usr/bin|w $_ssc" "$srcdir"/$_pkgname-$pkgver/advanced/Scripts/piholeLogFlush.sh - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log and bin location to logrotate 3" && 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 - -# ----------------- - - # no debug for us, right now - sed -n "/\-\- Generate debug log \-\-/w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: no debug for us, right now 1" && return 1 ; fi - sed -i '/\-\- Generate debug log \-\-/,+5d' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - -# ----------------- - - # change log location in admin php interface - #sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/data.php - #if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 1" && return 1 ; fi - - sed -i "s|/var/run/pihole-FTL.port|/run/pihole-ftl/pihole-FTL.port|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/FTL.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 2" && return 1 ; fi - sed -i "s|/var/log/pihole-FTL.log|/run/log/pihole-ftl/pihole-FTL.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 3" && return 1 ; fi - sed -i "s|/var/log/pihole.log|/run/log/pihole/pihole.log|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/tailLog.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: change log location in admin php interface 4" && return 1 ; fi - -# ----------------- - - # since we don't directly install from git... -# 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/\$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/\$web_branch =.*$/\$web_branch = "master";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.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/\$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/\$web_current =.*$/\$web_current = "'"$_wwwpkgver"'";/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - sed -n "/\$FTL_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... 5" && return 1 ; fi - sed -i 's/\$FTL_current =.*$/\$FTL_current = exec("pihole-FTL version");/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.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... 6" && return 1 ; fi -# 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... 7" && return 1 ; fi -# sed -i 's/\$web_commit =.*$/\$web_commit = NULL;/' "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/update_checker.php - - 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 - cd "$srcdir"/"$_pkgname"-"$pkgver" + patch -Np1 -i "$srcdir"/arch-server-core-$pkgver.patch patch -p1 -i "$srcdir"/version.patch - cd "$srcdir" - - 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/{{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 - -# ----------------- - - # web admin footer update setup - sed -i "s|https:\/\/github.com\/pi-hole\/pi-hole\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 1" && return 1 ; fi - sed -i "s|https:\/\/github.com\/pi-hole\/AdminLTE\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 2" && return 1 ; fi - sed -i "s|https:\/\/github.com\/pi-hole\/FTL\/releases|https:\/\/aur.archlinux.org\/packages\/pi-hole-server|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/footer.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: web admin footer update setup 3" && return 1 ; fi - -# ----------------- - - # sudo pihole full path (php-fpm compatibility) - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/api.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 1" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/header.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 2" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/queryads.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 3" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/savesettings.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 4" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/sub.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 5" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/add.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 6" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/gravity.sh.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 7" && return 1 ; fi - sed -i "s|sudo pihole|sudo /usr/bin/pihole|w $_ssc" "$srcdir"/$_wwwpkgname-$_wwwpkgver/scripts/pi-hole/php/loginpage.php - if [ -s $_ssc ] ; then rm $_ssc ; else echo " ==> Sed error: sudo pihole full path (php-fpm compatibility) 8" && return 1 ; fi - -# ----------------- - - # pi-hole sudoers file is now populated by install script - echo "http ALL=NOPASSWD: /usr/bin/pihole" >> $_pkgname-$pkgver/advanced/Templates/pihole.sudo - - # pi-hole dnsmasq config file include ready - echo "conf-dir=/etc/dnsmasq.d/,*.conf" >> $_pkgname-$pkgver/advanced/dnsmasq.conf.original - - # adlists.default is gone and adlists.list is populated by install script - # from basic-install.sh -- function chooseBlocklists() - cat <<EOF > $_pkgname-$pkgver/adlists.list -https://raw.githubusercontent.com/StevenBlack/hosts/master/hosts -https://mirror1.malwaredomains.com/files/justdomains -http://sysctl.org/cameleon/hosts -https://zeustracker.abuse.ch/blocklist.php?download=domainblocklist -https://s3.amazonaws.com/lists.disconnect.me/simple_tracking.txt -https://s3.amazonaws.com/lists.disconnect.me/simple_ad.txt -https://hosts-file.net/ad_servers.txt -EOF + cd "$srcdir"/"$_wwwpkgname"-"$_wwwpkgver" + patch -Np1 -i "$srcdir"/arch-server-admin-$pkgver.patch } package() { diff --git a/version.patch b/version.patch index 5979ad8f42a5..be710e1a7084 100644 --- a/version.patch +++ b/version.patch @@ -16,10 +16,10 @@ - echo "ERROR" - return 1 + if [[ "$1" == "pi-hole" ]]; then -+ echo "{{corever}}" ++ echo "4.1" else - echo "Untagged" -+ echo "{{webver}}" ++ echo "4.1" fi return 0 } |