Created by James Westby and last modified
Get this branch:
bzr branch lp://staging/ubuntu/maverick/apparmor
Members of Ubuntu branches can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Ubuntu branches
Review team:
Ubuntu Development Team

Recent revisions

108. By Jamie Strandboge

abstractions/ubuntu-email: adjustment for ever-changing thunderbird path
(LP: #648900)

107. By Jamie Strandboge

[ Jamie Strandboge ]
* New upstream RC release (revision 1413). In addition to getting the tools
  to work with the maverick kernel, this update fixes:
  - LP: #619521
  - LP: #633369
  - LP: #626451
  - LP: #581525
  - LP: #623467 (link and unlink still need to be addressed)
* Dropped the following patches, included upstream:
  - 0002-lp615177.patch
  - 0004-ubuntu-pux.patch
  - 0006-kde4-config-pux.patch
  - 0007-lp605835.patch
  - 0012-lp625041.patch
  - 0013-lp623586.patch
* Update the following patches:
  - rename 0010-fix-release.patch as 0001-fix-release.patch since this will
    likely always need to be here
  - rename 0005-add-chromium-browser.patch as
  - rename 0001-local-includes.patch as 0003-local-includes.patch and update
    to use r1493 (from trunk) of local/README file. This can be dropped in
  - collect the ubuntu abstractions updates pulled from trunk into
    0004-ubuntu-abstractions-updates.patch. This can be dropped in 2.6.
  - rename 0008-lp601583.patch as 0005-lp601583.patch. This can be dropped
    in 2.5.1 final.
* fix up some lintian warnings:
  - debian/control:
    + don't use 'Section' in apparmor-notify, since it is the same as the
    + updates Standards-Version to 3.9.1
    + add ${misc:Depends} to libapparmor-dev and apparmor-notify
  - add debian/source/format
  - debian/libapache2-mod-apparmor.postrm: use #DEBHELPER#
  - debian/libapache2-mod-apparmor.preinst: use #DEBHELPER#
  - add debian/watch
* debian/notify/notify.conf: set show_notifications="yes" by default
* debian/patches/0006-network-interface-enumeration.patch: allow network
  interface enumeration. This can be dropped in 2.5.1 final.
* debian/patches/0007-gnome-updates.patch: update for font/icon/mime
  locations in current gnome. This can be dropped in 2.5.1 final.

[ Kees Cook ]
* debian/apparmor.init: rename "stop" to "teardown", drop caches on
  "stop" and warn about the dangers of "teardown".

106. By Jamie Strandboge

* debian/profiles/chromium-browser: updated to have the proper path to
* debian/patches/0011-lp514356+573344+593413.patch: browser abstraction
  updates for /net, kmozillahelper and gnome-appearance-properties
  (LP: #593413, LP: #514356, LP: #573344)
* debian/patches/0012-lp625041.patch: add sensible-browser (LP: #625041)
* debian/patches/0013-lp623586.patch: allow access to ghostscript fonts when
  not using defoma (LP: #623586)

105. By Jamie Strandboge

* debian/patches/0007-lp605835.patch: allow ca-certificates in ssl_certs
  abstraction (LP: #605835)
* debian/patches/0008-lp601583.patch: adjust X abstraction for newer gdm
  (LP: #601583)
* debian/patches/0009-lp565753.patch: add ubuntu-feed-readers abstraction
  and have ubuntu-browsers.d/multimedia use it (LP: #565753)
* debian/apparmor.config: don't try to read in the existing value from
  /etc/apparmor.d/tunables/home.d/ubuntu, but instead always use what is
  in debconf. (LP: #561694)
* add aa-update-browser for giving a programmatic way to update browser
  profiles to use browser abstractions
  - add debian/aa-update-browser
  - add debian/aa-update-browser.8
  - debian/rules: install aa-update-browser*
* debian/patches/0003-ubuntu-browsers-d.patch: updated to generalize java
  child profile names
* debian/patches/0010-fix-release.patch: update common/Make.rules to use
  Canonical Ltd in generated documentation

104. By Jamie Strandboge

* debian/patches/0001-local-includes.patch: updated to adjust local/README
  to have upstream clarifications
* debian/patches/0003-ubuntu-browsers-d.patch: add ubuntu-browsers.d/*
* debian/patches/0004-ubuntu-pux.patch: use 'PUx' instead of 'Ux' in
* add chromium-browser profile. All this can be removed once
  chromium-browser ships its own profile:
  - debian/patches/0005-add-chromium-browser.patch: add preliminary
  - debian/profiles/chromium-browser: added for use with ubuntu-browsers.d
  - debian/rules: ship debian/profiles/chromium-browser in apparmor-profiles
* don't make /etc/apparmor.d/local/* from apparmor-profiles conffiles
  - debian/control: Build-Depends on debhelper 7.4.20ubuntu5
  - debian/rules: use dh_apparmor instead of shipping the files as conffiles
  - debian/apparmor-profiles.postinst: move DEBHELPER before initscript
  - debian/apparmor-profiles.postrm: added to remove chromium-browser config
* debian/patches/0006-kde4-config-pux.patch: remove kde4-config from kde
  abstraction and add it to kde ubuntu-browsers abstraction

103. By Jamie Strandboge

debian/patches/0002-lp615177.patch: 'owner' match in commit 1406 too
strict for /tmp/ and /var/tmp/ (LP: #615177)

102. By Jamie Strandboge

debian/rules: move local/usr.lib.apache2.mpm-prefork.apache2 to

101. By Jamie Strandboge

* Update to upstream bzr revision 1393 from lp:apparmor/2.5.
  * add dbus-session abstraction (LP: #566207)
  * require owner in user-tmp abstraction (LP: #578922)
  * don't use uninitialized $opt_s (LP: #582075)
  * allow thunderbird 3 in abstractions/ubuntu-email (LP: #590462)
  * allow gmplayer in abstractions/ubuntu-media-players (LP: #591421)
* debian/control: updated branches.
* debian/patches/0001-local-includes.patch: backported patch from trunk to
  allow local administrators to customize their profiles without modifying
  a shipped profile
* debian/rules:
  - don't pass RELEASE to libapparmor's 'make install' as it breaks the
    build and isn't used by the Makfile anyway
  - install apparmor.d/local/README in apparmor, not apparmor-profiles
  - don't install apparmor.d/local/usr.sbin.ntpd
* Drop the following patches already included upstream:
  - 0001-lp538561.patch
  - 0002-aalogprof-warnings.patch
  - 0003-fix-memleaks.patch
  - 0004-lp549557.patch
  - 0005-lp538661.patch
  - 0006-lp611248.patch

100. By Jamie Strandboge

debian/patches/0006-lp611248.patch: allow access to gdk-pixbuf loaders
LP: #611248

99. By Jamie Strandboge

[ Jamie Strandboge ]
* debian/patches/lp-549557.patch: have apparmor_notify deal with log file
  rotation. (LP: #549557)
* debian/notify/notify.conf: set show_notifications="yes"
* debian/patches/0005-lp538661.patch: adjust php5 abstraction for cgi config
  file path and extensions (LP: #538661)

[ Kees Cook ]
* debian/apparmor.functions: do not load in parallel, this is causing
  weird side-effects.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.