Bug#681911: unblock: apparmor/2.7.103-4

[Kees Cook <kees@debian.org>]

Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package apparmor

Version 2.7.103-3 contains fixes for an RC bug[1] and a piuparts failure.

Debdiff attached.

Thanks!

-Kees

[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679597
[2] http://piuparts.debian.org/sid/source/a/apparmor.html

unblock apparmor/2.7.103-4

-- System Information:
Debian Release: wheezy/sid
  APT prefers precise-updates
  APT policy: (500, 'precise-updates'), (500, 'precise-security'), (500, 'precise')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-26-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

diff -Nru apparmor-2.7.103/debian/apparmor-profiles.dirs apparmor-2.7.103/debian/apparmor-profiles.dirs
--- apparmor-2.7.103/debian/apparmor-profiles.dirs	2012-06-28 22:17:27.000000000 -0700
+++ apparmor-2.7.103/debian/apparmor-profiles.dirs	2012-06-29 01:24:51.000000000 -0700
@@ -1 +1,3 @@
 /etc/apparmor.d/local
+/etc/apparmor.d/abstractions/ubuntu-browsers.d
+/etc/apparmor.d/abstractions
diff -Nru apparmor-2.7.103/debian/changelog apparmor-2.7.103/debian/changelog
--- apparmor-2.7.103/debian/changelog	2012-06-29 00:43:20.000000000 -0700
+++ apparmor-2.7.103/debian/changelog	2012-07-16 11:54:14.000000000 -0700
@@ -1,3 +1,12 @@
+apparmor (2.7.103-4) unstable; urgency=low
+
+  * debian/apparmor-profiles.dirs: add directories we might collide
+    with apparmor on during purge.
+  * debian/patches/fix-network-rule-support.patch: handle lack of
+    networking features correctly (Closes: 679597).
+
+ -- Kees Cook <kees@debian.org>  Mon, 16 Jul 2012 11:52:42 -0700
+
 apparmor (2.7.103-3) unstable; urgency=low
 
   * debian/control: drop deprecated XS-Python-Version (Closes: 673062).
diff -Nru apparmor-2.7.103/debian/patches/fix-network-rule-support.patch apparmor-2.7.103/debian/patches/fix-network-rule-support.patch
--- apparmor-2.7.103/debian/patches/fix-network-rule-support.patch	1969-12-31 16:00:00.000000000 -0800
+++ apparmor-2.7.103/debian/patches/fix-network-rule-support.patch	2012-07-16 11:52:23.000000000 -0700
@@ -0,0 +1,20 @@
+Description: handle missing network mediation support.
+Author: John Johansen <john.johansen@canonical.com>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=679597
+
+Index: apparmor-debian/parser/parser_main.c
+===================================================================
+--- apparmor-debian.orig/parser/parser_main.c	2012-06-28 22:17:27.433492000 -0700
++++ apparmor-debian/parser/parser_main.c	2012-07-16 11:51:23.742020178 -0700
+@@ -1182,7 +1182,10 @@
+ 		write_cache = 0;
+ 		skip_read_cache = 1;
+ 		return;
+-	}
++	} else if (strstr(flags_string, "network"))
++		kernel_supports_network = 1;
++	else
++		kernel_supports_network = 0;
+ 
+ 	/*
+          * Deal with cache directory versioning:
diff -Nru apparmor-2.7.103/debian/patches/series apparmor-2.7.103/debian/patches/series
--- apparmor-2.7.103/debian/patches/series	2012-06-28 22:17:27.000000000 -0700
+++ apparmor-2.7.103/debian/patches/series	2012-07-16 11:50:18.000000000 -0700
@@ -9,3 +9,4 @@
 abstractions-ubuntu-browsers.patch
 pass-compiler-flags.patch
 non-linux.patch
+fix-network-rule-support.patch