From 672d0a758b1b2628fda239fbb3231a9fd7c51773 Mon Sep 17 00:00:00 2001
From: Alexandre Pujol <alexandre@pujol.io>
Date: Tue, 6 Sep 2022 17:56:29 +0100
Subject: [PATCH] build: for now lets overwrite abstractions/trash.

As the upstreaming content is a goal, it will be important to have a better
way to manage it.
---
 .gitlab-ci.yml             | 1 +
 README.md                  | 3 ++-
 debian/apparmor.d.displace | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4c4c5d09..2073a9c6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -89,6 +89,7 @@ preprocess-archlinux:
     - pacman -U --noconfirm --noprogressbar
         --overwrite etc/apparmor.d/tunables/global
         --overwrite etc/apparmor.d/tunables/xdg-user-dirs
+        --overwrite etc/apparmor.d/abstractions/trash
         $PKGDEST/*
     - apparmor_parser --preprocess /etc/apparmor.d 1> /dev/null
 
diff --git a/README.md b/README.md
index ab38c655..2cfb3d03 100644
--- a/README.md
+++ b/README.md
@@ -58,7 +58,8 @@ Build and install the package with:
 makepkg -s
 sudo pacman -U apparmor.d-*.pkg.tar.zst \
   --overwrite etc/apparmor.d/tunables/global \
-  --overwrite etc/apparmor.d/tunables/xdg-user-dirs
+  --overwrite etc/apparmor.d/tunables/xdg-user-dirs \
+  --overwrite etc/apparmor.d/abstractions/trash
 ```
 
 > **Warning**: for a first install, it is recommanded to install all profiles in complain mode. See [Complain mode](#troubleshooting)
diff --git a/debian/apparmor.d.displace b/debian/apparmor.d.displace
index 2c734c2e..773572b3 100644
--- a/debian/apparmor.d.displace
+++ b/debian/apparmor.d.displace
@@ -3,3 +3,4 @@
 
 /etc/apparmor.d/tunables/global.apparmor.d
 /etc/apparmor.d/tunables/xdg-user-dirs.apparmor.d
+/etc/apparmor.d/abstractions/trash.apparmor.d