- updated apparmor patch

diff --git a/0012-apparmor-add-base-infastructure-for-socket-mediation.patch b/0012-apparmor-add-base-infastructure-for-socket-mediation.patch
index 2a29c9608ae65ffa0026dd671578e654399a1d01..5369c3aea581e1ef3ea0c54837d44729d4f9cae9 100644 (file)
--- 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;

diff --git a/kernel.spec b/kernel.spec
index 360c38855dbc8854b7fb88760210bf90f79e9431..f8f9e001309dd52e403f66b7d08149cf35c46933 100644 (file)
--- 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