lp://qastaging/apparmor/2.5

Branch merges

Propose for merging

No branches dependent on this one.

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1497. By John Johansen on 2011-06-06

Rename tags to conform with git tag requirements

Rename tags
  apparmor_2.5.2~rc1 to apparmor_2.5.2-rc1
  apparmor_2.6.0~rc1 to apparmor_2.6.0-rc1

this is necessary for export to the git mirror

Signed-off-by: John Johansen <email address hidden>

1496. By Steve Beattie on 2011-03-07

Update version to indicate 2.5.2 release

1495. By Steve Beattie on 2011-03-07

Hook up the parser/tst 'make clean' target to the parser's makefile;
modify the parser/tst 'make clean' target to not blow away the readme
file.

1494. By Steve Beattie on 2011-03-07

Merge from trunk revs 1671 and 1672: Update project info in
libapparmor's setup.py.in and adjust the python setup to actually match
what swig expects so it will work.

Signed-Off-By: Steve Beattie <email address hidden>

1493. By Steve Beattie on 2011-03-07

Merge from trunk revs 1660 and 1661: Update swig to export all current
interface fns, and update change_hatv and change_hat_vargs prototypes to
use long (this would be an ABI change; however, there are no known users
of those particular functions).

Acked-By: Steve Beattie <email address hidden>

1492. By Steve Beattie on 2011-03-07

Merge from trunk revs 1676 and 1677: Override AF_MAX for kernels that
don't support proper masking. Older versions of the apparmor kernel
patches didn't handle receiving network tables of a larger size than
expected. Allow the parser to detect the kernel version and override
the AF_MAX value for those kernels. This also replaces the hack
using a hardcoded limit of 36 for kernels missing the features flag.

Also, ensure that the buffer read from /proc/sys/kernel/osrelease is
null terminated.

Signed-off-by: John Johansen <email address hidden>
Acked-By: Steve Beattie <email address hidden>

1491. By Steve Beattie on 2011-03-07

Merge from trunk rev 1674: Make tcp test support current network syntax,
re-enable tcp test.

Signed-Off-By: Steve Beattie <email address hidden>

1490. By Steve Beattie on 2011-02-23

Merge from trunk rev 1667: more adjustments to the libapparmor license
headers.

1489. By Steve Beattie on 2011-02-23

Merge from trunk rev 1666: Update the copyright message in
apparmor_parser --version

Signed-off-by: John Johansen <email address hidden>
Acked-By: Steve Beattie <email address hidden>

1488. By Steve Beattie on 2011-02-23

Merge from trunk rev 1658: Update licencing in libapparmor

Signed-off-by: John Johansen <email address hidden>
Acked-By: Steve Beattie <email address hidden>