Skip to content

Merge 2.13.2 10

Andrew Lee requested to merge merge-2.13.2-10 into apertis/v2020pre

apparmor (2.13.2-10co1) apertis; urgency=medium

  • Merge from Debian buster. Remaining apertis changes:
    • debian/apparmor.postinst: Don't use mv -n, it's only part of newer coreutils.
    • debian/control: Move aa-status into a separate package.
    • debian/control: Forward port remaining apparmor changes from Apertis.
      • New binary packages: apparmor-tests, apparmor-utils-tests.
      • New binary packages because the test scripts are not packaged by Debian which are used by our automated tests.
    • debian/control: Depend on libdbus-1-dev to build the dbus test programs.
    • Review and import following relevant patches.
      • debian/patches/ptrace-test-include-asm-ptrace.h-on-ARM.patch
      • debian/patches/9901-vivante-and-egl-for-X-abstraction.patch
      • debian/patches/9999-use_DEB_HOST_GNU_TYPE.patch
      • debian/patches/libreoffice-apparmor-profile-fonts.patch
      • debian/patches/abstractions-base-stop-working-around-LP-359338.patch
      • debian/patches/Add-pvr-devices-to-X-abstraction.patch
      • debian/patches/Extend-abstractions-X-to-account-for-Wayland-clients.patch
      • debian/patches/Allow-for-access-to-the-mutter-shared-keymap.patch
      • debian/patches/freedesktop.org-abstractions.patch
    • debian/apparmor-tests.install: Install the tests/regression/apparmor/dbus_* test programs. List syscall_ioperm and syscall_iop again, and later exclude them only on the architectures they are not built for.
    • debian/rules: Add -Xsyscall_ioperm -Xsyscall_iop to dh_install in override_dh_install-arch to exclude those test programs on architectures other than i386 and amd64.
    • debian/aa-status.install: Ship apparmor_status binary in aa-status instead of in apparmor binary package..
    • debian/features: Pin features to the ones provided by Apertis kernels.
    • debian/apertis: Add GitLab CI metadata.

-- Andrew Lee (李健秋) andrew.lee@collabora.co.uk Thu, 19 Sep 2019 18:44:56 +0800

Edited by Ritesh Raj Sarraf

Merge request reports