Attachment 191417 Details for Bug 226128 – Update FusionInventory agent to 2.4

[patch] Update FusionInventory agent to 2.4

p5-FusionInventory-agent-2.4.diff (text/plain), 12.83 KB, created by Mathieu Simon on 2018-03-11 15:18:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mathieu Simon

Created: 2018-03-11 15:18:05 UTC

Size: 12.83 KB

patch

obsolete

>diff --git a/net-mgmt/p5-FusionInventory-Agent/Makefile b/net-mgmt/p5-FusionInventory-Agent/Makefile
>index 66b42cdb408e..7be0d308ad98 100644
>--- a/net-mgmt/p5-FusionInventory-Agent/Makefile
>+++ b/net-mgmt/p5-FusionInventory-Agent/Makefile
>@@ -2,14 +2,13 @@
> # $FreeBSD$
> 
> PORTNAME=	FusionInventory-Agent
>-PORTVERSION=	2.3.20
>-PORTREVISION=	1
>+PORTVERSION=	2.4
> CATEGORIES=	net-mgmt
> MASTER_SITES=	CPAN
>-MASTER_SITE_SUBDIR=	CPAN:GBOUGARD/${PORTNAME}-2320targz
>+MASTER_SITE_SUBDIR=	CPAN:GBOUGARD
> PKGNAMEPREFIX=	p5-
> 
>-MAINTAINER=	perl@FreeBSD.org
>+MAINTAINER=	freebsd@simweb.ch
> COMMENT=	Agent for OCS Inventory server and FusionInventory for GLPI servers
> 
> LICENSE=	GPLv2
>@@ -22,7 +21,8 @@ BUILD_DEPENDS=	p5-File-Which>=0:sysutils/p5-File-Which \
> 		p5-Text-Template>=0:textproc/p5-Text-Template \
> 		p5-XML-TreePP>=0:textproc/p5-XML-TreePP
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>-TEST_DEPENDS=	p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
>+TEST_DEPENDS=	p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
>+		p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
> 		p5-HTTP-Proxy>=0:www/p5-HTTP-Proxy \
> 		p5-HTTP-Server-Simple>=0:www/p5-HTTP-Server-Simple \
> 		p5-HTTP-Server-Simple-Authen>=0:www/p5-HTTP-Server-Simple-Authen \
>@@ -69,6 +69,7 @@ DEPLOY_RUN_DEPENDS=	p5-Archive-Extract>=0:archivers/p5-Archive-Extract \
> 			p5-SHA>=0:security/p5-SHA \
> 			p5-File-Copy-Recursive>=0:devel/p5-File-Copy-Recursive \
> 			p5-JSON>=0:converters/p5-JSON \
>+			p5-Parallel-ForkManager>=0:devel/p5-Parallel-ForkManager \
> 			p5-POE-Component-Client-Ping>=0:net/p5-POE-Component-Client-Ping \
> 			p5-URI-Escape-XS>=0:www/p5-URI-Escape-XS
> # Wants URI::Escape, ports tree has URI::Escape::XS, seems drop-in replacement
>diff --git a/net-mgmt/p5-FusionInventory-Agent/distinfo b/net-mgmt/p5-FusionInventory-Agent/distinfo
>index 3a14c381ba83..ab776e43dba9 100644
>--- a/net-mgmt/p5-FusionInventory-Agent/distinfo
>+++ b/net-mgmt/p5-FusionInventory-Agent/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1500987610
>-SHA256 (FusionInventory-Agent-2.3.20.tar.gz) = b1aa86ac367edc26e7bc760f7617eb87dd9bf7c2aa88a6d2b799e69241c71346
>-SIZE (FusionInventory-Agent-2.3.20.tar.gz) = 2422386
>+TIMESTAMP = 1519161277
>+SHA256 (FusionInventory-Agent-2.4.tar.gz) = 9dc86f1bb4786d7b141824a007a0da1183c2451c33f8e3e9c958c7d6cce89885
>+SIZE (FusionInventory-Agent-2.4.tar.gz) = 2501564
>diff --git a/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL b/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL
>index 6fc0e78d93d5..effe54d82ede 100644
>--- a/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL
>+++ b/net-mgmt/p5-FusionInventory-Agent/files/patch-Makefile.PL
>@@ -4,9 +4,9 @@ Fix some locations specific to the ports tree i.e.
> - Set LOCALSTATEDIR to /var/run as done in this ports tree
> - Install agent.cfg as agent.cfg.sample
> 
>---- Makefile.PL.orig	2015-11-10 20:54:31 UTC
>+--- Makefile.PL.orig	2018-02-22 21:27:09 UTC
> +++ Makefile.PL
>-@@ -142,22 +142,12 @@ sub constants {
>+@@ -157,22 +157,12 @@ sub constants {
>  
>      # for some reason, initialising variables from the global scope doesn't work
>      %variables = (
>@@ -30,7 +30,7 @@ Fix some locations specific to the ports tree i.e.
>      );
>  
>      # allow variables defined on command line to override defaults
>-@@ -205,11 +195,7 @@ sub install {
>+@@ -220,11 +210,7 @@ sub install {
>  
>  config_install :
>  	install -d -m 755 $(DESTDIR)$(SYSCONFDIR)
>@@ -40,6 +40,6 @@ Fix some locations specific to the ports tree i.e.
> -	    install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg; \
> -	fi
> +	install -m 644 etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/agent.cfg.sample
>- 
>- data_install :
>- 	install -d -m 755 $(DESTDIR)$(DATADIR)
>+ 	$(ABSPERLRUN) -pi \
>+ 	    -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \
>+ 	        $(DESTDIR)$(DATADIR)/lib/FusionInventory/Agent/Config.pm
>diff --git a/net-mgmt/p5-FusionInventory-Agent/pkg-plist b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
>index 0becf609a9a0..38d56abd4914 100644
>--- a/net-mgmt/p5-FusionInventory-Agent/pkg-plist
>+++ b/net-mgmt/p5-FusionInventory-Agent/pkg-plist
>@@ -13,6 +13,7 @@ etc/fusioninventory/agent.cfg.sample
> %%NETDISC%%%%PERL5_MAN1%%/fusioninventory-netdiscovery.1.gz
> %%NETINV%%%%PERL5_MAN1%%/fusioninventory-netinventory.1.gz
> %%WOL%%%%PERL5_MAN1%%/fusioninventory-wakeonlan.1.gz
>+share/fusioninventory/edid.ids
> share/fusioninventory/html/favicon.ico
> share/fusioninventory/html/index.tpl
> share/fusioninventory/html/inventory.tpl
>@@ -21,6 +22,8 @@ share/fusioninventory/html/now.tpl
> share/fusioninventory/html/site.css
> share/fusioninventory/lib/FusionInventory/Agent.pm
> share/fusioninventory/lib/FusionInventory/Agent/Config.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Daemon.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Daemon/Win32.pm
> share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client.pm
> share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/Fusion.pm
> share/fusioninventory/lib/FusionInventory/Agent/HTTP/Client/OCS.pm
>@@ -33,7 +36,12 @@ share/fusioninventory/lib/FusionInventory/Agent/Logger/File.pm
> share/fusioninventory/lib/FusionInventory/Agent/Logger/Stderr.pm
> 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/Live.pm
>+share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport.pm
>+share/fusioninventory/lib/FusionInventory/Agent/SNMP/MibSupport/Digi.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
> share/fusioninventory/lib/FusionInventory/Agent/SOAP/VMware.pm
> share/fusioninventory/lib/FusionInventory/Agent/SOAP/VMware/Host.pm
>@@ -65,6 +73,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/FreeS
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyEquals.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyExists.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyMissing.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinKeyNotEquals.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueExists.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueMissing.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/CheckProcessor/WinValueType.pm
>@@ -74,6 +83,8 @@ 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/P2P.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/UserCheck/WTS.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Deploy/Version.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/ESX.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/ESX/Version.pm
>@@ -114,6 +125,8 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Dmidecode/Ports.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
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Drives/ASM.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Environment.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Firewall/Systemd.pm
>@@ -137,6 +150,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Screen.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Deb.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Gentoo.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Generic/Softwares/Nix.pm
> 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
>@@ -165,8 +179,8 @@ 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/Distro.pm
>-share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/LSB.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/NonLSB.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Distro/OSRelease.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Drives.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/Inputs.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Linux/LVM.pm
>@@ -209,6 +223,7 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Storages.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/USB.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Uptime.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/MacOS/Videos.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Module.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Provider.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Solaris.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/Inventory/Solaris/Bios.pm
>@@ -269,34 +284,39 @@ share/fusioninventory/lib/FusionInventory/Agent/Task/NetDiscovery.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/Version.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/WMI.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Task/WMI/Version.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan.pm
> share/fusioninventory/lib/FusionInventory/Agent/Task/WakeOnLan/Version.pm
> 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/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/Juniper.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Hardware/Qlogic.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Hostname.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/License.pm
> 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/SNMP.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Acer.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Goldstar.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Philips.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Screen/Samsung.pm
> share/fusioninventory/lib/FusionInventory/Agent/Tools/Solaris.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Tools/Standards/MobileCountryCode.pm
> 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/Constants.pm
>+share/fusioninventory/lib/FusionInventory/Agent/Tools/Win32/WTS.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

Actions: View | Diff

Attachments on bug 226128: 190943 | 191417