Created by Steve Beattie on 2011-02-24 and last modified on 2011-02-24
Get this branch:
bzr branch lp:~sbeattie/apparmor/apparmor-ubuntu-2.6.0-merge
Only Steve Beattie can upload to this branch. If you are Steve Beattie please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Steve Beattie

Recent revisions

1418. By Steve Beattie on 2011-02-24

- Patches taken upstream and dropped:
    + 0001-ubuntu-buildd.patch
    + 0003-add-libvirt-support-to-dnsmasq.patch
    + 0004-lp698194.patch
    + 0005-aa-disable.patch
- debian/rules: remove library path settings for mod_apparmor and
    pam_apprmor builds; upstream handles this properly now.
- debian/apparmor-utils.install: handle upstream SubDomain.pm =>
    AppArmor.pm renaming
* debian/rules, debian/control, debian/python-libapparmor: build
  a python-libapparmor package.

1417. By Steve Beattie on 2011-02-24

New upstream 2.6.0 release (LP: #724193)

1416. By Steve Beattie on 2011-02-24

debian/lib/apparmor/functions: handle profile names with embedded
  spaces (LP: #655523)

1415. By Jamie Strandboge on 2011-02-22

debian/lib/apparmor/functions: don't unload dynamically generated libvirt
profiles on reload, restart, and force-reload (LP: #702774)

1414. By Jamie Strandboge on 2011-02-08

debian/copyright: update and reformat according to DEP-5

1413. By Jamie Strandboge on 2011-02-08

Release 2.6~devel+bzr1617-0ubuntu2
* debian/patches/0005-aa-disable.patch: add aa-disable
* debian/apparmor-utils.install: install aa-disable
* debian/apparmor-utils.manpages: install aa-disable man page

1412. By Jamie Strandboge on 2011-01-07

upload 2.6~devel+bzr1617-0ubuntu1

1411. By Jamie Strandboge on 2011-01-07

Merge with upstream bzr revision 1617.

1410. By Jamie Strandboge on 2011-01-07

* Merge with upstream bzr revision 1616
* debian/patches/0004-lp698194:
  - abstractions/private-files: don't allow wl to autostart directories
  - abstractions/private-files-strict: don't allow access to chromium,
    kwallet and popular mail clients

1409. By Jamie Strandboge on 2011-01-04

- allow net_raw and network inet raw for ICMP pings when used as a DHCP

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.