Changes - j0ke.net Open Build Service

Changes of Revision 20

[-] [+]	Changed	rancid.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Sat Mar 29 10:36:40 UTC 2014 - cs@linux-administrator.com + +- added upstream patches for release 2.3.8 + +------------------------------------------------------------------- Fri Dec 13 12:04:18 UTC 2013 - cs@linux-administrator.com - add files for DELL switches
[-] [+]	Changed	rancid.spec ^
@@ -7,13 +7,20 @@ URL: http://www.shrubbery.net/rancid/ Source0: %{name}-%{version}.tar.bz2 Source1: %{name}-dell.tar.bz2 +Patch100: rancid-2.3.8.p1 +Patch101: rancid-2.3.8.p2 +Patch102: rancid-2.3.8.p3 +Patch103: rancid-2.3.8.p4 BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: glibc-devel libgcc gcc gcc-c++ expect >= 5.40 mailx iputils %if 0%{?suse_version} Requires(pre): pwdutils +BuildRequires: openssh %else - +Requires: shadow-utils +BuildRequires: openssh-clients %endif +BuildRequires: telnet rsh %if 0%{?fedora_version} \|\| 0%{?centos_version} BuildRequires: expect-devel @@ -33,6 +40,10 @@ %prep %setup -a 1 %configure +%patch100 +%patch101 +%patch102 +%patch103 %build %__make
[-] [+]	Added	rancid-2.3.8.p1 ^
@@ -0,0 +1,55 @@ +Index: bin/hpuifilter.c +=================================================================== +--- bin/hpuifilter.c (revision 2395) ++++ bin/hpuifilter.c (revision 2396) +@@ -367,7 +367,7 @@ + break; + } else if (bytes > 0) { + hlen -= bytes; +- memcpy(hbuf, hbuf + bytes, hlen + 1); ++ memmove(hbuf, hbuf + bytes, hlen + 1); + if (hlen < 1) + pfds[2].events &= ~POLLOUT; + } +@@ -423,7 +423,7 @@ + break; + } else if (bytes > 0) { + tlen -= bytes; +- memcpy(tbuf, tbuf + bytes, tlen + 1); ++ memmove(tbuf, tbuf + bytes, tlen + 1); + if (tlen < 1) + pfds[1].events &= ~POLLOUT; + } +@@ -593,8 +593,8 @@ + if (len - pmatch[0].rm_eo <= 0) { + buf[pmatch[0].rm_so] = '\0'; + } else { +- memcpy(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, +- len - pmatch[0].rm_eo + 1); ++ memmove(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, ++ len - pmatch[0].rm_eo + 1); + } + len -= pmatch[0].rm_eo - pmatch[0].rm_so; + /* start over with the first regex / +@@ -616,8 +616,8 @@ + if (len - pmatch[0].rm_eo == 0) { + buf[pmatch[0].rm_so] = '\0'; + } else { +- memcpy(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, +- len - pmatch[0].rm_eo + 1); ++ memmove(buf + pmatch[0].rm_so, buf + pmatch[0].rm_eo, ++ len - pmatch[0].rm_eo + 1); + } + len -= pmatch[0].rm_eo - pmatch[0].rm_so; + / start over with the first CR regex */ +Index: CHANGES +=================================================================== +--- CHANGES (revision 2395) ++++ CHANGES (revision 2396) +@@ -1,3 +1,6 @@ ++2.3.9 ++ hpuifilter: dont use memcpy for overlapping regions - David Byers ++ + 2.3.8 + rancid: filter sup-bootflash if sup-bootdisk worked +
[-] [+]	Added	rancid-2.3.8.p2 ^
@@ -0,0 +1,36 @@ +Index: bin/xrrancid.in +=================================================================== +--- bin/xrrancid.in (revision 2396) ++++ bin/xrrancid.in (working copy) +@@ -580,10 +580,16 @@ + return(-1) if (/\%Error opening \S+:\S+ $Device or resource busy$/i); + return(-1) if (/command authorization failed/i); + return(1) if (/(Open device \S+ failed\|Error opening \S+:)/); +- # filter frequently changing files from IOX bootflash +- if ($dev =~ /bootflash/) { +- next if (/temp_cont\s$/); +- next if (/uptime_cont\s$/); ++ # filter frequently changing files from IOX bootflash / hardiska ++ if ($dev =~ /(bootflash\|harddiska)/) { ++ if (/(temp_cont\|uptime_cont\|volt_cont)\s$/) { ++ if (/(\s\d+\s+\S+\s+)(\d+)(\s+)(\w+ \w+\s+\d+ \d+:\d+:\d+ \d+)/) { ++ my($a, $sz, $c, $dt, $rem) = ($1, $2, $3, $4, $'); ++ my($szl, $dtl) = (length($sz), length($dt)); ++ my($fmt) = "%s%-". $szl ."s%s%-". $dtl ."s%s"; ++ $_ = sprintf($fmt, $a, "", $c, "", $rem); ++ } ++ } + } + # Filter dhcp database + if (/dhcp_[^. ]*\.txt/) { +Index: CHANGES +=================================================================== +--- CHANGES (revision 2396) ++++ CHANGES (working copy) +@@ -1,4 +1,6 @@ + 2.3.9 ++ xrrancid: additional file filters for 4.2 ++ + hpuifilter: dont use memcpy for overlapping regions - David Byers + + 2.3.8
[-] [+]	Added	rancid-2.3.8.p3 ^
@@ -0,0 +1,13 @@ +Index: bin/fnlogin.in +=================================================================== +--- bin/fnlogin.in (revision 2376) ++++ bin/fnlogin.in (revision 2435) +@@ -303,7 +303,7 @@ + } elseif [string match "ssh" $prog] { + regexp {ssh(:([^[:space:]]+))} $prog methcmd suffix port + set cmd $sshcmd +- if {"$port" == ""} { ++ if {"$port" != ""} { + set cmd "$cmd -p $port" + } + set retval [ catch {eval spawn [split "$cmd -c $cyphertype -x -l $user $router" { }]} reason ]
[-] [+]	Added	rancid-2.3.8.p4 ^
@@ -0,0 +1,37 @@ +Index: bin/fnrancid.in +=================================================================== +--- bin/fnrancid.in (revision 2605) ++++ bin/fnrancid.in (revision 2693) +@@ -180,6 +180,7 @@ + next if (/^\sExtended DB: ./); + next if (/^\sIPS-DB: ./); + next if (/^FortiClient application signature package:/); ++ + ProcessHistory("","","","#$_"); + } + ProcessHistory("SYSTEM","","","\n"); +@@ -208,8 +209,22 @@ + next if (/^\s!System time:/); + # remove occurrances of conf_file_ver + next if (/^#?conf_file_ver=/); +- # filter variabilities between configurations. password encryption +- # upon each display of the configuration. ++ ++ # filter cycling RSA private keys ++ if (/^\sset private-key "-----BEGIN RSA PRIVATE KEY-----/) { ++ ProcessHistory("","","","#$_"); ++ ProcessHistory("","","","# <removed>"); ++ while (<INPUT>) { ++ tr/\015//d; ++ last if (/$prompt/); ++ ++ if (/^\s-----END RSA PRIVATE KEY-----"/) { ++ ProcessHistory("","","","#$_"); ++ last; ++ } ++ } ++ } ++ # filter cycling password encryption + if (/^\s(set [^\s])\s(Enc\s[^\s]+)(.)/i && $filter_pwds > 0 ) { + ProcessHistory("ENC","","","#$1 ENC <removed> $3\n"); + next;