Index: Makefile =================================================================== --- Makefile (revision 526605) +++ Makefile (working copy) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= FusionInventory-Agent -PORTVERSION= 2.4 +PORTVERSION= 2.5.2 CATEGORIES= net-mgmt MASTER_SITES= CPAN MASTER_SITE_SUBDIR= CPAN:GBOUGARD Index: distinfo =================================================================== --- distinfo (revision 526605) +++ distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1519161277 -SHA256 (FusionInventory-Agent-2.4.tar.gz) = 9dc86f1bb4786d7b141824a007a0da1183c2451c33f8e3e9c958c7d6cce89885 -SIZE (FusionInventory-Agent-2.4.tar.gz) = 2501564 +TIMESTAMP = 1582315000 +SHA256 (FusionInventory-Agent-2.5.2.tar.gz) = 37ee3b83600b99b0f552d3c41be0e9c3fb04faf57c5e709aa8c58750810df0cc +SIZE (FusionInventory-Agent-2.5.2.tar.gz) = 2700174 Index: files/patch-Makefile.PL =================================================================== --- files/patch-Makefile.PL (revision 526605) +++ files/patch-Makefile.PL (working copy) @@ -1,16 +1,13 @@ -Fix some locations specific to the ports tree i.e. - -- Fixes location of manpages resulting to be in site_perl -- Set LOCALSTATEDIR to /var/run as done in this ports tree -- Install agent.cfg as agent.cfg.sample - ---- Makefile.PL.orig 2018-02-22 21:27:09 UTC -+++ Makefile.PL -@@ -157,22 +157,12 @@ sub constants { +--- Makefile.PL.orig 2020-02-21 21:14:44.416901000 +0100 ++++ Makefile.PL 2020-02-21 21:15:41.844326000 +0100 +@@ -163,25 +163,15 @@ # for some reason, initialising variables from the global scope doesn't work %variables = ( - PREFIX => '/usr/local', + VERSION => '', + COMMENTS => "Platform : $Config{myuname},Build date: ".gmtime()." (GMT)", + RAWCOMMENTS => '', - INSTALLSCRIPT => '$(PREFIX)/bin', - INSTALLSITESCRIPT => '$(PREFIX)/bin', - INSTALLVENDORSCRIPT => '$(PREFIX)/bin', @@ -30,16 +27,18 @@ ); # allow variables defined on command line to override defaults -@@ -220,11 +210,7 @@ sub install { - - config_install : - install -d -m 755 $(DESTDIR)$(SYSCONFDIR) -- if [ -f $(DESTDIR)/$(SYSCONFDIR)/agent.cfg ]; then \ -- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.new; \ -- else \ -- install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \ -- fi -+ install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.sample +@@ -243,14 +233,9 @@ + $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR) + for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \ + do \ +- if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \ + $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ + $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ + $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ +- else \ +- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \ +- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \ +- fi; \ + done $(ABSPERLRUN) -pi \ -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \ - $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm Index: pkg-plist =================================================================== --- pkg-plist (revision 526605) +++ pkg-plist (working copy) @@ -1,18 +1,25 @@ bin/fusioninventory-agent -%%VMWARE%%bin/fusioninventory-esx +bin/fusioninventory-esx bin/fusioninventory-injector bin/fusioninventory-inventory -%%NETDISC%%bin/fusioninventory-netdiscovery -%%NETINV%%bin/fusioninventory-netinventory -%%WOL%%bin/fusioninventory-wakeonlan -etc/fusioninventory/agent.cfg.sample +bin/fusioninventory-netdiscovery +bin/fusioninventory-netinventory +bin/fusioninventory-remoteinventory +bin/fusioninventory-wakeonlan +etc/fusioninventory/agent.cfg.new +etc/fusioninventory/inventory-server-plugin.cfg.new +etc/fusioninventory/proxy-server-plugin.cfg.new +etc/fusioninventory/proxy2-server-plugin.cfg.new +etc/fusioninventory/server-test-plugin.cfg.new +etc/fusioninventory/ssl-server-plugin.cfg.new %%PERL5_MAN1%%/fusioninventory-agent.1.gz -%%VMWARE%%%%PERL5_MAN1%%/fusioninventory-esx.1.gz +%%PERL5_MAN1%%/fusioninventory-esx.1.gz %%PERL5_MAN1%%/fusioninventory-injector.1.gz %%PERL5_MAN1%%/fusioninventory-inventory.1.gz -%%NETDISC%%%%PERL5_MAN1%%/fusioninventory-netdiscovery.1.gz -%%NETINV%%%%PERL5_MAN1%%/fusioninventory-netinventory.1.gz -%%WOL%%%%PERL5_MAN1%%/fusioninventory-wakeonlan.1.gz +%%PERL5_MAN1%%/fusioninventory-netdiscovery.1.gz +%%PERL5_MAN1%%/fusioninventory-netinventory.1.gz +%%PERL5_MAN1%%/fusioninventory-remoteinventory.1.gz +%%PERL5_MAN1%%/fusioninventory-wakeonlan.1.gz share/fusioninventory/edid.ids share/fusioninventory/html/favicon.ico share/fusioninventory/html/index.tpl @@ -29,6 +36,13 @@ share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/OCS.pm share/fusioninventory/lib/FusionInventory/Agent/HTTP/Protocol/https.pm share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Inventory.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Plugin.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Proxy.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/SSL.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/SecondaryProxy.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Server/Test.pm +share/fusioninventory/lib/FusionInventory/Agent/HTTP/Session.pm share/fusioninventory/lib/FusionInventory/Agent/Inventory.pm share/fusioninventory/lib/FusionInventory/Agent/Logger.pm share/fusioninventory/lib/FusionInventory/Agent/Logger/Backend.pm @@ -37,9 +51,23 @@ share/fusioninventory/lib/FusionInventory/Agent/Logger/Syslog.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/Device.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/Device/Components.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/Live.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Brocade.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Digi.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/EatonEpdu.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Epson.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/FreeBSD.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/HPNetPeripheral.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/LinuxAppliance.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Mikrotik.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Oki.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Panasas.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Ricoh.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/UPS.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Ubnt.pm +share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Zebra.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/iLO.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupportTemplate.pm share/fusioninventory/lib/FusionInventory/Agent/SNMP/Mock.pm @@ -47,7 +75,9 @@ share/fusioninventory/lib/FusionInventory/Agent/SOAP/VMware/Host.pm share/fusioninventory/lib/FusionInventory/Agent/Storage.pm share/fusioninventory/lib/FusionInventory/Agent/Target.pm +share/fusioninventory/lib/FusionInventory/Agent/Target/Listener.pm share/fusioninventory/lib/FusionInventory/Agent/Target/Local.pm +share/fusioninventory/lib/FusionInventory/Agent/Target/Scheduler.pm share/fusioninventory/lib/FusionInventory/Agent/Target/Server.pm share/fusioninventory/lib/FusionInventory/Agent/Task.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Collect.pm @@ -82,6 +112,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/DiskFree.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/File.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Job.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Maintenance.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/P2P.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck/WTS.pm @@ -118,11 +149,15 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/BSD/i386.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Arch.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries/Acpiconf.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Batteries/Upower.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Battery.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Bios.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Memory.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Ports.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Psu.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Slots.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Domains.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Drives.pm @@ -133,6 +168,8 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall/Ufw.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Hostname.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi/Fru.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Ipmi/Lan.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Networks.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Networks/iLO.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/PCI.pm @@ -143,6 +180,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Printers.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Processes.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt/LiteManager.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Remote_Mgmt/TeamViewer.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Rudder.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/SSH.pm @@ -154,6 +192,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Pacman.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/RPM.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Slackware.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Snap.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/3ware.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Storages/HP.pm @@ -178,6 +217,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/ARM/CPU.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Alpha/CPU.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Bios.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/NonLSB.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/OSRelease.pm @@ -188,6 +228,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/MIPS/CPU.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Memory.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/DockerMacvlan.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Networks/FibreChannel.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/PowerPC/Bios.pm @@ -280,9 +321,13 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/USB.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Users.pm share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Win32/Videos.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Maintenance.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/Maintenance/Version.pm share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Job.pm share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery/Version.pm share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory.pm +share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory/Job.pm share/fusioninventory/lib/FusionInventory/Agent/Task/NetInventory/Version.pm share/fusioninventory/lib/FusionInventory/Agent/Task/WMI.pm share/fusioninventory/lib/FusionInventory/Agent/Task/WMI/Version.pm @@ -291,12 +336,12 @@ share/fusioninventory/lib/FusionInventory/Agent/Tools.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/AIX.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/BSD.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Batteries.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Constants.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Expiration.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Generic.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/HPUX.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware.pm -share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Apc.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Brocade.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Qlogic.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Hostname.pm @@ -304,6 +349,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Tools/Linux.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/MacOS.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Network.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/PowerSupplies.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/SNMP.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Acer.pm @@ -315,8 +361,12 @@ share/fusioninventory/lib/FusionInventory/Agent/Tools/Unix.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Virtualization.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/API.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/Constants.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/LoadIndirectString.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/NetAdapter.pm share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/WTS.pm +share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/WideChar.pm share/fusioninventory/lib/FusionInventory/Agent/Version.pm share/fusioninventory/lib/FusionInventory/Agent/XML/Query.pm share/fusioninventory/lib/FusionInventory/Agent/XML/Query/Inventory.pm