main/unbound: migrate: skip .apk-new files

(cherry picked from commit b1c9c64d2babe0f942f7bef17cd2a1996a851a77)

2 files changed, 7 insertions, 7 deletions

diff --git a/main/unbound/APKBUILD b/main/unbound/APKBUILD
index 6301afc157..f5eb19b165 100644
--- a/main/unbound/APKBUILD
+++ b/main/unbound/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=unbound
 pkgver=1.4.21
-pkgrel=0
+pkgrel=1
 pkgdesc="Unbound is a validating, recursive, and caching DNS resolver"
 pkgusers="unbound"
 pkggroups="unbound"
@@ -95,20 +95,20 @@ md5sums="0aa8db06ea784bf7879060bd1f6551c8  unbound-1.4.21.tar.gz
 32fe2914a2723142d3eae9ea556872d3  conf.patch
 cca28c13f9b835dfe94ea91012d76e2b  swig.patch
 c1c71cd0e7f9630536a2abf2513c675d  update-unbound-root-hints
-01abc5360897967be608eaf4ec1c25dc  migrate-dnscache-to-unbound
+5340681e5ec1a1fd47a0de27f5c03c21  migrate-dnscache-to-unbound
 d7a1cb305b7b5b72df4e574777f76723  root.hints
 29f8a33fbe40ffb79dd1fb727e01af48  unbound.initd"
 sha256sums="502f817a72721f78243923eb1d6187029639f7a8bdcc33a6ce0819bbb2a80970  unbound-1.4.21.tar.gz
 48bedb743eda892f82adc8b4ce2e4f5ad216f1ab50d432aef768377edc98165c  conf.patch
 e867faf7eaa494d3c3fc93fea36a30fd54914b25455aa843a057292c6fac03b4  swig.patch
 0db3ca197b62901fab984cb2559925adbf3307ccd1dca3e1dd69cd1642ff0a36  update-unbound-root-hints
-a4f87a880212c2f5c66ebd22143abd25d5ec2e081e2717f060ebd428978e1f5a  migrate-dnscache-to-unbound
+582851b4017044d8642c42c5df09b27494c963e1eebb8be3373b2dbd168d0ac0  migrate-dnscache-to-unbound
 eb0ce2b11bf2302a716fa8ef21d55e55f1892dfd853c73c71319bfa5e171eff3  root.hints
 d4bf1ed69c1933f52950f8e0dc8d28348b63b2acb0ad0bb0aa4c1ac0ff00b3dd  unbound.initd"
 sha512sums="a0b6f9d0d1905a72aa62e2a7a8d15450ccd68c81bf987f53931c0bbb888d86544253d85ca467eeaf3573db443ec11020f3517dc3de84816f28a2f4dabab0ed17  unbound-1.4.21.tar.gz
 2214882954ed813c564a34cbf433240814f1cc03e62b7aa007d054406d17fa0359514400afe53b9cb0445d25a29ccf9bf27c5974901d30bbfb2bfaf5e755da2b  conf.patch
 801bc10922f3a0c7d78a0e61c3ff7b9f719cc152e471908349b98da4ea01f957595c2de918f21e5d7bfffc6c37ecfba3a58f7aca697bc7d01c00232c401ce704  swig.patch
 0f80b507a8f71b0c00729501d861657ce91a57024cd1963c150d0630c71eccceba370d6e732ff39bb807713672550d87a8c8ecdb9fce6b8b4386c12689603700  update-unbound-root-hints
-ad4ebef660ff594074314cee7f495874c507a1ddb28b7801babe922f186b0fed3cebf03f39945470145097bc00e6e79cf24460de108016176a771a8015de883f  migrate-dnscache-to-unbound
+b26a13c1c88da9611a65705dc59f7233c5e0f6aced0d7d66c18536a969a2de627ca5d4bb55eedd81f2f040fa11bde48eaaeca2850f376e72e7a531678a259131  migrate-dnscache-to-unbound
 058ae1ef089eb4d5ad43ffb83e9f48d586cdfcd4cd4efe9b531a0628d4ee1a69e489187572747a224059a00efd9187012bf59a6da05c4ddfbfa1b7719ff6cbdc  root.hints
 f60caa74529000c2260b756e4216c74c411e23b3b64fd654b42318f866fd3c93d01e22d5af3c92d54e89b94418d9aace0a25e03834fc025c2932977fa454147f  unbound.initd"
diff --git a/main/unbound/migrate-dnscache-to-unbound b/main/unbound/migrate-dnscache-to-unbound
index 4fbb875fbe..babbcd4d18 100644
--- a/main/unbound/migrate-dnscache-to-unbound
+++ b/main/unbound/migrate-dnscache-to-unbound
@@ -32,9 +32,9 @@ gen_config() {
         fi
         for zonefile in "$root"/etc/dnscache/servers/*; do
                 local zone=${zonefile##*/}
-                if [ "$zone" = "@" ] || [ "$zone" = '*' ]; then
-                        continue
-                fi
+                case "$zone" in
+                        '@'|'*'|*.apk-new) continue;;
+                esac
                 echo "${fwdtype}-zone:"
                 echo -e "\tname: ${zone}"
                 for ip in $(cat $zonefile); do