diff -Nru apparmor-2.10.95/debian/changelog apparmor-2.10.95/debian/changelog --- apparmor-2.10.95/debian/changelog 2018-01-29 12:24:08.000000000 -0500 +++ apparmor-2.10.95/debian/changelog 2018-02-02 11:19:41.000000000 -0500 @@ -1,3 +1,14 @@ +apparmor (2.10.95-0ubuntu2.6~14.04.3) trusty; urgency=medium + + * d/p/14.04-allow-seven-digit-pid-lp1717714.patch: + - Renamed d/p/0001-Allow-seven-digit-pid.patch to mirror other + profiles-14.04 patches naming pattern. + - Modify the existing/renamed patch to use the dir that should be use to + patch a profile. profiles-14.04/ should be use instead of profiles/ + which is not use. (LP: #1717714) + + -- Eric Desrochers Fri, 02 Feb 2018 10:19:38 -0500 + apparmor (2.10.95-0ubuntu2.6~14.04.2) trusty; urgency=medium * d/p/0001-Allow-seven-digit-pid.patch: diff -Nru apparmor-2.10.95/debian/patches/0001-Allow-seven-digit-pid.patch apparmor-2.10.95/debian/patches/0001-Allow-seven-digit-pid.patch --- apparmor-2.10.95/debian/patches/0001-Allow-seven-digit-pid.patch 2018-02-02 10:18:17.000000000 -0500 +++ apparmor-2.10.95/debian/patches/0001-Allow-seven-digit-pid.patch 1969-12-31 19:00:00.000000000 -0500 @@ -1,22 +0,0 @@ -Description: Allow seven digit pid - On 64bit systems, /proc/sys/kernel/pid_max can be set to PID_MAX_LIMIT, - (2^22), which results in seven digit pids. Adjust the @{PID} variable in - tunables/global to accept this. - -Author: Vincas Dargis -Origin: upstream, http://bazaar.launchpad.net/~apparmor-dev/apparmor/master/revision/3722 -Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886732 -Bug-Ubuntu: https://bugs.launchpad.net/bugs/1717714 -Index: apparmor-2.10.95/profiles-14.04/apparmor.d/tunables/kernelvars -=================================================================== ---- apparmor-2.10.95.orig/profiles-14.04/apparmor.d/tunables/kernelvars -+++ apparmor-2.10.95/profiles-14.04/apparmor.d/tunables/kernelvars -@@ -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.10.95/debian/patches/14.04-allow-seven-digit-pid-lp1717714.patch apparmor-2.10.95/debian/patches/14.04-allow-seven-digit-pid-lp1717714.patch --- apparmor-2.10.95/debian/patches/14.04-allow-seven-digit-pid-lp1717714.patch 1969-12-31 19:00:00.000000000 -0500 +++ apparmor-2.10.95/debian/patches/14.04-allow-seven-digit-pid-lp1717714.patch 2018-02-02 10:18:17.000000000 -0500 @@ -0,0 +1,22 @@ +Description: Allow seven digit pid + On 64bit systems, /proc/sys/kernel/pid_max can be set to PID_MAX_LIMIT, + (2^22), which results in seven digit pids. Adjust the @{PID} variable in + tunables/global to accept this. + +Author: Vincas Dargis +Origin: upstream, http://bazaar.launchpad.net/~apparmor-dev/apparmor/master/revision/3722 +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=886732 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1717714 +Index: apparmor-2.10.95/profiles-14.04/apparmor.d/tunables/kernelvars +=================================================================== +--- apparmor-2.10.95.orig/profiles-14.04/apparmor.d/tunables/kernelvars ++++ apparmor-2.10.95/profiles-14.04/apparmor.d/tunables/kernelvars +@@ -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.10.95/debian/patches/series apparmor-2.10.95/debian/patches/series --- apparmor-2.10.95/debian/patches/series 2018-01-29 12:23:00.000000000 -0500 +++ apparmor-2.10.95/debian/patches/series 2018-02-02 10:39:07.000000000 -0500 @@ -64,6 +64,7 @@ 14.04-profiles-texlive_font_generation-lp1010909.patch 14.04-profiles-dovecot-updates-lp1296667.patch 14.04-profiles-adjust_X_for_lightdm-lp1339727.patch +14.04-allow-seven-digit-pid-lp1717714.patch # # Other patches on top of 16.04's apparmor package @@ -77,4 +78,3 @@ # patch a profile that ships in the apparmor or apparmor-profiles packages, you # must adjust it to patch profiles-14.04/ instead. The only exception is the # abstractions in profiles/ are used for /etc/apparmor.d/snap/abstractions. -0001-Allow-seven-digit-pid.patch