testing/conntracct: don't run setcap

This commit is contained in:
Leo 2020-09-29 11:03:42 -03:00
parent 5d5df0961f
commit 0489fdbf19
2 changed files with 23 additions and 1 deletions

View File

@ -15,6 +15,7 @@ source="
$pkgname-$pkgver.tar.gz::https://github.com/ti-mo/conntracct/archive/$pkgver.tar.gz
conntracct.confd
conntracct.initd
dont-run-setcap.patch
"
build() {
@ -40,4 +41,5 @@ package() {
sha512sums="f018116dbeb937a5e308fa05dcbe9633ee1227a3bdce6c946cca1c5d73bb463c0085835c042becc62f7ad597b243c470c06e9712a1dffb844c4c858615da09af conntracct-0.2.7.tar.gz
e2474f6a0fd86014ec87c662cbb3f51a906e3d5905ad7d77e557a3c42c1efaeace40dd0e3811c75536bb6b031be68453e7e945786ef1af158398424fba5213a8 conntracct.confd
5b1c44b43be54674e9d17d64677db700820144264dfd40a77389776f56fa8b8672f13c6b1d1dfc426037cc98298053e1364faaf9293c15c45c4acb24a653f78b conntracct.initd"
5b1c44b43be54674e9d17d64677db700820144264dfd40a77389776f56fa8b8672f13c6b1d1dfc426037cc98298053e1364faaf9293c15c45c4acb24a653f78b conntracct.initd
911a1e8d761071c2c8c077b7b6306c11aa318a671576ccc14486d70118a15eab4850257996f991b92e462b0897ac6e917007009696cd32885c344ffa5966c2e4 dont-run-setcap.patch"

View File

@ -0,0 +1,20 @@
diff --git a/magefile.go b/magefile.go
index f995949..368c873 100644
--- a/magefile.go
+++ b/magefile.go
@@ -51,15 +51,6 @@ func Build() error {
return err
}
- // 'Minimal' capability set to run without being uid 0.
- // cap_sys_admin for calling bpf().
- // cap_ipc_lock for locking memory for the ring buffer.
- // cap_dac_override for opening /sys/kernel/debug/tracing/*
- // cap_net_admin for managing sysctl net.netfilter.nf_conntrack_acct
- if err := sh.Run("sudo", "setcap", "cap_sys_admin,cap_ipc_lock,cap_net_admin,cap_dac_override,cap_sys_resource+eip", realPath); err != nil {
- return err
- }
-
fmt.Printf("Successfully built %s!\n", buildPath)
return nil
}