JDM170/build
1
0
Fork 0
mirror of https://github.com/armbian/build synced 2025-09-24 19:47:06 +07:00
Code Issues Packages Projects Releases Wiki Activity

Made clear what the patch fixes and add notes on code sources

Browse Source
This commit is contained in:
Piotr Szczepanik
2021-04-18 22:16:07 +02:00
parent 8b3efeedd5
commit 816187bd9e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packages/extras-buildpkgs/htop/debian/patches/avafinger-cpu-monitor.patch
View File

@@ -1,3 +1,11 @@
This patch file contains code from @avafinger's htop_2.2.2 repository.
It is the result of diff between:
https://github.com/avafinger/htop_2.2.2/commit/dc21e5f6
and:
https://github.com/hishamhm/htop/tree/2.2.0
---
diff --git a/Armbian_Meter.c b/Armbian_Meter.c diff --git a/Armbian_Meter.c b/Armbian_Meter.c
new file mode 100644 new file mode 100644
index 0000000..183032b index 0000000..183032b

4
packages/extras-buildpkgs/htop/debian/patches/fix-unchecked-buffer-writes.patch → packages/extras-buildpkgs/htop/debian/patches/fix-unchecked-buffer-writes-in-avafinger-cpu-monitor.patch
View File

@@ -55,11 +55,13 @@ diff --git a/StringUtils.c b/StringUtils.c
index 0578cde..fd1c3db 100644 index 0578cde..fd1c3db 100644
--- a/StringUtils.c --- a/StringUtils.c
+++ b/StringUtils.c +++ b/StringUtils.c
@@ -154,3 +154,15 @@ char* String_readLine(FILE* fd) { @@ -154,3 +154,17 @@ char* String_readLine(FILE* fd) {
at = buffer + bufSize - step; at = buffer + bufSize - step;
} }
} }
+ +
+// Function borowed from upstream htop, see:
+// https://github.com/htop-dev/htop/blob/feec16cbb53dabc6a52ef2f69a6a13798be82617/XUtils.c#L196-L206
+size_t String_safeStrncpy(char *restrict dest, const char *restrict src, size_t size) { +size_t String_safeStrncpy(char *restrict dest, const char *restrict src, size_t size) {
+ assert(size > 0); + assert(size > 0);
+ +

3
packages/extras-buildpkgs/htop/debian/patches/series
View File

@@ -1,9 +1,8 @@
780-fix-option-string.patch 780-fix-option-string.patch
fix-linux-process.patch fix-linux-process.patch
avafinger-cpu-monitor.patch avafinger-cpu-monitor.patch
fix-unchecked-buffer-writes-in-avafinger-cpu-monitor.patch
remove-fancy-flashing.patch remove-fancy-flashing.patch
fix-cpufreq-meter-on-biglittle.patch fix-cpufreq-meter-on-biglittle.patch
fix-cpufreq-meter-for-non-root.patch fix-cpufreq-meter-for-non-root.patch
cpu-temperatute-from-hwmon.patch cpu-temperatute-from-hwmon.patch
fix-unchecked-buffer-writes.patch