diff -Nru apparmor-2.7.99/debian/changelog apparmor-2.7.99/debian/changelog --- apparmor-2.7.99/debian/changelog 2012-02-24 16:19:51.000000000 +0000 +++ apparmor-2.7.99/debian/changelog 2012-03-02 14:11:37.000000000 +0000 @@ -1,3 +1,19 @@ +apparmor (2.7.99-0ubuntu2) precise; urgency=low + + * debian/control: dh-apparmor should Breaks/Replaces on debhelper + 9.20120115ubuntu3, not 9.20120115ubuntu2 + * debian/patches/0006-lp941808.patch: allow writes to + /{,var/}run/sendsigs.omit.d/*dnsmasq.pid for network manager integration + (LP: #941808) + * debian/patches/0007-lp941506.patch: allow reads to ~/.drirc in the X + abstraction (LP: #941506) + * debian/patches/0008-lp941503.patch: allow read access to + /usr/share/texmf/fonts in fonts abstraction (LP: #941503) + * debian/patches/0009-lp943161.patch: fix path to java in + ubuntu-browsers.d/java (LP: #943161) + + -- Jamie Strandboge Fri, 02 Mar 2012 07:50:50 -0600 + apparmor (2.7.99-0ubuntu1) precise; urgency=low * New upstream release which also pulls in 2.7.0-1 changes from Debian. diff -Nru apparmor-2.7.99/debian/control apparmor-2.7.99/debian/control --- apparmor-2.7.99/debian/control 2012-02-15 23:06:33.000000000 +0000 +++ apparmor-2.7.99/debian/control 2012-02-24 17:25:50.000000000 +0000 @@ -115,8 +115,8 @@ Section: devel Architecture: all Depends: ${perl:Depends}, ${misc:Depends} -Breaks: debhelper (<< 9.20120115ubuntu2) -Replaces: debhelper (<< 9.20120115ubuntu2) +Breaks: debhelper (<< 9.20120115ubuntu3) +Replaces: debhelper (<< 9.20120115ubuntu3) Description: AppArmor debhelper routines This provides the debhelper tools used to install and migrate AppArmor profiles. This is normally used from package maintainer scripts during diff -Nru apparmor-2.7.99/debian/patches/0006-lp941808.patch apparmor-2.7.99/debian/patches/0006-lp941808.patch --- apparmor-2.7.99/debian/patches/0006-lp941808.patch 1970-01-01 00:00:00.000000000 +0000 +++ apparmor-2.7.99/debian/patches/0006-lp941808.patch 2012-03-02 15:54:02.000000000 +0000 @@ -0,0 +1,17 @@ +Author: Jamie Strandboge +Description: allow writes to /{,var/}run/sendsigs.omit.d/*dnsmasq.pid for + network manager integration +Bug-Ubuntu: https://launchpad.net/bugs/941808 + +Index: apparmor-2.7.99/profiles/apparmor.d/usr.sbin.dnsmasq +=================================================================== +--- apparmor-2.7.99.orig/profiles/apparmor.d/usr.sbin.dnsmasq 2012-03-02 08:13:38.000000000 -0600 ++++ apparmor-2.7.99/profiles/apparmor.d/usr.sbin.dnsmasq 2012-03-02 09:53:59.000000000 -0600 +@@ -53,6 +53,7 @@ + + # NetworkManager integration + /{,var/}run/nm-dns-dnsmasq.conf r, ++ /{,var/}run/sendsigs.omit.d/*dnsmasq.pid w, + + # Site-specific additions and overrides. See local/README for details. + #include diff -Nru apparmor-2.7.99/debian/patches/0007-lp941506.patch apparmor-2.7.99/debian/patches/0007-lp941506.patch --- apparmor-2.7.99/debian/patches/0007-lp941506.patch 1970-01-01 00:00:00.000000000 +0000 +++ apparmor-2.7.99/debian/patches/0007-lp941506.patch 2012-03-02 13:55:36.000000000 +0000 @@ -0,0 +1,16 @@ +Author: Jamie Strandboge +Description: allow read access to ~/.drirc +Bug-Ubuntu: https://launchpad.net/bugs/941506 + +Index: apparmor-2.7.99/profiles/apparmor.d/abstractions/X +=================================================================== +--- apparmor-2.7.99.orig/profiles/apparmor.d/abstractions/X 2012-03-02 07:52:34.000000000 -0600 ++++ apparmor-2.7.99/profiles/apparmor.d/abstractions/X 2012-03-02 07:54:08.000000000 -0600 +@@ -37,6 +37,7 @@ + /usr/lib/@{multiarch}/dri/** mr, + /dev/dri/** rw, + /etc/drirc r, ++ owner @{HOME}/.drirc r, + + # mouse themes + /etc/X11/cursors/ r, diff -Nru apparmor-2.7.99/debian/patches/0008-lp941503.patch apparmor-2.7.99/debian/patches/0008-lp941503.patch --- apparmor-2.7.99/debian/patches/0008-lp941503.patch 1970-01-01 00:00:00.000000000 +0000 +++ apparmor-2.7.99/debian/patches/0008-lp941503.patch 2012-03-02 14:04:51.000000000 +0000 @@ -0,0 +1,17 @@ +Author: Jamie Strandboge +Description: allow read access to /usr/share/texmf/fonts +Bug-Ubuntu: https://launchpad.net/bugs/941503 + +Index: apparmor-2.7.99/profiles/apparmor.d/abstractions/fonts +=================================================================== +--- apparmor-2.7.99.orig/profiles/apparmor.d/abstractions/fonts 2012-01-03 17:25:10.000000000 -0600 ++++ apparmor-2.7.99/profiles/apparmor.d/abstractions/fonts 2012-03-02 08:03:35.000000000 -0600 +@@ -30,7 +30,7 @@ + /usr/share/a2ps/fonts/** r, + /usr/share/xfce/fonts/** r, + /usr/share/ghostscript/fonts/** r, +- /usr/share/texmf/*/fonts/** r, ++ /usr/share/texmf/{,*/}fonts/** r, + /var/lib/ghostscript/** r, + + @{HOME}/.fonts.conf r, diff -Nru apparmor-2.7.99/debian/patches/0009-lp943161.patch apparmor-2.7.99/debian/patches/0009-lp943161.patch --- apparmor-2.7.99/debian/patches/0009-lp943161.patch 1970-01-01 00:00:00.000000000 +0000 +++ apparmor-2.7.99/debian/patches/0009-lp943161.patch 2012-03-02 14:10:31.000000000 +0000 @@ -0,0 +1,30 @@ +Author: Jamie Strandboge +Description: fix path to java in ubuntu-browsers.d/java +Bug-Ubuntu: https://launchpad.net/bugs/943161 + +Index: apparmor-2.7.99/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java +=================================================================== +--- apparmor-2.7.99.orig/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java 2010-12-21 12:53:33.000000000 -0600 ++++ apparmor-2.7.99/profiles/apparmor.d/abstractions/ubuntu-browsers.d/java 2012-03-02 08:09:32.000000000 -0600 +@@ -4,8 +4,8 @@ + owner @{HOME}/.java/deployment/deployment.properties k, + /etc/java-*/ r, + /etc/java-*/** r, +- /usr/lib/jvm/java-6-openjdk/jre/lib/*/IcedTeaPlugin.so mr, +- /usr/lib/jvm/java-6-openjdk/jre/bin/java cx -> browser_openjdk, ++ /usr/lib/jvm/java-6-openjdk*/jre/lib/*/IcedTeaPlugin.so mr, ++ /usr/lib/jvm/java-6-openjdk*/jre/bin/java cx -> browser_openjdk, + /usr/lib/jvm/java-*-sun-1.*/jre/bin/java{,_vm} cx -> browser_java, + /usr/lib/jvm/java-*-sun-1.*/jre/lib/*/libnp*.so cx -> browser_java, + /usr/lib/j2*-ibm/jre/bin/java cx -> browser_java, +@@ -43,8 +43,8 @@ + /var/lib/dbus/machine-id r, + + /usr/bin/env ix, +- /usr/lib/jvm/java-6-openjdk/jre/bin/java ix, +- /usr/lib/jvm/java-6-openjdk/jre/lib/i386/client/classes.jsa m, ++ /usr/lib/jvm/java-6-openjdk*/jre/bin/java ix, ++ /usr/lib/jvm/java-6-openjdk*/jre/lib/i386/client/classes.jsa m, + + # Why would java need this? + deny /usr/bin/gconftool-2 x, diff -Nru apparmor-2.7.99/debian/patches/series apparmor-2.7.99/debian/patches/series --- apparmor-2.7.99/debian/patches/series 2012-02-24 14:54:32.000000000 +0000 +++ apparmor-2.7.99/debian/patches/series 2012-03-02 14:07:48.000000000 +0000 @@ -3,3 +3,7 @@ 0003-add-aa-easyprof.patch 0004-lp918879.patch 0005-disable-minimization.patch +0006-lp941808.patch +0007-lp941506.patch +0008-lp941503.patch +0009-lp943161.patch