From 502e992c429ef32b32d16bc05326bb836995d47e Mon Sep 17 00:00:00 2001 From: Jamie Strandboge Date: Wed, 20 Aug 2014 19:14:24 -0500 Subject: [PATCH] Update perl abstraction, logprof.conf, severity.db and tests for Debian/Ubuntu perl multiarch paths Acked-By: Jamie Strandboge Acked-by: Seth Arnold --- profiles/apparmor.d/abstractions/perl | 6 ++++-- utils/logprof.conf | 2 ++ utils/severity.db | 3 +++ utils/test/logprof.conf | 2 ++ utils/test/severity.db | 3 +++ utils/test/severity_broken.db | 3 +++ 6 files changed, 17 insertions(+), 2 deletions(-) diff --git a/profiles/apparmor.d/abstractions/perl b/profiles/apparmor.d/abstractions/perl index d429e726f..3838935d9 100644 --- a/profiles/apparmor.d/abstractions/perl +++ b/profiles/apparmor.d/abstractions/perl @@ -13,8 +13,10 @@ /usr/bin/perl rmix, /usr/bin/perl[0-9].[0-9].[0-9] rmix, - /usr/lib{,32,64}/perl5/** r, - /usr/lib{,32,64}/perl{,5}/**.so* mr, + /usr/lib{,32,64}/perl5/** r, + /usr/lib{,32,64}/perl{,5}/**.so* mr, + /usr/lib/@{multiarch}/perl/** r, + /usr/lib/@{multiarch}/perl{,5}/[0-9]*/**.so* mr, /usr/share/perl/** r, /usr/share/perl5/** r, diff --git a/utils/logprof.conf b/utils/logprof.conf index ea6636e7a..f5e719ada 100644 --- a/utils/logprof.conf +++ b/utils/logprof.conf @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2004-2006 Novell/SUSE +# Copyright (C) 2014 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -130,6 +131,7 @@ # if they use any perl modules, grant access to all ^/usr/lib/perl5/.+$ = /usr/lib/perl5/** + ^/usr/lib/[^\/]+/perl5?/.+$ = /usr/lib/@{multiarch}/perl{,5}/** # locale foo ^/usr/lib/locale/.+$ = /usr/lib/locale/** diff --git a/utils/severity.db b/utils/severity.db index 7fd62f445..3c0284004 100644 --- a/utils/severity.db +++ b/utils/severity.db @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE +# Copyright (C) 2014 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -231,6 +232,8 @@ /usr/lib/lib*so* 3 8 4 /usr/lib/iptables/* 2 8 2 /usr/lib/perl5/** 4 10 6 +/usr/lib/*/perl/** 4 10 6 +/usr/lib/*/perl5/** 4 10 6 /usr/lib/gconv/* 4 7 4 /usr/lib/locale/** 4 8 0 /usr/lib/jvm/** 5 7 5 diff --git a/utils/test/logprof.conf b/utils/test/logprof.conf index e073eb70a..47ad56303 100644 --- a/utils/test/logprof.conf +++ b/utils/test/logprof.conf @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2004-2006 Novell/SUSE +# Copyright (C) 2014 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -105,6 +106,7 @@ # if they use any perl modules, grant access to all ^/usr/lib/perl5/.+$ = /usr/lib/perl5/** + ^/usr/lib/[^\/]+/perl5?/.+$ = /usr/lib/@{multiarch}/perl{,5}/** # locale foo ^/usr/lib/locale/.+$ = /usr/lib/locale/** diff --git a/utils/test/severity.db b/utils/test/severity.db index f15fae3c9..3a4a90345 100644 --- a/utils/test/severity.db +++ b/utils/test/severity.db @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE +# Copyright (C) 2014 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -230,6 +231,8 @@ /usr/lib/lib*so* 3 8 4 /usr/lib/iptables/* 2 8 2 /usr/lib/perl5/** 4 10 6 +/usr/lib/*/perl/** 4 10 6 +/usr/lib/*/perl5/** 4 10 6 /usr/lib/gconv/* 4 7 4 /usr/lib/locale/** 4 8 0 /usr/lib/jvm/** 5 7 5 diff --git a/utils/test/severity_broken.db b/utils/test/severity_broken.db index 417945324..b4179860d 100644 --- a/utils/test/severity_broken.db +++ b/utils/test/severity_broken.db @@ -1,6 +1,7 @@ # ------------------------------------------------------------------ # # Copyright (C) 2002-2005 Novell/SUSE +# Copyright (C) 2014 Canonical Ltd. # # This program is free software; you can redistribute it and/or # modify it under the terms of version 2 of the GNU General Public @@ -230,6 +231,8 @@ /usr/lib/lib*so* 3 8 4 /usr/lib/iptables/* 2 8 2 /usr/lib/perl5/** 4 10 6 +/usr/lib/*/perl/* 4 10 6 +/usr/lib/*/perl5/* 4 10 6 /usr/lib/gconv/* 4 7 4 /usr/lib/locale/** 4 8 0 /usr/lib/jvm/** 5 7 5