3 files changed, 37 insertions, 10 deletions

diff --git a/net-mgmt/netdisco/Makefile b/net-mgmt/netdisco/Makefile
index 52da09fd560d..c9024f6b0185 100644
--- a/net-mgmt/netdisco/Makefile
+++ b/net-mgmt/netdisco/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	netdisco
-DISTVERSION=	2.040003
+DISTVERSION=	2.042005
 CATEGORIES=	net-mgmt perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:OLIVER
@@ -19,6 +19,7 @@ RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		p5-Net-SNMP>=6.0.1:net-mgmt/p5-Net-SNMP \
 		p5-Algorithm-Cron>=0.07:devel/p5-Algorithm-Cron \
 		p5-aliased>=0:devel/p5-aliased \
+		p5-autovivification>=0:devel/p5-autovivification \
 		p5-AnyEvent>=7.05:devel/p5-AnyEvent \
 		p5-AnyEvent-DNS-EtcHosts>=0.0103:dns/p5-AnyEvent-DNS-EtcHosts \
 		p5-App-cpanminus>=1.6108:devel/p5-App-cpanminus \
@@ -32,8 +33,10 @@ RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		p5-Dancer-Plugin-DBIC>=0.2001:databases/p5-Dancer-Plugin-DBIC \
 		p5-Dancer-Plugin-Auth-Extensible>=0.30:security/p5-Dancer-Plugin-Auth-Extensible \
 		p5-Dancer-Plugin-Passphrase>=2.0.1:security/p5-Dancer-Plugin-Passphrase \
+		p5-Dancer-Plugin-Swagger>=0:www/p5-Dancer-Plugin-Swagger \
 		p5-Dancer-Session-Cookie>=0.27:www/p5-Dancer-Session-Cookie \
 		p5-Env-Path>=0:devel/p5-Env-Path \
+		p5-Expect>=0:lang/p5-Expect \
 		p5-File-ShareDir>=1.03:devel/p5-File-ShareDir \
 		p5-File-Slurp>=9999.19:devel/p5-File-Slurp \
 		p5-Guard>=1.022:devel/p5-Guard \
@@ -42,7 +45,7 @@ RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		p5-HTML-Parser>=3.70:www/p5-HTML-Parser \
 		p5-HTTP-Tiny>=0.029:www/p5-HTTP-Tiny \
 		p5-JSON>=0:converters/p5-JSON \
-		p5-List-MoreUtils>=0.33:lang/p5-List-MoreUtils \
+		p5-List-MoreUtils>=0.428:lang/p5-List-MoreUtils \
 		p5-Log-Message-Simple>=0:devel/p5-Log-Message-Simple \
 		p5-Module-Find>=0.12:devel/p5-Module-Find \
 		p5-Module-Load>=0.32:devel/p5-Module-Load \
@@ -54,6 +57,7 @@ RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		p5-NetAddr-MAC>=0:net/p5-NetAddr-MAC \
 		p5-NetAddr-IP>=4.068:net-mgmt/p5-NetAddr-IP \
 		p5-Path-Class>=0.32:devel/p5-Path-Class \
+		p5-Path-Tiny>=0:devel/p5-Path-Tiny \
 		p5-Plack>=1.0023:www/p5-Plack \
 		p5-Plack-Middleware-Debug>=0:www/p5-Plack-Middleware-Debug \
 		p5-Plack-Middleware-Expires>=0.03:www/p5-Plack-Middleware-Expires \
@@ -79,6 +83,12 @@ RUN_DEPENDS=	p5-DBD-Pg>=0:databases/p5-DBD-Pg \
 		p5-IO-Socket-SSL>=2.048:security/p5-IO-Socket-SSL \
 		p5-File-Slurper>=0:devel/p5-File-Slurper
 
+USES=		perl5 pgsql
+USE_PERL5=	modbuild
+USE_RC_SUBR=	netdisco
+
+NO_ARCH=	yes
+
 USERS=		netdisco
 GROUPS=		netdisco
 
@@ -90,11 +100,6 @@ SUB_LIST=	SITE_PERL=${STAGEDIR}${PREFIX}/${SITE_PERL_REL} \
 		ETCDIR_REL=${ETCDIR_REL}
 PLIST_SUB+=	ETCDIR=${ETCDIR}
 
-USES=		perl5 pgsql
-USE_PERL5=	modbuild
-USE_RC_SUBR=	netdisco
-NO_ARCH=	yes
-
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}/perl5/bin
 	${INSTALL_SCRIPT} ${WRKDIR}/localenv ${STAGEDIR}${ETCDIR}/perl5/bin
diff --git a/net-mgmt/netdisco/distinfo b/net-mgmt/netdisco/distinfo
index b720aa48ece5..85fb9edf79c2 100644
--- a/net-mgmt/netdisco/distinfo
+++ b/net-mgmt/netdisco/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1547845062
-SHA256 (App-Netdisco-2.040003.tar.gz) = 3f8421d4652215e0276555845641c7ca37b6392ef9f1e53bc32b0574dcfb676d
-SIZE (App-Netdisco-2.040003.tar.gz) = 963373
+TIMESTAMP = 1554733780
+SHA256 (App-Netdisco-2.042005.tar.gz) = 79a1ad96169eef10d85086a544ef34d8eddc8a215ff989b13a6981ed55fcf7ba
+SIZE (App-Netdisco-2.042005.tar.gz) = 3808287
diff --git a/net-mgmt/netdisco/pkg-plist b/net-mgmt/netdisco/pkg-plist
index 0911c2e513d3..e1800878db49 100644
--- a/net-mgmt/netdisco/pkg-plist
+++ b/net-mgmt/netdisco/pkg-plist
@@ -109,8 +109,10 @@ bin/netdisco-web-fg
 %%SITE_PERL%%/App/Netdisco/SSHCollector/Platform/NXOS.pm
 %%SITE_PERL%%/App/Netdisco/SSHCollector/Platform/PaloAlto.pm
 %%SITE_PERL%%/App/Netdisco/Transport/SNMP.pm
+%%SITE_PERL%%/App/Netdisco/Transport/SSH.pm
 %%SITE_PERL%%/App/Netdisco/Util/DNS.pm
 %%SITE_PERL%%/App/Netdisco/Util/Device.pm
+%%SITE_PERL%%/App/Netdisco/Util/DeviceAuth.pm
 %%SITE_PERL%%/App/Netdisco/Util/ExpandParams.pm
 %%SITE_PERL%%/App/Netdisco/Util/FastResolver.pm
 %%SITE_PERL%%/App/Netdisco/Util/Graph.pm
@@ -227,6 +229,7 @@ bin/netdisco-web-fg
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Power.pm
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Psql.pm
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Renumber.pm
+%%SITE_PERL%%/App/Netdisco/Worker/Plugin/SetUserToken.pm
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Show.pm
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Stats.pm
 %%SITE_PERL%%/App/Netdisco/Worker/Plugin/Vlan.pm
@@ -363,6 +366,23 @@ bin/netdisco-web-fg
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-50-51-PostgreSQL.sql
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-51-52-PostgreSQL.sql
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-52-53-PostgreSQL.sql
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-53-54-PostgreSQL.sql
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-54-55-PostgreSQL.sql
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-55-56-PostgreSQL.sql
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/schema_versions/App-Netdisco-DB-56-57-PostgreSQL.sql
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/favicon-16x16.png
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/favicon-32x32.png
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/index.html
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/oauth2-redirect.html
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui-bundle.js
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui-bundle.js.map
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui-standalone-preset.js
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui-standalone-preset.js.map
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui.css
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui.css.map
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui.js
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/swagger-ui.js.map
+%%SITE_PERL%%/auto/share/dist/App-Netdisco/swagger-ui/version-3.20.3
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/views/admintask.tt
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/views/ajax/admintask/duplicatedevices.tt
 %%SITE_PERL%%/auto/share/dist/App-Netdisco/views/ajax/admintask/jobqueue.tt
@@ -535,8 +555,10 @@ bin/netdisco-web-fg
 %%PERL5_MAN3%%/App::Netdisco::SSHCollector::Platform::NXOS.3.gz
 %%PERL5_MAN3%%/App::Netdisco::SSHCollector::Platform::PaloAlto.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Transport::SNMP.3.gz
+%%PERL5_MAN3%%/App::Netdisco::Transport::SSH.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Util::DNS.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Util::Device.3.gz
+%%PERL5_MAN3%%/App::Netdisco::Util::DeviceAuth.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Util::ExpandParams.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Util::FastResolver.3.gz
 %%PERL5_MAN3%%/App::Netdisco::Util::Graph.3.gz