CVS commit: pkgsrc/net/p5-FusionInventory-Agent

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Sep 13 09:13:46 UTC 2020

Modified Files:
        pkgsrc/net/p5-FusionInventory-Agent: Makefile PLIST distinfo
        pkgsrc/net/p5-FusionInventory-Agent/patches: patch-Makefile.PL

Log Message:
p5-FusionInventory-Agent: update to 2.5.

2.5 Fri, 12 Apr 2019

core:
* linux: reload logger during daemonize to avoid issues like not listening http
  daemon if logger has still not been used before starting the listener
* Fix #646: HTTP daemon not starting on CentOS 7
* revert dfcb64573e as now more generic fix has been implemented in a538abaed7
  (tested on CentOS 6)
* win32: don't show service memory usage on OS not supporting GetProcessMemoryInfo
* Fix #601: Log URL for server target and log path for local target
* win32: add early stderr logging support for service
  Just rename "fusioninventory-win32-service.rc.sample" removing ".sample" part
  to enable this feature. This can be handy to investigate start service failures.
* Added support for HTTPD plugins
* Added Inventory HTTPD plugins to permit remote inventory request (disabled by default)
* Added Listener target to permit agent to only answer http requests
* Updated configuration to support HTTPD plugins dedicated configuration file
* Added fusioninventory-remoteinventory script to request agent with Inventory
  HTTPD plugin enabled
* Fix HTTPD local address reuse
* Added SSL HTTPD plugins to support SSL in any server plugins
* Limit the reload target check to 30 seconds
* win32: report memory usage as Working Set Size (WSS) and Page File Usage (PFU)
* win32: revert handling service with callbacks. Even if Win32::Daemon proposes
  the callbacks usage obsoletes the typical skeleton code, the callbacks usage
  is known to leak memory and tests with latest Win32::Daemon shows that's true.
* win32: handle task run in a managed thread as this is more efficient than using
  perl fork with thread emulation under win32 and preserve a little memory usage.
* win32: wait service control manager is ready before really starting the service
* logger: don't use File::stat module to just get logfile file size, better use -s
  as File::stat module seems to fail in rare case.

inventory:
* Bump Inventory task version to 1.7
* Fix lspci command subsystem parsing
* Fix hponcfg.exe can output on stderr on win32 when not really usable
* Skip not working under win32 Generic::Users inventory
  Also avoid error in log on /etc/passwd and /etc/group not found files
* Fix #601: Log deviceid as agentid and related target when running an inventory
* Fix #644: Make WORKGROUP inventory consistent
* Fix #541: Don't try to scan virtualbox VM in win32 users directories
* Updated pci.ids to 2019.04.12 version
* Updated usb.ids to 2019.03.20 version

netdiscovery/netinventory:
* Bump NetDiscovery task version to 2.9
* Bump NetInventory task version to 3.3
* Add Lancom in networking devices recognized by description parsing
* Fix #650: discard empty consumable level elements
* Fix #651: discard empty type element
* Add Netdisco export contrib script from Stoatwblr, see contrib/netdisco
* Fix #638: Fix Kyocera counters handling thanks to Stoatwblr
* Printers: assume -2 counter value means a WARNING level and report it
  Thanks Stoatwblr for the deep investigation
* Add Oki printer support
* Add APC serialnumber support
* Fix #612: Enhanced Ubnt AccessPoint support
* Updated sysobject.ids (tagged fia-2.5 tag on github repository)

deploy:
* Bump Deploy task version to 2.8
* Fix #394: Check file parts source/mirror url to guaranty it ends with a slash
  and trigger an error if it doesn't look like a valid URL.

collect:
* Bump Collect task version to 2.6
* WMI properties can now be a list of properties with comma or space as separator

2.4.3 Fri, 22 Feb 2019

core:
* fix some cases where a file handle was not closed
* win32: fix a handle leak case when agent was running as service
* Fix #637: Don't depend on GNU install during "make install" to support
  more Unix systems
* daemon/service: reload target when the stat file has been updated by
  another script to use the updated next run timeout
* For server target, server connection attempts are delayed from 60 seconds,
  doubled at each new failed attempt, now until reaching max defined by delaytime
  configuration parameter.

inventory:
* Bump Inventory task version to 1.6
* win32 antivirus support update:
 - nicer product name report for ESET
 - report expiration date for ESET
* Fix #582: Add other Acer monitors support
* Fix #687: Virtuozzo inventory task doesn't include first container
* Add few minor fix to virtuozzo containers inventory
* Fix LXC containers support to support recent LXC versions
* Fix #625: Container UUID is the same than host UUID
* Fix #624: Skip incomplete battery infos from dmidecode (seen on MacOS)
* Fix #631: Fix duplicated memory inventory on MacOS
* linux: fix storage size inventory
* linux: try to set storage serialnumber from mbr partition id or even
  PV UUID when not found (hdparm missing or virtual drive)
* Fix #604: Only inventory Windows Store on recent win32 platforms
* Fix #596: Openstack container seen as Physical on win32
* Fix #593: Correct detection of machine type when /var/log/dmesg is too short
* Fix #583: Add BitDefender antivirus support
* Encrypted filesystems support added
* Updated pci.ids to 2019.02.20 version
* Updated usb.ids to 2019.01.17 version

netdiscovery/netinventory:
* Bump NetDiscovery task version to 2.8
* Bump NetInventory task version to 3.2
* Add BlueCoat proxy appliance serialnumber support
* win32: Support arp table check for NetDiscovery task
* Fix #634: Net::Ping version may not numeric with win32 installer
* Add Panasas PanFS support
* Add few HP/Compaq serialnumber cases support
* Fix #605: try 'ip neighbor show' if 'arp' is not available for netdiscovery
* Add UPS-MIB support for Riello, S2S & APC
* Components support added
* Updated sysobject.ids (tagged fia-2.4.3 tag on github repository)

2.4.2 Wed, 03 Oct 2018

core:
* Linux: fix agent not listening on http port when syslog logger is active
  and Sys::Sylog module is too old

inventory:
* Bump Inventory task version to 1.5
* Fix physical memory error correction detection via WMI under win32
* Fix #299: Added UWP/APPX/Windows Store software inventory
* win32 antivirus detection enhanced support:
  - add support for few antivirus base versions (defender, kaspersky,
    EST, avira, MSE, McAfee, F-Secure)
  - try to set license expiration date for F-Secure, kaspersky & avira
* Fix #442: kaspersky not fully recognized in russia
* Fix #501: wrong status was reported when windows defender was disabled
* Enhanced software inventory under Arch Linux
* Fix #453: under MacOS, skip XML DTD validation for software inventory as
  parsing may fail if a proxy is enabled
* Fix #473: fix arch detection under MacOS
* Fix #475: fix video cards support under MacOS
* Fix #504: support non-standard ssh port to report local ssh server pubkey
* Updated pci.ids to 2018.10.02 version
* Updated usb.ids to 2018.08.15 version

deploy:
* Bump Deploy task version to 2.7
* Fix deployment of private packages: their downloaded parts were not
  fully found when download were too long (closes: #542)
* Handle retention duration differently for p2p and not p2p files
* P2p files have a default retention of 3 days by default
* P2p files have a default retention of 3 times the target prolog delay
  after download, parts retention is reset to the same delay for all file parts,
  so the retention duration applies at the time parts has been downloaded
* P2p file parts are now cleaned up after job success if retention duration
  is null
* Fix WinKeyNotEquals audit check to also be true when the registry key is
  simply missing
* Add support to "startjob" key for failing deploy audit check to permit
  to skip remaining checks when a failing condition makes them obsolete.

esx:
* Bump ESX task version to 2.4
* Support 2 ServiceTags case to cover chassis & lame board S/N inventory
* Updated AssetTag support
* fix wrong cpu core computation when only one package is available

netdiscovery/netinventory:
* Bump NetDiscovery task version to 2.7
* Bump NetInventory task version to 3.1
* Thanks to @QuickNerd357, Brocade devices will now show serial number and
  firmware informations.
* Sanitize VLAN names. This fixes an issue with Cisco Small Business Switches.
* Get rid of unofficial Net::Ping::TimeStamp support to only use official
  support if available. Net::Ping v2.67 is now mandatory to discover
  devices thanks to timestamp ping.
* Fix #481: Add Synology NAS support
* Fix #480: Add CheckPoint support
* Fix #488: Update HP Printers support
* Updated LLDP/CDP connection match checks
* Updated sysobject.ids (tagged fia-2.4.2 tag on github repository)

collect:
* Bump Collect task version to 2.5
* Thanks to David Durieux, add support for dynamic pattern in registry key
  collect under win32. The dynamic pattern is '**' to glob subkeys like in:
   HKEY_USERS/**/Software/**/**/CurrentVersion

maintenance:
* Bump Maintenance task version to 1.1
* Disable Maintenance task if no maintenance module could be used

test suite:
* Make snmp walk tests faster

2.4.1 Fri, 29 Jun 2018

core:
* Update setup & FusionInventory::Agent::Version modules during make install
* Can set FusionInventory::Agent::Version module VERSION & COMMMENTS during
  perl Makefile.PL configuration stage
* Normalized Target class APIs
* Register planned tasks at target level so target class can filter out
  unsupported tasks
* Add Scheduler target support to be used at the same time than Server target
  but more often to make maintenance other server target storage
* One scheduler target is created for each configured server target
* Scheduler target will trigger between one to 2 minutes
* Get rid of Time::Piece dependency

maintenance:
* New Maintenance v1.0 task
* Maintenance task handles quick server target storage cleanup to deploy
  packages are really removed afetr their expiration time
* Task only supported by Scheduler target

inventory:
* Fix BSD Storages support
* Don't try to run dmidecode inventories if it returns no output
* Set Bios && Hardware from /sys/class/dmi on recent Linux when dmidecode is missing
* Add PowerSupplies support
* Add BSD batteries support
* Add UUID to LXD containers under Linux
* Fix #439: Wrong network interface speed under win32
* Fix #472: On MacOS, add monitors serial number when available
* Fix #479: No virtual machine memory under Proxmox
* Fix #485: Fix df output parsing under MacOS
* Fix #500: Add Acer monitor EDID id match
* Better SQL Server software inventory under win32
* Update Xen Server support
* Fix get-edid command output parsing, thanks to David Durieux
* Updated pci.ids to 2018.06.29 version
* Updated usb.ids to 2018.05.04 version

netdiscovery/netinventory:
* Bump NetDiscovery task version to 2.6
* Bump NetInventory task version to 3.0
* fusioninventory-netdiscovery & fusioninventory-netinventory scripts
  now support '--port' and '--protocol' options for not standard snmp support.
* Fix RAM & CPU are missing from net inventory
* Fix MEMORY/RAM OID support
* Added support for HP Net Peripheral, involving better HP printers inventory
 * Get Serial number & firmware version
 * Fix total printed pages counter in many case
 * Added total color pages counter support
* Don't assume colors table was read: fixes black toner detection on many HP printers
* Added Microtik devices support
* Enhanced Epson printers support, including model name, serial number and firmwares
* Updated LLDP support
* NetInventory task protocol upgrade to fix multithreading scheduling according to
  upgrades done server-side.
* Fix discovery of devices with only ping responding and without found hostname. In
  that case, we default the DNSHOSTNAME to the scanned ip.
* fix entity option in fusioninventory-netdiscovery script
* Get rid of nmap support for NetDiscovery task
* Add Zebra printer support
* Add QuesCom Appliance detection
* Add Linux Appliance template support
* Closes: #441,#519
* Update extmod function calls, thanks to Vadim Pisarev
* Add custom OID for Canon printer counters
* Updated sysobject.ids (tagged fia-2.4.1 tag on github repository)

deploy:
* Bump Deploy task version to 2.6
* Fix file retention support
* Add P2P peers caching to reduce peers discovery load in the meantime
* Reduced timeout for peer discovery and file parts downloading for P2P. This
  efficiently limits the time passed to discover the local peers and disqualify
  any busy or not responding peers in a more acceptable delay.
* For better P2P support, agent ajusts its 404 message to "Nothing found" when it
  has nothing to share with other agents. So peers won't ask again and again for
  any file part during 20 minutes by default.

2.4 Fri, 29 Dec 2017
core:
* Cleanup confdir use in task so using deprecated etc/softwares folder is no more
  logged in journal
* Get rid of confdir setup in setup.pm
* Added "include" directive support while reading configuration file to make
  configuration maintenance easy
* Update syslog name to fullname agent
* Get rid of List::Util & Proc::PID::File module dependencies
* Try to load more recent IDS database files if found in well-known places
* Fixed default daemon pid filename
* When --pidfile is used, don't permit to manually start daemon even in foreground
  unless --pidfile parameter is different
* Makes --pidfile filename optional to compute a default one
* Check if we need to include libdir while daemonize
* Class refactoring: Get rid of discouraged 'use base' syntax in favor of lighter
  'use parent' and as fields pragma is not used (see 'base' man)
* Logger refactoring: no more an Exporter based class to simplify its usage and
  as Logger object should be commonly shared everywhere it is used.
* Fix command run to also time out while an alarm has been set
* Fix WMI calls to also time out under win32
* Few code refactoring
* remove devtom30 from maintainers

inventory:
* Bump Inventory task version to 1.4
* Fixed Provider program name in agent context
* Fixed HyperV VM issue while BIOSGUID is not defined
* Fix #349: Include last logged user as usual computer user on win32 platform
* Linux distro: Add support for reading os-release file and removing LSB support
* Fix Solaris drives df output parsing adding better zfs handling
* Make backend-collect-timeout working even while waiting on command output
* Support ASM filesystems on Oracle Grid
* Introduce getDeviceId() API on Inventory class so it returns task deviceid if set
  or set a new deviceid (aka agentid or machineid) in case of remote inventory
* Fix #161: Support retrieving License software via WMI, including Office 2016
* Fix #364: [win32] Get antivirus version from software installation and get
  Windows Defender version via WMI
* Added Windows 10 version support
* Updated pci.ids to 2017.12.20 version
* Updated usb.ids to 2017.12.28 version

netdiscovery/netinventory:
* Bump NetDiscovery & NetInventory task version to 2.5
* Added section support for MODEMS, SIMCARDS & FIRMWARES
* Added new detection algorithm based on exposed device supported MIB (sysORID list)
  and/or sysObjectID
* Added support for HP iLO cards
* Added support for Digi devices with enhanced MODEMS, SIMCARDS & FIRMWARES support
* Updated sysobject.ids with a lot of new devices support
* Keep first MAC address found while discovering
* Try first to select MAC address from SNMP session during SNMP device scan
* Updated sysobject.ids (tagged fia-2.4 tag on github repository)

deploy:
* Bump Deploy task version to 2.5
* ddurieux fixed a regression introduced in 2.3.18 preventing to re-use known
  good peer to download file parts.

esx:
* Bump ESX task version to 2.3
* Removed no more needed createFakeDeviceid() API

injector:
* Support --no-ssl-check option to avoid checking server SSL certificate

wmi-inventory:
* Added new task and script to permit agent-less inventory on win32 platform based
  on remote WMI support.


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 pkgsrc/net/p5-FusionInventory-Agent/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/p5-FusionInventory-Agent/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/p5-FusionInventory-Agent/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/p5-FusionInventory-Agent/Makefile
diff -u pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.17 pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.18
--- pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.17   Tue Sep  8 13:09:58 2020
+++ pkgsrc/net/p5-FusionInventory-Agent/Makefile        Sun Sep 13 09:13:45 2020
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2020/09/08 13:09:58 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2020/09/13 09:13:45 wiz Exp $
 
-DISTNAME=      FusionInventory-Agent-2.3.21
+DISTNAME=      FusionInventory-Agent-2.5
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   3
 CATEGORIES=    net perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GB/GBOUGARD/}
 
@@ -14,6 +13,9 @@ LICENSE=      gnu-gpl-v2
 PKG_SYSCONFSUBDIR?=    fusioninventory
 EGDIR=                 ${PREFIX}/share/examples/fusioninventory
 CONF_FILES+=           ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg
+CONF_FILES+=           ${EGDIR}/inventory-server-plugin.cfg ${PKG_SYSCONFDIR}/inventory-server-plugin.cfg
+CONF_FILES+=           ${EGDIR}/server-test-plugin.cfg ${PKG_SYSCONFDIR}/server-test-plugin.cfg
+CONF_FILES+=           ${EGDIR}/ssl-server-plugin.cfg ${PKG_SYSCONFDIR}/ssl-server-plugin.cfg
 
 BUILD_DEFS+=   VARBASE
 
@@ -47,7 +49,7 @@ PERL5_MODULE_TYPE=    Module::Install::Bund
 MAKE_PARAMS+=  PREFIX=${PREFIX} LOCALSTATEDIR=${VARBASE}/fusioninventory
 MAKE_PARAMS+=  SYSCONFDIR=${PKG_SYSCONFDIR} PKGMANDIR=${PKGMANDIR}
 
-MAKE_ENV+=     PERL_USE_UNSAFE_INC=1
+USE_TOOLS+=    perl
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/net/p5-FusionInventory-Agent/PLIST
diff -u pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.3 pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.4
--- pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.3       Wed Sep 27 22:24:36 2017
+++ pkgsrc/net/p5-FusionInventory-Agent/PLIST   Sun Sep 13 09:13:45 2020
@@ -1,5 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2017/09/27 22:24:36 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2020/09/13 09:13:45 wiz Exp $
 share/examples/fusioninventory/agent.cfg
+share/examples/fusioninventory/inventory-server-plugin.cfg
+share/examples/fusioninventory/server-test-plugin.cfg
+share/examples/fusioninventory/ssl-server-plugin.cfg
+share/fusioninventory/edid.ids
 share/fusioninventory/html/favicon.ico
 share/fusioninventory/html/index.tpl
 share/fusioninventory/html/inventory.tpl

Index: pkgsrc/net/p5-FusionInventory-Agent/distinfo
diff -u pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.4 pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.5
--- pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.4    Wed Sep 27 22:24:36 2017
+++ pkgsrc/net/p5-FusionInventory-Agent/distinfo        Sun Sep 13 09:13:45 2020
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.4 2017/09/27 22:24:36 wiz Exp $
+$NetBSD: distinfo,v 1.5 2020/09/13 09:13:45 wiz Exp $
 
-SHA1 (FusionInventory-Agent-2.3.21.tar.gz) = 9768548d7d9b9d9c3e9b473ad573488875e67dbb
-RMD160 (FusionInventory-Agent-2.3.21.tar.gz) = 20001f5193f721babee0f21790fa0785bb355f15
-SHA512 (FusionInventory-Agent-2.3.21.tar.gz) = 5f5628b4851431fe0c93ebfffdc91281efaa8aed721cf79439dbb738bfc765d3d01bb5e639de7dd2fcfc06537f7b472ea8b14ae4b9e6e5c408b68039a8b2185e
-Size (FusionInventory-Agent-2.3.21.tar.gz) = 2450622 bytes
-SHA1 (patch-Makefile.PL) = fc8c966d1d3f0f39b4df434f4479000f8ea70770
+SHA1 (FusionInventory-Agent-2.5.tar.gz) = 782f26d66f9f079cb96463be71bac161bb8600c6
+RMD160 (FusionInventory-Agent-2.5.tar.gz) = 3a100fd9b5506cfb6a39a77cfd7950638552335a
+SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333
+Size (FusionInventory-Agent-2.5.tar.gz) = 2638934 bytes
+SHA1 (patch-Makefile.PL) = 932d2075bc8fb67fca393e72409f93ce2a0675ca

Index: pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL
diff -u pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.2 pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.3
--- pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.2   Fri Apr  1 12:07:30 2016
+++ pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL       Sun Sep 13 09:13:45 2020
@@ -1,30 +1,11 @@
-$NetBSD: patch-Makefile.PL,v 1.2 2016/04/01 12:07:30 jperkin Exp $
-install sample config file in examples/ dir
-Fix man pages path
+$NetBSD: patch-Makefile.PL,v 1.3 2020/09/13 09:13:45 wiz Exp $
 
---- Makefile.PL.orig   2012-11-13 14:17:02.000000000 +0100
-+++ Makefile.PL        2013-01-14 13:20:36.000000000 +0100
-@@ -72,11 +72,6 @@
- $MY::variables{DATADIR} =~ s/\$\(PREFIX\)/$MY::variables{PREFIX}/;
- $MY::variables{LOCALSTATEDIR} =~ s/\$\(PREFIX\)/$MY::variables{PREFIX}/;
- 
--# look for already existing configuration file
--my $config_file_message = -f "$MY::variables{SYSCONFDIR}/agent.cfg" ?
--    "previous configuration file found, new one will be installed as agent.cfg.new" :
--    "no previous configuration file found, new one will be installed as agent.cfg";
--
- print <<EOF;
- 
- Installation summary
-@@ -86,7 +81,6 @@
- constant data installation directory: $MY::variables{DATADIR}
- variable data installation directory: $MY::variables{LOCALSTATEDIR}
- 
--$config_file_message
- EOF
- 
- package MY;
-@@ -108,12 +102,12 @@
+Fix man page path.
+Install config into examples/ directory.
+
+--- Makefile.PL.orig   2019-04-12 15:04:29.000000000 +0000
++++ Makefile.PL
+@@ -173,12 +173,12 @@ sub constants {
          INSTALLLIB           => '$(DATADIR)/lib',
          INSTALLSITELIB       => '$(DATADIR)/lib',
          INSTALLVENDORLIB     => '$(DATADIR)/lib',
@@ -43,18 +24,29 @@ Fix man pages path
          SYSCONFDIR           => '$(PREFIX)/etc/fusioninventory',
          DATADIR              => '$(PREFIX)/share/fusioninventory',
          LOCALSTATEDIR        => '$(PREFIX)/var/fusioninventory',
-@@ -163,12 +157,8 @@
+@@ -239,17 +239,17 @@ sub install {
      $install .= <<'EOF';
  
- 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 -d -m 755 $(DESTDIR)$(PREFIX)/share/examples/fusioninventory; \
-+      install -m 644 etc/agent.cfg $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/agent.cfg;
- 
- data_install :
-       install -d -m 755 $(DESTDIR)$(DATADIR)
+ config_install : pure_install
+-      $(MKPATH) $(DESTDIR)$(SYSCONFDIR)
+-      $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
++      $(MKPATH) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory
++      $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory
+       for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \
+       do \
+-        if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
+-          $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+-          $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+-          $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
++        if $(TEST_F) $(DESTDIR)/$(PREFIX)/share/examples/fusioninventory/$$config; then \
++          $(RM_F) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \
++          $(CP) etc/agent.cfg $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \
++          $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \
+         else \
+-          $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config; \
+-          $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
++          $(CP) etc/agent.cfg $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
++          $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
+         fi; \
+       done
+       $(ABSPERLRUN) -pi \