diff options
| author | tron <tron@pkgsrc.org> | 2002-09-12 19:12:18 +0000 |
|---|---|---|
| committer | tron <tron@pkgsrc.org> | 2002-09-12 19:12:18 +0000 |
| commit | c9ec59773df5bf7e40fc0b4c3251aedbcda3b536 (patch) | |
| tree | a3b54a46c38d197e5668fd24cbbc5d1f4d2af630 /sysutils | |
| parent | 4b06af5b33183142e9ea7c14d779ced24a7ccb1a (diff) | |
| download | pkgsrc-c9ec59773df5bf7e40fc0b4c3251aedbcda3b536.tar.gz | |
Fix build problem under NetBSD-current and combine two patches which
modify the same file.
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/lsof/distinfo | 5 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-aa | 39 | ||||
| -rw-r--r-- | sysutils/lsof/patches/patch-ab | 18 |
3 files changed, 26 insertions, 36 deletions
diff --git a/sysutils/lsof/distinfo b/sysutils/lsof/distinfo index 5e5d38ba88c..e1da6a81de8 100644 --- a/sysutils/lsof/distinfo +++ b/sysutils/lsof/distinfo @@ -1,6 +1,5 @@ -$NetBSD: distinfo,v 1.17 2002/08/19 22:52:24 atatat Exp $ +$NetBSD: distinfo,v 1.18 2002/09/12 19:12:18 tron Exp $ SHA1 (lsof_4.64.tar.gz) = eacd1d259d136b27f284928574529da0e35fe6b9 Size (lsof_4.64.tar.gz) = 942463 bytes -SHA1 (patch-aa) = 1946122860ad68f1c5e07f6ae82a147eb51e01c5 -SHA1 (patch-ab) = c2dd4962c1beffccc54fd13ef4a41bfd4dc608b7 +SHA1 (patch-aa) = 3a288b5f936df588c864fcda463d427abe80d279 diff --git a/sysutils/lsof/patches/patch-aa b/sysutils/lsof/patches/patch-aa index b316c5cf03b..ca4ebfaf9cd 100644 --- a/sysutils/lsof/patches/patch-aa +++ b/sysutils/lsof/patches/patch-aa @@ -1,18 +1,27 @@ -$NetBSD: patch-aa,v 1.17 2001/04/30 14:37:24 agc Exp $ +$NetBSD: patch-aa,v 1.18 2002/09/12 19:12:19 tron Exp $ -If LSOF_MORE_SECURE is non-zero, compile lsof with security, and -only let unprivileged (non-root) users view their own open files - ---- dialects/n+obsd/machine.h 2001/04/30 09:23:38 1.1 -+++ dialects/n+obsd/machine.h 2001/04/30 10:06:24 -@@ -373,7 +373,9 @@ - * (the one that its user logged on with) of the lsof process. - */ - --/* #define HASSECURITY 1 */ -+#if LSOF_MORE_SECURE -+#define HASSECURITY 1 -+#endif +--- dialects/n+obsd/dlsof.h.orig Mon Jun 17 03:44:15 2002 ++++ dialects/n+obsd/dlsof.h Thu Sep 12 21:08:10 2002 +@@ -46,6 +46,10 @@ + #include <string.h> + #include <unistd.h> ++#define _KERNEL ++#include <sys/buf.h> ++#undef _KERNEL ++ + # if defined(HASGETBOOTFILE) + #include <util.h> + # endif /* defined(HASGETBOOTFILE) */ +@@ -209,9 +213,9 @@ - /* + # if defined(HASNULLFS) + #define _KERNEL +-# if defined(NETBSDV) && NETBSDV>=1060 ++# if defined(NETBSDV) && NETBSDV>=1050 + #include "netexport.h" +-# endif /* defined(NETBSDV) && NETBSDV>=1060 */ ++# endif /* defined(NETBSDV) && NETBSDV>=1050 */ + #include <miscfs/nullfs/null.h> + #undef _KERNEL + # endif /* defined(HASNULLFS) */ diff --git a/sysutils/lsof/patches/patch-ab b/sysutils/lsof/patches/patch-ab deleted file mode 100644 index 4cb1043813c..00000000000 --- a/sysutils/lsof/patches/patch-ab +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ab,v 1.12 2002/08/19 22:52:25 atatat Exp $ - -Make 4.64 build under 1.5. - ---- dialects/n+obsd/dlsof.h.orig Mon Jun 17 03:44:15 2002 -+++ dialects/n+obsd/dlsof.h Wed Aug 14 18:47:38 2002 -@@ -209,9 +209,9 @@ - - # if defined(HASNULLFS) - #define _KERNEL --# if defined(NETBSDV) && NETBSDV>=1060 -+# if defined(NETBSDV) && NETBSDV>=1050 - #include "netexport.h" --# endif /* defined(NETBSDV) && NETBSDV>=1060 */ -+# endif /* defined(NETBSDV) && NETBSDV>=1050 */ - #include <miscfs/nullfs/null.h> - #undef _KERNEL - # endif /* defined(HASNULLFS) */ |