From e37782efcdbde3ccb9c9b58746b484e878fdb496 Mon Sep 17 00:00:00 2001
From: Christian Boltz <gitlab@cboltz.de>
Date: Sat, 20 Jan 2018 22:59:17 +0000
Subject: [PATCH] Merge branch 'master' into 'master'

abstractions/gnupg: allow pubring.kbx

See merge request apparmor/apparmor!58

Acked-by: Christian Boltz <apparmor@cboltz.de> for 2.9..trunk

(cherry picked from commit e1929298ac70b382cc377776e4ad0ffb85de00e8)

8fc3dcb3 abstractions/gnupg: allow pubring.kbx
---
 profiles/apparmor.d/abstractions/gnupg | 1 +
 1 file changed, 1 insertion(+)

diff --git a/profiles/apparmor.d/abstractions/gnupg b/profiles/apparmor.d/abstractions/gnupg
index f976f028d..d04c920df 100644
--- a/profiles/apparmor.d/abstractions/gnupg
+++ b/profiles/apparmor.d/abstractions/gnupg
@@ -4,6 +4,7 @@
   # user configurations
   owner @{HOME}/.gnupg/options     r,
   owner @{HOME}/.gnupg/pubring.gpg r,
+  owner @{HOME}/.gnupg/pubring.kbx r,
   owner @{HOME}/.gnupg/random_seed rw,
   owner @{HOME}/.gnupg/secring.gpg r,
   owner @{HOME}/.gnupg/so/*.x86_64 mr,