feat(profiles): gpg -> gpg{,2}

apparmor.d/groups/apps/android-studio

@@ -74,7 +74,7 @@ profile android-studio @{exec_path} {
   /{usr/,}bin/git         rPx,
 
   /{usr/,}bin/lsb_release rCx -> lsb-release,
-  /{usr/,}bin/gpg         rCx -> gpg,
+  /{usr/,}bin/gpg{,2}     rCx -> gpg,
   /{usr/,}bin/xdg-open    rCx -> open,
 
   /{usr/,}lib/jvm/java-[0-9]*-openjdk-*/jre/bin/* rix,
@@ -222,7 +222,7 @@ profile android-studio @{exec_path} {
   profile gpg {
     include <abstractions/base>
 
-    /{usr/,}bin/gpg mr,
+    /{usr/,}bin/gpg{,2} mr,
 
     owner @{HOME}/@{XDG_GPG_DIR}/ rw,
     owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**,

apparmor.d/groups/apps/atom

@@ -73,7 +73,7 @@ profile atom @{exec_path} {
   /{usr/,}bin/git          rPx,
 
   # Needed to sign commits
-  /{usr/,}bin/gpg           rCx -> gpg,
+  /{usr/,}bin/gpg{,2}      rCx -> gpg,
 
   #      /home/ r,
   # Reading of the user home dir is required or the following error will be printed:
@@ -150,7 +150,7 @@ profile atom @{exec_path} {
     include <abstractions/fonts>
     include <abstractions/fontconfig-cache-read>
 
-    /{usr/,}bin/gpg mr,
+    /{usr/,}bin/gpg{,2} mr,
 
     owner @{HOME}/@{XDG_GPG_DIR}/ rw,
     owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**,

apparmor.d/groups/apps/code

@@ -52,7 +52,7 @@ profile code @{exec_path} {
   /{usr/,}bin/git        rPUx,
 
   # Needed to sign commits
-  /{usr/,}bin/gpg        rPUx -> gpg,
+  /{usr/,}bin/gpg{,2}    rPUx,
 
   #      /home/ r,
   # Reading of the user home dir is required or the following error will be printed:

apparmor.d/groups/apps/thunderbird

@@ -213,7 +213,7 @@ profile thunderbird @{exec_path} {
   /usr/share/xul-ext/enigmail/{,**} r,
   /{usr/,}bin/gpgconf           rCx -> gpg,
   /{usr/,}bin/gpg-connect-agent rCx -> gpg,
-  /{usr/,}bin/gpg               rCx -> gpg,
+  /{usr/,}bin/gpg{,2}           rCx -> gpg,
   /{usr/,}bin/gpgsm             rCx -> gpg,
 
   # Allowed apps to open
@@ -239,7 +239,7 @@ profile thunderbird @{exec_path} {
     network netlink raw,
 
     /{usr/,}bin/gpgconf           mr,
-    /{usr/,}bin/gpg               mr,
+    /{usr/,}bin/gpg{,2}           mr,
     /{usr/,}bin/gpg-connect-agent mr,
     /{usr/,}bin/gpgsm             mr,
     /{usr/,}bin/gpg-agent          rix,

apparmor.d/groups/apt/apt-key

@@ -35,7 +35,7 @@ profile apt-key @{exec_path} {
   /{usr/,}bin/wc         rix,
 
   /{usr/,}bin/gpgconf    rCx -> gpg,
-  /{usr/,}bin/gpg        rCx -> gpg,
+  /{usr/,}bin/gpg{,2}    rCx -> gpg,
 
   # Do not strip env to avoid errors like the following:
   #  ERROR: ld.so: object 'libfakeroot-sysv.so' from LD_PRELOAD cannot be preloaded (cannot open
@@ -67,7 +67,7 @@ profile apt-key @{exec_path} {
     network inet stream,
     network inet6 stream,
 
-    /{usr/,}bin/gpg     mr,
+    /{usr/,}bin/gpg{,2} mr,
     /{usr/,}bin/gpgconf mr,
 
     /{usr/,}bin/dirmngr           rix,

apparmor.d/groups/apt/debsign

@@ -48,7 +48,7 @@ profile debsign @{exec_path} {
   profile gpg {
     include <abstractions/base>
 
-    /{usr/,}bin/gpg mr,
+    /{usr/,}bin/gpg{,2} mr,
 
     owner @{HOME}/@{XDG_GPG_DIR}/ r,
     owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**,

apparmor.d/groups/apt/reportbug

@@ -62,7 +62,7 @@ profile reportbug @{exec_path} {
 
   /{usr/,}bin/xdg-open         rCx -> open,
   /{usr/,}bin/run-parts        rCx -> run-parts,
-  /{usr/,}bin/gpg              rCx -> gpg,
+  /{usr/,}bin/gpg{,2}          rCx -> gpg,
 
   # For sending additional information
   /etc/** r,
@@ -113,7 +113,7 @@ profile reportbug @{exec_path} {
   profile gpg {
     include <abstractions/base>
 
-    /{usr/,}bin/gpg mr,
+    /{usr/,}bin/gpg{,2} mr,
 
     owner @{HOME}/@{XDG_GPG_DIR}/ rw,
     owner @{HOME}/@{XDG_GPG_DIR}/** rwkl -> @{HOME}/@{XDG_GPG_DIR}/**,

apparmor.d/groups/cron/cron-popularity-contest

@@ -30,7 +30,7 @@ profile cron-popularity-contest @{exec_path} {
   /{usr/,}sbin/getcap             rix,
 
   /usr/share/popularity-contest/popcon-upload rCx -> popcon-upload,
-  /{usr/,}bin/gpg                 rCx -> gpg,
+  /{usr/,}bin/gpg{,2}             rCx -> gpg,
   /{usr/,}sbin/runuser            rCx -> runuser,
   /{usr/,}bin/savelog             rCx -> savelog,
 
@@ -113,7 +113,7 @@ profile cron-popularity-contest @{exec_path} {
     include <abstractions/base>
     include <abstractions/nameservice-strict>
 
-    /{usr/,}bin/gpg mr,
+    /{usr/,}bin/gpg{,2} mr,
 
     /usr/share/popularity-contest/debian-popcon.gpg r,
 

apparmor.d/groups/gnome/gnome-software

@@ -36,7 +36,7 @@ profile gnome-software @{exec_path} {
 
   /{usr/,}bin/bwrap              rPUx,
   /{usr/,}bin/fusermount{,3}      rCx -> fusermount,
-  /{usr/,}bin/gpg                 rCx -> gpg,
+  /{usr/,}bin/gpg{,2}             rCx -> gpg,
   /{usr/,}bin/gpgconf             rCx -> gpg,
   /{usr/,}bin/gpgsm               rCx -> gpg,
   /{usr/,}lib/gio-launch-desktop  rPx -> child-open,
@@ -103,7 +103,7 @@ profile gnome-software @{exec_path} {
   profile gpg {
     include <abstractions/base>
 
-    /{usr/,}bin/gpg      mr,
+    /{usr/,}bin/gpg{,2}  mr,
     /{usr/,}bin/gpgconf  mr,
     /{usr/,}bin/gpgsm    mr,
 

apparmor.d/groups/gnome/seahorse

@@ -38,7 +38,7 @@ profile seahorse @{exec_path} {
   @{exec_path} mr,
 
   /{usr/,}bin/gpgconf  rPx,
-  /{usr/,}bin/gpg      rUx,
+  /{usr/,}bin/gpg{,2}  rUx,
   /{usr/,}bin/gpgsm    rPx,
 
   /usr/share/glib-2.0/schemas/gschemas.compiled r,

apparmor.d/groups/pacman/archlinux-keyring-wkd-sync

@@ -23,7 +23,7 @@ profile archlinux-keyring-wkd-sync @{exec_path} {
   /{usr/,}bin/{m,g,}awk    rix,
   /{usr/,}bin/bash         rix,
   /{usr/,}bin/dirmngr      rix,
-  /{usr/,}bin/gpg          rix,
+  /{usr/,}bin/gpg{,2}      rix,
   /{usr/,}bin/gpg-agent    rix,
   /{usr/,}bin/pacman-conf  rix,
 

apparmor.d/groups/pacman/aurpublish

@@ -20,7 +20,7 @@ profile aurpublish @{exec_path} {
   /{usr/,}bin/date        rix,
   /{usr/,}bin/gettext     rix,
   /{usr/,}bin/git         rPx,
-  /{usr/,}bin/gpg         rPUx,
+  /{usr/,}bin/gpg{,2}     rPUx,
   /{usr/,}bin/grep        rix,
   /{usr/,}bin/makepkg     rix,
   /{usr/,}bin/mkdir       rix,

apparmor.d/groups/pacman/pacman

@@ -45,7 +45,7 @@ profile pacman @{exec_path} {
 
   @{exec_path} mr,
 
-  /{usr/,}bin/gpg          rCx -> gpg,
+  /{usr/,}bin/gpg{,2}      rCx -> gpg,
   /{usr/,}bin/gpgconf      rCx -> gpg,
   /{usr/,}bin/gpgsm        rCx -> gpg,
 
@@ -151,7 +151,7 @@ profile pacman @{exec_path} {
 
     capability dac_read_search,
 
-    /{usr/,}bin/gpg     mr,
+    /{usr/,}bin/gpg{,2} mr,
     /{usr/,}bin/gpgconf mr,
     /{usr/,}bin/gpgsm   mr,
 

apparmor.d/groups/pacman/pacman-key

@@ -21,7 +21,7 @@ profile pacman-key @{exec_path} {
   /{usr/,}bin/chmod        rix,
   /{usr/,}bin/{m,g,}awk    rix,
   /{usr/,}bin/gettext      rix,
-  /{usr/,}bin/gpg          rCx -> gpg,
+  /{usr/,}bin/gpg{,2}      rCx -> gpg,
   /{usr/,}bin/grep         rix,
   /{usr/,}bin/pacman-conf  rPx,
   /{usr/,}bin/touch        rix,
@@ -45,7 +45,7 @@ profile pacman-key @{exec_path} {
     capability dac_read_search,
     capability mknod,
 
-    /{usr/,}bin/gpg        mr,
+    /{usr/,}bin/gpg{,2}     mr,
     /{usr/,}bin/dirmngr    rix,
     /{usr/,}bin/gpg-agent  rix,