Received: from mx12.valuehost.ru (mx12.valuehost.ru [217.112.42.215]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTP id 038C778104D for ; Wed, 20 Nov 2019 13:27:46 +0000 (UTC) Received: from mx7.valuehost.ru (unknown [127.0.0.255]) by mx12.valuehost.ru (Postfix) with ESMTP id 888854DB19 for ; Wed, 20 Nov 2019 16:27:44 +0300 (MSK) From: alpine-mips-patches Date: Wed, 20 Nov 2019 13:18:23 +0000 Subject: [PATCH] main/hiredis: fix test #40 in disconnected environment To: alpine-aports@lists.alpinelinux.org Message-Id: <20191120132744.888854DB19@mx12.valuehost.ru> This adds musl's error string for EAI_AGAIN to the PASSED list in addition to existing glibc message for this error code. --- main/hiredis/APKBUILD | 4 ++-- main/hiredis/musl-test.patch | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/main/hiredis/APKBUILD b/main/hiredis/APKBUILD index 5e9ef2b0c6..202bcc0aef 100644 --- a/main/hiredis/APKBUILD +++ b/main/hiredis/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Natanael Copa pkgname=hiredis pkgver=0.14.0 -pkgrel=2 +pkgrel=3 pkgdesc="Minimalistic C client library for Redis" url="https://github.com/redis/hiredis" arch="all" @@ -42,4 +42,4 @@ package() { sha512sums="57a81a35b4750f0ca9dba830789483667f8ca1559f13b0ebdc3fab3e34ad16b2809f9734cf88157041263784e11447556b7a748bfb7ef318a60bb5dda3e358a0 hiredis-0.14.0.tar.gz -4f33e8683ba27121f6d4711a2f94bc8b766b3de5095ee81ccef5b551c7d1d235ef0f75a5333706aebec35b4911391905124d6a843cbc4c48817e93c07ef20374 musl-test.patch" +a16c212e6c391a0434ffbd865b241cebfc6f46acc282ac6a651fb2dea7e30991fe5a2ef267dded03eb13c6d4012d7588f9d1224596da4782bc93b5fd6829c117 musl-test.patch" diff --git a/main/hiredis/musl-test.patch b/main/hiredis/musl-test.patch index 37a7001396..400f4a9d56 100644 --- a/main/hiredis/musl-test.patch +++ b/main/hiredis/musl-test.patch @@ -1,10 +1,11 @@ --- hiredis-0.14.0/test.c +++ hiredis-0.14.0_p/test.c -@@ -439,6 +439,7 @@ +@@ -439,6 +439,8 @@ c = redisConnect((char*)"idontexist.test", 6379); test_cond(c->err == REDIS_ERR_OTHER && (strcmp(c->errstr,"Name or service not known") == 0 || + strcmp(c->errstr,"Name does not resolve") == 0 || ++ strcmp(c->errstr,"Try again") == 0 || strcmp(c->errstr,"Can't resolve: idontexist.test") == 0 || strcmp(c->errstr,"nodename nor servname provided, or not known") == 0 || strcmp(c->errstr,"No address associated with hostname") == 0 || -- 2.24.0