diff options
| -rw-r--r-- | net-mgmt/rancid/Makefile | 3 | ||||
| -rw-r--r-- | net-mgmt/rancid/files/patch-bin__flogin.in | 11 | ||||
| -rw-r--r-- | net-mgmt/rancid/files/patch-bin__rancid.in | 45 | ||||
| -rw-r--r-- | net-mgmt/rancid/files/patch-bin__xrrancid.in | 11 |
4 files changed, 68 insertions, 2 deletions
diff --git a/net-mgmt/rancid/Makefile b/net-mgmt/rancid/Makefile index 49431c2f78de..62b1c86f66be 100644 --- a/net-mgmt/rancid/Makefile +++ b/net-mgmt/rancid/Makefile @@ -3,7 +3,7 @@ PORTNAME= rancid PORTVERSION= 2.3.8 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= net-mgmt MASTER_SITES= ftp://ftp.shrubbery.net/pub/rancid/ @@ -31,7 +31,6 @@ NEWERCONFIG_FILES2= etc/lg.conf NEWCONFIG_FILES= rancid.conf lg.conf OPTIONS_DEFINE= SVN -OPTIONS_DEFAULT= SVN_DESC= Use Subversion instead of CVS diff --git a/net-mgmt/rancid/files/patch-bin__flogin.in b/net-mgmt/rancid/files/patch-bin__flogin.in new file mode 100644 index 000000000000..88ab35bdcaa6 --- /dev/null +++ b/net-mgmt/rancid/files/patch-bin__flogin.in @@ -0,0 +1,11 @@ +--- bin/flogin.in.orig 2015-06-09 16:08:17.000000000 +0100 ++++ bin/flogin.in 2015-06-09 15:59:02.000000000 +0100 +@@ -84,7 +84,7 @@ + # Sometimes routers take awhile to answer (the default is 10 sec) + set timeoutdflt 45 + # +-set send_human {.4 .4 .7 .3 5} ++set send_human {.01 .01 100 .01 2} + + # Find the user in the ENV, or use the unix userid. + if {[ info exists env(CISCO_USER) ]} { diff --git a/net-mgmt/rancid/files/patch-bin__rancid.in b/net-mgmt/rancid/files/patch-bin__rancid.in new file mode 100644 index 000000000000..328a6e4a1986 --- /dev/null +++ b/net-mgmt/rancid/files/patch-bin__rancid.in @@ -0,0 +1,45 @@ +--- bin/rancid.in.orig 2015-06-09 15:46:07.000000000 +0100 ++++ bin/rancid.in 2015-06-09 15:57:24.000000000 +0100 +@@ -162,13 +162,38 @@ + @sorted_lines; + } + +-# These two routines will sort based upon IP addresses ++# ipaddrval(IPaddr) converts and IPv4/v6 address to a string for comparison. + sub ipaddrval { +- my(@a) = ($_[0] =~ m#^(\d+)\.(\d+)\.(\d+)\.(\d+)$#); +- $a[3] + 256 * ($a[2] + 256 * ($a[1] +256 * $a[0])); ++ my($a) = @_; ++ my($norder); ++ ++ if ($a =~ /:/) { ++ my($l); ++ if ($a =~ /\//) { ++ ($a, $l) = split(/\//, $a); ++ } else { ++ $l = 128; ++ } ++ $norder = inet_pton(AF_INET6, $a); ++ return unpack("H*", $norder) . unpack("H*", pack("C", $l)); ++ } else { ++ my($l); ++ if ($a =~ /\//) { ++ ($a, $l) = split(/\//, $a); ++ } else { ++ $l = 32; ++ } ++ $norder = inet_pton(AF_INET, $a); ++ return(unpack("H*", $norder) . unpack("H*", pack("C", $l))); ++ } ++ ++ # otherwise return the original key value, so as not to sort on null ++ return($_[0]); + } ++ ++# sortbyipaddr(IPaddr, IPaddr) compares two IPv4/v6 addresses like strcmp(). + sub sortbyipaddr { +- &ipaddrval($a) <=> &ipaddrval($b); ++ &ipaddrval($a) cmp &ipaddrval($b); + } + + # This routine parses "show version" diff --git a/net-mgmt/rancid/files/patch-bin__xrrancid.in b/net-mgmt/rancid/files/patch-bin__xrrancid.in new file mode 100644 index 000000000000..8ebeceaad3b2 --- /dev/null +++ b/net-mgmt/rancid/files/patch-bin__xrrancid.in @@ -0,0 +1,11 @@ +--- bin/xrrancid.in.orig 2015-06-09 15:58:36.000000000 +0100 ++++ bin/xrrancid.in 2015-06-09 16:03:53.000000000 +0100 +@@ -590,7 +590,7 @@ + next; + } + # Filter debugging file dlbg.txt & dlbg.txt-1 only on ASR9k w/ XR +- if ($proc =~ /ASR9K/ && /dlbg\.txt/) { ++ if ($proc =~ /ASR9K/ && (/dlbg\.txt/ || /uptime_cont/ || /temp_cont/ || /volt_cont/)) { + next; + } + if (/.*\((\d+) bytes free\)/) { |