Received: from vps892.directvps.nl (ikke.info [178.21.113.177]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id A47DD7819D4 for ; Fri, 22 Nov 2019 11:36:49 +0000 (UTC) Received: by vps892.directvps.nl (Postfix, from userid 1008) id 8DD5E4400E7; Fri, 22 Nov 2019 12:36:49 +0100 (CET) Date: Fri, 22 Nov 2019 12:36:49 +0100 From: Kevin Daudt To: alpine-mips-patches Cc: alpine-aports@lists.alpinelinux.org Subject: Re: [PATCH] main/hiredis: fix test #40 in disconnected environment Message-ID: <20191122113649.GH456781@alpha> References: <20191120132744.888854DB19@mx12.valuehost.ru> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20191120132744.888854DB19@mx12.valuehost.ru> User-Agent: Mutt/1.12.2 (2019-09-21) On Wed, Nov 20, 2019 at 01:18:23PM +0000, alpine-mips-patches wrote: > 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 > This was applied as 73a1809 (by maxice8).