aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilip Paeps <philip@FreeBSD.org>2025-10-10 23:42:45 +0000
committerPhilip Paeps <philip@FreeBSD.org>2025-10-11 23:42:40 +0000
commitd20c714eed50e2b69d9046c7ba2a150931318766 (patch)
tree401c4d8ba30411872277e4044c41ef9f539e87fa
parentf30095bfb166b5addd315ba63756caa09a1ecd46 (diff)
comms/conserver-com: fix clobbering replstring
Add a patch against upstream to fix tasks which substitute replstring. [1] While here, take maintainership. Obtained from: https://github.com/bstansell/conserver/pull/126 [1] Approved by: eduardo (previous maintainer)
-rw-r--r--comms/conserver-com/Makefile4
-rw-r--r--comms/conserver-com/files/patch-conserver_readcfg.c14
2 files changed, 16 insertions, 2 deletions
diff --git a/comms/conserver-com/Makefile b/comms/conserver-com/Makefile
index 9b7a20488617..e9d9cf309626 100644
--- a/comms/conserver-com/Makefile
+++ b/comms/conserver-com/Makefile
@@ -1,11 +1,11 @@
PORTNAME= conserver
DISTVERSION= 8.2.7
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= comms
MASTER_SITES= https://github.com/bstansell/conserver/releases/download/v${DISTVERSION}/
PKGNAMESUFFIX= -com
-MAINTAINER= eduardo@FreeBSD.org
+MAINTAINER= philip@FreeBSD.org
COMMENT= Application that allows multiple users to watch serial consoles
WWW= https://www.conserver.com/
diff --git a/comms/conserver-com/files/patch-conserver_readcfg.c b/comms/conserver-com/files/patch-conserver_readcfg.c
new file mode 100644
index 000000000000..a683927d324c
--- /dev/null
+++ b/comms/conserver-com/files/patch-conserver_readcfg.c
@@ -0,0 +1,14 @@
+--- conserver/readcfg.c.orig 2022-07-08 01:20:02 UTC
++++ conserver/readcfg.c
+@@ -3128,9 +3128,9 @@ ConsoleAdd(CONSENT *c)
+
+ SwapStr(&pCEmatch->motd, &c->motd);
+ SwapStr(&pCEmatch->idlestring, &c->idlestring);
+- SwapStr(&pCEmatch->replstring, &c->breaklist);
++ SwapStr(&pCEmatch->replstring, &c->replstring);
+ SwapStr(&pCEmatch->tasklist, &c->tasklist);
+- SwapStr(&pCEmatch->breaklist, &c->tasklist);
++ SwapStr(&pCEmatch->breaklist, &c->breaklist);
+ pCEmatch->portinc = c->portinc;
+ pCEmatch->portbase = c->portbase;
+ pCEmatch->spinmax = c->spinmax;