Mon May 3 17:12:23 2021 UTC ()
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


(bouyer)
diff -r1.18 -r1.19 pkgsrc/net/p5-FusionInventory-Agent/Makefile
diff -r1.4 -r1.5 pkgsrc/net/p5-FusionInventory-Agent/PLIST
diff -r1.5 -r1.6 pkgsrc/net/p5-FusionInventory-Agent/distinfo
diff -r1.3 -r1.4 pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL
cvs diff -r1.18 -r1.19 pkgsrc/net/p5-FusionInventory-Agent/Makefile (expand / switch to unified diff)

--- pkgsrc/net/p5-FusionInventory-Agent/Makefile 2020/09/13 09:13:45 1.18
+++ pkgsrc/net/p5-FusionInventory-Agent/Makefile 2021/05/03 17:12:23 1.19
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.18 2020/09/13 09:13:45 wiz Exp $ 1# $NetBSD: Makefile,v 1.19 2021/05/03 17:12:23 bouyer Exp $
2 2
3DISTNAME= FusionInventory-Agent-2.5 3DISTNAME= FusionInventory-Agent-2.6
4PKGNAME= p5-${DISTNAME} 4PKGNAME= p5-${DISTNAME}
5CATEGORIES= net perl5 5CATEGORIES= net perl5
6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GB/GBOUGARD/} 6MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GB/GBOUGARD/}
7 7
8MAINTAINER= bouyer@NetBSD.org 8MAINTAINER= bouyer@NetBSD.org
9HOMEPAGE= https://metacpan.org/release/FusionInventory-Agent 9HOMEPAGE= https://metacpan.org/release/FusionInventory-Agent
10COMMENT= Fusion Inventory agent 10COMMENT= Fusion Inventory agent
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13PKG_SYSCONFSUBDIR?= fusioninventory 13PKG_SYSCONFSUBDIR?= fusioninventory
14EGDIR= ${PREFIX}/share/examples/fusioninventory 14EGDIR= ${PREFIX}/share/examples/fusioninventory
15CONF_FILES+= ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg 15CONF_FILES+= ${EGDIR}/agent.cfg ${PKG_SYSCONFDIR}/agent.cfg
16CONF_FILES+= ${EGDIR}/inventory-server-plugin.cfg ${PKG_SYSCONFDIR}/inventory-server-plugin.cfg 16CONF_FILES+= ${EGDIR}/inventory-server-plugin.cfg ${PKG_SYSCONFDIR}/inventory-server-plugin.cfg
cvs diff -r1.4 -r1.5 pkgsrc/net/p5-FusionInventory-Agent/PLIST (expand / switch to unified diff)

--- pkgsrc/net/p5-FusionInventory-Agent/PLIST 2020/09/13 09:13:45 1.4
+++ pkgsrc/net/p5-FusionInventory-Agent/PLIST 2021/05/03 17:12:23 1.5
@@ -1,15 +1,17 @@ @@ -1,15 +1,17 @@
1@comment $NetBSD: PLIST,v 1.4 2020/09/13 09:13:45 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.5 2021/05/03 17:12:23 bouyer Exp $
2share/examples/fusioninventory/agent.cfg 2share/examples/fusioninventory/agent.cfg
3share/examples/fusioninventory/inventory-server-plugin.cfg 3share/examples/fusioninventory/inventory-server-plugin.cfg
 4share/examples/fusioninventory/proxy-server-plugin.cfg
 5share/examples/fusioninventory/proxy2-server-plugin.cfg
4share/examples/fusioninventory/server-test-plugin.cfg 6share/examples/fusioninventory/server-test-plugin.cfg
5share/examples/fusioninventory/ssl-server-plugin.cfg 7share/examples/fusioninventory/ssl-server-plugin.cfg
6share/fusioninventory/edid.ids 8share/fusioninventory/edid.ids
7share/fusioninventory/html/favicon.ico 9share/fusioninventory/html/favicon.ico
8share/fusioninventory/html/index.tpl 10share/fusioninventory/html/index.tpl
9share/fusioninventory/html/inventory.tpl 11share/fusioninventory/html/inventory.tpl
10share/fusioninventory/html/logo.png 12share/fusioninventory/html/logo.png
11share/fusioninventory/html/now.tpl 13share/fusioninventory/html/now.tpl
12share/fusioninventory/html/site.css 14share/fusioninventory/html/site.css
13share/fusioninventory/pci.ids 15share/fusioninventory/pci.ids
14share/fusioninventory/sysobject.ids 16share/fusioninventory/sysobject.ids
15share/fusioninventory/usb.ids 17share/fusioninventory/usb.ids
cvs diff -r1.5 -r1.6 pkgsrc/net/p5-FusionInventory-Agent/distinfo (expand / switch to unified diff)

--- pkgsrc/net/p5-FusionInventory-Agent/distinfo 2020/09/13 09:13:45 1.5
+++ pkgsrc/net/p5-FusionInventory-Agent/distinfo 2021/05/03 17:12:23 1.6
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.5 2020/09/13 09:13:45 wiz Exp $ 1$NetBSD: distinfo,v 1.6 2021/05/03 17:12:23 bouyer Exp $
2 2
3SHA1 (FusionInventory-Agent-2.5.tar.gz) = 782f26d66f9f079cb96463be71bac161bb8600c6 3SHA1 (FusionInventory-Agent-2.6.tar.gz) = 288acf5707e550fa10275f8e6fab70b50aa790aa
4RMD160 (FusionInventory-Agent-2.5.tar.gz) = 3a100fd9b5506cfb6a39a77cfd7950638552335a 4RMD160 (FusionInventory-Agent-2.6.tar.gz) = 1d6504f2119bb531c527180c9275bb692b8a1a2a
5SHA512 (FusionInventory-Agent-2.5.tar.gz) = 37f0545df716e482fffd018a56b9c7482d7fce64fd0fa277c481a553a2108e7588f34077fb4775bb6352668efc96b3525fe97b1d6331d637401e8db8c0c91333 5SHA512 (FusionInventory-Agent-2.6.tar.gz) = c4d12b17e87f9b7e59c1a7284fb88bb0ab51c22037624f666469c75b993ec5939f3f88752afdab82b5d35972c76fbc36a49c6fd1f5246481efb8adf893b4fa3f
6Size (FusionInventory-Agent-2.5.tar.gz) = 2638934 bytes 6Size (FusionInventory-Agent-2.6.tar.gz) = 2819730 bytes
7SHA1 (patch-Makefile.PL) = 932d2075bc8fb67fca393e72409f93ce2a0675ca 7SHA1 (patch-Makefile.PL) = d01414b74fa3bbd9bedb658b39d3a07074274142
cvs diff -r1.3 -r1.4 pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL (expand / switch to unified diff)

--- pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL 2020/09/13 09:13:45 1.3
+++ pkgsrc/net/p5-FusionInventory-Agent/patches/patch-Makefile.PL 2021/05/03 17:12:23 1.4
@@ -1,52 +1,50 @@ @@ -1,52 +1,50 @@
1$NetBSD: patch-Makefile.PL,v 1.3 2020/09/13 09:13:45 wiz Exp $ 1$NetBSD: patch-Makefile.PL,v 1.4 2021/05/03 17:12:23 bouyer Exp $
2 2
3Fix man page path. 3Fix man page path.
4Install config into examples/ directory. 4Install config into examples/ directory.
5 5
6--- Makefile.PL.orig 2019-04-12 15:04:29.000000000 +0000 6--- Makefile.PL.orig 2020-09-28 11:55:10.000000000 +0200
7+++ Makefile.PL 7+++ Makefile.PL 2021-05-03 18:36:36.841916298 +0200
8@@ -173,12 +173,12 @@ sub constants { 8@@ -174,12 +174,12 @@
9 INSTALLLIB => '$(DATADIR)/lib', 9 INSTALLLIB => '$(DATADIR)/lib',
10 INSTALLSITELIB => '$(DATADIR)/lib', 10 INSTALLSITELIB => '$(DATADIR)/lib',
11 INSTALLVENDORLIB => '$(DATADIR)/lib', 11 INSTALLVENDORLIB => '$(DATADIR)/lib',
12- INSTALLMAN1DIR => '$(PREFIX)/share/man/man1', 12- INSTALLMAN1DIR => '$(PREFIX)/share/man/man1',
13- INSTALLSITEMAN1DIR => '$(PREFIX)/share/man/man1', 13- INSTALLSITEMAN1DIR => '$(PREFIX)/share/man/man1',
14- INSTALLVENDORMAN1DIR => '$(PREFIX)/share/man/man1', 14- INSTALLVENDORMAN1DIR => '$(PREFIX)/share/man/man1',
15- INSTALLMAN3DIR => '$(PREFIX)/share/man/man3', 15- INSTALLMAN3DIR => '$(PREFIX)/share/man/man3',
16- INSTALLSITEMAN3DIR => '$(PREFIX)/share/man/man3', 16- INSTALLSITEMAN3DIR => '$(PREFIX)/share/man/man3',
17- INSTALLVENDORMAN3DIR => '$(PREFIX)/share/man/man3', 17- INSTALLVENDORMAN3DIR => '$(PREFIX)/share/man/man3',
18+ INSTALLMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1', 18+ INSTALLMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1',
19+ INSTALLSITEMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1', 19+ INSTALLSITEMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1',
20+ INSTALLVENDORMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1', 20+ INSTALLVENDORMAN1DIR => '$(PREFIX)/$(PKGMANDIR)/man1',
21+ INSTALLMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3', 21+ INSTALLMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3',
22+ INSTALLSITEMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3', 22+ INSTALLSITEMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3',
23+ INSTALLVENDORMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3', 23+ INSTALLVENDORMAN3DIR => '$(PREFIX)/$(PKGMANDIR)/man3',
24 SYSCONFDIR => '$(PREFIX)/etc/fusioninventory', 24 SYSCONFDIR => '$(PREFIX)/etc/fusioninventory',
25 DATADIR => '$(PREFIX)/share/fusioninventory', 25 DATADIR => '$(PREFIX)/share/fusioninventory',
26 LOCALSTATEDIR => '$(PREFIX)/var/fusioninventory', 26 LOCALSTATEDIR => '$(PREFIX)/var/fusioninventory',
27@@ -239,17 +239,17 @@ sub install { 27@@ -240,18 +240,12 @@
28 $install .= <<'EOF'; 28 $install .= <<'EOF';
29  29
30 config_install : pure_install 30 config_install : pure_install
31- $(MKPATH) $(DESTDIR)$(SYSCONFDIR) 31- $(MKPATH) $(DESTDIR)$(SYSCONFDIR)
32- $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR) 32- $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(SYSCONFDIR)
 33- for config in agent.cfg $(shell cd etc; echo *-plugin.cfg ); \
33+ $(MKPATH) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory 34+ $(MKPATH) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory
34+ $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory 35+ $(NOECHO) $(CHMOD) $(PERM_DIR) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory
35 for config in agent.cfg inventory-server-plugin.cfg server-test-plugin.cfg ssl-server-plugin.cfg ; \ 36+ 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; \
36 do \ 37 do \
37- if $(TEST_F) $(DESTDIR)/$(SYSCONFDIR)/$$config; then \ 38- if $(TEST_F) $(DESTDIR)$(SYSCONFDIR)/$$config; then \
38- $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ 39- $(RM_F) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
39- $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ 40- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
40- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \ 41- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config.new; \
41+ if $(TEST_F) $(DESTDIR)/$(PREFIX)/share/examples/fusioninventory/$$config; then \ 42- else \
42+ $(RM_F) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \ 43- $(CP) etc/$$config $(DESTDIR)$(SYSCONFDIR)/$$config; \
43+ $(CP) etc/agent.cfg $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \ 
44+ $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config.new; \ 
45 else \ 
46- $(CP) etc/agent.cfg $(DESTDIR)$(SYSCONFDIR)/$$config; \ 
47- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \ 44- $(CHMOD) $(PERM_RW) $(DESTDIR)$(SYSCONFDIR)/$$config; \
48+ $(CP) etc/agent.cfg $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \ 45- fi; \
49+ $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \ 46+ $(CP) etc/$$config $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
50 fi; \ 47+ $(CHMOD) $(PERM_RW) $(DESTDIR)$(PREFIX)/share/examples/fusioninventory/$$config; \
51 done 48 done
52 $(ABSPERLRUN) -pi \ 49 $(ABSPERLRUN) -pi \
 50 -e "s|=> undef, # SYSCONFDIR.*|=> '$(SYSCONFDIR)',|;" \