Date: Thu, 20 Aug 2020 10:41:37 +0000 (UTC) From: Joe Marcus Clarke <marcus@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r545524 - head/net-mgmt/rancid3/files Message-ID: <202008201041.07KAfb0Z067169@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: marcus Date: Thu Aug 20 10:41:36 2020 New Revision: 545524 URL: https://svnweb.freebsd.org/changeset/ports/545524 Log: Fix build on HEAD. Rename the internal "environ" symbol to "enviro" to avoid a conflict. Added: head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c (contents, props changed) head/net-mgmt/rancid3/files/patch-bin_par.c (contents, props changed) Modified: head/net-mgmt/rancid3/files/patch-configure head/net-mgmt/rancid3/files/patch-etc__Makefile.in Added: head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c Thu Aug 20 10:41:36 2020 (r545524) @@ -0,0 +1,33 @@ +--- bin/hpuifilter.c.orig 2020-08-20 10:37:10 UTC ++++ bin/hpuifilter.c +@@ -119,7 +119,7 @@ + #define BUFSZ (LINE_MAX * 2) + #define ESC 0x1b + +-char **environ, ++char **enviro, + *progname; + int debug, + sigrx, +@@ -162,7 +162,7 @@ main(int argc, char **argv, char **ev) + struct pollfd pfds[3]; + struct termios tios; + +- environ = ev; ++ enviro = ev; + + /* get just the basename() of our exec() name and strip a .* off the end */ + if ((progname = strrchr(argv[0], '/')) != NULL) +@@ -695,10 +695,10 @@ unsetenv(const char *name) + char **victim, + **end; + int len; +- if (environ == NULL) ++ if (enviro == NULL) + return(0); + len = strlen(name); +- victim = environ; ++ victim = enviro; + while (*victim != NULL) { + if (strncmp(name, *victim, len) == 0 && victim[0][len] == '=') + break; Added: head/net-mgmt/rancid3/files/patch-bin_par.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/rancid3/files/patch-bin_par.c Thu Aug 20 10:41:36 2020 (r545524) @@ -0,0 +1,11 @@ +--- bin/par.c.orig 2020-08-20 10:37:18 UTC ++++ bin/par.c +@@ -108,7 +108,7 @@ + + #include "version.h" + +-extern char **environ; ++extern char **enviro; + + typedef struct { + int n; /* proc n of n_opt processes */ Modified: head/net-mgmt/rancid3/files/patch-configure ============================================================================== --- head/net-mgmt/rancid3/files/patch-configure Thu Aug 20 10:39:15 2020 (r545523) +++ head/net-mgmt/rancid3/files/patch-configure Thu Aug 20 10:41:36 2020 (r545524) @@ -1,6 +1,6 @@ ---- configure.orig 2017-07-09 02:56:22 UTC +--- configure.orig 2020-03-10 13:04:25 UTC +++ configure -@@ -5471,24 +5471,25 @@ fi +@@ -5500,24 +5500,25 @@ fi # ping seems to take one of two formats for count (N) # BSD: ping -c N host # SVR: ping host N Modified: head/net-mgmt/rancid3/files/patch-etc__Makefile.in ============================================================================== --- head/net-mgmt/rancid3/files/patch-etc__Makefile.in Thu Aug 20 10:39:15 2020 (r545523) +++ head/net-mgmt/rancid3/files/patch-etc__Makefile.in Thu Aug 20 10:41:36 2020 (r545524) @@ -1,6 +1,6 @@ ---- etc/Makefile.in.orig 2017-10-25 18:05:21 UTC +--- etc/Makefile.in.orig 2020-03-10 13:04:23 UTC +++ etc/Makefile.in -@@ -535,30 +535,10 @@ uninstall-am: uninstall-pkgdataDATA unin +@@ -542,30 +542,10 @@ uninstall-am: uninstall-pkgdataDATA uninstall-sysconfD install-data-local: all
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008201041.07KAfb0Z067169>