diff options
| -rw-r--r-- | .SRCINFO | 14 | ||||
| -rw-r--r-- | PKGBUILD | 20 | ||||
| -rw-r--r-- | aa-teardown | 10 | ||||
| -rw-r--r-- | apparmor.service | 25 | ||||
| -rw-r--r-- | apparmor.systemd | 85 |
5 files changed, 11 insertions, 143 deletions
@@ -1,6 +1,6 @@ pkgbase = apparmor pkgdesc = Linux application security framework - mandatory access control for programs - pkgver = 2.12.0 + pkgver = 2.13.0 pkgrel = 2 url = https://launchpad.net/apparmor arch = i686 @@ -13,17 +13,11 @@ pkgbase = apparmor makedepends = perl-locale-gettext makedepends = perl-rpc-xml makedepends = audit - source = https://launchpad.net/apparmor/2.12/2.12.0/+download/apparmor-2.12.tar.gz - source = https://launchpad.net/apparmor/2.12/2.12.0/+download/apparmor-2.12.tar.gz.asc - source = apparmor.systemd - source = aa-teardown - source = apparmor.service + source = https://launchpad.net/apparmor/2.13/2.13.0/+download/apparmor-2.13.tar.gz + source = https://launchpad.net/apparmor/2.13/2.13.0/+download/apparmor-2.13.tar.gz.asc validpgpkeys = 3ECDCBA5FB34D254961CC53F6689E64E3D3664BB - sha512sums = d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a + sha512sums = f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827 sha512sums = SKIP - sha512sums = 5fc5135ffae07c4cfa125c819b67ea812626e13201fde70d15c0d7b09bceadbd4cea9383b8af07c871173fb4d273edb4bbe926871d674565a19958cc08ac9d3a - sha512sums = 47666085482c899d64f73109d50eacd704db33b1726f985edfed0319326e147df177d9cc4cd7d3f45bb7bed348f8fedd03374fc53dde2a42a12c899b88d5ce6b - sha512sums = e7bfb69d6f98842caba1da9790b14b9368b1e5c65fc726e8226e776c8d42f06c0c051329e048a994d06908a365ad3c078745b7d09376d29639e9175b2c2b4c0d pkgname = apparmor pkgdesc = Linux application security framework - mandatory access control for programs (metapackage) @@ -8,7 +8,7 @@ pkgbase=apparmor pkgname=("${pkgbase}" 'apparmor-parser' 'apparmor-libapparmor' 'apparmor-utils' 'apparmor-profiles' 'apparmor-pam' 'apparmor-vim') -pkgver=2.12.0 +pkgver=2.13.0 _majorver="$(expr "${pkgver}" : '\([0-9]*\.[0-9]*\)\.')" pkgrel=2 pkgdesc='Linux application security framework - mandatory access control for programs' @@ -16,15 +16,9 @@ arch=('i686' 'x86_64') url='https://launchpad.net/apparmor' license=('GPL') makedepends=('flex' 'swig' 'perl' 'python' 'perl-locale-gettext' 'perl-rpc-xml' 'audit') -source=("https://launchpad.net/${pkgbase}/${_majorver}/${pkgver}/+download/${pkgbase}-${_majorver}.tar.gz"{,.asc} - "apparmor.systemd" - "aa-teardown" - "apparmor.service") -sha512sums=('d85fd47c66333fe5658ee5e977b32142697f6e36c575550712ee2ace2ad0fbf2aa59c8fd3b82ad8821c0190adf8cc150cf623ea09a84d5b32bde050a03dd6e9a' - 'SKIP' - '5fc5135ffae07c4cfa125c819b67ea812626e13201fde70d15c0d7b09bceadbd4cea9383b8af07c871173fb4d273edb4bbe926871d674565a19958cc08ac9d3a' - '47666085482c899d64f73109d50eacd704db33b1726f985edfed0319326e147df177d9cc4cd7d3f45bb7bed348f8fedd03374fc53dde2a42a12c899b88d5ce6b' - 'e7bfb69d6f98842caba1da9790b14b9368b1e5c65fc726e8226e776c8d42f06c0c051329e048a994d06908a365ad3c078745b7d09376d29639e9175b2c2b4c0d') +source=("https://launchpad.net/${pkgbase}/${_majorver}/${pkgver}/+download/${pkgbase}-${_majorver}.tar.gz"{,.asc}) +sha512sums=('f98914713153d4c823a3ea7e96291cc4528bf7c8d3a139286ae0ecd806613e9c34b0ad81f2b258df2193cf6f3157d3252ef72d32d339427948a3fd8ba5651827' + 'SKIP') # 3D3664BB: AppArmor Development Team (AppArmor signing key) <apparmor@lists.ubuntu.com> validpgpkeys=('3ECDCBA5FB34D254961CC53F6689E64E3D3664BB') @@ -124,9 +118,9 @@ package_apparmor-utils() { cd "${srcdir}/${pkgbase}-${_majorver}" make -C utils DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" install - install -D -m755 "${srcdir}/apparmor.systemd" "${pkgdir}/usr/lib/apparmor/apparmor.systemd" - install -D -m755 "${srcdir}/aa-teardown" "${pkgdir}/usr/bin/aa-teardown" - install -D -m644 "${srcdir}/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" + install -D -m755 "parser/apparmor.systemd" "${pkgdir}/usr/lib/apparmor/apparmor.systemd" + install -D -m755 "parser/aa-teardown" "${pkgdir}/usr/bin/aa-teardown" + install -D -m644 "parser/apparmor.service" "${pkgdir}/usr/lib/systemd/system/apparmor.service" } package_apparmor-profiles() { diff --git a/aa-teardown b/aa-teardown deleted file mode 100644 index 44288569e5e2..000000000000 --- a/aa-teardown +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/bash - -test $# = 0 || { - echo "Usage: $0" - echo - echo "Unloads all AppArmor profiles" - exit 1 -} - -/usr/lib/apparmor/apparmor.systemd stop diff --git a/apparmor.service b/apparmor.service deleted file mode 100644 index 2490d1bb84bd..000000000000 --- a/apparmor.service +++ /dev/null @@ -1,25 +0,0 @@ -[Unit] -Description=Load AppArmor profiles -DefaultDependencies=no -Before=sysinit.target -After=systemd-journald-audit.socket -After=var.mount var-lib.mount -ConditionSecurity=apparmor - -[Service] -Type=oneshot -ExecStart=/usr/lib/apparmor/apparmor.systemd reload -ExecReload=/usr/lib/apparmor/apparmor.systemd reload - -# systemd maps 'restart' to 'stop; start' which means removing AppArmor confinement -# from running processes (and not being able to re-apply it later). -# Upstream systemd developers refused to implement an option that allows overriding -# this behaviour, therefore we have to make ExecStop a no-op to error out on the -# safe side. -# -# If you really want to unload all AppArmor profiles, run aa-teardown -ExecStop=/usr/bin/true -RemainAfterExit=yes - -[Install] -WantedBy=multi-user.target diff --git a/apparmor.systemd b/apparmor.systemd deleted file mode 100644 index 17794c1ac164..000000000000 --- a/apparmor.systemd +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/sh - -APPARMOR_FUNCTIONS='/usr/lib/apparmor/rc.apparmor.functions' - -aa_action() -{ - echo $1 - shift - "$@" - return $? -} - -aa_log_warning_msg() -{ - echo "Warning: $@" -} - -aa_log_failure_msg() -{ - echo "Error: $@" -} - -aa_log_action_start() -{ - echo "$@" -} - -aa_log_action_end() -{ - echo -n -} - -aa_log_daemon_msg() -{ - echo "$@" -} - -aa_log_skipped_msg() -{ - echo "Skipped: $@" -} - -aa_log_end_msg() -{ - echo -n -} - -# source apparmor function library -if [ -f "${APPARMOR_FUNCTIONS}" ]; then - . ${APPARMOR_FUNCTIONS} -else - aa_log_failure_msg "Unable to find AppArmor initscript functions" - exit 1 -fi - -case "$1" in - start) - apparmor_start - rc=$? - ;; - stop) - apparmor_stop - rc=$? - ;; - restart|reload|force-reload) - apparmor_restart - rc=$? - ;; - try-restart) - apparmor_try_restart - rc=$? - ;; - kill) - apparmor_kill - rc=$? - ;; - status) - apparmor_status - rc=$? - ;; - *) - exit 1 - ;; -esac -exit $rc |