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

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

Module Name:    pkgsrc
Committed By:   bouyer
Date:           Fri May  7 18:27:20 UTC 2021

Modified Files:
        pkgsrc/net/p5-FusionInventory-Agent: Makefile distinfo
        pkgsrc/net/p5-FusionInventory-Agent/patches:
            patch-lib_FusionInventory_Agent_Tools_Generic.pm

Log Message:
Backport patch from upstream for better Intel CPU report
Bump PKGREVISION


To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/net/p5-FusionInventory-Agent/Makefile
cvs rdiff -u -r1.7 -r1.8 pkgsrc/net/p5-FusionInventory-Agent/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm

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.20 pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.21
--- pkgsrc/net/p5-FusionInventory-Agent/Makefile:1.20   Thu May  6 20:25:15 2021
+++ pkgsrc/net/p5-FusionInventory-Agent/Makefile        Fri May  7 18:27:20 2021
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2021/05/06 20:25:15 bouyer Exp $
+# $NetBSD: Makefile,v 1.21 2021/05/07 18:27:20 bouyer Exp $
 
 DISTNAME=      FusionInventory-Agent-2.6
 PKGNAME=       p5-${DISTNAME}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    net perl5
 MASTER_SITES=  ${MASTER_SITE_PERL_CPAN:=../../authors/id/G/GB/GBOUGARD/}
 

Index: pkgsrc/net/p5-FusionInventory-Agent/distinfo
diff -u pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.7 pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.8
--- pkgsrc/net/p5-FusionInventory-Agent/distinfo:1.7    Thu May  6 20:25:15 2021
+++ pkgsrc/net/p5-FusionInventory-Agent/distinfo        Fri May  7 18:27:20 2021
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2021/05/06 20:25:15 bouyer Exp $
+$NetBSD: distinfo,v 1.8 2021/05/07 18:27:20 bouyer Exp $
 
 SHA1 (FusionInventory-Agent-2.6.tar.gz) = 288acf5707e550fa10275f8e6fab70b50aa790aa
 RMD160 (FusionInventory-Agent-2.6.tar.gz) = 1d6504f2119bb531c527180c9275bb692b8a1a2a
@@ -12,4 +12,4 @@ SHA1 (patch-lib_FusionInventory_Agent_Ta
 SHA1 (patch-lib_FusionInventory_Agent_Task_Inventory_BSD_Storages.pm) = a2ffacd0b9ee84accc001b2013aa52a0c0dc419f
 SHA1 (patch-lib_FusionInventory_Agent_Task_Inventory_Generic_PCI.pm) = 94f5afb7b4277a1729c322c7111c94481e1cbe34
 SHA1 (patch-lib_FusionInventory_Agent_Tools_BSD.pm) = d312bc244889beb7c747a4c8b021590102a8294c
-SHA1 (patch-lib_FusionInventory_Agent_Tools_Generic.pm) = 1e8cc8d8ff4c03ba563c3c63ed348e22bd665e9d
+SHA1 (patch-lib_FusionInventory_Agent_Tools_Generic.pm) = 415b4c3483b6e322ca04bde01ed048c3640f0741

Index: pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm
diff -u pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm:1.1 
pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm:1.2
--- pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm:1.1    Thu May  6 20:25:15 2021
+++ pkgsrc/net/p5-FusionInventory-Agent/patches/patch-lib_FusionInventory_Agent_Tools_Generic.pm        Fri May  7 18:27:20 2021
@@ -1,10 +1,25 @@
-$NetBSD: patch-lib_FusionInventory_Agent_Tools_Generic.pm,v 1.1 2021/05/06 20:25:15 bouyer Exp $
+$NetBSD: patch-lib_FusionInventory_Agent_Tools_Generic.pm,v 1.2 2021/05/07 18:27:20 bouyer Exp $
 
 accept pcictl as alternative to lspci
+Bring in upstream patch for better CPU report
 
 --- lib/FusionInventory/Agent/Tools/Generic.pm.orig    2020-11-09 14:49:31.000000000 +0100
-+++ lib/FusionInventory/Agent/Tools/Generic.pm 2021-05-06 21:25:27.448948334 +0200
-@@ -217,52 +217,103 @@
++++ lib/FusionInventory/Agent/Tools/Generic.pm 2021-05-07 20:08:32.214113753 +0200
+@@ -126,10 +126,12 @@
+             MANUFACTURER => $manufacturer
+         };
+         $cpu->{NAME} =
+-            ($cpu->{MANUFACTURER} =~ /Intel/ ? $info->{'Family'} : undef) ||
+             $info->{'Version'}                                     ||
++          $info->{'Family'}                                      ||
+             $info->{'Processor Family'}                            ||
+             $info->{'Processor Version'};
++      # Cleanup cpu NAME
++      $cpu->{NAME} =~ s/\((R|TM)\)//gi if $cpu->{NAME};
+ 
+        if ($cpu->{ID}) {
+ 
+@@ -217,52 +219,103 @@
  }
  
  sub getPCIDevices {