From 0a2dc018e1c189484ef2429bbfb10b1c50bdf668 Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Mon, 19 Oct 2015 23:13:38 +0000
Subject: [PATCH] Remove old tame() stub

---
 lib/libc/Symbols.list     |  2 --
 lib/libc/sys/Makefile.inc |  4 ++--
 lib/libc/sys/tame.c       | 16 ----------------
 3 files changed, 2 insertions(+), 20 deletions(-)
 delete mode 100644 lib/libc/sys/tame.c

diff --git a/lib/libc/Symbols.list b/lib/libc/Symbols.list
index 87186ac0f22..3c32bac4966 100644
--- a/lib/libc/Symbols.list
+++ b/lib/libc/Symbols.list
@@ -230,7 +230,6 @@ _thread_sys_symlinkat
 _thread_sys_sync
 _thread_sys_sysarch
 _thread_sys_sysctl
-_thread_sys_tame
 _thread_sys_truncate
 _thread_sys_umask
 _thread_sys_unlink
@@ -427,7 +426,6 @@ symlinkat
 sync
 sysarch
 syscall
-tame
 timer_create
 timer_delete
 timer_getoverrun
diff --git a/lib/libc/sys/Makefile.inc b/lib/libc/sys/Makefile.inc
index 98f7f4062f3..09b56d98efd 100644
--- a/lib/libc/sys/Makefile.inc
+++ b/lib/libc/sys/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.132 2015/10/18 00:36:20 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.133 2015/10/19 23:13:38 deraadt Exp $
 #	$NetBSD: Makefile.inc,v 1.35 1995/10/16 23:49:07 jtc Exp $
 #	@(#)Makefile.inc	8.1 (Berkeley) 6/17/93
 
@@ -17,7 +17,7 @@ SRCS+=	posix_madvise.c w_fork.c
 # with old syscall interfaces.
 SRCS+=	ftruncate.c lseek.c mquery.c mmap.c ptrace.c semctl.c truncate.c \
 	timer_create.c timer_delete.c timer_getoverrun.c timer_gettime.c \
-	timer_settime.c pread.c preadv.c pwrite.c pwritev.c tame.c
+	timer_settime.c pread.c preadv.c pwrite.c pwritev.c
 
 # stack protector helper functions
 SRCS+=	stack_protector.c
diff --git a/lib/libc/sys/tame.c b/lib/libc/sys/tame.c
deleted file mode 100644
index 077e1698edb..00000000000
--- a/lib/libc/sys/tame.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*	$OpenBSD: tame.c,v 1.3 2015/10/09 06:10:57 deraadt Exp $	*/
-/*
- *	Written by Artur Grabowski <art@openbsd.org> Public Domain
- */
-
-#include <sys/types.h>
-#include <sys/syscall.h>
-#include <unistd.h>
-
-int tame(const char *req, const char **paths);
-
-int
-tame(const char *req, const char **paths)
-{
-	return (pledge(req, paths));
-}
-- 
2.20.1