main/musl: fix handling of non matching address family entries in hosts

fixes #5143

2 files changed, 31 insertions, 1 deletions

diff --git a/main/musl/0001-fix-handling-of-non-matching-address-family-entries-.patch b/main/musl/0001-fix-handling-of-non-matching-address-family-entries-.patch
new file mode 100644
index 0000000000..40c2a85122
--- /dev/null
+++ b/main/musl/0001-fix-handling-of-non-matching-address-family-entries-.patch
@@ -0,0 +1,26 @@
+From 8be65561a9f8c641dc22269ae33ff736fdc71f7c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Timo=20Ter=C3=A4s?= <timo.teras@iki.fi>
+Date: Tue, 23 Feb 2016 08:46:09 +0200
+Subject: [PATCH] fix handling of non-matching address family entries in
+ /etc/hosts
+
+---
+ src/network/lookup_name.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c
+index a26ad53..db0f237 100644
+--- a/src/network/lookup_name.c
++++ b/src/network/lookup_name.c
+@@ -71,7 +71,7 @@ static int name_from_hosts(struct address buf[static MAXADDRS], char canon[stati
+                /* Isolate IP address to parse */
+                for (p=line; *p && !isspace(*p); p++);
+                *p++ = 0;
+-               if (name_from_numeric(buf+cnt, line, family))
++               if (name_from_numeric(buf+cnt, line, family) > 0)
+                        cnt++;
+ 
+                /* Extract first name as canonical name */
+-- 
+2.7.1
+
diff --git a/main/musl/APKBUILD b/main/musl/APKBUILD
index 2b6df2ee95..9bd7feaa4f 100644
--- a/main/musl/APKBUILD
+++ b/main/musl/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: Timo Teräs <timo.teras@iki.fi>
 pkgname=musl
 pkgver=1.1.14
-pkgrel=0
+pkgrel=1
 pkgdesc="the musl c library (libc) implementation"
 url="http://www.musl-libc.org/"
 arch="all"
@@ -12,6 +12,7 @@ depends_dev="!uclibc-dev"
 makedepends="$depends_dev"
 subpackages="$pkgname-dev $pkgname-utils $pkgname-dbg libc6-compat:compat"
 source="http://www.musl-libc.org/releases/musl-$pkgver.tar.gz
+        0001-fix-handling-of-non-matching-address-family-entries-.patch
 
         ldconfig
         __stack_chk_fail_local.c
@@ -128,18 +129,21 @@ compat() {
 }
 
 md5sums="d529ce4a2f7f79d8c3fd4b8329417b57  musl-1.1.14.tar.gz
+a92361d373756777fc0d8f188274207d  0001-fix-handling-of-non-matching-address-family-entries-.patch
 830d01f7821b978df770b06db3790921  ldconfig
 0df687757221bbb0fc1aa67f1bd646f9  __stack_chk_fail_local.c
 57ef2c63b9ec6a2041694ace97d4ffa2  getconf.c
 2b941c4251cac44988a4abfc50e21267  getent.c
 45f92f8d59cf84d765de698a9578dbf4  iconv.c"
 sha256sums="35f6c00c84a6091bd5dab29eedde7508dae755ead92dcc0239f3677d1055b9b5  musl-1.1.14.tar.gz
+6c0663d834cfda068527608236ceb801996ba8c56d8df25a2e68df3379a23350  0001-fix-handling-of-non-matching-address-family-entries-.patch
 b4a2c06db38742e8c42c3c9838b285a7d8cdac6c091ff3df5ff9a15f1e41b9c7  ldconfig
 299a7d75a09de3e2e11e7fb4acc3182e4a14e868093d2f30938fce9bfcff13da  __stack_chk_fail_local.c
 d87d0cbb3690ae2c5d8cc218349fd8278b93855dd625deaf7ae50e320aad247c  getconf.c
 68373a55e89ce85c562d941ccf588337d6cc6c9c17689d695f65cd7607134bbe  getent.c
 f79a2930a2e5bb0624321589edf8b889d1e9b603e01e6b7ae214616605b3fdd7  iconv.c"
 sha512sums="9016246b44a7e6ef51477f0a246373c79f3e796c70031c3323be1b6c4c0518a2d4578f1aa712adfd9a80cdc1d71918bd7a35855052a0452b854755bf0cc2424e  musl-1.1.14.tar.gz
+b479a30d596328cefcf9ae8cbd0123027da09639fcfd85a06008ea2f0b4f04e82d7196b9e62c221c74734869a35a93d7c8349c1da82dcd7fd16f736f47a5cc62  0001-fix-handling-of-non-matching-address-family-entries-.patch
 8d3a2d5315fc56fee7da9abb8b89bb38c6046c33d154c10d168fb35bfde6b0cf9f13042a3bceee34daf091bc409d699223735dcf19f382eeee1f6be34154f26f  ldconfig
 062bb49fa54839010acd4af113e20f7263dde1c8a2ca359b5fb2661ef9ed9d84a0f7c3bc10c25dcfa10bb3c5a4874588dff636ac43d5dbb3d748d75400756d0b  __stack_chk_fail_local.c
 0d80f37b34a35e3d14b012257c50862dfeb9d2c81139ea2dfa101d981d093b009b9fa450ba27a708ac59377a48626971dfc58e20a3799084a65777a0c32cbc7d  getconf.c