aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Lange <DLange@git.local>2021-01-15 10:47:42 +0100
committerDaniel Lange <DLange@git.local>2021-01-15 11:37:28 +0100
commit46b17a1d917b759bfd0df83490d0a9cc1d01a364 (patch)
tree27b3245dd23dc8aec1319f0031e723ea1aea4a76
parentb5abd1f947bfa4d8263906f1dfa94c22a9183571 (diff)
downloaddebian_htop-46b17a1d917b759bfd0df83490d0a9cc1d01a364.tar.gz
debian_htop-46b17a1d917b759bfd0df83490d0a9cc1d01a364.tar.bz2
debian_htop-46b17a1d917b759bfd0df83490d0a9cc1d01a364.zip
Update hurd patch
-rw-r--r--debian/changelog6
-rw-r--r--debian/patches/0003-fix-hurd-build.patch29
2 files changed, 35 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fd4d95a..15379f4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+htop (3.0.5-3) UNRELEASED; urgency=medium
+
+ * Another update to the hurd patch
+
+ -- Daniel Lange <DLange@debian.org> Fri, 15 Jan 2021 10:47:00 +0100
+
htop (3.0.5-2) unstable; urgency=medium
* Backport patches to fix:
diff --git a/debian/patches/0003-fix-hurd-build.patch b/debian/patches/0003-fix-hurd-build.patch
index 8e77927..f4690c5 100644
--- a/debian/patches/0003-fix-hurd-build.patch
+++ b/debian/patches/0003-fix-hurd-build.patch
@@ -40,3 +40,32 @@ Date: Thu Jan 14 13:27:47 2021 +0100
extern const ProcessField Platform_defaultFields[];
extern const SignalItem Platform_signals[];
+--- a/linux/LinuxProcessList.c
++++ b/linux/LinuxProcessList.c
+@@ -42,6 +42,7 @@
+ #include "LinuxProcess.h"
+ #include "Macros.h"
+ #include "Object.h"
++#include "Platform.h" // needed for GNU/hurd to get PATH_MAX
+ #include "Process.h"
+ #include "Settings.h"
+ #include "XUtils.h"
+--- a/linux/SELinuxMeter.c
++++ b/linux/SELinuxMeter.c
+@@ -12,7 +12,6 @@
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <unistd.h>
+-#include <linux/magic.h>
+ #include <sys/statfs.h>
+ #include <sys/statvfs.h>
+
+@@ -35,7 +34,7 @@
+ return false;
+ }
+
+- if ((uint32_t)sfbuf.f_type != (uint32_t)SELINUX_MAGIC) {
++ if ((uint32_t)sfbuf.f_type != /* SELINUX_MAGIC */ 0xf97cff8cU) {
+ return false;
+ }
+

© 2014-2024 Faster IT GmbH | imprint | privacy policy