diff options
| author | multi <depot@in-addr.xyz> | 2020-11-17T23·56+0000 |
|---|---|---|
| committer | multi <depot@in-addr.xyz> | 2020-11-18T00·29+0000 |
| commit | 4331bc8da76ae67a43d64ff5355598a2699a647f (patch) | |
| tree | 2db05805958d2be1992bd6b827de8801f9097e71 /users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch | |
| parent | 73c862279aad7aa4c87bfe5ae2c69a0f56bb59df (diff) | |
chore(users/multi): Update htop derivation for new upstream. r/1883
- htop has moved upstreams, which has been producing new releases, so update the derivation to pull from the new repository on GitHub. - All of the patches I have locally have been merged upstream, so drop them from the depot. - Pull from a reasonably recent git commit instead of from a numbered release, as the ZFS ARC stats and CPU meter columnation patches haven't made it into a release yet. Change-Id: I66ad4c035df07709abf4f75a9d4e1486920091d0 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2105 Reviewed-by: multi <depot@in-addr.xyz> Tested-by: BuildkiteCI
Diffstat (limited to 'users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch')
| -rw-r--r-- | users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch b/users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch deleted file mode 100644 index 5bd4d5edfa5b..000000000000 --- a/users/multi/pkgs/htop/zfs-arc-stats/0001-Specify-correct-MIB-length.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 92258e99e639795f4119a86a1c44d5015b29ffdc Mon Sep 17 00:00:00 2001 -From: Ross Williams <ross@ross-williams.net> -Date: Sat, 6 Jul 2019 04:27:00 +0000 -Subject: [PATCH 1/9] Specify correct MIB length - -Could have resulted in a buffer overflow if the -FreeBSD kernel returned more bytes than expected. ---- - freebsd/FreeBSDProcessList.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/freebsd/FreeBSDProcessList.c b/freebsd/FreeBSDProcessList.c -index 9fef324..26019b6 100644 ---- a/freebsd/FreeBSDProcessList.c -+++ b/freebsd/FreeBSDProcessList.c -@@ -121,7 +121,7 @@ ProcessList* ProcessList_new(UsersTable* usersTable, Hashtable* pidWhiteList, ui - len = sizeof(fpl->memZfsArc); - if (sysctlbyname("kstat.zfs.misc.arcstats.size", &fpl->memZfsArc, &len, - NULL, 0) == 0 && fpl->memZfsArc != 0) { -- sysctlnametomib("kstat.zfs.misc.arcstats.size", MIB_kstat_zfs_misc_arcstats_size, &len); -+ len = 5; sysctlnametomib("kstat.zfs.misc.arcstats.size", MIB_kstat_zfs_misc_arcstats_size, &len); - fpl->zfsArcEnabled = 1; - } else { - fpl->zfsArcEnabled = 0; --- -2.20.1 - |