From b9b3d0fab1e4e0403ad3d9839f97563959c69740 Mon Sep 17 00:00:00 2001 From: Alexandre Pujol Date: Mon, 24 Apr 2023 00:01:35 +0100 Subject: [PATCH] fix(build): debian specificities build. --- apparmor.d/abstractions/gtk.d/complete | 2 -- apparmor.d/abstractions/trash.d/complete | 2 -- cmd/prebuild/build.go | 2 +- cmd/prebuild/prepare.go | 12 +++++++++++- 4 files changed, 12 insertions(+), 6 deletions(-) diff --git a/apparmor.d/abstractions/gtk.d/complete b/apparmor.d/abstractions/gtk.d/complete index d6bcefee1..e5c7aeda6 100644 --- a/apparmor.d/abstractions/gtk.d/complete +++ b/apparmor.d/abstractions/gtk.d/complete @@ -2,8 +2,6 @@ # Copyright (C) 2022 Alexandre Pujol # SPDX-License-Identifier: GPL-2.0-only - abi , - /etc/gtk-{3,4}.0/settings.ini r, owner @{user_config_dirs}/gtk-{3,4}.0/ rw, diff --git a/apparmor.d/abstractions/trash.d/complete b/apparmor.d/abstractions/trash.d/complete index c70721458..db23f93a2 100644 --- a/apparmor.d/abstractions/trash.d/complete +++ b/apparmor.d/abstractions/trash.d/complete @@ -3,8 +3,6 @@ # Copyright (C) 2021-2022 Alexandre Pujol # SPDX-License-Identifier: GPL-2.0-only - abi , - owner @{user_config_dirs}/trashrc rw, owner @{user_config_dirs}/trashrc.lock rwk, owner @{user_config_dirs}/#[0-9]*[0-9] rwk, diff --git a/cmd/prebuild/build.go b/cmd/prebuild/build.go index 49a0cb0d2..4da68f7d3 100644 --- a/cmd/prebuild/build.go +++ b/cmd/prebuild/build.go @@ -13,7 +13,7 @@ import ( ) var ( - regABI = regexp.MustCompile(`abi.*,\n`) + regABI = regexp.MustCompile(`abi ,\n\n`) regAttachments = regexp.MustCompile(`(profile .* @{exec_path})`) regFlag = regexp.MustCompile(`flags=\(([^)]+)\)`) regProfileHeader = regexp.MustCompile(` {`) diff --git a/cmd/prebuild/prepare.go b/cmd/prebuild/prepare.go index 8d6e861a5..6cc05c0c8 100644 --- a/cmd/prebuild/prepare.go +++ b/cmd/prebuild/prepare.go @@ -146,7 +146,17 @@ func Configure() error { } } } - + files, _ := RootApparmord.Join("abstractions").ReadDir(paths.FilterOutDirectories()) + for _, file := range files { + if !file.Exist() { + continue + } + content, _ := file.ReadFile() + profile := BuildABI(string(content)) + if err := file.WriteFile([]byte(profile)); err != nil { + return err + } + } default: return fmt.Errorf("%s is not a supported distribution", Distribution)