Merge branch 'master' into lsm_implementation_kernel

srcpkgs/linux4.16/template

@@ -1,7 +1,7 @@
 # Template file for 'linux4.16'
 pkgname=linux4.16
-version=4.16.12
-revision=2
+version=4.16.14
+revision=1
 patch_args="-Np1"
 wrksrc="linux-${version}"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
@@ -9,7 +9,7 @@ homepage="https://www.kernel.org"
 license="GPL-2.0-only"
 short_desc="The Linux kernel and modules (${version%.*} series)"
 distfiles="https://cdn.kernel.org/pub/linux/kernel/v4.x/linux-${version}.tar.xz"
-checksum=567078358d5a3490d1410696f36f36f5e88f98bef9f4d3c0d68c605aeb71111d
+checksum=b708b6fd755df7d3f954ca9542e59d0070488b29653071ae4b13fb76b995dfc0
 
 nodebug=yes  # -dbg package is generated below manually
 nostrip=yes

srcpkgs/runit-void/runit-void-apparmor.INSTALL

@@ -0,0 +1,13 @@
+case "$ACTION" in
+pre)
+  # Fix incorrect path in /etc/default
+  if [ -e /etc/default/apparmor/rc.apparmor ]; then
+    mv /etc/default/apparmor/rc.apparmor /etc/default/rc.apparmor
+    rm -rf /etc/default/apparmor
+    mv /etc/default/rc.apparmor /etc/default/apparmor
+  fi
+  if [ -d /etc/default/apparmor ]; then
+    rm -rf /etc/default/apparmor
+  fi
+	;;
+esac

srcpkgs/runit-void/template

@@ -1,7 +1,7 @@
 # Template file for 'runit-void'
 pkgname=runit-void
 version=20171102
-revision=2
+revision=3
 wrksrc="void-runit-${version}"
 build_style=gnu-makefile
 homepage="http://www.voidlinux.eu"
@@ -32,7 +32,7 @@ post_install() {
 	vconf ${FILESDIR}/hostname
 	vconf ${FILESDIR}/os-release
 	vconf ${FILESDIR}/locale.conf
-	vinstall ${FILESDIR}/rc.apparmor 644 /etc/default/apparmor
+	vinstall ${FILESDIR}/apparmor 644 /etc/default/
 	vinstall ${FILESDIR}/09-apparmor.sh 644 /etc/runit/core-services/
 	# Enable services at post-install time instead.
 	rm -f ${DESTDIR}/etc/runit/runsvdir/current
@@ -44,6 +44,7 @@ post_install() {
 runit-void-apparmor_package() {
 	short_desc+=" - AppArmor initialization"
 	depends="${sourcepkg}-${version}_${revision}"
+	conf_files="/etc/default/apparmor"
 	pkg_install() {
 		vmove etc/default/apparmor
 		vmove etc/runit/core-services/09-apparmor.sh