Fix build on HEAD.

Rename the internal "environ" symbol to "enviro" to avoid a conflict.

4 files changed, 48 insertions, 4 deletions

diff --git a/net-mgmt/rancid3/files/patch-bin_hpuifilter.c b/net-mgmt/rancid3/files/patch-bin_hpuifilter.c
new file mode 100644
index 000000000000..8702ff5cba0d
--- /dev/null
+++ b/net-mgmt/rancid3/files/patch-bin_hpuifilter.c
@@ -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;
diff --git a/net-mgmt/rancid3/files/patch-bin_par.c b/net-mgmt/rancid3/files/patch-bin_par.c
new file mode 100644
index 000000000000..40e0ccdc3b84
--- /dev/null
+++ b/net-mgmt/rancid3/files/patch-bin_par.c
@@ -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 */
diff --git a/net-mgmt/rancid3/files/patch-configure b/net-mgmt/rancid3/files/patch-configure
index f8beb5d7dcd9..68747dcf9738 100644
--- a/net-mgmt/rancid3/files/patch-configure
+++ b/net-mgmt/rancid3/files/patch-configure
@@ -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
diff --git a/net-mgmt/rancid3/files/patch-etc__Makefile.in b/net-mgmt/rancid3/files/patch-etc__Makefile.in
index dcf82d3624e6..b3283ca8396c 100644
--- a/net-mgmt/rancid3/files/patch-etc__Makefile.in
+++ b/net-mgmt/rancid3/files/patch-etc__Makefile.in
@@ -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