Skip site navigation (1)Skip section navigation (2) 
Date:      Thu, 28 Nov 2019 19:42:00 +0000 (UTC)
From:      "Sergey A. Osokin" <osa@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r518604 - head/databases/redis-devel/files
Message-ID:  <201911281942.xASJg0wv039354@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: osa
Date: Thu Nov 28 19:42:00 2019
New Revision: 518604
URL: https://svnweb.freebsd.org/changeset/ports/518604

Log:
  Fix the build by updating the patch.

Modified:
  head/databases/redis-devel/files/patch-deps-hiredis-net.c

Modified: head/databases/redis-devel/files/patch-deps-hiredis-net.c
==============================================================================
--- head/databases/redis-devel/files/patch-deps-hiredis-net.c	Thu Nov 28 19:21:47 2019	(r518603)
+++ head/databases/redis-devel/files/patch-deps-hiredis-net.c	Thu Nov 28 19:42:00 2019	(r518604)
@@ -1,35 +1,18 @@
---- deps/hiredis/net.c.orig	2019-09-25 10:40:18 UTC
-+++ deps/hiredis/net.c
-@@ -135,13 +135,12 @@ int redisKeepAlive(redisContext *c, int interval) {
- 
-     val = interval;
- 
--#ifdef _OSX
-+#if defined(_OSX)
-     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &val, sizeof(val)) < 0) {
+--- deps/hiredis/net.c.orig	2019-11-28 14:32:05.942453000 -0500
++++ deps/hiredis/net.c	2019-11-28 14:39:08.326408000 -0500
+@@ -178,14 +178,34 @@
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
      }
 -#else
 -#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
 +#elif defined(__GLIBC__)
-     val = interval;
      if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
          __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-@@ -160,6 +159,27 @@ int redisKeepAlive(redisContext *c, int interval) {
-         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
          return REDIS_ERR;
      }
-+#else
-+#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTVL) && \
-+    defined(TCP_KEEPCNT)
-+    val = interval;
-+    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
-+        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
-+        return REDIS_ERR;
-+    }
-+ 
-+    val = interval/3;
+ 
+     val = interval/3;
 +    if (val == 0) val = 1;
 +    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
 +        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
@@ -41,24 +24,16 @@
 +        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
 +        return REDIS_ERR;
 +    }
- #endif
- #endif
- 
-@@ -431,7 +451,7 @@ int redisContextConnectUnix(redisContext *c, const cha
-     struct sockaddr_un sa;
-     long timeout_msec = -1;
- 
--    if (redisCreateSocket(c,AF_LOCAL) < 0)
-+    if (redisCreateSocket(c,AF_UNIX) < 0)
-         return REDIS_ERR;
-     if (redisSetBlocking(c,0) != REDIS_OK)
-         return REDIS_ERR;
-@@ -456,7 +476,7 @@ int redisContextConnectUnix(redisContext *c, const cha
-     if (redisContextTimeoutMsec(c,&timeout_msec) != REDIS_OK)
-         return REDIS_ERR;
- 
--    sa.sun_family = AF_LOCAL;
-+    sa.sun_family = AF_UNIX;
-     strncpy(sa.sun_path,path,sizeof(sa.sun_path)-1);
-     if (connect(c->fd, (struct sockaddr*)&sa, sizeof(sa)) == -1) {
-         if (errno == EINPROGRESS && !blocking) {
++#else
++#if !defined(__sun) && defined(TCP_KEEPIDLE) && defined(TCP_KEEPINTL) && \
++    defined(TCP_KEEPCNT)
++    val = interval;
++    if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
++        __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
++        return REDIS_ERR;
++    }
++
++    val = internal/3;
+     if (val == 0) val = 1;
+     if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPINTVL, &val, sizeof(val)) < 0) {
+         __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201911281942.xASJg0wv039354>