lp:~sbeattie/apparmor/apparmor-ubuntu-2.6.0-merge
Created by
Steve Beattie
and last modified
- 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
Propose for merging
No branches
dependent on this one.
- Jamie Strandboge: Approve
-
Diff: 115775 lines (+75421/-13735)265 files modified.bzrignore (+0/-165)
Makefile (+5/-4)
changehat/mod_apparmor/Makefile (+1/-5)
changehat/mod_apparmor/mod_apparmor.c (+1/-5)
changehat/pam_apparmor/Makefile (+3/-3)
changehat/pam_apparmor/pam_apparmor.c (+1/-1)
changehat/tomcat_apparmor/tomcat_5_5/build.xml (+8/-7)
changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/JNIChangeHat.c (+1/-1)
changehat/tomcat_apparmor/tomcat_5_5/src/jni_src/Makefile (+2/-2)
common/.stamp_rev (+1/-0)
common/Make-po.rules (+15/-7)
common/Version (+1/-1)
debian/apparmor-utils.install (+1/-1)
debian/changelog (+19/-2)
debian/control (+10/-1)
debian/lib/apparmor/functions (+1/-1)
debian/patches/0001-ubuntu-buildd.patch (+0/-25)
debian/patches/0003-add-libvirt-support-to-dnsmasq.patch (+0/-35)
debian/patches/0004-lp698194.patch (+0/-40)
debian/patches/0005-aa-disable.patch (+0/-369)
debian/patches/series (+1/-5)
debian/python-libapparmor.install (+1/-0)
debian/rules (+2/-5)
deprecated/management/applets/apparmorapplet-gnome/AppArmor_Monitor_Factory.server.in (+0/-25)
deprecated/management/applets/apparmorapplet-gnome/COPYING (+0/-340)
deprecated/management/applets/apparmorapplet-gnome/INSTALL (+0/-236)
deprecated/management/applets/apparmorapplet-gnome/Makefile.am (+0/-14)
deprecated/management/applets/apparmorapplet-gnome/apparmorapplet-gnome.spec (+0/-48)
deprecated/management/applets/apparmorapplet-gnome/autogen.sh (+0/-159)
deprecated/management/applets/apparmorapplet-gnome/config.h.in (+0/-76)
deprecated/management/applets/apparmorapplet-gnome/configure.in (+0/-41)
deprecated/management/applets/apparmorapplet-gnome/pixmaps/Makefile.am (+0/-6)
deprecated/management/applets/apparmorapplet-gnome/po/Makefile.in.in (+0/-258)
deprecated/management/applets/apparmorapplet-gnome/po/POTFILES.in (+0/-6)
deprecated/management/applets/apparmorapplet-gnome/po/af.po (+0/-48)
deprecated/management/applets/apparmorapplet-gnome/po/apparmorapplet.pot (+0/-49)
deprecated/management/applets/apparmorapplet-gnome/po/ar.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/bg.po (+0/-53)
deprecated/management/applets/apparmorapplet-gnome/po/bn.po (+0/-45)
deprecated/management/applets/apparmorapplet-gnome/po/bs.po (+0/-44)
deprecated/management/applets/apparmorapplet-gnome/po/ca.po (+0/-51)
deprecated/management/applets/apparmorapplet-gnome/po/cs.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/cy.po (+0/-44)
deprecated/management/applets/apparmorapplet-gnome/po/da.po (+0/-55)
deprecated/management/applets/apparmorapplet-gnome/po/de.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/el.po (+0/-59)
deprecated/management/applets/apparmorapplet-gnome/po/en_GB.po (+0/-51)
deprecated/management/applets/apparmorapplet-gnome/po/en_US.po (+0/-45)
deprecated/management/applets/apparmorapplet-gnome/po/es.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/et.po (+0/-48)
deprecated/management/applets/apparmorapplet-gnome/po/fi.po (+0/-52)
deprecated/management/applets/apparmorapplet-gnome/po/fr.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/gl.po (+0/-65)
deprecated/management/applets/apparmorapplet-gnome/po/gu.po (+0/-54)
deprecated/management/applets/apparmorapplet-gnome/po/he.po (+0/-44)
deprecated/management/applets/apparmorapplet-gnome/po/hi.po (+0/-53)
deprecated/management/applets/apparmorapplet-gnome/po/hr.po (+0/-52)
deprecated/management/applets/apparmorapplet-gnome/po/hu.po (+0/-52)
deprecated/management/applets/apparmorapplet-gnome/po/id.po (+0/-44)
deprecated/management/applets/apparmorapplet-gnome/po/it.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/ja.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/ka.po (+0/-50)
deprecated/management/applets/apparmorapplet-gnome/po/km.po (+0/-52)
deprecated/management/applets/apparmorapplet-gnome/po/ko.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/lo.po (+0/-44)
deprecated/management/applets/apparmorapplet-gnome/po/lt.po (+0/-49)
deprecated/management/applets/apparmorapplet-gnome/po/mk.po (+0/-48)
deprecated/management/applets/apparmorapplet-gnome/po/mr.po (+0/-49)
deprecated/management/applets/apparmorapplet-gnome/po/nb.po (+0/-59)
deprecated/management/applets/apparmorapplet-gnome/po/nl.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/pa.po (+0/-55)
deprecated/management/applets/apparmorapplet-gnome/po/pl.po (+0/-50)
deprecated/management/applets/apparmorapplet-gnome/po/pt.po (+0/-57)
deprecated/management/applets/apparmorapplet-gnome/po/pt_BR.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/ro.po (+0/-51)
deprecated/management/applets/apparmorapplet-gnome/po/ru.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/si.po (+0/-47)
deprecated/management/applets/apparmorapplet-gnome/po/sk.po (+0/-57)
deprecated/management/applets/apparmorapplet-gnome/po/sl.po (+0/-52)
deprecated/management/applets/apparmorapplet-gnome/po/sr.po (+0/-50)
deprecated/management/applets/apparmorapplet-gnome/po/sv.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/ta.po (+0/-51)
deprecated/management/applets/apparmorapplet-gnome/po/th.po (+0/-47)
deprecated/management/applets/apparmorapplet-gnome/po/tr.po (+0/-51)
deprecated/management/applets/apparmorapplet-gnome/po/uk.po (+0/-59)
deprecated/management/applets/apparmorapplet-gnome/po/vi.po (+0/-50)
deprecated/management/applets/apparmorapplet-gnome/po/wa.po (+0/-55)
deprecated/management/applets/apparmorapplet-gnome/po/xh.po (+0/-48)
deprecated/management/applets/apparmorapplet-gnome/po/zh_CN.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/zh_TW.po (+0/-43)
deprecated/management/applets/apparmorapplet-gnome/po/zu.po (+0/-54)
deprecated/management/applets/apparmorapplet-gnome/src/Makefile.am (+0/-25)
deprecated/management/applets/apparmorapplet-gnome/src/apparmor-applet.c (+0/-355)
deprecated/management/applets/apparmorapplet-gnome/src/apparmor-applet.h (+0/-37)
deprecated/management/applets/apparmorapplet-gnome/src/preferences_dialog.c (+0/-129)
deprecated/management/applets/apparmorapplet-gnome/src/preferences_dialog.h (+0/-9)
deprecated/management/applets/apparmorapplet-gnome/src/reject_list.c (+0/-272)
deprecated/management/applets/apparmorapplet-gnome/src/reject_list.h (+0/-13)
kernel-patches/2.6.36.2/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+538/-0)
kernel-patches/2.6.36.2/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+392/-0)
kernel-patches/2.6.36.2/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+68/-0)
kernel-patches/2.6.37/0001-AppArmor-compatibility-patch-for-v5-network-controll.patch (+538/-0)
kernel-patches/2.6.37/0002-AppArmor-compatibility-patch-for-v5-interface.patch (+392/-0)
kernel-patches/2.6.37/0003-AppArmor-Allow-dfa-backward-compatibility-with-broke.patch (+68/-0)
libraries/libapparmor/AUTHORS (+1/-1)
libraries/libapparmor/Makefile.in (+740/-0)
libraries/libapparmor/aclocal.m4 (+9178/-0)
libraries/libapparmor/autom4te.cache/output.0 (+13966/-0)
libraries/libapparmor/autom4te.cache/output.1 (+13962/-0)
libraries/libapparmor/autom4te.cache/requests (+281/-0)
libraries/libapparmor/autom4te.cache/traces.0 (+2779/-0)
libraries/libapparmor/autom4te.cache/traces.1 (+646/-0)
libraries/libapparmor/compile (+143/-0)
libraries/libapparmor/config.guess (+1502/-0)
libraries/libapparmor/config.sub (+1714/-0)
libraries/libapparmor/configure (+13962/-0)
libraries/libapparmor/depcomp (+630/-0)
libraries/libapparmor/doc/Makefile.in (+470/-0)
libraries/libapparmor/doc/aa_change_hat.pod (+23/-5)
libraries/libapparmor/doc/aa_change_profile.pod (+9/-1)
libraries/libapparmor/install-sh (+520/-0)
libraries/libapparmor/missing (+376/-0)
libraries/libapparmor/src/Makefile.am (+2/-2)
libraries/libapparmor/src/Makefile.in (+759/-0)
libraries/libapparmor/src/aalogparse.h (+14/-14)
libraries/libapparmor/src/apparmor.h (+21/-11)
libraries/libapparmor/src/grammar.y (+25/-212)
libraries/libapparmor/src/kernel_interface.c (+15/-7)
libraries/libapparmor/src/libaalogparse.c (+14/-15)
libraries/libapparmor/src/libimmunix_warning.c (+14/-6)
libraries/libapparmor/src/parser.h (+14/-14)
libraries/libapparmor/src/scanner.l (+15/-112)
libraries/libapparmor/src/tst_aalogmisc.c (+17/-0)
libraries/libapparmor/swig/Makefile.in (+575/-0)
libraries/libapparmor/swig/SWIG/libapparmor.i (+10/-3)
libraries/libapparmor/swig/perl/Makefile.am (+1/-0)
libraries/libapparmor/swig/perl/Makefile.in (+407/-0)
libraries/libapparmor/swig/python/Makefile.in (+397/-0)
libraries/libapparmor/swig/python/setup.py.in (+7/-7)
libraries/libapparmor/swig/ruby/Makefile.in (+400/-0)
libraries/libapparmor/testsuite/Makefile.in (+711/-0)
libraries/libapparmor/testsuite/config/Makefile.in (+372/-0)
libraries/libapparmor/testsuite/lib/Makefile.in (+372/-0)
libraries/libapparmor/testsuite/libaalogparse.test/Makefile.in (+372/-0)
libraries/libapparmor/testsuite/test_multi/old_style_log_01.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_02.out (+2/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_03.out (+3/-7)
libraries/libapparmor/testsuite/test_multi/old_style_log_04.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_05.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_06.out (+3/-7)
libraries/libapparmor/testsuite/test_multi/old_style_log_07.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_08.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_09.out (+3/-7)
libraries/libapparmor/testsuite/test_multi/old_style_log_10.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_11.out (+3/-7)
libraries/libapparmor/testsuite/test_multi/old_style_log_12.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_13.out (+3/-7)
libraries/libapparmor/testsuite/test_multi/old_style_log_14.out (+3/-8)
libraries/libapparmor/testsuite/test_multi/old_style_log_15.out (+3/-6)
libraries/libapparmor/testsuite/test_multi/old_style_log_16.out (+3/-4)
libraries/libapparmor/testsuite/test_multi/old_style_log_17.out (+3/-3)
libraries/libapparmor/testsuite/test_multi/old_style_log_18.out (+3/-7)
libraries/libapparmor/ylwrap (+222/-0)
parser/COPYING.GPL (+1/-1)
parser/immunix.h (+2/-2)
parser/libapparmor_re/regexp.y (+3/-0)
parser/parser_interface.c (+1/-1)
parser/parser_main.c (+2/-2)
parser/parser_merge.c (+3/-2)
parser/po/af.po (+1/-1)
parser/po/apparmor-parser.pot (+540/-0)
parser/po/en_GB.po (+2/-2)
parser/po/en_US.po (+4/-4)
parser/po/subdomain_parser.pot (+0/-420)
parser/rc.apparmor.functions (+6/-4)
parser/subdomain.conf (+6/-6)
parser/techdoc.tex (+1/-1)
parser/tst/README (+4/-4)
parser/tst/caching.sh (+7/-0)
profiles/apparmor.d/abstractions/private-files (+2/-0)
profiles/apparmor.d/abstractions/private-files-strict (+6/-0)
profiles/apparmor.d/abstractions/ubuntu-browsers.d/productivity (+8/-0)
profiles/apparmor.d/usr.sbin.dnsmasq (+17/-1)
profiles/apparmor.d/usr.sbin.ntpd (+2/-2)
profiles/apparmor/profiles/extras/usr.lib.firefox.firefox (+116/-51)
utils/Immunix/AppArmor.pm (+70/-10)
utils/Immunix/Reports.pm (+4/-4)
utils/Makefile (+15/-7)
utils/aa-audit (+2/-2)
utils/aa-audit.pod (+2/-2)
utils/aa-autodep (+2/-2)
utils/aa-autodep.pod (+2/-2)
utils/aa-complain (+2/-2)
utils/aa-complain.pod (+5/-5)
utils/aa-disable (+152/-0)
utils/aa-disable.pod (+49/-0)
utils/aa-enforce (+2/-2)
utils/aa-enforce.pod (+6/-5)
utils/aa-genprof (+4/-4)
utils/aa-genprof.pod (+3/-2)
utils/aa-logprof (+2/-2)
utils/aa-logprof.pod (+2/-2)
utils/aa-repo.pl (+1/-1)
utils/aa-unconfined (+2/-2)
utils/apparmor.vim (+205/-66)
utils/logprof.conf.pod (+2/-2)
utils/po/af.po (+118/-127)
utils/po/ar.po (+114/-123)
utils/po/bg.po (+116/-126)
utils/po/bn.po (+116/-126)
utils/po/bs.po (+116/-126)
utils/po/ca.po (+116/-125)
utils/po/cs.po (+115/-124)
utils/po/cy.po (+116/-125)
utils/po/da.po (+114/-123)
utils/po/de.po (+116/-125)
utils/po/el.po (+116/-126)
utils/po/en_GB.po (+61/-65)
utils/po/en_US.po (+69/-80)
utils/po/es.po (+116/-125)
utils/po/et.po (+116/-125)
utils/po/fi.po (+117/-126)
utils/po/fr.po (+114/-123)
utils/po/gl.po (+116/-125)
utils/po/gu.po (+116/-126)
utils/po/he.po (+116/-125)
utils/po/hi.po (+114/-124)
utils/po/hr.po (+116/-125)
utils/po/hu.po (+117/-130)
utils/po/id.po (+116/-125)
utils/po/it.po (+116/-125)
utils/po/ja.po (+114/-123)
utils/po/ka.po (+116/-125)
utils/po/km.po (+114/-123)
utils/po/ko.po (+114/-123)
utils/po/lo.po (+116/-125)
utils/po/lt.po (+116/-125)
utils/po/mk.po (+116/-125)
utils/po/mr.po (+116/-125)
utils/po/nb.po (+117/-126)
utils/po/nl.po (+115/-124)
utils/po/pa.po (+114/-124)
utils/po/pl.po (+116/-125)
utils/po/pt.po (+114/-123)
utils/po/pt_BR.po (+114/-123)
utils/po/pt_PT.po (+1/-1)
utils/po/ro.po (+116/-125)
utils/po/ru.po (+114/-123)
utils/po/si.po (+116/-125)
utils/po/sk.po (+116/-126)
utils/po/sl.po (+116/-126)
utils/po/sr.po (+116/-125)
utils/po/sv.po (+114/-123)
utils/po/ta.po (+116/-126)
utils/po/th.po (+114/-123)
utils/po/tr.po (+120/-130)
utils/po/uk.po (+116/-125)
utils/po/vi.po (+116/-125)
utils/po/wa.po (+116/-125)
utils/po/xh.po (+116/-125)
utils/po/zh_CN.po (+114/-123)
utils/po/zh_TW.po (+114/-123)
utils/po/zu.po (+116/-125)
utils/rc.sd-event-dispatch.suse (+0/-97)
utils/severity.pl (+0/-56)
Related source package recipes
Related bugs
| Bug #655523: apparmor init script fails to load profile with space in name | Undecided | Fix Released |
|
| Bug #724193: Merge AppArmor 2.6.0 release | Undecided | Fix Released |
|
Related blueprints
Branch information
Recent revisions
- 1418. By Steve Beattie
-
- 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. - 1416. By Steve Beattie
-
debian/
lib/apparmor/ functions: handle profile names with embedded
spaces (LP: #655523) - 1415. By Jamie Strandboge
-
debian/
lib/apparmor/ functions: don't unload dynamically generated libvirt
profiles on reload, restart, and force-reload (LP: #702774) - 1413. By Jamie Strandboge
-
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 - 1410. By Jamie Strandboge
-
* 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
-
- allow net_raw and network inet raw for ICMP pings when used as a DHCP
server
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
