forked from Lainports/freebsd-ports
da202ea080
When installing package of databases/redis62, following pkg-message is
displayed.
To setup "redis62" you need to edit the configuration file:
/usr/local/etc/redis62.conf
To run redis from startup, add redis62_enable="YES"
in your /etc/rc.conf.
But path of configuration file is /usr/local/etc/redis.conf and what
should really be added to /etc/rc.conf is redis_enable="YES". Same
problem also happens when installing databases/redis6
The source of the problem is that the value of ${PORTNAME} is used to
create pkg-message from file/pkg-message.in. So fix it by changing the
value of ${PORTNAME} to "redis" and set PKGNAMESUFFIX in Makefile of
each port.
While I'm here,
* Pet portlint and portclippy
* Tidy up Makefile with portfmt.
PR: 265623
Reported by: FiLiS
MFH: 2022Q3
39 lines
1.3 KiB
C
39 lines
1.3 KiB
C
--- deps/hiredis/net.c.orig 2019-11-28 19:32:05 UTC
|
|
+++ deps/hiredis/net.c
|
|
@@ -178,14 +178,34 @@
|
|
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
return REDIS_ERR;
|
|
}
|
|
-#else
|
|
-#if defined(__GLIBC__) && !defined(__FreeBSD_kernel__)
|
|
+#elif defined(__GLIBC__)
|
|
if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPIDLE, &val, sizeof(val)) < 0) {
|
|
__redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
return REDIS_ERR;
|
|
}
|
|
|
|
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));
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
+
|
|
+ val = 3;
|
|
+ if (setsockopt(fd, IPPROTO_TCP, TCP_KEEPCNT, &val, sizeof(val)) < 0) {
|
|
+ __redisSetError(c,REDIS_ERR_OTHER,strerror(errno));
|
|
+ return REDIS_ERR;
|
|
+ }
|
|
+#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));
|