[ptxdist] [PATCH] htop: version bump 2.0.2 -> 2.1.0

[Marc Kleine-Budde <mkl@pengutronix.de>]

Also add a patch to fix "number of read syscalls of process".

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
---
 ...ProcessList-fix-reading-of-number-of-read.patch | 28 ++++++++++++++++++++++
 patches/htop-2.1.0/series                          |  4 ++++
 rules/htop.make                                    |  8 ++++---
 3 files changed, 37 insertions(+), 3 deletions(-)
 create mode 100644 patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
 create mode 100644 patches/htop-2.1.0/series

diff --git a/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
new file mode 100644
index 000000000000..e1267a32ad71
--- /dev/null
+++ b/patches/htop-2.1.0/0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
@@ -0,0 +1,28 @@
+From: Marc Kleine-Budde <mkl@pengutronix.de>
+Date: Wed, 7 Feb 2018 23:16:37 +0100
+Subject: [PATCH] linux/LinuxProcessList: fix reading of number of read
+ syscalls of process
+
+The "if" tests if the character at index "5" is 'r', as a first quick
+check. However at index "5" will always be a colon ":". This patch fixes
+the off-by-one error. htop now shows proper values in the RD_SYSC
+column.
+
+Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
+---
+ linux/LinuxProcessList.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/linux/LinuxProcessList.c b/linux/LinuxProcessList.c
+index 6f2631afa12f..230770258084 100644
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -436,7 +436,7 @@ static void LinuxProcessList_readIoFile(LinuxProcess* process, const char* dirna
+          }
+          break;
+       case 's':
+-         if (line[5] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
++         if (line[4] == 'r' && strncmp(line+1, "yscr: ", 6) == 0) {
+             process->io_syscr = strtoull(line+7, NULL, 10);
+          } else if (strncmp(line+1, "yscw: ", 6) == 0) {
+             process->io_syscw = strtoull(line+7, NULL, 10);
diff --git a/patches/htop-2.1.0/series b/patches/htop-2.1.0/series
new file mode 100644
index 000000000000..81ca0ba6e16d
--- /dev/null
+++ b/patches/htop-2.1.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-linux-LinuxProcessList-fix-reading-of-number-of-read.patch
+# f87a037f960f427f6ab7ebcbb54e5e4e  - git-ptx-patches magic
diff --git a/rules/htop.make b/rules/htop.make
index d7d27306a617..af624c7dfc83 100644
--- a/rules/htop.make
+++ b/rules/htop.make
@@ -17,8 +17,8 @@ PACKAGES-$(PTXCONF_HTOP) += htop
 #
 # Paths and names
 #
-HTOP_VERSION	:= 2.0.2
-HTOP_MD5	:= 7d354d904bad591a931ad57e99fea84a
+HTOP_VERSION	:= 2.1.0
+HTOP_MD5	:= f262b66ad6c194782f4d3a80627e84c8
 HTOP		:= htop-$(HTOP_VERSION)
 HTOP_SUFFIX	:= tar.gz
 HTOP_URL	:= http://hisham.hm/htop/releases/$(HTOP_VERSION)/$(HTOP).$(HTOP_SUFFIX)
@@ -44,7 +44,9 @@ HTOP_CONF_OPT	:= \
 	--enable-taskstats \
 	--disable-unicode \
 	--enable-linux-affinity \
-	--disable-hwloc
+	--disable-hwloc \
+	--disable-setuid \
+	--disable-delayacct
 
 # ----------------------------------------------------------------------------
 # Target-Install
-- 
2.15.1


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de