commit 29e30844be1e82c029c99f60b06d335e9e7ce531
Author: Jan Rękorajski <[email protected]>
Date: Sat Dec 9 22:59:58 2017 +0100
- updated apparmor patch
...armor-add-base-infastructure-for-socket-mediation.patch | 14 ++++++++------
kernel.spec | 2 +-
2 files changed, 9 insertions(+), 7 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 360c3885..f8f9e001 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.14
%define postver .4
diff --git a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
index 2a29c960..5369c3ae 100644
--- a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
+++ b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
@@ -200,14 +200,17 @@ diff --git a/security/apparmor/include/audit.h
b/security/apparmor/include/audit
index 620e81169659..ff4316e1068d 100644
--- a/security/apparmor/include/audit.h
+++ b/security/apparmor/include/audit.h
-@@ -121,21 +121,29 @@ struct apparmor_audit_data {
+@@ -121,23 +121,29 @@ struct apparmor_audit_data {
/* these entries require a custom callback fn */
struct {
struct aa_label *peer;
-- struct {
-- const char *target;
-- kuid_t ouid;
-- } fs;
+- union {
+- struct {
+- const char *target;
+- kuid_t ouid;
+- } fs;
+- int signal;
+- };
+ union {
+ struct {
+ kuid_t ouid;
@@ -231,7 +234,6 @@ index 620e81169659..ff4316e1068d 100644
const char *ns;
long pos;
} iface;
-- int signal;
- struct {
- int rlim;
- unsigned long max;
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/29e30844be1e82c029c99f60b06d335e9e7ce531
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
