lp:~sbeattie/apparmor/apparmor-ubuntu-2.6.1-merge

Created by Steve Beattie on 2011-03-24 and last modified on 2011-03-24
Get this branch:
bzr branch lp:~sbeattie/apparmor/apparmor-ubuntu-2.6.1-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

Owner:
Steve Beattie
Project:
AppArmor
Status:
Development

Recent revisions

1423. By Steve Beattie on 2011-03-24

* New upstream release.
  - Fixes breakage of mod_apparmor apache2 module (LP: #737074)
  - Fixes profile matching when an attachement doesn't contain a
    regex (LP: #731155)
  - Fixes parser acceptance of missing network protocols (LP: #732837)
  - Patches taken upstream and dropped:
    + debian/patches/0002-lp727478.patch
    + debian/patches/0003-test-lp727478.patch
    + debian/patches/0004-lp736870.patch
* debian/apparmor.install, debian/apparmor.dirs: add new multiarch
  tunable file and directory
* debian/python-libapparmor.install: loosen directory specification
  for resiliancy against different python versions

1422. By Steve Langasek on 2011-03-22

releasing version 2.6.0-0ubuntu4

1421. By Steve Langasek on 2011-03-22

* Update debian/patches/0004-lp736870.patch (LP: #736870):
  - armel triplet doesn't match '*-linux-gnu'
  - /lib/tls for libc6-xen needs handling
  - gnome, kde, kerberosclient, and authentication abstractions also need
    updating for multiarch.

1420. By Jamie Strandboge on 2011-03-22

meh, adjust 0002-lp727478.patch and 0003-test-lp727478.patch to what we
actually used

1419. By Jamie Strandboge on 2011-03-22

actually add debian/patches/0004-lp736870.patch. d'oh!

1418. By Jamie Strandboge on 2011-03-17

debian/patches/0004-lp736870.patch: add multiarch support to abstractions
(LP: #736870)

1417. By Jamie Strandboge on 2011-03-10

apparmor (2.6.0-0ubuntu2) natty; urgency=low

* debian/patches/0002-lp727478.patch: Override AF_MAX for kernels that don't
  support proper masking. Patch thanks to John Johansen (LP: #727478)
* debian/patches/0003-test-lp727478.patch: add tcp.sh test as partial
  networking test

1416. By Jamie Strandboge on 2011-02-24

Released 2.6.0-0ubuntu1 to natty

[ Steve Beattie ]
* New upstream 2.6.0 release (LP: #724193)
  - 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/lib/apparmor/functions: handle profile names with embedded
  spaces (LP: #655523)
* debian/rules, debian/control, debian/python-libapparmor: build
  a python-libapparmor package.
[ Jamie Strandboge ]
* debian/control: use Section: python for python-libapparmor

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

Branch metadata

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

Subscribers