From 1f75dc995655952cb6fca683ebd297ead632881c Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Sun, 9 Jul 2023 15:09:32 +0100
Subject: [PATCH] build: update build for new bin & lib variables

---
 apparmor.d/tunables/multiarch.d/apparmor.d |  2 --
 pkg/aa/profile.go                          |  3 ++-
 pkg/prebuild/prepare.go                    | 10 +---------
 pkg/prebuild/tools.go                      | 12 ------------
 4 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/apparmor.d/tunables/multiarch.d/apparmor.d b/apparmor.d/tunables/multiarch.d/apparmor.d
index 3c7909424..13f386372 100644
--- a/apparmor.d/tunables/multiarch.d/apparmor.d
+++ b/apparmor.d/tunables/multiarch.d/apparmor.d
@@ -27,5 +27,3 @@
 # Common places for binaries and libraries across distributions
 @{bin}=/{usr/,}{s,}bin
 @{lib}=/{usr/,}lib{,exec,32,64}
-
-# Libexec path. Different in some distribution
diff --git a/pkg/aa/profile.go b/pkg/aa/profile.go
index da5a683ad..659271ced 100644
--- a/pkg/aa/profile.go
+++ b/pkg/aa/profile.go
@@ -20,7 +20,8 @@ var (
 
 	// Tunables
 	Tunables = map[string][]string{
-		"libexec":         {},
+		"bin":             {"/{usr/,}{s,}bin"},
+		"lib":             {"/{usr/,}lib{,exec,32,64}"},
 		"multiarch":       {"*-linux-gnu*"},
 		"user_share_dirs": {"/home/*/.local/share"},
 		"etc_ro":          {"/{usr/,}etc/"},
diff --git a/pkg/prebuild/prepare.go b/pkg/prebuild/prepare.go
index 50cb75da6..5d8c4b026 100644
--- a/pkg/prebuild/prepare.go
+++ b/pkg/prebuild/prepare.go
@@ -117,17 +117,9 @@ func Merge() error {
 // Set the distribution specificities
 func Configure() (err error) {
 	switch Distribution {
-	case "arch":
-		err = setLibexec("/{usr/,}lib")
-
-	case "opensuse":
-		err = setLibexec("/{usr/,}libexec")
+	case "arch", "opensuse":
 
 	case "debian", "ubuntu", "whonix":
-		if err := setLibexec("/{usr/,}libexec"); err != nil {
-			return err
-		}
-
 		// Copy Ubuntu specific profiles
 		if err := copyTo(DistDir.Join("ubuntu"), RootApparmord); err != nil {
 			return err
diff --git a/pkg/prebuild/tools.go b/pkg/prebuild/tools.go
index 2240f538e..cd66572f0 100644
--- a/pkg/prebuild/tools.go
+++ b/pkg/prebuild/tools.go
@@ -9,7 +9,6 @@ import (
 	"strings"
 
 	"github.com/arduino/go-paths-helper"
-	"github.com/roddhjav/apparmor.d/pkg/aa"
 	"golang.org/x/exp/slices"
 )
 
@@ -48,17 +47,6 @@ func getSupportedDistribution() string {
 	return id
 }
 
-func setLibexec(libexec string) error {
-	aa.Tunables["libexec"] = []string{libexec}
-	file, err := RootApparmord.Join("tunables", "multiarch.d", "apparmor.d").Append()
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-	_, err = file.WriteString(`@{libexec}=` + libexec)
-	return err
-}
-
 func copyTo(src *paths.Path, dst *paths.Path) error {
 	files, err := src.ReadDirRecursiveFiltered(nil, paths.FilterOutDirectories())
 	if err != nil {