- updated apparmor patch

- rel 1

diff --git a/0001-apparmor-add-base-infastructure-for-socket-mediation.patch b/0001-apparmor-add-base-infastructure-for-socket-mediation.patch
index 4fae1ca0ef0a6c90a7782dd86ea5358fe0fddaf4..184fbdd601a3ac4d2f08476028028bdcb6ed7f5c 100644 (file)
--- 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

diff --git a/kernel.spec b/kernel.spec
index 2a9cafcd048a37fc2c8f42c7c1d668ba4d2c70fc..64cd83e684cedbf40894527e8e697e4913ca617b 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.16
 %define                postver         .3