sysutils/py-Glances: Update to 3.2.5

Changes since 3.2.4.2:

===============
Version 3.2.5
===============

Enhancement requests:

    * Add a Accumulated per program function to the Glances process list needs
      test new feature plugin/ps #2015
    * Including battery and AC adapter health in Glances enhancement new feature
      #1049
    * Display uptime of a docker container enhancement plugin/docker #2004
    * Add a code formatter enhancement #1964

Bugs corrected:

    * Threading.Event.isSet is deprecated in Python 3.10 #2017
    * Fix code scanning alert - Clear-text logging of sensitive information
      security #2006
    * The gpu temperature unit are displayed incorrectly in web ui bug #2002
    * Doc for 'alert' Restfull/JSON API response documentation #1994
    * Show the spinning state of a disk documentation #1993
    * Web server status check endpoint enhancement #1988
    * --time parameter being ignored for client/server mode bug #1978
    * Amp with pipe do not work documentation #1976
    * glances_ip.py plugin relies on low rating / malicious site domain bug
      security #1975
    * "N" command freezes/unfreezes the current time instead of show/hide bug
      #1974
    * Missing commands in help "h" screen enhancement needs contributor #1973
    * Grafana dashboards not displayed with influxdb2 enhancement needs
      contributor #1960
    * Glances reports different amounts of used memory than free -m or top
      documentation #1924
    * Missing: Help command doesn't have info on TCP Connections bug
      documentation enhancement needs contributor #1675
    * Docstring convention documentation enhancement #940

Thanks for the bug report and the patch: @RazCrimson, @Karthikeyan Singaravelan,
@Moldavite, @ledwards

4 files changed, 23 insertions, 21 deletions

diff --git a/sysutils/py-Glances/Makefile b/sysutils/py-Glances/Makefile
index 48d44206603..12fd3ac0e5d 100644
--- a/sysutils/py-Glances/Makefile
+++ b/sysutils/py-Glances/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2022/05/01 09:13:42 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/07 08:06:51 fox Exp $
 
-DISTNAME=	Glances-3.2.4.2
+DISTNAME=	Glances-3.2.5
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
-PKGREVISION=	2
 CATEGORIES=	sysutils python
 MASTER_SITES=	${MASTER_SITE_PYPI:=G/Glances/}
 
diff --git a/sysutils/py-Glances/PLIST b/sysutils/py-Glances/PLIST
index 58017a87283..d4051c48faa 100644
--- a/sysutils/py-Glances/PLIST
+++ b/sysutils/py-Glances/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2021/07/25 16:47:46 fox Exp $
+@comment $NetBSD: PLIST,v 1.9 2022/05/07 08:06:51 fox Exp $
 bin/glances-${PYVERSSUFFIX}
 ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
 ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
@@ -171,6 +171,9 @@ ${PYSITELIB}/glances/outputs/glances_stdout_csv.pyo
 ${PYSITELIB}/glances/outputs/glances_stdout_issue.py
 ${PYSITELIB}/glances/outputs/glances_stdout_issue.pyc
 ${PYSITELIB}/glances/outputs/glances_stdout_issue.pyo
+${PYSITELIB}/glances/outputs/glances_unicode.py
+${PYSITELIB}/glances/outputs/glances_unicode.pyc
+${PYSITELIB}/glances/outputs/glances_unicode.pyo
 ${PYSITELIB}/glances/password.py
 ${PYSITELIB}/glances/password.pyc
 ${PYSITELIB}/glances/password.pyo
@@ -291,6 +294,9 @@ ${PYSITELIB}/glances/ports_list.pyo
 ${PYSITELIB}/glances/processes.py
 ${PYSITELIB}/glances/processes.pyc
 ${PYSITELIB}/glances/processes.pyo
+${PYSITELIB}/glances/programs.py
+${PYSITELIB}/glances/programs.pyc
+${PYSITELIB}/glances/programs.pyo
 ${PYSITELIB}/glances/secure.py
 ${PYSITELIB}/glances/secure.pyc
 ${PYSITELIB}/glances/secure.pyo
diff --git a/sysutils/py-Glances/distinfo b/sysutils/py-Glances/distinfo
index 60cea8da4ee..b77b55f0f6c 100644
--- a/sysutils/py-Glances/distinfo
+++ b/sysutils/py-Glances/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.16 2021/12/05 11:46:40 fox Exp $
+$NetBSD: distinfo,v 1.17 2022/05/07 08:06:51 fox Exp $
 
-BLAKE2s (Glances-3.2.4.2.tar.gz) = bfa0483181a2baf293df7dcdf81230f55d4fc88aec1e1de0563c3092425de2e7
-SHA512 (Glances-3.2.4.2.tar.gz) = 17502d0bfdc1fc67e3c8f909e229b84fdfd7aa4a971c2c925a8b59f933b29406bfcde6600b5f400506281d2a480f9488f74d6d1b3bd6f20486d7a202819f09b3
-Size (Glances-3.2.4.2.tar.gz) = 6893198 bytes
+BLAKE2s (Glances-3.2.5.tar.gz) = 99e3594d979214dd1c8b8011aa467a6af052f2b3ad400fdaacd0a5e72033b04a
+SHA512 (Glances-3.2.5.tar.gz) = 09f08e408f2a23159d3fbafb4df0c937c84b4b9dc7cff44c1abeb0cbdd199e0820bf5ed0011b5cf19f31029bef995b845e3f31f5f5d22a3b329ad3d5267b8ef9
+Size (Glances-3.2.5.tar.gz) = 6884037 bytes
 SHA1 (patch-glances_plugins_glances__cpu.py) = 0692c14bd8ac79a7a6a4ff7dfe1a6dfc61c8a8c5
-SHA1 (patch-glances_plugins_glances__quicklook.py) = 349a469bd11ad5aaafb264d2689b52d7404b4d62
+SHA1 (patch-glances_plugins_glances__quicklook.py) = 7bc17f94fd3b2a9105123ee3f6ea44e500944e9e
diff --git a/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py b/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py
index cdf87450bad..eb615925690 100644
--- a/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py
+++ b/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py
@@ -1,26 +1,23 @@
-$NetBSD: patch-glances_plugins_glances__quicklook.py,v 1.1 2021/07/16 04:24:16 fox Exp $
+$NetBSD: patch-glances_plugins_glances__quicklook.py,v 1.2 2022/05/07 08:06:51 fox Exp $
 
 It seems cpu_hz_current and cpu_hz is not available in NetBSD, so add additional
 check to see if the key exists.
---- glances/plugins/glances_quicklook.py.orig	2021-07-10 07:09:24.000000000 +0000
+--- glances/plugins/glances_quicklook.py.orig	2022-04-10 14:15:33.000000000 +0000
 +++ glances/plugins/glances_quicklook.py
-@@ -82,8 +82,10 @@ class Plugin(GlancesPlugin):
+@@ -74,10 +74,12 @@ class Plugin(GlancesPlugin):
              # Get additional information
              cpu_info = cpu_percent.get_info()
              stats['cpu_name'] = cpu_info['cpu_name']
--            stats['cpu_hz_current'] = self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
+-            stats['cpu_hz_current'] = (
+-                self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
+-            )
 -            stats['cpu_hz'] = self._mhz_to_hz(cpu_info['cpu_hz']) if cpu_info['cpu_hz'] is not None else None
 +            if 'cpu_hz_current' in cpu_info:
-+                stats['cpu_hz_current'] = self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
++                stats['cpu_hz_current'] = (
++                    self._mhz_to_hz(cpu_info['cpu_hz_current']) if cpu_info['cpu_hz_current'] is not None else None
++                )
 +            if 'cpu_hz' in cpu_info:
 +                stats['cpu_hz'] = self._mhz_to_hz(cpu_info['cpu_hz']) if cpu_info['cpu_hz'] is not None else None
  
          elif self.input_method == 'snmp':
              # Not available
-@@ -193,4 +195,4 @@ class Plugin(GlancesPlugin):
- 
-     def _mhz_to_hz(self, hz):
-         """Convert Mhz to Hz."""
--        return hz * 1000000.0
-\ No newline at end of file
-+        return hz * 1000000.0