From ead2f4e40bf35bb664aef45b6d036f2efa807d47 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Sun, 6 Apr 2025 16:07:51 +0200 Subject: [PATCH] Revert "fix: remove wip workarroind in gstreamer abs." This reverts commit 75a8ef29060585f77815fff63b7de4ca2c412fd2. --- pkg/prebuild/prepare/fsp.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkg/prebuild/prepare/fsp.go b/pkg/prebuild/prepare/fsp.go index 6bb45d70a..e46efe0e8 100644 --- a/pkg/prebuild/prepare/fsp.go +++ b/pkg/prebuild/prepare/fsp.go @@ -9,6 +9,7 @@ import ( "github.com/roddhjav/apparmor.d/pkg/paths" "github.com/roddhjav/apparmor.d/pkg/prebuild" + "github.com/roddhjav/apparmor.d/pkg/util" ) type FullSystemPolicy struct { @@ -44,6 +45,18 @@ func (p FullSystemPolicy) Apply() ([]string, error) { return res, err } + // Fix conflicting x modifiers in abstractions - FIXME: Temporary solution + path = prebuild.RootApparmord.Join("abstractions/gstreamer") + out, err = path.ReadFileAsString() + if err != nil { + return res, err + } + regFixConflictX := util.ToRegexRepl([]string{`.*gst-plugin-scanner.*`, ``}) + out = regFixConflictX.Replace(out) + if err := path.WriteFile([]byte(out)); err != nil { + return res, err + } + // Set systemd unit drop-in files return res, paths.CopyTo(prebuild.SystemdDir.Join("full"), prebuild.Root.Join("systemd")) }