Author: Christian Boltz
Revision Date: 2019-04-03 20:35:53 UTC

Merge branch 'cboltz-complex-profile-name' into 'master'

Add some tests for complex profile names

See merge request apparmor/apparmor!360

Acked-by: Eric Chiang <ericchiang@google.com>

Author: Steve Beattie
Revision Date: 2019-02-19 09:38:13 UTC

The AppArmor project has been converted to git and is now hosted on
gitlab.

To get the converted repository, please do
  git clone https://gitlab.com/apparmor/apparmor

Author: Simon Déziel
Revision Date: 2017-10-27 00:02:24 UTC

profiles: update wireshark profile for modern releases

MErge from trunk commit 3728

Acked-by: Steve Beattie <steve@nxnw.org>

Author: intrigeri
Revision Date: 2017-10-26 17:27:37 UTC

profiles: allow OpenAL HRTF support in audio abstraction

merge from trunk commit 3726

The files are "head-related transfer function" data sets, used by
OpenAL for better spatialization of sounds when headphones are detected.

Acked-by: Steve Beattie <steve@nxnw.org>

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874665

Author: intrigeri
Revision Date: 2017-10-26 17:31:35 UTC

profiles: allow OpenAL HRTF support in audio abstraction

Merge from trunk commit 3726

The files are "head-related transfer function" data sets, used by
OpenAL for better spatialization of sounds when headphones are detected.

Acked-by: Steve Beattie <steve@nxnw.org>

Bug: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=874665

Author: John Johansen
Revision Date: 2017-10-19 02:44:47 UTC

Bump release version to 2.8.5

Author: Kees Cook
Revision Date: 2012-04-25 19:58:58 UTC

Merge from trunk rev 2037:

The m4 shipped to handle Python was incorrectly clearing
$CPPFLAGS. Additionally, do not repeat compiler flags for automake
targets that already include them, and pass more flags to the Perl build.

Signed-off-by: Kees Cook <kees@ubuntu.com>
Acked-By: Steve Beattie <sbeattie@ubuntu.com>

Author: Launchpad Translations on behalf of apparmor-dev
Revision Date: 2024-03-08 06:49:46 UTC

Launchpad automatic translations update.

Author: Vincas Dargis
Revision Date: 2017-11-05 15:49:35 UTC

Migrated to GitLab

Author: vincas
Revision Date: 2017-10-30 18:55:15 UTC

Update phpsysinfo for multiple denies.

Author: intrigeri
Revision Date: 2017-10-23 14:23:26 UTC

Stop inappropriately mangling script shebangs.

Patch by Adam Conrad <adconrad@ubuntu.com>

Author: <email address hidden>
Revision Date: 2017-09-29 19:04:35 UTC

Apparmor profile for QuiteRSS feed reader.

Author: Patrick Steinhardt
Revision Date: 2017-09-27 09:44:36 UTC

parser: explicitly define non-standard function types

In our parser code, we use the function definitions
`comparison_fn_t` and `__free_fn_t` to cast function pointers to
the correct type. These typedefs are not standardized though and
are specific to the glibc library, which may cause compiler
errors when another libc is being used instead.

To fix the issue we can add explicit typedefs for those
functions. Having duplicated typedefs is not an issue as long as
the actual type alias is the same for all existing typedefs of
the same name. Given that both the comparison function and the
free function have a standardized function signature, this is not
an issue.

This fixes compilation with musl libc.

Signed-off-by: Patrick Steinhardt <ps@pks.im>

Author: intrigeri
Revision Date: 2017-09-20 13:40:21 UTC

abstractions/freedesktop.org: fixup.

Author: Jamie Strandboge
Revision Date: 2017-09-15 13:24:38 UTC

add debian/patches/nameservice-add-stub-resolv.patch

Author: Tyler Hicks
Revision Date: 2016-08-24 15:39:55 UTC

debian/source/format: use source format 1.0

Author: Chris Holcombe
Revision Date: 2016-07-22 19:22:36 UTC

sys.exit(1) when unable to find the apparmor profile

Author: Simon McVittie
Revision Date: 2016-06-21 17:20:30 UTC

abstractions/nameservice: also support ConnMan-managed resolv.conf

Follow the same logic we already did for NetworkManager,
resolvconf and systemd-resolved. The wonderful thing about
standards is that there are so many to choose from.

Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>

Author: Christian Boltz
Revision Date: 2016-03-01 20:24:10 UTC

Fix wrong usage of write_prof_data in serialize_profile_from_old_profile()

write_prof_data[hat] is correct (it only contains one profile, see bug 1528139),
write_prof_data[profile][hat] is not and returns an empty (sub)hasher.

This affects RE_PROFILE_START and RE_PROFILE_BARE_FILE_ENTRY.

Acked-by: Kshitij Gupta <kgupta8592@gmail.com> for trunk, 2.9 and 2.10

Author: Jamie Strandboge
Revision Date: 2016-02-18 20:52:21 UTC

debian/patches/parser-allow-unspec-in-network-rules.patch: Allow
apparmor_parser to support rules that use 'unspec' as the network protocol
family. (LP: #1546455)

Author: Chad Miller
Revision Date: 2016-01-15 14:49:27 UTC

Finish separating accessibility rules.

Author: William Hua
Revision Date: 2015-06-25 19:59:08 UTC

Simplify dconf data serialization.

Author: Steve Beattie
Revision Date: 2015-06-17 19:57:47 UTC

Update changelog release for pushing to trusty-proposed.

Author: Cameron Norman
Revision Date: 2015-06-06 22:48:19 UTC

abstractions/gnome: allow reading gschemas, gtk3 per-user config

Author: William Hua
Revision Date: 2015-05-27 15:49:03 UTC

Correct permissions.

Author: William Hua
Revision Date: 2015-05-19 20:31:28 UTC

Minor fixes.

Author: William Hua
Revision Date: 2015-05-12 13:06:40 UTC

parser: fix warnings

Author: Christian Boltz
Revision Date: 2015-04-14 02:07:47 UTC

utils: simplify serialize_parse_profile_start()
Merge from trunk revision 3001

Change serialize_parse_profile_start() to use parse_profile_start()
instead of using duplicated code.

The behaviour is mostly kept, with the exception that the function is
more strict now and raises exceptions instead of ignoring errors.

In practise, this won't change anything because the profiles are parsed
with parse_profile() (which calls parse_profile_start()) - and that
already errors out.

The tests are updated to match the more strict behaviour.

The next step would be to drop serialize_parse_profile_start()
completely, but this isn't urgent and can/should be done when we have
test coverage for serialize_profile_from_old_profile() one day ;-)

Acked-by: Steve Beattie <steve@nxnw.org>

Author: Serge Hallyn
Revision Date: 2015-03-27 00:29:55 UTC

Add /lib/apparmor/profile-load; moved from
/lib/init/apparmor-profile-load from the upstart package. A wrapper at
the original path is now provided by init-system-helpers. (LP: #1432683)

Author: Tyler Hicks
Revision Date: 2015-03-06 18:56:48 UTC

parser: Remove atomic ops

The parser no longer has a need for the atomic operations since all
callers have been moved to libapparmor.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>

Author: Jamie Strandboge
Revision Date: 2014-09-08 23:12:56 UTC

debian/control: update Breaks for apparmor-easyprof-ubuntu, libvirt-bin,
and lightdm. Add Breaks on rsyslog.

Author: Tyler Hicks
Revision Date: 2014-08-27 21:38:24 UTC

parser: Don't write the stream's address to the rule buffer

The writeu16() function was returning the address of the passed in
std::ostringstream and then the callers of that function were
incorrectly writing that address to the rule buffer.

Signed-off-by: Tyler Hicks <tyhicks@canonical.com>

Author: Tyler Hicks
Revision Date: 2014-08-14 14:37:48 UTC

WIP: abstract rules

Author: Tyler Hicks
Revision Date: 2014-08-15 20:53:15 UTC

* 01-get-text.patch, 02-network1.patch, 03-type_name.patch,
  04-af_mapping.patch, 05-af_type_mappings.patch, 06-network3.patch,
  07-move-node.patch, 08-split-accept-perm.patch, 09-refactor1.patch,
  10-refactor1.patch, 11-refactor1.patch, 12-split-accept-from-rule.patch:
  Import the latest AF_UNIX parser patches from the AppArmor list. Note that
  these patches are a work in progress and are not in their final form.

Author: Tyler Hicks
Revision Date: 2014-08-07 00:57:21 UTC

* parser-include-usr-share-apparmor.patch, debian/apparmor.install: Adjust
  the default parser.conf file, to add /usr/share/apparmor as an additional
  search path when resolving include directives in profiles, and install the
  file in /etc/apparmor. Ubuntu places hardware specific access rules in
  /usr/share/apparmor/hardware. This change allows these files to be
  included without using an absolute path (e.g.,
  '#include <hardware/graphics.d>').

Author: Dimitri John Ledkov
Revision Date: 2014-05-23 09:11:59 UTC

* debian/control: mark apparmor M-A:foreign, typically it's only needed
  for it's hosts tools, which some M-A:same packages exec.
* debian/control: drop using deprecated python*:Versions variables.

Author: Jamie Strandboge
Revision Date: 2014-04-07 22:07:50 UTC

utils/aa-notify: add preliminary dbus support

Author: Cameron Norman
Revision Date: 2014-04-06 19:26:06 UTC

Updated abstractions/freedesktop.org for nested application dirs, /usr/local

Author: Tyler Hicks
Revision Date: 2014-04-03 21:15:31 UTC

Fix patch tag typo in python-utils-file-support.patch

Author: Tyler Hicks
Revision Date: 2014-03-27 19:13:53 UTC

debian/changelog: Fix spelling and readability errors

Author: Jamie Strandboge
Revision Date: 2014-03-26 16:15:34 UTC

* autostart aa-notify via /etc/xdg/autostart instead of /etc/X11/Xsession.d
  (LP: #1288241)
  - remove debian/notify/90apparmor-notify
  - add debian/notify/apparmor-notify.desktop
  - debian/apparmor-notify.install: adjust for the above
  - add debian/apparmor-notify.maintscript to remove 90apparmor-notify
* debian/notify/notify.conf: use_group should be set to "sudo" instead of
  "admin" (LP: #1009666)

Author: Jamie Strandboge
Revision Date: 2014-03-26 15:26:21 UTC

use -name instead of -regex based on feedback by Christian Boltz

Author: Jamie Strandboge
Revision Date: 2014-03-20 15:28:12 UTC

update changelog for trusty

Author: Seth Arnold
Revision Date: 2014-03-20 03:36:23 UTC

Modified patches to remove numbers, they complicated quilt handling too
much.

  - add-chromium-browser.patch
  - add-debian-integration-to-lighttpd.patch
  - ubuntu-manpage-updates.patch
  - libapparmor-layout-deb.patch
  - libapparmor-mention-dbus-method-in-getcon-man.patch
  - etc-writable.patch
  - aa-utils_are_bilingual.patch
  - convert-to-rules.patch
  - list-fns.patch
  - parse-mode.patch
  - add-decimal-interp.patch
  - policy_mediates.patch
  - fix-failpath.patch
  - feature_file.patch
  - fix-network.patch
  - aare-to-class.patch
  - add-mediation-unix.patch
  - parser_version.patch
  - caching.patch
  - label-class.patch
  - fix-lexer-debug.patch
  - use-diff-encode.patch
  - fix-serialize.patch
  - fix-ppc-endian-ftbfs.patch
  - opt_arg.patch
  - tests-cond-dbus.patch

Author: Kees Cook
Revision Date: 2014-01-03 22:58:44 UTC

releasing package apparmor version 2.8.0-5

Author: Dimitri John Ledkov
Revision Date: 2014-01-01 03:46:35 UTC

Fix FTBFS with Bison 3.0+

Author: jdstrand
Revision Date: 2013-07-08 00:25:14 UTC

update manifest JSON structure to use m['security']['profiles']['profile_name']
instead of m['security']['profile_name']

Author: Steve Beattie
Revision Date: 2012-10-09 20:34:17 UTC

debian/patches/0022-aa-decode-stdin.patch: fix aa-decode to process
stdin correctly and decode encoded profiles names

Author: nvalcarcel
Revision Date: 2012-06-11 22:54:38 UTC

add test_is_skippable_file and test_read_file

Author: Steve Beattie
Revision Date: 2012-04-30 17:42:36 UTC

debian/patches/apparmor-lp982619.patch: fix aa-logprof to not rewrite
PUx permissions into (syntactically invalid) UPx perms (LP: #982619)

Author: Steve Beattie
Revision Date: 2012-04-12 06:25:21 UTC

* debian/patches/0017-apparmor-lp979135.patch: incorporate testsuite
  change (upstream revno 2032) that the patch originally should have
  taken into account, since it was fixing the onexec failure due to the
  missing implicit access to /proc/*/attr/exec.

Author: Steve Beattie
Revision Date: 2011-08-26 23:03:03 UTC

Merge from trunk revision 1805:

  Attached is a patch to make the initscript not fail if /tmp is full
  by converting the comm(1) usage on temporary files to an embedded
  awk script. On both Ubuntu and OpenSUSE, a version of awk (mawk in
  Ubuntu, gawk in OpenSUSE) is either a direct or indirect dependency
  on the minimal or base package set, and the original reporter also
  mentioned that an awk-based solution would be palatable in a way
  that converting to bash, or using perl or python here would not be.

  In the embedded awk script, I've tried to avoid gawk or mawk
  specific behaviors or extensions; e.g. this is the reason for the
  call to sort on the output of the awk script, rather than using
  gawk's asort(). But please let me know if you see anything that
  shouldn't be portable across awk implementations.

  An additional issue that is fixed in both scripts is handling
  child profiles (e.g. hats) during reload. If child profiles are
  filtered out (via grep -v '//') of the list to consider, then
  on reloading a profile where a child profile has been removed or
  renamed, that child profile will continue to stick around. However,
  if the profile containing child profiles is removed entirely,
  if the initscript attempts to unload the child profiles after the
  parent is removed, this will fail because they were unloaded when
  the parent was unloaded. Thus I removed any filtering of child
  profiles out, but do a post-awk reverse sort which guarantees that
  any child profiles will be removed before their parent is. I also
  added the LC_COLLATE=C (based on the Ubuntu version) to the sort
  call to ensure a consistent sort order.

  To restate, the problem with the existing code is that it creates
  temporary files in $TMPDIR (by default /tmp) and if that partition
  is full, problems with the reload action ensue. Alternate solutions
  include switching the initscript to use bash and its <$() extension
  or setting TMPDIR to /dev/shm/. The former is unpalatable to some
  (particularly for an initscript), and for the latter, /dev/shm is
  only guaranteed to exist on GNU libc based systems (glibc apparently
  expects /dev/shm to exist for its POSIX shared memory implementation;
  see shm_overview(7)). So to me, awk (sans GNU extensions) looks
  to be the least bad option here.

Nominated-By: Steve Beattie <sbeattie@ubuntu.com>
Acked-By: John Johansen <john.johansen@canonical.com>

Author: John Johansen
Revision Date: 2011-06-06 17:39:54 UTC

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 <john.johansen@canonical.com>

Author: Steve Beattie
Revision Date: 2011-05-31 19:46:04 UTC

debian/lib/apparmor/functions: adjust configured_profile_names()
to filter based on the proper hatname/child profile separator.
(LP: #788616)

Author: Jamie Strandboge
Revision Date: 2011-04-18 16:21:25 UTC

Release 2.6.1-0ubuntu3

* debian/patches/0003-add-debian-integration-to-lighttpd.patch: updates for
  lighttpd example profile to work in Debian/Ubuntu (LP: #582814)
* debian/patches/0004-lp754889.patch: add several image viewers to
  ubuntu-browsers.d/multimedia abstraction (LP: #754889)
* debian/patches/0005-lp761217.patch: abstractions/private-files updates for
  zsh and several other shells (LP: #761217)
* debian/patches/0001-add-chromium-browser.patch: fixes for multiarch and
  crash reporter (LP: #764786)

Author: Steve Beattie
Revision Date: 2011-04-13 21:11:26 UTC

once more with feeling

Author: Steve Beattie
Revision Date: 2011-03-24 08:50:57 UTC

* 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

Author: Steve Beattie
Revision Date: 2011-02-24 09:44:53 UTC

- 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.

Author: Jamie Strandboge
Revision Date: 2011-02-16 20:47:41 UTC

removed all profiles and added README to point to new bzr tree:
lp:apparmor-profiles

Author: Jamie Strandboge
Revision Date: 2011-01-05 19:12:00 UTC

Bring karmic tree up to date with what is in karmic-updates and the latest
karmic-security

* Fix for apparmor_parser not generating correct policy when mixing exec
  transitions with and without unconfined fallback transitions.
  - parser/immunix.h, parser/libapparmor_re/regexp.y: adjust dfa match flag
    table size and fix index calculation for pux and cux.
  - parser/tst/Makefile, parser/tst/gen-xtrans.pl,
    parser/tst/simple_tests/generated_x/readme: add comprehensive test cases
  - LP: #693082
* debian/control: Build-Depends on libpam0g-dev

Author: Jamie Strandboge
Revision Date: 2011-01-05 19:02:59 UTC

Bring up to date with what was shipped in lucid-proposed and add most recent
lucid-security update

* Fix for apparmor_parser not generating correct policy when mixing exec
  transitions with and without unconfined fallback transitions.
  - debian/patches/0013-lp693082.patch: adjust dfa match flag table size
    and fix index calculation for pux and cux.
  - LP: #693082
* debian/patches/0011-lucid-compat-dbus.patch: move /var/lib/dbus/machine-id
* debian/patches/0012-lucid-compat-kde.patch: add kde4-config to kde
    + 0004-ubuntu-abstractions-updates.patch
* debian/patches/0009-sensible-browser-pix.patch: use Pix with
  sensible-browser
* debian/patches/0010-ubuntu-buildd.patch: skip parser caching test if
  the AppArmor securityfs introspection directory is not mounted, as
  is the case on Ubuntu buildds.

Author: Jamie Strandboge
Revision Date: 2011-01-05 18:57:22 UTC

* Fix for apparmor_parser not generating correct policy when mixing exec
  transitions with and without unconfined fallback transitions.
  - debian/patches/0011-lp693082.patch: adjust dfa match flag table size
    and fix index calculation for pux and cux.
  - LP: #693082

Author: Steve Beattie
Revision Date: 2010-10-15 19:35:38 UTC

Test fix for makefiles.

Author: Kees Cook
Revision Date: 2009-11-11 20:05:25 UTC

mark merge point

Author: Kees Cook
Revision Date: 2009-11-11 20:05:25 UTC

mark merge point

Author: jrjohansen
Revision Date: 2008-07-23 08:12:28 UTC

fix error in selinux patch

Author: jrjohansen
Revision Date: 2009-01-07 14:11:56 UTC

Fix for bnc#464103

where the command name reported can be confused because the application
was started as a link.

Author: DominicReynolds_
Revision Date: 2007-09-17 19:32:54 UTC

Create a branch for 10.2 for maintenance.

Author: DominicReynolds_
Revision Date: 2007-09-18 16:38:04 UTC

Maintenance update for the apparmor-utils package. All source pulled
from trunk except lcn updates.

Author: dominic_r
Revision Date: 2007-10-18 02:46:58 UTC

Removed temporary dir under experimental.

Author: jrjohansen
Revision Date: 2008-05-27 12:04:33 UTC

remove for-mainline dir from kernel patches

Author: jrjohansen
Revision Date: 2008-03-28 07:19:57 UTC

merge -r 1158 - fix fatal errors so that they have an exit with an exit code
of 127

Author: jrjohansen
Revision Date: 2007-09-11 00:37:16 UTC

update patch header

Author: Steve Beattie
Revision Date: 2009-08-07 11:01:50 UTC

Add changelog entry.

Author: Jamie Strandboge
Revision Date: 2009-04-08 13:56:24 UTC

abstractions/smbpass: Add *.ldb used in Samba 3.2 and above (LP: #357581)

Author: Jamie Strandboge
Revision Date: 2009-05-05 23:09:20 UTC

apparmor (2.1+1075-0ubuntu9.2) hardy-proposed; urgency=low

SubDomain.pm: Ignore "force-complain/" to prevent aa-genprof from failing.
(LP: #331534)

-John Dong <jdong@ubuntu.com>Tue, 28 Apr 2009 15:26:48 -0400

Author: Jamie Strandboge
Revision Date: 2009-05-05 23:00:39 UTC

apparmor (2.3+1289-0ubuntu4.2) intrepid-proposed; urgency=low

utils/SubDomain.pm: re-add dropped patch to not process disable/ as
include files, and also don't process force-complain/ (LP: #331534)

Author: Thierry Carrez
Revision Date: 2009-04-08 11:46:10 UTC

abstractions/smbpass: Add *.ldb used in Samba 3.2 and above (LP: #357581)

Author: Steve Beattie
Revision Date: 2009-03-19 22:43:55 UTC

Update changelog.

Author: Kees Cook
Revision Date: 2007-10-12 20:00:32 UTC

merge; update cups client more, add KDE paths; release;

Author: rclark
Revision Date: 2008-02-14 20:39:08 UTC

merged with trunk