From 7e565912ab852e999122f2d66ae1fd2226f1a907 Mon Sep 17 00:00:00 2001
From: Antz <antzz@protonmail.ch>
Date: Wed, 8 Apr 2020 12:40:03 +0200
Subject: [PATCH] apparmor: fix dhcpcd profile for dhcpcd version 9

---
 srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd | 13 ++++++++++---
 srcpkgs/apparmor/template                      |  2 +-
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
index 65c3970ab15..26364f36385 100644
--- a/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
+++ b/srcpkgs/apparmor/files/profiles/usr.bin.dhcpcd
@@ -7,9 +7,15 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
   #include <abstractions/nameservice>
 
   capability chown,
+  capability fowner,
+  capability fsetid,
+  capability kill,
   capability net_admin,
   capability net_raw,
+  capability setuid,
+  capability setgid,
   capability sys_admin,
+  capability sys_chroot,
 
   network packet dgram,
   network inet raw,
@@ -26,9 +32,10 @@ profile dhcpcd /{usr/,}bin/dhcpcd {
   /proc/sys/net/ipv{4,6}/neigh/*/retrans_time_ms w,
   /proc/sys/net/ipv{4,6}/neigh/*/base_reachable_time_ms w,
 
-  /{var/,}run/dhcpcd{-*,}.pid rwk,
-  /{var/,}run/dhcpcd.sock rw,
-  /{var/,}run/dhcpcd.unpriv.sock rw,
+  /{var/,}run/dhcpcd/ w,
+  /{var/,}run/dhcpcd/{,*.}pid rwk,
+  /{var/,}run/dhcpcd/{,*.}sock rw,
+  /{var/,}run/dhcpcd/unpriv.sock rw,
   /{var/,}run/udev/data/* r,
 
   /sys/devices/**/net/*/uevent r,
diff --git a/srcpkgs/apparmor/template b/srcpkgs/apparmor/template
index a0e04bf6a61..cd7073fdcfb 100644
--- a/srcpkgs/apparmor/template
+++ b/srcpkgs/apparmor/template
@@ -1,7 +1,7 @@
 # Template file for 'apparmor'
 pkgname=apparmor
 version=2.13.4
-revision=1
+revision=2
 wrksrc="${pkgname}-v${version}"
 build_wrksrc=libraries/libapparmor
 build_style=gnu-configure