Received: by mail.netbsd.org (Postfix, from userid 605) id BB15B84F22; Sat, 7 May 2022 08:08:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BD82884EEA for ; Sat, 7 May 2022 08:06:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id tL05URhtbtrr for ; Sat, 7 May 2022 08:06:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id D2FF584E88 for ; Sat, 7 May 2022 08:06:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9DCA9F991; Sat, 7 May 2022 08:06:51 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_165191081121350" MIME-Version: 1.0 Date: Sat, 7 May 2022 08:06:51 +0000 From: "Santhosh Raju" Subject: CVS commit: pkgsrc/sysutils/py-Glances To: pkgsrc-changes@NetBSD.org Reply-To: fox@netbsd.org X-Mailer: log_accum Message-Id: <20220507080651.9DCA9F991@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_165191081121350 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: fox Date: Sat May 7 08:06:51 UTC 2022 Modified Files: pkgsrc/sysutils/py-Glances: Makefile PLIST distinfo pkgsrc/sysutils/py-Glances/patches: patch-glances_plugins_glances__quicklook.py Log Message: 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 To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 pkgsrc/sysutils/py-Glances/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/sysutils/py-Glances/PLIST cvs rdiff -u -r1.16 -r1.17 pkgsrc/sysutils/py-Glances/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_165191081121350 Content-Disposition: inline Content-Length: 5724 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/sysutils/py-Glances/Makefile diff -u pkgsrc/sysutils/py-Glances/Makefile:1.17 pkgsrc/sysutils/py-Glances/Makefile:1.18 --- pkgsrc/sysutils/py-Glances/Makefile:1.17 Sun May 1 09:13:42 2022 +++ pkgsrc/sysutils/py-Glances/Makefile Sat May 7 08:06:51 2022 @@ -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/} Index: pkgsrc/sysutils/py-Glances/PLIST diff -u pkgsrc/sysutils/py-Glances/PLIST:1.8 pkgsrc/sysutils/py-Glances/PLIST:1.9 --- pkgsrc/sysutils/py-Glances/PLIST:1.8 Sun Jul 25 16:47:46 2021 +++ pkgsrc/sysutils/py-Glances/PLIST Sat May 7 08:06:51 2022 @@ -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_std ${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 Index: pkgsrc/sysutils/py-Glances/distinfo diff -u pkgsrc/sysutils/py-Glances/distinfo:1.16 pkgsrc/sysutils/py-Glances/distinfo:1.17 --- pkgsrc/sysutils/py-Glances/distinfo:1.16 Sun Dec 5 11:46:40 2021 +++ pkgsrc/sysutils/py-Glances/distinfo Sat May 7 08:06:51 2022 @@ -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 Index: pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py diff -u pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py:1.1 pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py:1.2 --- pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py:1.1 Fri Jul 16 04:24:16 2021 +++ pkgsrc/sysutils/py-Glances/patches/patch-glances_plugins_glances__quicklook.py Sat May 7 08:06:51 2022 @@ -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 --_----------=_165191081121350--