Date: Tue, 19 Mar 2024 16:12:13 GMT From: Cy Schubert <cy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 28df2926d2ad - main - net/rdist6: Add RDIST_RSH environment variable Message-ID: <202403191612.42JGCDF1069417@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/ports/commit/?id=28df2926d2ad90e95a53276b8e0fb4eaccd84245 commit 28df2926d2ad90e95a53276b8e0fb4eaccd84245 Author: Cy Schubert <cy@FreeBSD.org> AuthorDate: 2024-03-19 16:11:00 +0000 Commit: Cy Schubert <cy@FreeBSD.org> CommitDate: 2024-03-19 16:11:00 +0000 net/rdist6: Add RDIST_RSH environment variable Similar to rsync's RSYNC_RSH, add RDIST_RSH, for the same reason. --- net/rdist6/Makefile | 2 +- net/rdist6/files/patch-doc_rdist.man | 35 ++++++++++++++++++++++++++++++++++ net/rdist6/files/patch-src_rdist.c | 37 +++++++++++++++++++++++++++++++----- 3 files changed, 68 insertions(+), 6 deletions(-) diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile index d740af9e0353..c8335f64dcff 100644 --- a/net/rdist6/Makefile +++ b/net/rdist6/Makefile @@ -1,6 +1,6 @@ PORTNAME= rdist PORTVERSION= 6.1.5 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= net MASTER_SITES= https://fossies.org/linux/misc/old/ \ http://www.magnicomp.com/download/rdist/ diff --git a/net/rdist6/files/patch-doc_rdist.man b/net/rdist6/files/patch-doc_rdist.man new file mode 100644 index 000000000000..0c92425b02b9 --- /dev/null +++ b/net/rdist6/files/patch-doc_rdist.man @@ -0,0 +1,35 @@ +--- doc/rdist.man.orig 1998-11-09 21:38:53.000000000 -0800 ++++ doc/rdist.man 2024-03-19 08:57:42.415646000 -0700 +@@ -242,6 +242,21 @@ + .RE + .sp + .fi ++The ++.I rsh(1) ++method can be overridden to ssh using the ++.I RDIST_RSH ++environment variable. ++.nf ++.sp ++.RS ++\fBexport RDIST_RSH=/usr/local/bin/ssh\fR ++.RE ++.sp ++.fi ++See the ++.I ENVIRONMENT ++section below. + .PP + If the + .I rcmd(3) +@@ -870,6 +885,10 @@ + .IP TMPDIR + Name of temporary directory to use. Default is + .B /tmp. ++.IP RDIST_RSH ++This environment variable lets you override the default remote shell used ++to transport the rdist protocol. By default it is net/bsdrcmds rsh. To ++use ssh simply assign the full pathname of the ssh binary. + .SH FILES + .nf + .ta \w'/tmp/rdist* 'u diff --git a/net/rdist6/files/patch-src_rdist.c b/net/rdist6/files/patch-src_rdist.c index e1752e33b5ad..b1b9dcde4dcb 100644 --- a/net/rdist6/files/patch-src_rdist.c +++ b/net/rdist6/files/patch-src_rdist.c @@ -1,6 +1,6 @@ ---- src/rdist.c.orig 1998-11-10 04:13:50 UTC -+++ src/rdist.c -@@ -62,8 +62,8 @@ static char copyright[] = +--- src/rdist.c.orig 1998-11-09 20:13:50.000000000 -0800 ++++ src/rdist.c 2024-03-19 09:08:42.194504000 -0700 +@@ -62,8 +62,8 @@ char *distfile = NULL; /* Name of distfile to use */ int maxchildren = MAXCHILDREN; /* Max no of concurrent PIDs */ int nflag = 0; /* Say without doing */ @@ -11,7 +11,16 @@ FILE *fin = NULL; /* Input file pointer */ struct group *gr = NULL; /* Static area for getgrent */ char localmsglist[] = "stdout=all:notify=all:syslog=nerror,ferror"; -@@ -107,12 +107,13 @@ main(argc, argv, envp) +@@ -72,6 +72,8 @@ + FILE *opendist(); + char *path_rdistd = _PATH_RDISTD; + char *path_remsh = _PATH_REMSH; ++char *path_remsh_env; ++#define RDIST_RSH_ENV "RDIST_RSH" + + /* + * Add a hostname to the host list +@@ -107,12 +109,13 @@ register char *cp; int cmdargs = 0; int c; @@ -26,7 +35,25 @@ if (cp = msgparseopts(localmsglist, TRUE)) { error("Bad builtin log option (%s): %s.", -@@ -176,10 +177,20 @@ main(argc, argv, envp) +@@ -155,6 +158,17 @@ + fatalerr("This version of rdist should not be installed setuid."); + #endif /* DIRECT_RCMD */ + ++ path_remsh_env = getenv(RDIST_RSH_ENV); ++ if (path_remsh_env) { ++ if (cp = searchpath(path_remsh_env)) ++ path_remsh = strdup(cp); ++ else { ++ error("Environment incorrect: No component of path \"%s\" exists.", ++ path_remsh_env); ++ exit(1); ++ } ++ } ++ + while ((c = getopt(argc, argv, optchars)) != -1) + switch (c) { + case 'l': +@@ -176,10 +190,20 @@ error("\"%s\" is not a number.", optarg); usage(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202403191612.42JGCDF1069417>