rancid 3.5:

        aeos.pm: handle returning from a function with a prompt in $_
        rancid-cvs, rancid-run, rancid.conf: use LOGDIR from rancid.conf, set a
        default, and makes manpage notes
        complogin: correct ssh/telnet port variable check
        control_rancid: if the router list is empty, commit everything, not
        just router.db.  .cvsignore, rancid.conf, etc.
        *login: do not default to ssh -c 3des; as openssh removes more legacy
        algorithms.  note work-arounds in the FAQ S3 & adjust manpages.
        ciscowlc.pm: filter OUI classification failures
        ciscowlc.pm: filter rogue client config that are added/removed
        automatically
        fnlogin: fix pager disabling for newer o/s - Romanens Xavier, Michael
        Newton confirms working for older 4.x o/s
        edgerouter.pm: filter passwords, snmp community, keys, GC some unused
        code, & fix comment character.
        ciscowlc.pm: some older code fails to echo <CR> after logout
        edgerouter.pm: initial module for Ubiquity Edgerouter, WiP
        hlogin: when refactoring prompt, eat full lines before looking for the
        prompt
        hpuifilter: only turn off echo on the tty, not also the slave pty,
        which fixes the echoing problem with Ubiquity Edgerouters
        a10login: fix cut-n-paste bug
        flogin: eat spaces followed by ^H
        login_top: move variable initialization so it doesnt override env()s
        foundry.pm: ignore invalid command errors in inloop found on Ironware
        5.5 for MLX
        srancid: filter oscillating file aaafile.prv
        nxos.pm: reverse VTP test for nexus without vtp
        ios.pm: filter ios-xe requested time from show inventory feature
        iosxr.pm: differences in NCS6k show inventory
        nxos.pm: show env temp does not exist on 1000v
        lg.cgi: add show interfaces wanphy for cisco-xr & juniper
        cisco: Change command show flash to show flash:.  The first has been
        dropped from the 15.5M and the latter seems to be supported back as I
        can check.
        mrvlogin, mrv.pm: fixes for MRV Optiswitch devices
        iosxr.pm: fix handling of comments in access-lists
        nxos.pm: sort ip{v6} access-lists & filter sequence numbers
        foundry.pm: summarize flash free space
        xrancid, exos.pm, xlogin: convert extreme to a module and hack clogin
        into xlogin to deal some weird terminal handling in EXOS >11.0 that
        uses terminal manipulation to reprint the login prompt (telnet) or
        the first cli prompt (ssh).
        nxos.pm: fix PS wattage filtering
        junos.pm: filter benign subsystem warnings
        ios.pm: filter license broker BS
        FAQ: add notes about openssh client changes for logjam
        hpuifilter: fix handling of buffer when it drains
        rancid.conf: change NOCOMMSTR to require "YES", not just defined
        arrancid, aeos.pm: convert Arista to a module
        ios.pm: add show license summary for older XE images, such as C4500e
        3.04/15.1
        bigip.pm: module for F5 BIG-IP >=v11
        rancid.conf: add variable FILTER_OSC to control filtering oscillating
        data.  See rancid.conf(5).  This may not yet be applied in all places.
        rancid: change logging of missed commands to preserve order to make it
        easier for us to parse when providing support.  also, only log to stderr
        and not just with -d.
        fnrancid: filter new private key format and fix filtering of encryptd
        passwords
        ios.pm: filter/sort new ipv4/6 access-list format where list names are
        omitted from rule lines.
        ios.pm: correct debug log msg
        iosxr.pm: ShowInstallSummary() return error if active install operation
        iosxr.pm: filter perpetually changing file aaa
        srancid: Add 'terminal dump' cmd for Dell PowerConnect 3524/3548
        iosxr.pm: fail on temp error in admin show install
        configure: fix mktemp variable inconsistency
        edgemax.pm: https://www.ubnt.com/edgemax/
        flogin: merge ssh key code from jlogin
        junos.pm: chassis command error changed/differs in vMX:
                error: the chassis subsystem is not running
                to
                error: the chassis-control subsystem is not responding to ...
        jlogin: missing catch for wait in login()
        rancid-cvs: initialize .git/description
        iosxr.pm: ASR show version chassis line changed - tip top work cisco
        ios.pm: strip license period from 2900
        ios.pm: show license is an incomplete cmd on older XE images
        ios.pm: trim trailing WS is show activation key, formatting problem on
        old ASAs
        plogin: wrong variable used in error msg
        control_rancid: test -e -> -f for old shells
        hpuifilter: missing include for solaris
        ios.pm: recognize aironet in ShowVersion & filter counters in ShowVlan
        rancid-cvs: do not set git config --global, local only
        flogin: build with login_top
        foundry.pm: add 'show media' and 'show media validation', tested on
        Brocade ICX 6650 and Brocade CER 2024, but not available on pre-8
        firmware

3 files changed, 20 insertions, 12 deletions

diff --git a/net/rancid/Makefile b/net/rancid/Makefile
index f3b4b2434eb..ebaa34cf5b9 100644
--- a/net/rancid/Makefile
+++ b/net/rancid/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2016/07/09 06:38:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2016/08/29 07:56:39 pettai Exp $
 #
 
-DISTNAME=		rancid-3.4.1
-PKGREVISION=		2
+DISTNAME=		rancid-3.5.0
 CATEGORIES=		net
 MASTER_SITES=		ftp://ftp.shrubbery.net/pub/rancid/
 
@@ -14,6 +13,7 @@ LICENSE=		original-bsd
 DEPENDS+=		tcl-expect>=5.4:../../lang/tcl-expect
 
 BUILD_DEFS+=		VARBASE
+WRKSRC=			${WRKDIR}/rancid-3.5
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		perl:run
diff --git a/net/rancid/PLIST b/net/rancid/PLIST
index 82f0dccf32e..6deb5617e94 100644
--- a/net/rancid/PLIST
+++ b/net/rancid/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.9 2016/03/19 06:45:28 pettai Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/08/29 07:56:39 pettai Exp $
 bin/a10login
 bin/agmrancid
 bin/alogin
 bin/anlogin
 bin/arancid
-bin/arrancid
 bin/avologin
 bin/avorancid
 bin/blogin
 bin/brancid
+bin/brlogin
 bin/cat5rancid
 bin/clogin
 bin/complogin
@@ -54,16 +54,22 @@ bin/rtftpcopy
 bin/srancid
 bin/tlogin
 bin/trancid
+bin/ulogin
 bin/wlogin
 bin/xilogin
 bin/xirancid
-bin/xrancid
+bin/xlogin
 bin/zrancid
 lib/rancid/acos.pm
+lib/rancid/aeos.pm
 lib/rancid/arbor.pm
+lib/rancid/bigip.pm
 lib/rancid/ciscowlc.pm
 lib/rancid/dell.pm
+lib/rancid/edgemax.pm
+lib/rancid/edgerouter.pm
 lib/rancid/eos.pm
+lib/rancid/exos.pm
 lib/rancid/foundry.pm
 lib/rancid/ios.pm
 lib/rancid/iosxr.pm
@@ -127,10 +133,11 @@ man/man1/rrancid.1
 man/man1/srancid.1
 man/man1/tlogin.1
 man/man1/trancid.1
+man/man1/ulogin.1
 man/man1/wlogin.1
 man/man1/xilogin.1
 man/man1/xirancid.1
-man/man1/xrancid.1
+man/man1/xlogin.1
 man/man1/zrancid.1
 man/man3/rancid.3
 man/man5/cloginrc.5
@@ -160,3 +167,4 @@ share/doc/rancid/rtrfilter
 share/examples/rancid/lg.conf.sample
 share/examples/rancid/rancid.conf.sample
 share/examples/rancid/rancid.types.base
+@pkgdir etc/rancid
diff --git a/net/rancid/distinfo b/net/rancid/distinfo
index 4058c0e3171..2588f5348ce 100644
--- a/net/rancid/distinfo
+++ b/net/rancid/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.12 2016/03/19 06:45:28 pettai Exp $
+$NetBSD: distinfo,v 1.13 2016/08/29 07:56:39 pettai Exp $
 
-SHA1 (rancid-3.4.1.tar.gz) = 472a890cd5b20c3e02da788c87aecf51ce0c8534
-RMD160 (rancid-3.4.1.tar.gz) = 87e72f1b839a9177b6d36dc6054750efbb503add
-SHA512 (rancid-3.4.1.tar.gz) = d11dc471d3f13c15faa260fc2b074fe5fad5959b673d2fe97c2e233bf339cfc148ae80b080253513261a799f5c1913fdc848de1fc1f2db0e787175531704b228
-Size (rancid-3.4.1.tar.gz) = 486292 bytes
+SHA1 (rancid-3.5.0.tar.gz) = 46e80023b202fcf85a32b9c2049f2af159dc7a46
+RMD160 (rancid-3.5.0.tar.gz) = 2dd86e69c128b324314c385f5c61ebad3d02cc61
+SHA512 (rancid-3.5.0.tar.gz) = 028c9873194958432a01bfe2e5780ea2c4130a83dc0c307fbcac1a734a6a4cb1a86de3a310b61cc8322a475262ad49e95a5bb96858725be04ff5e0fd11354ff5
+Size (rancid-3.5.0.tar.gz) = 477742 bytes
 SHA1 (patch-etc_Makefile.in) = 5400aa7c2a55ecb09577984e86e9f4dbc117f00d