[packages/kernel] - updated apparmor patch - rel 1

[baggins]

commit 871ea71819281e05727ff1073f2015c2f4c55974
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Apr 23 10:24:10 2018 +0200

    - updated apparmor patch
    - rel 1

 ...d-base-infastructure-for-socket-mediation.patch | 24 ++++------------------
 kernel.spec                                        |  2 +-
 2 files changed, 5 insertions(+), 21 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 2a9cafcd..64cd83e6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -68,7 +68,7 @@
 %define		have_pcmcia	0
 %endif
 
-%define		rel		0.1
+%define		rel		1
 %define		basever		4.16
 %define		postver		.3
 
diff --git a/0001-apparmor-add-base-infastructure-for-socket-mediation.patch b/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
index 4fae1ca0..184fbdd6 100644
--- a/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
+++ b/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
@@ -199,7 +199,7 @@ diff --git a/security/apparmor/include/audit.h b/security/apparmor/include/audit
 index 4ac095118717..ff4316e1068d 100644
 --- a/security/apparmor/include/audit.h
 +++ b/security/apparmor/include/audit.h
-@@ -123,10 +123,20 @@ struct apparmor_audit_data {
+@@ -123,9 +123,15 @@ struct apparmor_audit_data {
  			struct aa_label *peer;
  			union {
  				struct {
@@ -213,25 +213,9 @@ index 4ac095118717..ff4316e1068d 100644
 +					void *addr;
 +					int addrlen;
 +				} net;
- 				int signal;
-+				struct {
-+					int rlim;
-+					unsigned long max;
-+				} rlim;
- 			};
- 		};
- 		struct {
-@@ -134,10 +144,6 @@ struct apparmor_audit_data {
- 			const char *ns;
- 			long pos;
- 		} iface;
--		struct {
--			int rlim;
--			unsigned long max;
--		} rlim;
- 		struct {
- 			const char *src_name;
- 			const char *type;
+ 				struct {
+ 					int rlim;
+ 					unsigned long max;
 diff --git a/security/apparmor/include/net.h b/security/apparmor/include/net.h
 new file mode 100644
 index 000000000000..140c8efcf364
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/871ea71819281e05727ff1073f2015c2f4c55974