Index: head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c =================================================================== --- head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c (nonexistent) +++ head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c (revision 545524) @@ -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; Property changes on: head/net-mgmt/rancid3/files/patch-bin_hpuifilter.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/rancid3/files/patch-bin_par.c =================================================================== --- head/net-mgmt/rancid3/files/patch-bin_par.c (nonexistent) +++ head/net-mgmt/rancid3/files/patch-bin_par.c (revision 545524) @@ -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 */ Property changes on: head/net-mgmt/rancid3/files/patch-bin_par.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/rancid3/files/patch-configure =================================================================== --- head/net-mgmt/rancid3/files/patch-configure (revision 545523) +++ head/net-mgmt/rancid3/files/patch-configure (revision 545524) @@ -1,46 +1,46 @@ ---- 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 -$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1 -if test $? -eq 0 ; then - LG_PING_CMD="$PING_PATH -c 1" -else - $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1 - if test $? -eq 0 ; then - LG_PING_CMD="$PING_PATH" - else - # cygwin using windows ping? - $PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1 - if test $? -eq 0 ; then - LG_PING_CMD="$PING_PATH -n 1" - else - as_fn_error $? "can't figure out how to pass count == 1 to $PING_PATH." "$LINENO" 5 - exit 1 - fi - fi -fi +#$PING_PATH -c 1 -v 127.0.0.1 > /dev/null 2>&1 +#if test $? -eq 0 ; then +# LG_PING_CMD="$PING_PATH -c 1" +#else +# $PING_PATH 127.0.0.1 56 1 > /dev/null 2>&1 +# if test $? -eq 0 ; then +# LG_PING_CMD="$PING_PATH" +# else +# # cygwin using windows ping? +# $PING_PATH -n 1 127.0.0.1 > /dev/null 2>&1 +# if test $? -eq 0 ; then +# LG_PING_CMD="$PING_PATH -n 1" +# else +# as_fn_error $? "can't figure out how to pass count == 1 to $PING_PATH." "$LINENO" 5 +# exit 1 +# fi +# fi +#fi +LG_PING_CMD="$PING_PATH -c 1" rd_cv_lg_ping_cmd=$LG_PING_CMD Index: head/net-mgmt/rancid3/files/patch-etc__Makefile.in =================================================================== --- head/net-mgmt/rancid3/files/patch-etc__Makefile.in (revision 545523) +++ head/net-mgmt/rancid3/files/patch-etc__Makefile.in (revision 545524) @@ -1,37 +1,37 @@ ---- 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 - @if test "$(DO_CONF_INSTALL)" = "yes"; then \ - if test -f $(DESTDIR)$(sysconfdir)/rancid.conf ; then \ - echo ""; \ - echo "WARNING: *** $(DESTDIR)$(sysconfdir)/rancid.conf exists. See "; \ - echo " *** $(pkgdatadir)/rancid.conf.sample for new"; \ - echo " *** examples."; \ - echo ""; \ - else \ - $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir)/rancid.conf; \ - fi; \ - if test ! -f $(DESTDIR)$(sysconfdir)/rancid.types.conf ; then \ - $(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir)/rancid.types.conf; \ - fi; \ - if test -f $(DESTDIR)$(sysconfdir)/lg.conf ; then \ - echo ""; \ - echo "WARNING: *** $(DESTDIR)$(sysconfdir)/lg.conf exists. See "; \ - echo " *** $(pkgdatadir)/lg.conf.sample for new"; \ - echo " *** examples."; \ - echo ""; \ - else \ - $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir)/lg.conf; \ - fi; \ - fi; \ - $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir)/rancid.types.base + $(INSTALL_DATA) rancid.conf.sample $(DESTDIR)$(sysconfdir) + #$(INSTALL_DATA) rancid.types.conf $(DESTDIR)$(sysconfdir) + $(INSTALL_DATA) lg.conf.sample $(DESTDIR)$(sysconfdir) + $(INSTALL_DATA) rancid.types.base $(DESTDIR)$(sysconfdir) lg.conf.sample: Makefile $(srcdir)/lg.conf.sample.in rm -f lg.conf.sample lg.conf.sample.tmp; \