seccomp: move out of helper

Signed-off-by: Ophestra <cat@gensokyo.uk>

14 files changed, 9 insertions, 9 deletions

diff --git a/cmd/fpkg/main.go b/cmd/fpkg/main.go
index 70f42935..480833b2 100644
--- a/cmd/fpkg/main.go
+++ b/cmd/fpkg/main.go
@@ -13,13 +13,13 @@ import (
 	"git.gensokyo.uk/security/fortify/command"
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/helper/bwrap"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
 	"git.gensokyo.uk/security/fortify/internal/app/shim"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
 	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/internal/sys"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 const shellPath = "/run/current-system/sw/bin/bash"
diff --git a/helper/bwrap/config_test.go b/helper/bwrap/config_test.go
index e0f14511..678f49de 100644
--- a/helper/bwrap/config_test.go
+++ b/helper/bwrap/config_test.go
@@ -8,7 +8,7 @@ import (
 
 	"git.gensokyo.uk/security/fortify/helper/bwrap"
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 func TestConfig_Args(t *testing.T) {
diff --git a/helper/bwrap/seccomp.go b/helper/bwrap/seccomp.go
index f74015fd..8e55171b 100644
--- a/helper/bwrap/seccomp.go
+++ b/helper/bwrap/seccomp.go
@@ -5,7 +5,7 @@ import (
 	"strconv"
 
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 type SyscallPolicy struct {
diff --git a/internal/app/shim/main.go b/internal/app/shim/main.go
index 4ec3916c..9855535a 100644
--- a/internal/app/shim/main.go
+++ b/internal/app/shim/main.go
@@ -14,10 +14,10 @@ import (
 	"git.gensokyo.uk/security/fortify/fst"
 	"git.gensokyo.uk/security/fortify/helper"
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 // everything beyond this point runs as unconstrained target user
diff --git a/internal/sandbox/container.go b/internal/sandbox/container.go
index 76389358..97dd0ee0 100644
--- a/internal/sandbox/container.go
+++ b/internal/sandbox/container.go
@@ -12,9 +12,9 @@ import (
 	"syscall"
 
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 type HardeningFlags uintptr
diff --git a/internal/sandbox/init.go b/internal/sandbox/init.go
index 6bc52705..83b5f46c 100644
--- a/internal/sandbox/init.go
+++ b/internal/sandbox/init.go
@@ -14,9 +14,9 @@ import (
 	"time"
 
 	"git.gensokyo.uk/security/fortify/helper/proc"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/fmsg"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 const (
diff --git a/main.go b/main.go
index ecf5bc79..ac5532ed 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,6 @@ import (
 	"git.gensokyo.uk/security/fortify/command"
 	"git.gensokyo.uk/security/fortify/dbus"
 	"git.gensokyo.uk/security/fortify/fst"
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
 	"git.gensokyo.uk/security/fortify/internal"
 	"git.gensokyo.uk/security/fortify/internal/app"
 	"git.gensokyo.uk/security/fortify/internal/app/init0"
@@ -27,6 +26,7 @@ import (
 	"git.gensokyo.uk/security/fortify/internal/sandbox"
 	"git.gensokyo.uk/security/fortify/internal/state"
 	"git.gensokyo.uk/security/fortify/internal/sys"
+	"git.gensokyo.uk/security/fortify/seccomp"
 	"git.gensokyo.uk/security/fortify/system"
 )
 
diff --git a/helper/seccomp/api.go b/seccomp/api.go
index 697b09f3..697b09f3 100644
--- a/helper/seccomp/api.go
+++ b/seccomp/api.go
diff --git a/helper/seccomp/export.go b/seccomp/export.go
index 95684235..95684235 100644
--- a/helper/seccomp/export.go
+++ b/seccomp/export.go
diff --git a/helper/seccomp/export_test.go b/seccomp/export_test.go
index ff6f250e..991517f4 100644
--- a/helper/seccomp/export_test.go
+++ b/seccomp/export_test.go
@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 func TestExport(t *testing.T) {
diff --git a/helper/seccomp/seccomp-build.c b/seccomp/seccomp-build.c
index 4b2114f4..4b2114f4 100644
--- a/helper/seccomp/seccomp-build.c
+++ b/seccomp/seccomp-build.c
diff --git a/helper/seccomp/seccomp-build.h b/seccomp/seccomp-build.h
index 7f1be761..7f1be761 100644
--- a/helper/seccomp/seccomp-build.h
+++ b/seccomp/seccomp-build.h
diff --git a/helper/seccomp/seccomp.go b/seccomp/seccomp.go
index 05c314c9..05c314c9 100644
--- a/helper/seccomp/seccomp.go
+++ b/seccomp/seccomp.go
diff --git a/helper/seccomp/seccomp_test.go b/seccomp/seccomp_test.go
index c04179c1..f2949ef8 100644
--- a/helper/seccomp/seccomp_test.go
+++ b/seccomp/seccomp_test.go
@@ -6,7 +6,7 @@ import (
 	"syscall"
 	"testing"
 
-	"git.gensokyo.uk/security/fortify/helper/seccomp"
+	"git.gensokyo.uk/security/fortify/seccomp"
 )
 
 func TestLibraryError(t *testing.T) {