summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortedu <tedu@openbsd.org>2016-04-25 19:28:12 +0000
committertedu <tedu@openbsd.org>2016-04-25 19:28:12 +0000
commitee6ecc10e80505dd9259c52a5c9e153dd21863dc (patch)
tree31f820cba88736535360f3bd7c1b9dbd0fc55a5f
parentspacing / KNF error in earlier commit (diff)
downloadwireguard-openbsd-ee6ecc10e80505dd9259c52a5c9e153dd21863dc.tar.xz
wireguard-openbsd-ee6ecc10e80505dd9259c52a5c9e153dd21863dc.zip
remove systrace
-rw-r--r--regress/bin/Makefile4
-rw-r--r--regress/bin/systrace/Makefile6
-rw-r--r--regress/bin/systrace/id/Makefile10
-rw-r--r--regress/bin/systrace/id/id.policy37
-rw-r--r--regress/bin/systrace/id/id.sh19
-rw-r--r--regress/bin/systrace/symlink/Makefile19
-rw-r--r--regress/bin/systrace/symlink/ln.policy18
7 files changed, 2 insertions, 111 deletions
diff --git a/regress/bin/Makefile b/regress/bin/Makefile
index a257f183a79..9a2f0675e8d 100644
--- a/regress/bin/Makefile
+++ b/regress/bin/Makefile
@@ -1,6 +1,6 @@
-# $OpenBSD: Makefile,v 1.9 2015/06/15 09:25:22 florian Exp $
+# $OpenBSD: Makefile,v 1.10 2016/04/25 19:28:12 tedu Exp $
-SUBDIR+= chmod ksh ln md5 pax ps systrace test
+SUBDIR+= chmod ksh ln md5 pax ps test
install:
diff --git a/regress/bin/systrace/Makefile b/regress/bin/systrace/Makefile
deleted file mode 100644
index 663026dc25f..00000000000
--- a/regress/bin/systrace/Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
-# $OpenBSD: Makefile,v 1.2 2006/08/10 09:00:20 espie Exp $
-
-SUBDIR+= id
-SUBDIR+= symlink
-
-.include <bsd.subdir.mk>
diff --git a/regress/bin/systrace/id/Makefile b/regress/bin/systrace/id/Makefile
deleted file mode 100644
index 9997759e76e..00000000000
--- a/regress/bin/systrace/id/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2004/01/15 17:14:43 sturm Exp $
-
-REGRESS_TARGETS=id.sh
-
-id.sh:
- @sh ${.CURDIR}/id.sh ${.CURDIR}/id.policy
-
-.PHONY: ${REGRESS_TARGETS}
-
-.include <bsd.regress.mk>
diff --git a/regress/bin/systrace/id/id.policy b/regress/bin/systrace/id/id.policy
deleted file mode 100644
index 47ecf9987f9..00000000000
--- a/regress/bin/systrace/id/id.policy
+++ /dev/null
@@ -1,37 +0,0 @@
-# $OpenBSD: id.policy,v 1.6 2015/10/18 11:27:17 doug Exp $
-Policy: /usr/bin/id, Emulation: native
- native-__set_tcb: permit
- native-break: permit
- native-close: permit
- native-exit: permit
- native-fcntl: permit
- native-fsread: filename eq "/etc/group" then permit
- native-fsread: filename eq "/etc/malloc.conf" then permit
- native-fsread: filename eq "/etc/pwd.db" then permit
- native-fsread: filename eq "/etc/spwd.db" then permit
- native-fsread: filename eq "/var/run/ld.so.hints" then permit
- native-fsread: filename match "/usr/lib/libc.so.*" then permit
- native-fstat: permit
- native-getegid: permit
- native-getentropy: permit
- native-geteuid: permit
- native-getgid: permit
- native-getgroups: permit
- native-getpid: permit
- native-getrlimit: permit
- native-getuid: permit
- native-ioctl: permit
- native-issetugid: permit
- native-kbind: permit
- native-minherit: permit
- native-mmap: permit
- native-mprotect: permit
- native-mquery: permit
- native-munmap: permit
- native-pledge: permit
- native-pread: permit
- native-read: permit
- native-sendsyslog: permit
- native-sigprocmask: permit
- native-sysctl: permit
- native-write: permit
diff --git a/regress/bin/systrace/id/id.sh b/regress/bin/systrace/id/id.sh
deleted file mode 100644
index 06e479be758..00000000000
--- a/regress/bin/systrace/id/id.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/ksh
-# $OpenBSD: id.sh,v 1.1 2004/01/15 17:14:43 sturm Exp $
-
-echo "/bin/systrace -f $1 -a /usr/bin/id"
-SYSTR_RES=`eval /bin/systrace -f $1 -a /usr/bin/id 2>/dev/null`
-NORM_RES=`/usr/bin/id`
-if [ -z "$SYSTR_RES" ] ; then
- rm -f id.core
- echo "Systrace of /usr/bin/id failed"
- exit 1
-fi
-
-if [ "$NORM_RES" != "$SYSTR_RES" ] ; then
- echo "Expected \"$NORM_RES\""
- echo "Got \"$SYSTR_RES\""
- exit 1
-fi
-
-exit 0
diff --git a/regress/bin/systrace/symlink/Makefile b/regress/bin/systrace/symlink/Makefile
deleted file mode 100644
index 4eb1f1a6f80..00000000000
--- a/regress/bin/systrace/symlink/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# $OpenBSD: Makefile,v 1.1 2006/08/10 09:00:20 espie Exp $
-
-REGRESS_TARGETS=symlink1
-
-symlink1:
- rm -f ${.OBJDIR}/{a,b}
- ln -sf b ${.OBJDIR}/a
- if systrace -ae -f ${.CURDIR}/ln.policy ln -s b ${.OBJDIR}/a; then \
- exit 1; \
- fi
- if test -e ${.OBJDIR}/b; then \
- exit 1; \
- fi
-
-.PHONY: ${REGRESS_TARGETS}
-
-CLEANFILES+= a b
-
-.include <bsd.regress.mk>
diff --git a/regress/bin/systrace/symlink/ln.policy b/regress/bin/systrace/symlink/ln.policy
deleted file mode 100644
index 5e2706eb019..00000000000
--- a/regress/bin/systrace/symlink/ln.policy
+++ /dev/null
@@ -1,18 +0,0 @@
-# $OpenBSD: ln.policy,v 1.4 2015/09/13 17:08:04 guenther Exp $
-
-Policy: /bin/ln, Emulation: native
- native-close: permit
- native-exit: permit
- native-fsread: permit
- native-fstat: permit
- native-getentropy: permit
- native-issetugid: permit
- native-kbind: permit
- native-minherit: permit
- native-mmap: permit
- native-mprotect: permit
- native-munmap: permit
- native-sendsyslog: permit
- native-symlink: filename match "/*" then permit
- native-sysctl: permit
- native-write: permit