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

["Manuel Bouyer" <bouyer%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Mon May  3 17:12:23 UTC 2021

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

Log Message:
Update to 2.6. Sumary of changes since 2.5:
bug fixes
serial number support for more devices
better manufacturer reporting
parsing of a few partnumbers for better inventory
improved inventory for storage, memory and controllers
updated PCI & USB database


To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/p5-FusionInventory-Agent/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/p5-FusionInventory-Agent/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/p5-FusionInventory-Agent/distinfo
cvs rdiff -u -r1.3 -r1.4 \
    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.18 pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.19
--- pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.18   Sun Sep 13 09:13:45 2020
+++ pkgsrc/net/p5-FusionInventory-Agent/Makefile        Mon May  3 17:12:23 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2020/09/13 09:13:45 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2021/05/03 17:12:23 bouyer Exp $
 
-DISTNAME=      FusionInventory-Agent-2.5
+DISTNAME=      FusionInventory-Agent-2.6
 PKGNAME=       p5-${DISTNAME}
 CATEGORIES=    net perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GB/GBOUGARD/}

Index: pkgsrc/net/p5-FusionInventory-Agent/PLIST
diff -u pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.4 pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.5
--- pkgsrc/net/p5-FusionInventory-Agent/PLIST:1.4       Sun Sep 13 09:13:45 2020
+++ pkgsrc/net/p5-FusionInventory-Agent/PLIST   Mon May  3 17:12:23 2021
@@ -1,6 +1,8 @@
-@comment $NetBSD: PLIST,v 1.4 2020/09/13 09:13:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.5 2021/05/03 17:12:23 bouyer Exp $
 share/examples/fusioninventory/agent.cfg
 share/examples/fusioninventory/inventory-server-plugin.cfg
+share/examples/fusioninventory/proxy-server-plugin.cfg
+share/examples/fusioninventory/proxy2-server-plugin.cfg
 share/examples/fusioninventory/server-test-plugin.cfg
 share/examples/fusioninventory/ssl-server-plugin.cfg
 share/fusioninventory/edid.ids

Index: pkgsrc/net/p5-FusionInventory-Agent/distinfo
diff -u pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.5 pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.6
--- pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.5    Sun Sep 13 09:13:45 2020
+++ pkgsrc/net/p5-FusionInventory-Agent/distinfo        Mon May  3 17:12:23 2021
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2020/09/13 09:13:45 wiz Exp $
+$NetBSD: distinfo,v 1.6 2021/05/03 17:12:23 bouyer Exp $
 
-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
+SHA1 (FusionInventory-Agent-2.6.tar.gz) = 288acf5707e550fa10275f8e6fab70b50aa790aa
+RMD160 (FusionInventory-Agent-2.6.tar.gz) = 1d6504f2119bb531c527180c9275bb692b8a1a2a
+SHA512 (FusionInventory-Agent-2.6.tar.gz) = c4d12b17e87f9b7e59c1a7284fb88bb0ab51c22037624f666469c75b993ec5939f3f88752afdab82b5d35972c76fbc36a49c6fd1f5246481efb8adf893b4fa3f
+Size (FusionInventory-Agent-2.6.tar.gz) = 2819730 bytes
+SHA1 (patch-Makefile.PL) = d01414b74fa3bbd9bedb658b39d3a07074274142

Index: pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL
diff -u pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.3 pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.4
--- pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL:1.3   Sun Sep 13 09:13:45 2020
+++ pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL       Mon May  3 17:12:23 2021
@@ -1,11 +1,11 @@
-$NetBSD: patch-Makefile.PL,v 1.3 2020/09/13 09:13:45 wiz Exp $
+$NetBSD: patch-Makefile.PL,v 1.4 2021/05/03 17:12:23 bouyer Exp $
 
 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 {
+--- Makefile.PL.orig   2020-09-28 11:55:10.000000000 +0200
++++ Makefile.PL        2021-05-03 18:36:36.841916298 +0200
+@@ -174,12 +174,12 @@
          INSTALLLIB           => '$(DATADIR)/lib',
          INSTALLSITELIB       => '$(DATADIR)/lib',
          INSTALLVENDORLIB     => '$(DATADIR)/lib',
@@ -24,29 +24,27 @@ Install config into examples/ directory.
          SYSCONFDIR           => '$(PREFIX)/etc/fusioninventory',
          DATADIR              => '$(PREFIX)/share/fusioninventory',
          LOCALSTATEDIR        => '$(PREFIX)/var/fusioninventory',
-@@ -239,17 +239,17 @@ sub install {
+@@ -240,18 +240,12 @@
      $install .= <<'EOF';
  
  config_install : pure_install
 -      $(MKPATH) $(DESTDIR)$(SYSCONFDIR)
 -      $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
+-      for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
 +      $(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 ; \
++      for config in agent.cfg inventory-server-plugin.cfg proxy-server-plugin.cfg proxy2-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg; \
        do \
--        if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \
+-        if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
 -          $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
--          $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
+-          $(CP) etc/$$config $(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; \
+-        else \
+-          $(CP) etc/$$config $(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; \
+-        fi; \
++        $(CP) etc/$$config $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
++        $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
        done
        $(ABSPERLRUN) -pi \
+           -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \