From bc4bc0437b0e05f8830968a9c2e494bb35684030 Mon Sep 17 00:00:00 2001 From: Leo Date: Sun, 26 May 2019 16:22:18 -0300 Subject: testing/apparmor: modernize, fix license Closes GH-8148 --- ...0005-utils-adjust-tests-to-match-the-Alpine-layout.patch | 2 +- testing/apparmor/APKBUILD | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) (limited to 'testing/apparmor') diff --git a/testing/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch b/testing/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch index 9173850234..2b814732f3 100644 --- a/testing/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch +++ b/testing/apparmor/0005-utils-adjust-tests-to-match-the-Alpine-layout.patch @@ -26,7 +26,7 @@ index d93b8eae..b40a2001 100644 ('#!/usr/bin/perl', ('/usr/bin/perl', 'abstractions/perl')), ('#!/usr/bin/perl -w', ('/usr/bin/perl', 'abstractions/perl')), # '-w' is not part of the interpreter path - ('#!/usr/bin/python', ('/usr/bin/python', 'abstractions/python')), -+ ('#!/usr/bin/python', ('/usr/bin/python2.7', 'abstractions/python')), ++ ('#!/usr/bin/python', ('/usr/bin/python', 'abstractions/python')), ('#!/usr/bin/python2', ('/usr/bin/python2', 'abstractions/python')), ('#!/usr/bin/python2.7', ('/usr/bin/python2.7', 'abstractions/python')), ('#!/usr/bin/python3', ('/usr/bin/python3', 'abstractions/python')), diff --git a/testing/apparmor/APKBUILD b/testing/apparmor/APKBUILD index 9dfc059e16..87122eef99 100644 --- a/testing/apparmor/APKBUILD +++ b/testing/apparmor/APKBUILD @@ -2,14 +2,15 @@ # Maintainer: Allan Garret pkgname=apparmor pkgver=2.13.2 -pkgrel=2 +pkgrel=3 pkgdesc="Linux application security framework - mandatory access control for programs" url="https://gitlab.com/apparmor/apparmor/wikis/home" arch="all" -license="GPL" +license="GPL-2.0-only" depends="bash" -makedepends="bash sed python3 autoconf automake libtool bison flex perl-dev swig gettext-dev python3-dev linux-pam-dev linux-headers" -checkdepends="dejagnu py3-pyflakes python2" +makedepends="sed python3 autoconf automake libtool bison flex perl-dev swig + gettext-dev python3-dev linux-pam-dev linux-headers" +checkdepends="dejagnu py3-pyflakes" subpackages=" libapparmor:_libapparmor @@ -85,8 +86,6 @@ check() { } package() { - cd "$builddir" - make -C parser install DESTDIR="$pkgdir" mv "$pkgdir"/lib "$pkgdir"/usr/lib mkdir -p "$pkgdir"/usr/libexec/apparmor @@ -222,6 +221,6 @@ e94f44427ed3c6f64462170939ffc92ce9ac1a58c61c7c7c3483fe16fe8e1c419daade9d56cdd342 20817633590c40eb5f6132c11396cf0bbd532b6e436aa90b6ccc61d7c914794d868ec981b91406f6c11f550102aa25a32982610445cc8e5e703ee90697233263 0002-utils-remove-vim-from-the-default-build.patch 568e10bda27745ac6e1b9495bb6863e93466ee1c387912393c2c7396bcedd7400b13ee233dd953f82460328e3aae45dd2f7aba92962edef31330d6b4dbc9951b 0003-parser-remove-specific-tests-for-rttime.patch 3a84fb3b2b19ccf52e179190e98ec0da2469727eaaa73d0094b0e9c85b80738c9cb9da9242d17a472a649e6042933bedb5f78c3f574d555369a4ece38a1d8a8a 0004-parser-remove-specific-tests-for-ofile.patch -618b96c9d5e6059dff9fabb51ab9138ee8f7a6978a94f5805297b3dc4bd3836026ad50ec4f8496baa8f7978d17fe0a10ebfa3ff96e3d65f362e1cba33da8e115 0005-utils-adjust-tests-to-match-the-Alpine-layout.patch +be7397ab9db4aff4774b9ee8dd43644ceb36e5755fb2e38a72ab42a53ee67bcdeccc3f8c09ce9279a10f3c110ede2026d72fec81f06f1b66149e160cf9a7dd7c 0005-utils-adjust-tests-to-match-the-Alpine-layout.patch 38ebb30a0185f8eabd9103925959da365f64ef485f66ffb10180ac596fc172f9c98df39baec0b035138e9ab32056148e69a066faba9faebf9e92bf7a09c150c0 0006-utils-adjust-rc-functions-for-aa-remove-unknown.patch 093c2f216776c5cc67294a134af6ef788dd5a82477592093abbdd244d65591006890a7c911d4f72d7c0ceac5d3ee33927b055a6d3731284701057b35372e7265 0007-Remove-Locale-gettext-from-parser-tests.patch" -- cgit v1.2.3