From 308aa3af1e8500e6bd13cf3abe8b9303f4e40420 Mon Sep 17 00:00:00 2001
From: kamil <kamil@pkgsrc.org>
Date: Fri, 23 Jun 2017 22:13:22 +0000
Subject: Correct tct build on NetBSD 8.99.1

Address <sys/user.h> removal fallout.
---
 security/tct/distinfo         |  4 ++--
 security/tct/patches/patch-am | 11 +++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'security/tct')

diff --git a/security/tct/distinfo b/security/tct/distinfo
index f990937e9b9..33fa4c66823 100644
--- a/security/tct/distinfo
+++ b/security/tct/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2015/11/04 01:18:12 agc Exp $
+$NetBSD: distinfo,v 1.10 2017/06/23 22:13:22 kamil Exp $
 
 SHA1 (tct-1.09.tar.gz) = fffb6ae1f389cfdfad95a9a81f6eaba115c9dfc0
 RMD160 (tct-1.09.tar.gz) = ee4ddc286a2564f9b1daaa41f35e3d0fe8d6ea71
@@ -16,7 +16,7 @@ SHA1 (patch-ai) = a706e9265552d4864b765c7700ee80cd61a19edf
 SHA1 (patch-aj) = 736eb7f1cb1c1a3eb7f7ce69019e8f4a61753b40
 SHA1 (patch-ak) = 03cb4b36878386c3200b37a0f9092f80f6813bcd
 SHA1 (patch-al) = e29ba1b2846f63c2847072f6e0c37b58a94a76e9
-SHA1 (patch-am) = 57531cca621df787c4aa59e4a2ddd2d538f3933a
+SHA1 (patch-am) = 3c84ffe20ea0d180801b3286ded407a2045c6b48
 SHA1 (patch-an) = 27c7d503841bcb58ae141f594decc8aff3b72e7d
 SHA1 (patch-ao) = ba87c403613154a091cdbe91c8fa43335d2bfe50
 SHA1 (patch-ap) = 1587d7b4e4da1226a2943a4f98b9fa20bd83c79d
diff --git a/security/tct/patches/patch-am b/security/tct/patches/patch-am
index 1dad734b220..8e356f653cd 100644
--- a/security/tct/patches/patch-am
+++ b/security/tct/patches/patch-am
@@ -1,4 +1,4 @@
-$NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
+$NetBSD: patch-am,v 1.4 2017/06/23 22:13:22 kamil Exp $
 
  - Use standard headers.
  - Support NetBSD.
@@ -14,7 +14,7 @@ $NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
  #include <unistd.h>
  #include <fcntl.h>
  #include <signal.h>
-@@ -177,6 +178,24 @@
+@@ -177,6 +178,23 @@
  #endif
  
   /*
@@ -23,7 +23,6 @@ $NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
 +#if defined(NETBSD1) || defined(NETBSD2)
 +#define SUPPORTED
 +#include <sys/param.h>
-+#include <sys/user.h>
 +#include <sys/sysctl.h>
 +#include <kvm.h>
 +#include <stddef.h>
@@ -39,7 +38,7 @@ $NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
    * SunOS 4.x has no /proc, and ptrace() peeking the u area won't give us the
    * process memory segment sizes. Instead we must grope process information
    * from kernel virtual memory. This requires super-user privilege.
-@@ -414,7 +433,7 @@ static int ptrace_attach_wait(pid_t pid)
+@@ -414,7 +432,7 @@ static int ptrace_attach_wait(pid_t pid)
  
  /* call_ptrace - ptrace() with error handling */
  
@@ -48,7 +47,7 @@ $NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
  {
      int     result;
  
-@@ -456,7 +475,7 @@ static void read_proc(PROC_INFO *proc, c
+@@ -456,7 +474,7 @@ static void read_proc(PROC_INFO *proc, c
  	      "; did you use GCC with another machine's header files?" : "");
  #else
      int     words[READ_BUFSIZ_WORDS];
@@ -57,7 +56,7 @@ $NetBSD: patch-am,v 1.3 2015/03/19 08:34:53 dholland Exp $
      int     n;
  
      /*
-@@ -469,7 +488,7 @@ static void read_proc(PROC_INFO *proc, c
+@@ -469,7 +487,7 @@ static void read_proc(PROC_INFO *proc, c
  	panic("read_proc: request size %d is not word-aligned", len);
      if (verbose)
  	fprintf(stderr, "read seek to 0x%lx\n", (long) offset);
-- 
cgit v1.2.3