[pkg-apparmor] Bug#886732: Attachment

[Seyeong Kim]

diff -Nru apparmor-2.11.1/debian/changelog apparmor-2.11.1/debian/changelog
--- apparmor-2.11.1/debian/changelog	2017-12-06 23:32:02.000000000 -0800
+++ apparmor-2.11.1/debian/changelog	2018-01-09 03:25:45.000000000 -0800
@@ -1,3 +1,10 @@
+apparmor (2.11.1-5) unstable; urgency=medium
+
+  * Support PID more than 6 digits (Closes: #886732))
+    - d/p/0001-Allow-seven-digit-pid.patch
+
+ -- Seyeong Kim <seyeong.kim at canonical.com>  Tue, 09 Jan 2018 02:45:56 -0800
+
 apparmor (2.11.1-4) unstable; urgency=medium
 
   * Bump pinned feature set to linux-image-4.14.0-1's, version 4.14.2-1
diff -Nru apparmor-2.11.1/debian/patches/0001-Allow-seven-digit-pid.patch apparmor-2.11.1/debian/patches/0001-Allow-seven-digit-pid.patch
--- apparmor-2.11.1/debian/patches/0001-Allow-seven-digit-pid.patch	1969-12-31 16:00:00.000000000 -0800
+++ apparmor-2.11.1/debian/patches/0001-Allow-seven-digit-pid.patch	2018-01-09 02:33:18.000000000 -0800
@@ -0,0 +1,25 @@
+From 630cb2a981cdc731847e8fdaafc45bcd337fe747 Mon Sep 17 00:00:00 2001
+From: Vincas Dargis <vindrg at gmail.com>
+Date: Sat, 30 Sep 2017 15:28:15 +0300
+Subject: [PATCH] Allow seven digit pid
+
+---
+ profiles/apparmor.d/tunables/kernelvars | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Origin: upstream, https://gitlab.com/apparmor/apparmor/commit/630cb2a981cdc731847e8fdaafc45bcd337fe747
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1717714
+
+Index: apparmor-2.11.1/profiles/apparmor.d/tunables/kernelvars
+===================================================================
+--- apparmor-2.11.1.orig/profiles/apparmor.d/tunables/kernelvars	2018-01-09 02:31:59.545270685 -0800
++++ apparmor-2.11.1/profiles/apparmor.d/tunables/kernelvars	2018-01-09 02:31:59.545270685 -0800
+@@ -13,7 +13,7 @@
+ # and until the parser supports nested groupings like
+ #   @{pid}=[1-9]{[0-9]{[0-9]{[0-9]{[0-9]{[0-9],},},},},}
+ # use
+-@{pid}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9]}
++@{pid}={[1-9],[1-9][0-9],[1-9][0-9][0-9],[1-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9],[1-9][0-9][0-9][0-9][0-9][0-9],[1-4][0-9][0-9][0-9][0-9][0-9][0-9]}
+ 
+ #same pattern as @{pid} for now
+ @{tid}=@{pid}
diff -Nru apparmor-2.11.1/debian/patches/series apparmor-2.11.1/debian/patches/series
--- apparmor-2.11.1/debian/patches/series	2017-11-05 11:25:34.000000000 -0800
+++ apparmor-2.11.1/debian/patches/series	2018-01-09 02:31:57.000000000 -0800
@@ -41,3 +41,4 @@
 flatpak-exports.patch
 utils-logprof-python3.6.patch
 utils-keep-shebang.patch
+0001-Allow-seven-digit-pid.patch