diff --git a/dev-db/redis/patches/redis-3.2.9.patchset b/dev-db/redis/patches/redis-3.2.9.patchset deleted file mode 100644 index c164a7868..000000000 --- a/dev-db/redis/patches/redis-3.2.9.patchset +++ /dev/null @@ -1,102 +0,0 @@ -From 4496da13ed6db5eb5e823902e6aac90cc753a0f1 Mon Sep 17 00:00:00 2001 -From: begasus -Date: Thu, 8 Jun 2017 00:17:54 +0200 -Subject: fix build - - -diff --git a/deps/hiredis/net.c b/deps/hiredis/net.c -index bdb84ce..8dc1586 100644 ---- a/deps/hiredis/net.c -+++ b/deps/hiredis/net.c -@@ -138,7 +138,7 @@ int redisKeepAlive(redisContext *c, int interval) { - return REDIS_ERR; - } - #else --#ifndef __sun -+#if !defined(__sun) && !defined(__HAIKU__) - val = interval; - if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { - __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); -diff --git a/src/Makefile b/src/Makefile -index fdbe36a..a07a545 100644 ---- a/src/Makefile -+++ b/src/Makefile -@@ -64,6 +64,11 @@ ifeq ($(uname_S),SunOS) - FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 - FINAL_LIBS+= -ldl -lnsl -lsocket -lresolv -lpthread -lrt - else -+ifeq ($(uname_S),Haiku) -+ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) -+ CCLINK?=-lroot -lnetwork -+ DEBUG?=-g -ggdb -+else - ifeq ($(uname_S),Darwin) - # Darwin - FINAL_LIBS+= -ldl -@@ -89,6 +94,7 @@ endif - endif - endif - endif -+endif - # Include paths to dependencies - FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src - -diff --git a/src/aof.c b/src/aof.c -index cbd906c..3d28b47 100644 ---- a/src/aof.c -+++ b/src/aof.c -@@ -221,7 +221,7 @@ void stopAppendOnly(void) { - serverLog(LL_NOTICE,"Killing running AOF rewrite child: %ld", - (long) server.aof_child_pid); - if (kill(server.aof_child_pid,SIGUSR1) != -1) { -- while(wait3(&statloc,0,NULL) != server.aof_child_pid); -+ while(waitpid(&statloc,0,NULL) != server.aof_child_pid); - } - /* reset the buffer accumulating changes while the child saves */ - aofRewriteBufferReset(); -diff --git a/src/sentinel.c b/src/sentinel.c -index 0168aa6..717d7e9 100644 ---- a/src/sentinel.c -+++ b/src/sentinel.c -@@ -796,7 +796,7 @@ void sentinelCollectTerminatedScripts(void) { - int statloc; - pid_t pid; - -- while ((pid = wait3(&statloc,WNOHANG,NULL)) > 0) { -+ while ((pid = waitpid(&statloc,WNOHANG,NULL)) > 0) { - int exitcode = WEXITSTATUS(statloc); - int bysignal = 0; - listNode *ln; -@@ -808,7 +808,7 @@ void sentinelCollectTerminatedScripts(void) { - - ln = sentinelGetScriptListNodeByPid(pid); - if (ln == NULL) { -- serverLog(LL_WARNING,"wait3() returned a pid (%ld) we can't find in our scripts execution queue!", (long)pid); -+ serverLog(LL_WARNING,"waitpid() returned a pid (%ld) we can't find in our scripts execution queue!", (long)pid); - continue; - } - sj = ln->value; -diff --git a/src/server.c b/src/server.c -index 609f396..09f246f 100644 ---- a/src/server.c -+++ b/src/server.c -@@ -1185,14 +1185,14 @@ int serverCron(struct aeEventLoop *eventLoop, long long id, void *clientData) { - int statloc; - pid_t pid; - -- if ((pid = wait3(&statloc,WNOHANG,NULL)) != 0) { -+ if ((pid = waitpid(&statloc,WNOHANG,NULL)) != 0) { - int exitcode = WEXITSTATUS(statloc); - int bysignal = 0; - - if (WIFSIGNALED(statloc)) bysignal = WTERMSIG(statloc); - - if (pid == -1) { -- serverLog(LL_WARNING,"wait3() returned an error: %s. " -+ serverLog(LL_WARNING,"waitpid() returned an error: %s. " - "rdb_child_pid = %d, aof_child_pid = %d", - strerror(errno), - (int) server.rdb_child_pid, --- -2.7.0 - diff --git a/dev-db/redis/patches/redis-5.0.6.patchset b/dev-db/redis/patches/redis-5.0.6.patchset new file mode 100644 index 000000000..8baa95938 --- /dev/null +++ b/dev-db/redis/patches/redis-5.0.6.patchset @@ -0,0 +1,72 @@ +From 9765982fde68b8ad42e532f2a486dbe5b6634b2d Mon Sep 17 00:00:00 2001 +From: begasus +Date: Thu, 8 Jun 2017 00:17:54 +0200 +Subject: fix build + + +diff --git a/deps/hiredis/net.c b/deps/hiredis/net.c +index 7d41209..9df8bc8 100644 +--- a/deps/hiredis/net.c ++++ b/deps/hiredis/net.c +@@ -141,7 +141,7 @@ int redisKeepAlive(redisContext *c, int interval) { + return REDIS_ERR; + } + #else +-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) ++#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__) && !defined(__HAIKU__) + val = interval; + if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) { + __redisSetError(c,REDIS_ERR_OTHER,strerror(errno)); +diff --git a/src/Makefile b/src/Makefile +index 2a68649..ce8946d 100644 +--- a/src/Makefile ++++ b/src/Makefile +@@ -90,6 +90,11 @@ ifeq ($(uname_S),SunOS) + FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 + FINAL_LIBS+= -ldl -lnsl -lsocket -lresolv -lpthread -lrt + else ++ifeq ($(uname_S),Haiku) ++ CFLAGS?=-std=c99 -pedantic $(OPTIMIZATION) -Wall -W $(ARCH) $(PROF) ++ CCLINK?=-lroot -lnetwork ++ DEBUG?=-g -ggdb ++else + ifeq ($(uname_S),Darwin) + # Darwin + FINAL_LIBS+= -ldl +@@ -126,6 +131,7 @@ endif + endif + endif + endif ++endif + # Include paths to dependencies + FINAL_CFLAGS+= -I../deps/hiredis -I../deps/linenoise -I../deps/lua/src + +-- +2.24.0 + + +From ae32c278250eb551a7acce111569002406bf1687 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 14 Nov 2019 19:38:32 +0100 +Subject: ESOCKTNOSUPPORT isn't available on Haiku. + + +diff --git a/src/server.c b/src/server.c +index 828be2e..69a288e 100644 +--- a/src/server.c ++++ b/src/server.c +@@ -1964,7 +1964,10 @@ int listenToPort(int port, int *fds, int *count) { + server.bindaddr[j] ? server.bindaddr[j] : "*", + port, server.neterr); + if (errno == ENOPROTOOPT || errno == EPROTONOSUPPORT || +- errno == ESOCKTNOSUPPORT || errno == EPFNOSUPPORT || ++#ifndef __HAIKU__ ++ errno == ESOCKTNOSUPPORT || ++#endif ++ errno == EPFNOSUPPORT || + errno == EAFNOSUPPORT || errno == EADDRNOTAVAIL) + continue; + return C_ERR; +-- +2.24.0 + diff --git a/dev-db/redis/redis-3.2.9.recipe b/dev-db/redis/redis-5.0.6.recipe similarity index 81% rename from dev-db/redis/redis-3.2.9.recipe rename to dev-db/redis/redis-5.0.6.recipe index edb1496ef..47366ef3f 100644 --- a/dev-db/redis/redis-3.2.9.recipe +++ b/dev-db/redis/redis-5.0.6.recipe @@ -5,12 +5,12 @@ referred to as a data structure server since keys can contain strings, hashes,\ HOMEPAGE="https://redis.io/" COPYRIGHT="2006-2010 Salvatore Sanfilippo" LICENSE="BSD (3-clause)" -REVISION="2" +REVISION="1" SOURCE_URI="http://download.redis.io/releases/redis-$portVersion.tar.gz" -CHECKSUM_SHA256="6eaacfa983b287e440d0839ead20c2231749d5d6b78bbe0e0ffa3a890c59ff26" +CHECKSUM_SHA256="6624841267e142c5d5d5be292d705f8fb6070677687c5aad1645421a936d22b3" PATCHES="redis-$portVersion.patchset" -ARCHITECTURES="!x86_gcc2 x86 ?x86_64" +ARCHITECTURES="!x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" @@ -40,10 +40,10 @@ BUILD_PREREQUIRES=" BUILD() { - make PREFIX=$binDir LDFLAGS=-lnetwork + make LDFLAGS="-lnetwork -lbsd" } INSTALL() { - make install + make INSTALL_BIN=$prefix/bin install }