Date: Sat, 11 Oct 2025 23:45:05 GMT From: Philip Paeps <philip@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d20c714eed50 - main - comms/conserver-com: fix clobbering replstring Message-ID: <202510112345.59BNj5aP052684@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/ports/commit/?id=d20c714eed50e2b69d9046c7ba2a150931318766 commit d20c714eed50e2b69d9046c7ba2a150931318766 Author: Philip Paeps <philip@FreeBSD.org> AuthorDate: 2025-10-10 23:42:45 +0000 Commit: Philip Paeps <philip@FreeBSD.org> CommitDate: 2025-10-11 23:42:40 +0000 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) --- comms/conserver-com/Makefile | 4 ++-- comms/conserver-com/files/patch-conserver_readcfg.c | 14 ++++++++++++++ 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;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510112345.59BNj5aP052684>