From dfadf0aef00cfbef33332d1acb5d9eb98e38a651 Mon Sep 17 00:00:00 2001
From: Jeroen Rijken <jeroen.rijken@xs4all.nl>
Date: Thu, 23 Feb 2023 16:37:39 +0100
Subject: [PATCH] Resolve merge conflicts

Signed-off-by: Jeroen Rijken <jeroen.rijken@xs4all.nl>
---
 apparmor.d/groups/apt/apt-methods-gpgv | 13 ++-----------
 apparmor.d/groups/apt/apt-methods-http |  3 +--
 2 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/apparmor.d/groups/apt/apt-methods-gpgv b/apparmor.d/groups/apt/apt-methods-gpgv
index a33c3c2a..d8b8c5c1 100644
--- a/apparmor.d/groups/apt/apt-methods-gpgv
+++ b/apparmor.d/groups/apt/apt-methods-gpgv
@@ -69,11 +69,11 @@ profile apt-methods-gpgv @{exec_path} {
   /etc/ r,
   /root/ r,
 
-        /var/lib/apt/lists/{,**} r,
+        {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/{,**} r,
         /var/lib/dpkg/arch r,
         /var/lib/extrepo/keys/*.{gpg,asc} r,
         /var/lib/ubuntu-advantage/apt-esm/{,**} r,
-  owner /var/lib/apt/lists/* rw,
+  owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
   owner /var/lib/apt/lists/partial/* rw,
 
   # For package building
@@ -84,15 +84,6 @@ profile apt-methods-gpgv @{exec_path} {
   owner /tmp/apt-key-gpghome.*/** rwkl -> /tmp/apt-key-gpghome.*/**,
   owner /tmp/apt.{conf,sig,data}.* rw,
 
-        /var/lib/apt/lists/{,**} r,
-  owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
-  owner /var/lib/apt/lists/partial/* rw,
-
-  /usr/share/dpkg/cputable r,
-  /usr/share/dpkg/tupletable r,
-
-  /var/lib/dpkg/arch r,
-
   @{PROC}/@{pid}/fd/ r,
 
   # file_inherit
diff --git a/apparmor.d/groups/apt/apt-methods-http b/apparmor.d/groups/apt/apt-methods-http
index f202581a..0818f344 100644
--- a/apparmor.d/groups/apt/apt-methods-http
+++ b/apparmor.d/groups/apt/apt-methods-http
@@ -53,10 +53,9 @@ profile apt-methods-http @{exec_path} {
 
   /var/log/cron-apt/temp w,
 
-        /var/lib/apt/lists/{,**} r,
+        {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/{,**} r,
   owner {/var/lib/ubuntu-advantage/apt-esm,}/var/lib/apt/lists/* rw,
   owner /var/lib/apt/lists/partial/* rw,
-  owner /var/lib/apt/lists/{,**} rw,
 
   # For package building
   @{user_build_dirs}/** rwkl -> @{user_build_dirs}/**,