diff options
| author | tnn <tnn@pkgsrc.org> | 2020-05-13 19:36:56 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2020-05-13 19:36:56 +0000 |
| commit | 2369855e0f12a74638376ac5279d2d194907baaf (patch) | |
| tree | 0bd7d9404ae0915e49548e231b09b873758d4a42 /sysutils | |
| parent | 382e43195d5f68c58d0fba15117a63163ee71194 (diff) | |
| download | pkgsrc-2369855e0f12a74638376ac5279d2d194907baaf.tar.gz | |
lsof: fix wrong conditional added in patch-af 1.20
machine/ptrace.h pulls in sys/module_hook.h after 2019-11-27 under _KERNEL
This corresponds to NetBSD 9.99.19.
sys/module_hook.h is not installed.
Ergo sys/ptrace.h must be included /without/ defining _KERNEL.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lsof/distinfo | 4 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-af | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 3555f9da83a..4118f4516fa 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.95 2020/04/16 12:28:36 manu Exp $ +$NetBSD: distinfo,v 1.96 2020/05/13 19:36:56 tnn Exp $ SHA1 (lsof_4.91.tar.bz2) = da6f9883d00f200671f6e47cf838bb9b6b9c6f01 RMD160 (lsof_4.91.tar.bz2) = 5f7be9a860f30b66e247e0405657a69dd044e245 @@ -9,7 +9,7 @@ SHA1 (patch-ab) = 1501d8b0e6fd2c61949ba0d447c7b726655725c4 SHA1 (patch-ac) = dac0fcdfee97d42c8f23684a4321519b9f8698d9 SHA1 (patch-ad) = 7f639e8832c2da8e498c33a38ecbc7b3d3a7430a SHA1 (patch-ae) = 3f4a7ce54c0646941fd86400f91a2d17e9d2354a -SHA1 (patch-af) = 5407ed91bb6459637054a6f84720f7ab3c19c8e8 +SHA1 (patch-af) = 300d8042078e1137deead7f82d7ab252bbdbbb43 SHA1 (patch-ag) = ced30f63961268a6c76bcc1d22a2eb9e1f750480 SHA1 (patch-ah) = 2de22b9a3733f958298af5e33b66c0653c320f59 SHA1 (patch-dialects_n+obsd_dnode1.c) = dc8c766760aca4eb2e7d7af3944260dd49795c09 diff --git a/sysutils/lsof/patches/patch-af b/sysutils/lsof/patches/patch-af index 4e59b2bb20c..3ae8a55bfc3 100644 --- a/sysutils/lsof/patches/patch-af +++ b/sysutils/lsof/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.20 2020/04/16 12:28:36 manu Exp $ +$NetBSD: patch-af,v 1.21 2020/05/13 19:36:56 tnn Exp $ --- dialects/n+obsd/dlsof.h.orig 2006-03-28 23:54:15.000000000 +0200 +++ dialects/n+obsd/dlsof.h 2020-04-16 14:25:29.349520955 +0200 @@ -7,7 +7,7 @@ $NetBSD: patch-af,v 1.20 2020/04/16 12:28:36 manu Exp $ #include <signal.h> #include <string.h> #include <unistd.h> -+#if (!defined(NETBSDV) || __NetBSD_Version__<900000000) ++#if (!defined(NETBSDV) || __NetBSD_Version__>=999001900) +#include <sys/ptrace.h> /* pulled in by procfs.h, but needs to be pulled in before _KERNEL is defined */ +#endif |