apparmor-git 2.13.r638.gdb1f3918-1

2 files changed, 35 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 302167dbfeff..3cfa7388fdef 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = apparmor-git
 	pkgdesc = Mandatory Access Control (MAC) using Linux Security Module (LSM)
-	pkgver = 2.13.r277.g4a2dad33
+	pkgver = 2.13.r638.gdb1f3918
 	pkgrel = 1
 	url = https://gitlab.com/apparmor/apparmor
 	arch = x86_64
@@ -8,7 +8,10 @@ pkgbase = apparmor-git
 	checkdepends = dejagnu
 	checkdepends = perl-locale-gettext
 	checkdepends = python-pyflakes
+	checkdepends = python-notify2
+	checkdepends = python-psutil
 	makedepends = git
+	makedepends = apache
 	makedepends = swig
 	makedepends = ruby
 	depends = audit
@@ -17,15 +20,11 @@ pkgbase = apparmor-git
 	depends = python
 	optdepends = perl: perl bindings
 	optdepends = ruby: ruby bindings
-	provides = apparmor=2.13.r277.g4a2dad33
-	provides = libapparmor
+	optdepends = python-notify2: for the aa-notify tool
+	optdepends = python-psutil: for the aa-notify tool
+	provides = apparmor=2.13.r638.gdb1f3918
+	provides = libapparmor.so
 	conflicts = apparmor
-	replaces = apparmor-libapparmor
-	replaces = apparmor-pam
-	replaces = apparmor-parser
-	replaces = apparmor-profiles
-	replaces = apparmor-utils
-	replaces = apparmor-vim
 	backup = etc/apparmor/easyprof.conf
 	backup = etc/apparmor/logprof.conf
 	backup = etc/apparmor/notify.conf
diff --git a/PKGBUILD b/PKGBUILD
index 60d5f5dc5a65..eaea645f4cc1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,20 +2,21 @@
 # Contributor: David Runge <dave@sleepmap.de>
 
 pkgname=apparmor-git
-pkgver=2.13.r277.g4a2dad33
+pkgver=2.13.r638.gdb1f3918
 pkgrel=1
 pkgdesc='Mandatory Access Control (MAC) using Linux Security Module (LSM)'
 arch=('x86_64')
 url='https://gitlab.com/apparmor/apparmor'
 license=('GPL')
 depends=('audit' 'bash' 'pam' 'python')
-makedepends=('git' 'swig' 'ruby')
-checkdepends=('dejagnu' 'perl-locale-gettext' 'python-pyflakes')
+makedepends=('git' 'apache' 'swig' 'ruby')
+checkdepends=('dejagnu' 'perl-locale-gettext' 'python-pyflakes' 'python-notify2' 'python-psutil')
 optdepends=('perl: perl bindings'
-            'ruby: ruby bindings')
+            'ruby: ruby bindings'
+            'python-notify2: for the aa-notify tool'
+            'python-psutil: for the aa-notify tool')
 conflicts=("${pkgname%-git}")
-provides=("${pkgname%-git}=${pkgver}" 'libapparmor')
-replaces=('apparmor-libapparmor' 'apparmor-pam' 'apparmor-parser' 'apparmor-profiles' 'apparmor-utils' 'apparmor-vim')
+provides=("${pkgname%-git}=${pkgver}" 'libapparmor.so')
 backup=('etc/apparmor/easyprof.conf'
         'etc/apparmor/logprof.conf'
         'etc/apparmor/notify.conf'
@@ -36,8 +37,13 @@ pkgver() {
 
 prepare() {
 	cd "${srcdir}/${pkgname%-git}"
-	# fix default installation path for vim syntax file
-	sed -e 's|share/apparmor|share/vim/vimfiles/syntax|' -i utils/vim/Makefile
+	# fix PYTHONPATH and add LD_LIBRARY_PATH for aa-logprof based check:
+	# https://gitlab.com/apparmor/apparmor/issues/39
+	local _py3_ver=$(python --version | cut -d " " -f2)
+	local path="${PWD}/libraries/libapparmor/swig/python/build/lib.linux-${CARCH}-${_py3_ver%"."*}/LibAppArmor"
+	local libs="${PWD}/libraries/libapparmor/src/.libs"
+	sed -e "/PYTHONPATH/ s|utils\ |utils:$path\ LD_LIBRARY_PATH=$libs\ |" -i profiles/Makefile
+
 	cd "${srcdir}/${pkgname%-git}/libraries/libapparmor"
 	./autogen.sh
 }
@@ -64,6 +70,7 @@ build() {
 	make -C profiles
 	make -C utils
 	make -C changehat/pam_apparmor
+	make -C changehat/mod_apparmor
 	make -C utils/vim
 }
 
@@ -72,26 +79,31 @@ check() {
 	make -C libraries/libapparmor check
 	make -C binutils check
 	make -C parser check
-	#make -C utils check
-	#make -C profiles check
+	# only running check-parser, as check-logprof (included in check) fails:
+	# https://gitlab.com/apparmor/apparmor/issues/36
+	make -C profiles check-parser
+	make -C utils check
 }
 
 package() {
 	cd "${srcdir}/${pkgname%-git}"
 	make -C libraries/libapparmor DESTDIR="${pkgdir}" install
-	make -C changehat/pam_apparmor DESTDIR="${pkgdir}/usr" install
+	make -C changehat/pam_apparmor DESTDIR="${pkgdir}" SECDIR="${pkgdir}/usr/lib/security" install
+	make -C changehat/mod_apparmor DESTDIR="${pkgdir}" install
 	make -C binutils DESTDIR="${pkgdir}" install
 	make -C parser DESTDIR="${pkgdir}" APPARMOR_BIN_PREFIX="${pkgdir}/usr/lib/apparmor" SBINDIR="${pkgdir}/usr/bin" USR_SBINDIR="${pkgdir}/usr/bin" install
 	make -C parser DESTDIR="${pkgdir}" APPARMOR_BIN_PREFIX="${pkgdir}/usr/lib/apparmor" SBINDIR="${pkgdir}/usr/bin" USR_SBINDIR="${pkgdir}/usr/bin" install-systemd
 	make -C profiles DESTDIR="${pkgdir}" install
-	make -C utils DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" install
-	#  removing empty core_perl directory
+	make -C utils DESTDIR="${pkgdir}" BINDIR="${pkgdir}/usr/bin" VIM_INSTALL_PATH="${pkgdir}/usr/share/vim/vimfiles/syntax" install
+	# removing empty core_perl directory:
+	# https://gitlab.com/apparmor/apparmor/issues/40
 	rm -rv "${pkgdir}/usr/lib/perl5/"*/core_perl
-	# move ruby bindings to vendor_ruby
+	# move ruby bindings to vendor_ruby:
+	# https://gitlab.com/apparmor/apparmor/issues/35
 	mv -v "${pkgdir}/usr/lib/ruby/site_ruby/" "${pkgdir}/usr/lib/ruby/vendor_ruby/"
 	# adding files below /etc/apparmor.d to backup array
 	cd "${pkgdir}"
 	# tricking extract_function_variable() in makepkg into not detecting the
-	# backup array modification
+	# backup array modification and adding remaining configuration files
 	[[ /usr/bin/true ]] && backup=( ${backup[@]} $(find 'etc/apparmor.d/' -type f) )
 }